Fix bug with MorphologicalRuleOrder.Linear for LT-21988

sillsdev · Dec 4, 2024 · f28237b · f28237b
1 parent 3b98936
commit f28237b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/src/SIL.Machine.Morphology.HermitCrab/AnalysisStratumRule.cs b/src/SIL.Machine.Morphology.HermitCrab/AnalysisStratumRule.cs
@@ -69,17 +69,8 @@ public IEnumerable<Word> Apply(Word input)
             _prulesRule.Apply(input);
             input.Freeze();
 
-            IEnumerable<Word> mruleOutWords = null;
-            switch (_stratum.MorphologicalRuleOrder)
-            {
-                case MorphologicalRuleOrder.Linear:
-                    mruleOutWords = ApplyTemplates(input);
-                    break;
-
-                case MorphologicalRuleOrder.Unordered:
-                    mruleOutWords = ApplyTemplates(input).Concat(ApplyMorphologicalRules(input));
-                    break;
-            }
+            // AnalysisStratumRule.Apply should cover the inverse of SynthesisStratumRule.Apply.
+            IEnumerable<Word> mruleOutWords = ApplyTemplates(input).Concat(ApplyMorphologicalRules(input));
             Debug.Assert(mruleOutWords != null);
 
             var output = new HashSet<Word>(FreezableEqualityComparer<Word>.Default) { input };

diff --git a/tests/SIL.Machine.Morphology.HermitCrab.Tests/HermitCrabTestBase.cs b/tests/SIL.Machine.Morphology.HermitCrab.Tests/HermitCrabTestBase.cs
@@ -813,6 +813,15 @@ public void TestCleanup()
             stratum.MorphologicalRules.Clear();
             stratum.AffixTemplates.Clear();
         }
+        SetRuleOrder(MorphologicalRuleOrder.Unordered);
+    }
+
+    protected void SetRuleOrder(MorphologicalRuleOrder ruleOrder)
+    {
+        foreach (Stratum stratum in Language.Strata)
+        {
+            stratum.MorphologicalRuleOrder = ruleOrder;
+       }
     }
 
     public LexEntry AddEntry(string gloss, FeatureStruct syntacticFS, Stratum stratum, params string[] forms)

diff --git a/tests/SIL.Machine.Morphology.HermitCrab.Tests/MorpherTests.cs b/tests/SIL.Machine.Morphology.HermitCrab.Tests/MorpherTests.cs
@@ -36,6 +36,12 @@ public void AnalyzeWord_CanAnalyze_ReturnsCorrectAnalysis()
             morpher.AnalyzeWord("sagd"),
             Is.EquivalentTo(new[] { new WordAnalysis(new IMorpheme[] { Entries["32"], edSuffix }, 0, "V") })
         );
+
+        SetRuleOrder(MorphologicalRuleOrder.Linear);
+        Assert.That(
+            morpher.AnalyzeWord("sagd"),
+            Is.EquivalentTo(new[] { new WordAnalysis(new IMorpheme[] { Entries["32"], edSuffix }, 0, "V") })
+        );
     }
 
     [Test]