more cleanup

Author: milseman

Sources/_RegexParser/Regex/AST/AST.swift

@@ -24,11 +24,6 @@ public struct AST: Hashable {
 extension AST {
   /// Whether this AST tree has nested somewhere inside it a capture.
   public var hasCapture: Bool { root.hasCapture }
-
-  /// The capture structure of this AST tree.
-  var captureStructure: CaptureStructure {
-    root._captureList._captureStructure(nestOptionals: true)
-  }
 }
 
 extension AST {

Sources/_RegexParser/Regex/Parse/CaptureStructure.swift

@@ -9,6 +9,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// TODO: Remove and serialize CaptureList instead
+
 // A tree representing the type of some captures.
 enum CaptureStructure: Equatable {
   case atom(name: String? = nil, type: AnyType? = nil)
@@ -29,47 +31,12 @@ enum CaptureStructure: Equatable {
 extension CaptureStructure {
   /// Returns a Boolean indicating whether the structure does not contain any
   /// captures.
-  var isEmpty: Bool {
+  private var isEmpty: Bool {
     if case .tuple(let elements) = self, elements.isEmpty {
       return true
     }
     return false
   }
-
-  func type(withAtomType atomType: Any.Type) -> Any.Type {
-    switch self {
-    case .atom(_, type: nil):
-      return atomType
-    case .atom(_, type: let type?):
-      return type.base
-    case .optional(let child):
-      return TypeConstruction.optionalType(of: child.type(withAtomType: atomType))
-    case .tuple(let children):
-      return TypeConstruction.tupleType(of: children.map {
-        $0.type(withAtomType: atomType)
-      })
-    }
-  }
-
-  typealias DefaultAtomType = Substring
-
-  var type: Any.Type {
-    type(withAtomType: DefaultAtomType.self)
-  }
-
-  var atomType: AnyType {
-    switch self {
-    case .atom(_, type: nil):
-      return .init(Substring.self)
-    case .atom(_, type: let type?):
-      return type
-    case .optional(let child):
-      return child.atomType
-    case .tuple:
-      fatalError("Recursive nesting has no single atom type")
-    }
-
-  }
 }
 
 // MARK: - Serialization
@@ -252,3 +219,10 @@ extension CaptureStructure: CustomStringConvertible {
     }
   }
 }
+
+extension AST {
+  /// The capture structure of this AST tree.
+  var captureStructure: CaptureStructure {
+    root._captureList._captureStructure(nestOptionals: true)
+  }
+}