Replace Iterative with IsIterative and SetIterative

sillsdev · Sep 30, 2024 · 2dc7d71 · 2dc7d71
1 parent fc3c939
commit 2dc7d71
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/src/SIL.Machine.Morphology.HermitCrab/CharacterDefinitionTable.cs b/src/SIL.Machine.Morphology.HermitCrab/CharacterDefinitionTable.cs
@@ -189,7 +189,7 @@ private bool GetShapeNodes(string str, bool allowPattern, out IEnumerable<ShapeN
                             // Example: [Seg]*.
                             // Make the last node Kleene star.
                             nodesList[nodesList.Count - 1].Annotation.Optional = true;
-                            nodesList[nodesList.Count - 1].Iterative = true;
+                            nodesList[nodesList.Count - 1].SetIterative(true);
                             i++;
                             continue;
                         }

diff --git a/src/SIL.Machine.Morphology.HermitCrab/HermitCrabExtensions.cs b/src/SIL.Machine.Morphology.HermitCrab/HermitCrabExtensions.cs
@@ -88,6 +88,19 @@ internal static void SetDeleted(this ShapeNode node, bool deleted)
             );
         }
 
+        internal static bool IsIterative(this ShapeNode node)
+        {
+            return node.Annotation.Data != null;
+        }
+
+        internal static void SetIterative(this ShapeNode node, bool iterative)
+        {
+            if (iterative)
+                node.Annotation.Data = iterative;
+            else
+                node.Annotation.Data = null;
+        }
+
         private static readonly IEqualityComparer<ShapeNode> NodeComparer = new ProjectionEqualityComparer<
             ShapeNode,
             FeatureStruct

diff --git a/src/SIL.Machine.Morphology.HermitCrab/Morpher.cs b/src/SIL.Machine.Morphology.HermitCrab/Morpher.cs
@@ -466,7 +466,7 @@ public IEnumerable<List<ShapeNode>> MatchNodesWithPattern(
                 return results;
             // Make a copy of prefix to avoid crosstalk and add newNode.
             prefix = new List<ShapeNode>(prefix) { newNode };
-            if (pattern[p].Iterative)
+            if (pattern[p].IsIterative())
                 // Try using this item in the pattern again.
                 results.AddRange(MatchNodesWithPattern(nodes, pattern, n + 1, p, true, prefix));
             // Try the remainder of the nodes against the remainder of the pattern.

diff --git a/src/SIL.Machine.Morphology.HermitCrab/RootAllomorph.cs b/src/SIL.Machine.Morphology.HermitCrab/RootAllomorph.cs
@@ -18,7 +18,7 @@ public RootAllomorph(Segments segments)
             _segments = segments;
             foreach (ShapeNode node in _segments.Shape.GetNodes(_segments.Shape.Range))
             {
-                if (node.Iterative || (node.Annotation.Optional && node.Annotation.Type() != HCFeatureSystem.Boundary))
+                if (node.IsIterative() || (node.Annotation.Optional && node.Annotation.Type() != HCFeatureSystem.Boundary))
                 {
                     IsPattern = true;
                 }

diff --git a/src/SIL.Machine/Annotations/ShapeNode.cs b/src/SIL.Machine/Annotations/ShapeNode.cs
@@ -45,21 +45,6 @@ public Annotation<ShapeNode> Annotation
             get { return _ann; }
         }
 
-        /// <summary>
-        /// Whether this is an iterative node in a lexical pattern.
-        /// </summary>
-        public bool Iterative
-        {
-            get { return Annotation.Data != null; }
-            set
-            {
-                if (value)
-                    Annotation.Data = value;
-                else
-                    Annotation.Data = null;
-            }
-        }
-
         public int CompareTo(ShapeNode other)
         {
             if (other.List != List)