Subsume referencedCaptureOffsets

Author: Azoy

Sources/_StringProcessing/Engine/Structuralize.swift

@@ -1,4 +1,5 @@
 @_implementationOnly import _RegexParser
+
 extension CaptureList {
   @available(SwiftStdlib 5.7, *)
   func createElements(
@@ -9,11 +10,12 @@ extension CaptureList {
 
     var result = [AnyRegexOutput.ElementRepresentation]()
 
-    for (cap, meStored) in zip(captures, list.values) {
+    for (i, (cap, meStored)) in zip(captures, list.values).enumerated() {
       let element = AnyRegexOutput.ElementRepresentation(
         optionalDepth: cap.optionalDepth,
         bounds: meStored.latest,
         name: cap.name,
+        referenceID: list.referencedCaptureOffsets.first { $1 == i }?.key,
         value: meStored.latestValue
       )
 

Sources/_StringProcessing/Executor.swift

@@ -64,7 +64,6 @@ struct Executor {
     return .init(
       anyRegexOutput: anyRegexOutput,
       range: range,
-      referencedCaptureOffsets: capList.referencedCaptureOffsets,
       value: value
     )
   }

Sources/_StringProcessing/Regex/AnyRegexOutput.swift

@@ -70,6 +70,9 @@ public struct AnyRegexOutput {
     /// The name of the capture.
     var name: String? = nil
 
+    /// The capture reference this element refers to.
+    var referenceID: ReferenceID? = nil
+    
     /// If the output vaule is strongly typed, then this will be set.
     var value: Any? = nil
   }
@@ -145,7 +148,11 @@ extension AnyRegexOutput: RandomAccessCollection {
     public var range: Range<String.Index>? {
       representation.bounds
     }
-
+    
+    var referenceID: ReferenceID? {
+      representation.referenceID
+    }
+    
     /// The slice of the input over which a value was captured. `nil` for no-capture.
     public var substring: Substring? {
       range.map { input[$0] }
@@ -201,7 +208,6 @@ extension Regex.Match where Output == AnyRegexOutput {
     self.init(
       anyRegexOutput: match.anyRegexOutput,
       range: match.range,
-      referencedCaptureOffsets: match.referencedCaptureOffsets,
       value: match.value
     )
   }

Sources/_StringProcessing/Regex/Match.swift

@@ -22,8 +22,6 @@ extension Regex {
     /// The range of the overall match.
     public let range: Range<String.Index>
 
-    let referencedCaptureOffsets: [ReferenceID: Int]
-
     let value: Any?
   }
 }
@@ -35,8 +33,7 @@ extension Regex.Match {
     if Output.self == AnyRegexOutput.self {
       let wholeMatchCapture = AnyRegexOutput.ElementRepresentation(
         optionalDepth: 0,
-        bounds: range,
-        value: nil
+        bounds: range
       )
 
       let output = AnyRegexOutput(
@@ -79,11 +76,13 @@ extension Regex.Match {
 
   @_spi(RegexBuilder)
   public subscript<Capture>(_ id: ReferenceID) -> Capture {
-    guard let offset = referencedCaptureOffsets[id] else {
-      preconditionFailure(
-        "Reference did not capture any match in the regex")
+    guard let element = anyRegexOutput.first(
+      where: { $0.referenceID == id }
+    ) else {
+      preconditionFailure("Reference did not capture any match in the regex")
     }
-    return anyRegexOutput[offset].existentialOutputComponent(
+    
+    return element.existentialOutputComponent(
       from: anyRegexOutput.input[...]
     ) as! Capture
   }