Eliminate need for VirtualUnaryTuple extraction node type

sblom · Dec 20, 2023 · fb646d9 · fb646d9
1 parent ed80c9f
commit fb646d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/RegExtract/ExtractionPlan.cs b/RegExtract/ExtractionPlan.cs
@@ -12,7 +12,7 @@ namespace RegExtract
 {
     public class ExtractionPlan<T>: IFormattable
     {
-        public ExtractionPlanNode Plan { get; protected set; }
+        ExtractionPlanNode Plan { get; set; }
         RegexCaptureGroupTree? _tree;
 
         protected ExtractionPlan()
@@ -226,7 +226,8 @@ private ExtractionPlanNode AssignTypesToTree(RegexCaptureGroupNode tree, Type ty
 
             if (IsDirectlyConstructable(type))
             {
-                // We're at a leaf--if there's an inner capture group, use it instead of everything.
+                // We're at a leaf in the type hierarchy, and all we need is a string.
+                // If there's an inner capture group, use it to narrow the match.
                 if (tree.children.Count() == 1)
                 {
                     tree = tree.children.Single();
@@ -244,7 +245,7 @@ private ExtractionPlanNode AssignTypesToTree(RegexCaptureGroupNode tree, Type ty
 
                 if (tree.name == "0")
                 {
-                    return new VirtualUnaryTupleNode(tree.name, type, new[] { AssignTypesToTree(tree.children.Single(), type) }, new ExtractionPlanNode[0]);
+                    return AssignTypesToTree(tree.children.Single(), type);
                 }
 
                 if (typeParams.Length < 2 && !IsInitializableCollection(typeParams.FirstOrDefault()))

diff --git a/RegExtract/ExtractionPlanNode.cs b/RegExtract/ExtractionPlanNode.cs
@@ -192,7 +192,7 @@ internal virtual void Validate()
             return result;
         }
 
-        public object? Execute(Match match)
+        internal object? Execute(Match match)
         {
             if (!match.Success)
             {
@@ -201,7 +201,7 @@ internal virtual void Validate()
 
             Dictionary<string, (string Value, int Index, int Length)[]> cache = new();
 
-            return Execute(match, match.Groups[groupName].Index, match.Groups[groupName].Length, cache);
+            return Execute(match, match.Groups[0].Index, match.Groups[0].Length, cache);
         }
 
         protected const string VALUETUPLE_TYPENAME = "System.ValueTuple`";

diff --git a/RegExtract/ExtractionPlanNodeTypes.cs b/RegExtract/ExtractionPlanNodeTypes.cs
@@ -16,20 +16,6 @@ internal record UninitializedNode() :
         }
     }
 
-    internal record VirtualUnaryTupleNode(string groupName, Type type, ExtractionPlanNode[] constructorParams, ExtractionPlanNode[] propertySetters) :
-        ExtractionPlanNode(groupName, type, constructorParams, propertySetters)
-    {
-        internal override object? Execute(Match match, int captureStart, int captureLength, Dictionary<string, (string Value, int Index, int Length)[]> cache)
-        {
-            return constructorParams.Single().Execute(match, captureStart, captureLength, cache);
-        }
-
-        internal override void Validate()
-        {
-            base.Validate();
-        }
-    }
-
     internal record CollectionInitializerNode(string groupName, Type type, ExtractionPlanNode[] constructorParams, ExtractionPlanNode[] propertySetters) :
         ExtractionPlanNode(groupName, type, constructorParams, propertySetters)
     {