wip: more plumbing

Author: milseman

Sources/_StringProcessing/Compiler.swift

@@ -28,7 +28,7 @@ class Compiler {
   __consuming func emit() throws -> Program {
     // TODO: Handle global options
     var codegen = ByteCodeGen(options: options)
-    codegen.builder.captureStructure = tree.captureStructure
+    codegen.builder.captureList = tree.root._captureList
     try codegen.emitNode(tree.root)
     let program = try codegen.finish()
     return program

Sources/_StringProcessing/Engine/MEBuilder.swift

@@ -38,9 +38,7 @@ extension MEProgram where Input.Element: Hashable {
     // Special addresses or instructions
     var failAddressToken: AddressToken? = nil
 
-    // TODO: Should we have better API for building this up
-    // as we compile?
-    var captureStructure: CaptureStructure = .empty
+    var captureList = CaptureList()
 
     // Symbolic reference resolution
     var unresolvedReferences: [ReferenceID: [InstructionAddress]] = [:]
@@ -353,7 +351,7 @@ extension MEProgram.Builder {
       staticTransformFunctions: transformFunctions,
       staticMatcherFunctions: matcherFunctions,
       registerInfo: regInfo,
-      captureStructure: captureStructure,
+      captureList: captureList,
       referencedCaptureOffsets: referencedCaptureOffsets,
       namedCaptureOffsets: namedCaptureOffsets)
   }

Sources/_StringProcessing/Engine/MECapture.swift

@@ -142,7 +142,7 @@ extension Processor._StoredCapture: CustomStringConvertible {
   }
 }
 
-struct CaptureList {
+struct MECaptureList {
   var values: Array<Processor<String>._StoredCapture>
   var referencedCaptureOffsets: [ReferenceID: Int]
   var namedCaptureOffsets: [String: Int]

Sources/_StringProcessing/Engine/MEProgram.swift

@@ -34,7 +34,7 @@ struct MEProgram<Input: Collection> where Input.Element: Equatable {
 
   var enableTracing: Bool = false
 
-  let captureStructure: CaptureStructure
+  let captureList: CaptureList
   let referencedCaptureOffsets: [ReferenceID: Int]
   let namedCaptureOffsets: [String: Int]
 }

Sources/_StringProcessing/Engine/Structuralize.swift

@@ -17,7 +17,7 @@ extension CaptureStructure {
   // FIXME: Do it all in one pass, no need for all these
   // intermediary arrays
   func structuralize(
-    _ list: CaptureList,
+    _ list: MECaptureList,
     _ input: String
   ) throws -> [StructuredCapture] {
 

Sources/_StringProcessing/Executor.swift

@@ -35,12 +35,12 @@ struct Executor {
       return nil
     }
 
-    let capList = CaptureList(
+    let capList = MECaptureList(
       values: cpu.storedCaptures,
       referencedCaptureOffsets: engine.program.referencedCaptureOffsets,
       namedCaptureOffsets: engine.program.namedCaptureOffsets)
 
-    let capStruct = engine.program.captureStructure
+    let capStruct = engine.program.captureList._captureStructure(nestOptionals: true)
     let range = inputRange.lowerBound..<endIdx
     let caps = try capStruct.structuralize(
         capList, input)

Sources/_StringProcessing/Regex/DSLTree.swift

@@ -460,7 +460,7 @@ public struct CaptureTransform: Hashable, CustomStringConvertible {
 
 extension DSLTree.Node {
   func _addCaptures(
-    to list: inout _RegexParser.CaptureList,
+    to list: inout CaptureList,
     optionalNesting nesting: Int
   ) {
     let addOptional = nesting+1
@@ -533,8 +533,8 @@ extension DSLTree.Node {
     }
   }
 
-  var _captureList: _RegexParser.CaptureList {
-    var list = _RegexParser.CaptureList()
+  var _captureList: CaptureList {
+    var list = CaptureList()
     self._addCaptures(to: &list, optionalNesting: 0)
     return list
   }