cleanup

Author: milseman

Sources/_MatchingEngine/Regex/Parse/CaptureStructure.swift

@@ -42,12 +42,6 @@ extension CaptureStructure {
 }
 
 extension CaptureStructure.Constructor {
-  private func atom(
-    _ name: String? = nil , _ type: AnyType? = nil
-  ) -> CaptureStructure {
-    .atom(name: name, type: type)
-  }
-
   public mutating func alternating<C: Collection>(
     _ children: C
   ) -> CaptureStructure where C.Element: _TreeNode {
@@ -66,48 +60,28 @@ extension CaptureStructure.Constructor {
 
   public mutating func grouping<T: _TreeNode>(
     _ child: T,
-    as kind: AST.Group.Kind,
-    withType type: AnyType? = nil
+    as kind: AST.Group.Kind
   ) -> CaptureStructure {
-    let innerCaptures = child._captureStructure(&self)
     switch kind {
     case .capture:
-      return atom(nil, type) + innerCaptures
+      return capturing(child)
     case .namedCapture(let name):
-      return atom(name.value, type) + innerCaptures
+      return capturing(name: name.value, child)
     case .balancedCapture(let b):
-      return atom(b.name?.value, type) + innerCaptures
+      return capturing(name: b.name?.value, child)
     default:
       precondition(!kind.isCapturing)
-      return innerCaptures
-    }
-  }
-
-  public mutating func grouping<T: _TreeNode>(
-    _ child: T,
-    as kind: AST.Group.Kind,
-    withTransform transform: CaptureTransform
-  ) -> CaptureStructure {
-    let innerCaptures = child._captureStructure(&self)
-    let type = AnyType(transform.resultType)
-    switch kind {
-    case .capture:
-      return atom(nil, type) + innerCaptures
-    case .namedCapture(let name):
-      return atom(name.value, type) + innerCaptures
-    case .balancedCapture(let b):
-      return atom(b.name?.value, type) + innerCaptures
-    default:
-      return innerCaptures
+      return child._captureStructure(&self)
     }
   }
 
   public mutating func capturing<T: _TreeNode>(
-    name: String?,
+    name: String? = nil,
     _ child: T,
     withType type: AnyType? = nil
   ) -> CaptureStructure {
-    atom(name, type) + child._captureStructure(&self)
+    .atom(name: name, type: type)
+      + child._captureStructure(&self)
   }
 
   // TODO: We'll likely want/need a generalization of