Merge pull request #225 from rxwei/main-integration-50ec05d

Author: rxwei

Documentation/Evolution/RegexBuilderDSL.md

@@ -8,7 +8,7 @@ See [Declarative String Processing Overview][decl-string]
 
 ## Requirements
 
-- [Swift Trunk Development Snapshot](https://www.swift.org/download/#snapshots) DEVELOPMENT-SNAPSHOT-2022-02-03 or later.
+- [Swift Trunk Development Snapshot](https://www.swift.org/download/#snapshots) DEVELOPMENT-SNAPSHOT-2022-03-09 or later.
 
 ## Integration with Swift
 
@@ -45,8 +45,9 @@ A pair of corresponding branches are expected to build successfully together and
 To integrate the latest changes in apple/swift-experimental-string-processing to apple/swift, carefully follow the workflow: 
 
 - Create pull requests.
-  - Create a pull request in apple/swift-experimental-string-processing from `main` to `swift/main`, e.g. "[Integration] main -> swift/main".
-  - If apple/swift needs to be modified to work with the latest `main` in apple/swift-experimental-string-processing, create a pull request in apple/swift.
+  - Create a branch from a commit on `main` that you would like to integrate into `swift/main`.
+  - Create a pull request in apple/swift-experimental-string-processing from that branch to `swift/main`, e.g. "[Integration] main (<commit>) -> swift/main".
+  - If apple/swift needs to be modified to work with the latest `main` in apple/swift-experimental-string-processing, create a pull request in apple/swift.  **Note:** Since CI in apple/swift-experimental-string-processing has not yet been set up to run full toolchain tests, you should create a PR in apple/swift regardless; if the integartion does not require changing apple/swift, create a dummy PR in apple/swift by changing the README and just not merge it in the end.
 - Trigger CI.
   - In the apple/swift-experimental-string-processing pull request, trigger CI using the following command (replacing `<PR NUMBER>` with the apple/swift pull request number, if any):
     ```

Documentation/Evolution/RegexTypeOverview.md

@@ -58,11 +58,11 @@ private func extractFromCaptures(
 }
 
 @inline(__always) // get rid of generic please
-private func graphemeBreakPropertyData<RP: RegexProtocol>(
+private func graphemeBreakPropertyData<RP: RegexComponent>(
   forLine line: String,
   using regex: RP
-) -> GraphemeBreakEntry? where RP.Match == (Substring, Substring, Substring?, Substring) {
-  line.match(regex).map(\.match).flatMap(extractFromCaptures)
+) -> GraphemeBreakEntry? where RP.Output == (Substring, Substring, Substring?, Substring) {
+  line.match(regex).map(\.output).flatMap(extractFromCaptures)
 }
 
 private func graphemeBreakPropertyDataLiteral(
@@ -80,18 +80,18 @@ private func graphemeBreakPropertyData(
   forLine line: String
 ) -> GraphemeBreakEntry? {
   line.match {
-    tryCapture(oneOrMore(.hexDigit)) { Unicode.Scalar(hex: $0) }
-    optionally {
+    TryCapture(OneOrMore(.hexDigit)) { Unicode.Scalar(hex: $0) }
+    Optionally {
       ".."
-      tryCapture(oneOrMore(.hexDigit)) { Unicode.Scalar(hex: $0) }
+      TryCapture(OneOrMore(.hexDigit)) { Unicode.Scalar(hex: $0) }
     }
-    oneOrMore(.whitespace)
+    OneOrMore(.whitespace)
     ";"
-    oneOrMore(.whitespace)
-    tryCapture(oneOrMore(.word)) { Unicode.GraphemeBreakProperty($0) }
-    zeroOrMore(.any)
+    OneOrMore(.whitespace)
+    TryCapture(OneOrMore(.word)) { Unicode.GraphemeBreakProperty($0) }
+    ZeroOrMore(.any)
   }.map {
-    let (_, lower, upper, property) = $0.match
+    let (_, lower, upper, property) = $0.output
     return GraphemeBreakEntry(lower...(upper ?? lower), property)
   }
 }

Documentation/Evolution/StronglyTypedCaptures.md

@@ -55,16 +55,16 @@ enum SemanticsLevel {
 }
 
 /// Conformers can be ran as a regex / pattern
-protocol RegexProtocol {
+protocol RegexComponent {
   var level: SemanticsLevel? { get }
 }
 
 /// Provide the option to encode semantic level statically
 protocol RegexLiteralProtocol: ExpressibleByRegexLiteral {
-  associatedtype ScalarSemanticRegex: RegexProtocol
-  associatedtype GraphemeSemanticRegex: RegexProtocol
-  associatedtype POSIXSemanticRegex: RegexProtocol
-  associatedtype UnspecifiedSemanticRegex: RegexProtocol = RegexLiteral
+  associatedtype ScalarSemanticRegex: RegexComponent
+  associatedtype GraphemeSemanticRegex: RegexComponent
+  associatedtype POSIXSemanticRegex: RegexComponent
+  associatedtype UnspecifiedSemanticRegex: RegexComponent = RegexLiteral
 
   var scalarSemantic: ScalarSemanticRegex { get }
   var graphemeSemantic: GraphemeSemanticRegex { get }
@@ -84,16 +84,16 @@ struct StaticSemanticRegexLiteral: RegexLiteralProtocol {
    */
 
   /// A regex that has statically  bound its semantic level
-  struct ScalarSemanticRegex: RegexProtocol {
+  struct ScalarSemanticRegex: RegexComponent {
     var level: SemanticsLevel? { .scalar }
   }
-  struct GraphemeSemanticRegex: RegexProtocol {
+  struct GraphemeSemanticRegex: RegexComponent {
     var level: SemanticsLevel? { .graphemeCluster }
   }
-  struct POSIXSemanticRegex: RegexProtocol {
+  struct POSIXSemanticRegex: RegexComponent {
     var level: SemanticsLevel? { .posix }
   }
-  struct UnspecifiedSemanticRegex: RegexProtocol {
+  struct UnspecifiedSemanticRegex: RegexComponent {
     var level: SemanticsLevel? { nil }
   }
 
@@ -132,9 +132,9 @@ struct RegexLiteral: ExpressibleByRegexLiteral {
   }
 }
 
-extension RegexLiteral: RegexProtocol, RegexLiteralProtocol {
+extension RegexLiteral: RegexComponent, RegexLiteralProtocol {
   /// A regex that has finally bound its semantic level (dynamically)
-  struct BoundSemantic: RegexProtocol {
+  struct BoundSemantic: RegexComponent {
     var _level: SemanticsLevel // Bound semantic level
     var level: SemanticsLevel? { _level }
   }