Hide functionality behind SPI init

add comments

Author: Azoy

Sources/RegexBuilder/Anchor.swift

@@ -51,7 +51,7 @@ extension Anchor: RegexComponent {
   }
 
   public var regex: Regex<Substring> {
-    _RegexFactory.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(_RegexFactory.lookaheadNonCapturing(component))
+    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(_RegexFactory.lookaheadNonCapturing(component()))
+    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(_RegexFactory.negativeLookaheadNonCapturing(component))
+    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(_RegexFactory.negativeLookaheadNonCapturing(component()))
+    self.init(_RegexFactory().negativeLookaheadNonCapturing(component()))
   }
 }

Sources/RegexBuilder/Builder.swift

@@ -15,7 +15,7 @@
 @resultBuilder
 public enum RegexComponentBuilder {
   public static func buildBlock() -> Regex<Substring> {
-    _RegexFactory.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> {
-    _RegexFactory.customCharacterClass(ccc)
+    _RegexFactory().customCharacterClass(ccc)
   }
 }
 

Sources/RegexBuilder/DSL.swift

@@ -49,7 +49,7 @@ extension Character: RegexComponent {
   public typealias Output = Substring
 
   public var regex: Regex<Output> {
-    _RegexFactory.char(self)
+    _RegexFactory().char(self)
   }
 }
 
@@ -58,7 +58,7 @@ extension UnicodeScalar: RegexComponent {
   public typealias Output = Substring
 
   public var regex: Regex<Output> {
-    _RegexFactory.scalar(self)
+    _RegexFactory().scalar(self)
   }
 }
 
@@ -248,7 +248,7 @@ public struct Reference<Capture>: RegexComponent {
   }
 
   public var regex: Regex<Capture> {
-    _RegexFactory.symbolicReference(id)
+    _RegexFactory().symbolicReference(id)
   }
 }
 
@@ -258,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()
+}