LT-22353: Fix bug in NarrowAnalysisRewriteRuleSpec

Author: jtmaxwell3

src/SIL.Machine.Morphology.HermitCrab/PhonologicalRules/NarrowAnalysisRewriteRuleSpec.cs

@@ -51,6 +51,7 @@ Constraint<Word, ShapeNode> constraint in _analysisRhs.Children.Cast<Constraint<
                 curNode = targetMatch.Input.Shape.AddAfter(curNode, fs, true);
             }
 
+            curNode = range.Start;
             for (int i = 0; i < _targetCount; i++)
             {
                 curNode.Annotation.Optional = true;

tests/SIL.Machine.Morphology.HermitCrab.Tests/PhonologicalRules/RewriteRuleTests.cs

@@ -425,6 +425,163 @@ public void MultipleSegmentRules()
         AssertMorphsEqual(morpher.ParseWord("buuubuuu"), "27");
     }
 
+    [Test]
+    public void MultipleDeletionRules()
+    {
+        var highVowel = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("cons-")
+            .Symbol("voc+")
+            .Symbol("high+")
+            .Value;
+        var backRnd = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("back+")
+            .Symbol("round+")
+            .Value;
+        var backRndVowel = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("cons-")
+            .Symbol("voc+")
+            .Symbol("back+")
+            .Symbol("round+")
+            .Value;
+        var t = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("cons+")
+            .Symbol("alveolar")
+            .Symbol("del_rel-")
+            .Symbol("asp-")
+            .Symbol("vd-")
+            .Symbol("strident-")
+            .Value;
+
+        var rule1 = new RewriteRule
+        {
+            Name = "rule1",
+            Lhs = Pattern<Word, ShapeNode>.New().Annotation(highVowel).Annotation(highVowel).Value
+        };
+        Allophonic.PhonologicalRules.Add(rule1);
+        rule1.Subrules.Add(
+            new RewriteSubrule
+            {
+                LeftEnvironment = Pattern<Word, ShapeNode>.New().Annotation(backRndVowel).Value
+            }
+        );
+
+        var morpher = new Morpher(TraceManager, Language);
+        AssertMorphsEqual(morpher.ParseWord("bubu"), "27", "19");
+    }
+
+    [Test]
+    public void MergeRules()
+    {
+        var highVowel = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("cons-")
+            .Symbol("voc+")
+            .Symbol("high+")
+            .Value;
+        var backRnd = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("back+")
+            .Symbol("round+")
+            .Value;
+        var backRndVowel = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("cons-")
+            .Symbol("voc+")
+            .Symbol("back+")
+            .Symbol("round+")
+            .Value;
+        var t = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("cons+")
+            .Symbol("alveolar")
+            .Symbol("del_rel-")
+            .Symbol("asp-")
+            .Symbol("vd-")
+            .Symbol("strident-")
+            .Value;
+
+        var rule1 = new RewriteRule
+        {
+            Name = "rule1",
+            Lhs = Pattern<Word, ShapeNode>.New().Annotation(highVowel).Annotation(highVowel).Value
+        };
+        Allophonic.PhonologicalRules.Add(rule1);
+        rule1.Subrules.Add(
+            new RewriteSubrule
+            {
+                Rhs = Pattern<Word, ShapeNode>.New().Annotation(t).Value,
+                LeftEnvironment = Pattern<Word, ShapeNode>.New().Annotation(backRndVowel).Value
+            }
+        );
+
+        var morpher = new Morpher(TraceManager, Language);
+        AssertMorphsEqual(morpher.ParseWord("butbut"), "27");
+    }
+
+    [Test]
+    public void MultipleMergeRules()
+    {
+        var highVowel = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("cons-")
+            .Symbol("voc+")
+            .Symbol("high+")
+            .Value;
+        var backRnd = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("back+")
+            .Symbol("round+")
+            .Value;
+        var backRndVowel = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("cons-")
+            .Symbol("voc+")
+            .Symbol("back+")
+            .Symbol("round+")
+            .Value;
+        var t = FeatureStruct
+            .New(Language.PhonologicalFeatureSystem)
+            .Symbol(HCFeatureSystem.Segment)
+            .Symbol("cons+")
+            .Symbol("alveolar")
+            .Symbol("del_rel-")
+            .Symbol("asp-")
+            .Symbol("vd-")
+            .Symbol("strident-")
+            .Value;
+
+        var rule1 = new RewriteRule
+        {
+            Name = "rule1",
+            Lhs = Pattern<Word, ShapeNode>.New().Annotation(backRndVowel).Annotation(highVowel).Annotation(highVowel).Value
+        };
+        Allophonic.PhonologicalRules.Add(rule1);
+        rule1.Subrules.Add(
+            new RewriteSubrule
+            {
+                Rhs = Pattern<Word, ShapeNode>.New().Annotation(t).Annotation(t).Value,
+            }
+        );
+
+        var morpher = new Morpher(TraceManager, Language);
+        AssertMorphsEqual(morpher.ParseWord("bttbtt"), "27");
+    }
+
     [Test]
     public void BoundaryRules()
     {