Merge pull request #533 from hamishknight/main-merge

Author: hamishknight

Sources/PatternConverter/PatternConverter.swift

@@ -50,8 +50,7 @@ struct PatternConverter: ParsableCommand {
     print("Converting '\(delim)\(regex)\(delim)'")
 
     let ast = try _RegexParser.parse(
-      regex, .semantic,
-      experimentalSyntax ? .experimental : .traditional)
+      regex, experimentalSyntax ? .experimental : .traditional)
 
     // Show rendered source ranges
     if renderSourceRanges {

Sources/RegexBuilder/Anchor.swift

@@ -51,7 +51,7 @@ extension Anchor: RegexComponent {
   }
 
   public var regex: Regex<Substring> {
-    Regex(node: .atom(.assertion(baseAssertion)))
+    _RegexFactory().assertion(baseAssertion)
   }
 }
 
@@ -159,14 +159,14 @@ public struct Lookahead<Output>: _BuiltinRegexComponent {
   public init<R: RegexComponent>(
     _ component: R
   ) where R.RegexOutput == Output {
-    self.init(node: .nonCapturingGroup(.lookahead, component.regex.root))
+    self.init(_RegexFactory().lookaheadNonCapturing(component))
   }
 
   /// Creates a lookahead from the regex generated by the given builder closure.
   public init<R: RegexComponent>(
     @RegexComponentBuilder _ component: () -> R
   ) where R.RegexOutput == Output {
-    self.init(node: .nonCapturingGroup(.lookahead, component().regex.root))
+    self.init(_RegexFactory().lookaheadNonCapturing(component()))
   }
 }
 
@@ -189,14 +189,14 @@ public struct NegativeLookahead<Output>: _BuiltinRegexComponent {
   public init<R: RegexComponent>(
     _ component: R
   ) where R.RegexOutput == Output {
-    self.init(node: .nonCapturingGroup(.negativeLookahead, component.regex.root))
+    self.init(_RegexFactory().negativeLookaheadNonCapturing(component))
   }
 
   /// Creates a negative lookahead from the regex generated by the given builder
   /// closure.
   public init<R: RegexComponent>(
     @RegexComponentBuilder _ component: () -> R
   ) where R.RegexOutput == Output {
-    self.init(node: .nonCapturingGroup(.negativeLookahead, component().regex.root))
+    self.init(_RegexFactory().negativeLookaheadNonCapturing(component()))
   }
 }

Sources/RegexBuilder/Builder.swift

@@ -15,7 +15,7 @@
 @resultBuilder
 public enum RegexComponentBuilder {
   public static func buildBlock() -> Regex<Substring> {
-    .init(node: .empty)
+    _RegexFactory().empty()
   }
 
   public static func buildPartialBlock<R: RegexComponent>(

Sources/RegexBuilder/CharacterClass.swift

@@ -31,7 +31,7 @@ public struct CharacterClass {
 @available(SwiftStdlib 5.7, *)
 extension CharacterClass: RegexComponent {
   public var regex: Regex<Substring> {
-    return Regex(node: DSLTree.Node.customCharacterClass(ccc))
+    _RegexFactory().customCharacterClass(ccc)
   }
 }
 

Sources/RegexBuilder/DSL.swift

@@ -28,13 +28,6 @@ internal protocol _BuiltinRegexComponent: RegexComponent {
   init(_ regex: Regex<RegexOutput>)
 }
 
-@available(SwiftStdlib 5.7, *)
-extension _BuiltinRegexComponent {
-  init(node: DSLTree.Node) {
-    self.init(Regex(node: node))
-  }
-}
-
 // MARK: - Primitive regex components
 
 @available(SwiftStdlib 5.7, *)
@@ -56,7 +49,7 @@ extension Character: RegexComponent {
   public typealias Output = Substring
 
   public var regex: Regex<Output> {
-    .init(node: .atom(.char(self)))
+    _RegexFactory().char(self)
   }
 }
 
@@ -65,7 +58,7 @@ extension UnicodeScalar: RegexComponent {
   public typealias Output = Substring
 
   public var regex: Regex<Output> {
-    .init(node: .atom(.scalar(self)))
+    _RegexFactory().scalar(self)
   }
 }
 
@@ -90,39 +83,6 @@ extension UnicodeScalar: RegexComponent {
 
 // Note: Quantifiers are currently gyb'd.
 
-extension DSLTree.Node {
-  // Individual public API functions are in the generated Variadics.swift file.
-  /// Generates a DSL tree node for a repeated range of the given node.
-  @available(SwiftStdlib 5.7, *)
-  static func repeating(
-    _ range: Range<Int>,
-    _ behavior: RegexRepetitionBehavior?,
-    _ node: DSLTree.Node
-  ) -> DSLTree.Node {
-    // TODO: Throw these as errors
-    assert(range.lowerBound >= 0, "Cannot specify a negative lower bound")
-    assert(!range.isEmpty, "Cannot specify an empty range")
-    
-    let kind: DSLTree.QuantificationKind = behavior.map { .explicit($0.dslTreeKind) } ?? .default
-
-    switch (range.lowerBound, range.upperBound) {
-    case (0, Int.max): // 0...
-      return .quantification(.zeroOrMore, kind, node)
-    case (1, Int.max): // 1...
-      return .quantification(.oneOrMore, kind, node)
-    case _ where range.count == 1: // ..<1 or ...0 or any range with count == 1
-      // Note: `behavior` is ignored in this case
-      return .quantification(.exactly(range.lowerBound), .default, node)
-    case (0, _): // 0..<n or 0...n or ..<n or ...n
-      return .quantification(.upToN(range.upperBound), kind, node)
-    case (_, Int.max): // n...
-      return .quantification(.nOrMore(range.lowerBound), kind, node)
-    default: // any other range
-      return .quantification(.range(range.lowerBound, range.upperBound), kind, node)
-    }
-  }
-}
-
 /// A regex component that matches exactly one occurrence of its underlying
 /// component.
 @available(SwiftStdlib 5.7, *)
@@ -140,6 +100,7 @@ public struct One<Output>: RegexComponent {
 public struct OneOrMore<Output>: _BuiltinRegexComponent {
   public var regex: Regex<Output>
 
+  @usableFromInline
   internal init(_ regex: Regex<Output>) {
     self.regex = regex
   }
@@ -152,6 +113,7 @@ public struct OneOrMore<Output>: _BuiltinRegexComponent {
 public struct ZeroOrMore<Output>: _BuiltinRegexComponent {
   public var regex: Regex<Output>
 
+  @usableFromInline
   internal init(_ regex: Regex<Output>) {
     self.regex = regex
   }
@@ -164,6 +126,7 @@ public struct ZeroOrMore<Output>: _BuiltinRegexComponent {
 public struct Optionally<Output>: _BuiltinRegexComponent {
   public var regex: Regex<Output>
 
+  @usableFromInline
   internal init(_ regex: Regex<Output>) {
     self.regex = regex
   }
@@ -176,6 +139,7 @@ public struct Optionally<Output>: _BuiltinRegexComponent {
 public struct Repeat<Output>: _BuiltinRegexComponent {
   public var regex: Regex<Output>
 
+  @usableFromInline
   internal init(_ regex: Regex<Output>) {
     self.regex = regex
   }
@@ -217,6 +181,7 @@ public struct AlternationBuilder {
 public struct ChoiceOf<Output>: _BuiltinRegexComponent {
   public var regex: Regex<Output>
 
+  @usableFromInline
   internal init(_ regex: Regex<Output>) {
     self.regex = regex
   }
@@ -232,6 +197,7 @@ public struct ChoiceOf<Output>: _BuiltinRegexComponent {
 public struct Capture<Output>: _BuiltinRegexComponent {
   public var regex: Regex<Output>
 
+  @usableFromInline
   internal init(_ regex: Regex<Output>) {
     self.regex = regex
   }
@@ -243,6 +209,7 @@ public struct Capture<Output>: _BuiltinRegexComponent {
 public struct TryCapture<Output>: _BuiltinRegexComponent {
   public var regex: Regex<Output>
 
+  @usableFromInline
   internal init(_ regex: Regex<Output>) {
     self.regex = regex
   }
@@ -260,6 +227,7 @@ public struct TryCapture<Output>: _BuiltinRegexComponent {
 public struct Local<Output>: _BuiltinRegexComponent {
   public var regex: Regex<Output>
 
+  @usableFromInline
   internal init(_ regex: Regex<Output>) {
     self.regex = regex
   }
@@ -274,8 +242,13 @@ public struct Reference<Capture>: RegexComponent {
 
   public init(_ captureType: Capture.Type = Capture.self) {}
 
+  @usableFromInline
+  var _raw: Int {
+    id._raw
+  }
+  
   public var regex: Regex<Capture> {
-    .init(node: .atom(.symbolicReference(id)))
+    _RegexFactory().symbolicReference(id)
   }
 }
 
@@ -285,3 +258,12 @@ extension Regex.Match {
     self[reference.id]
   }
 }
+
+// RegexFactory's init is SPI, so we can't make an instance of one in AEIC, but
+// if we hide it behind a resilience barrier we can call this function instead
+// to get our instance of it.
+@available(SwiftStdlib 5.7, *)
+@usableFromInline
+internal func makeFactory() -> _RegexFactory {
+  _RegexFactory()
+}