Merge pull request #1 from milseman/5_7_azoy

Remove compiling argument label

Author: Azoy

Documentation/Evolution/RegexSyntaxRunTimeConstruction.md

@@ -54,11 +54,11 @@ We propose run-time construction of `Regex` from a best-in-class treatment of fa
 
 ```swift
 let pattern = #"(\w+)\s\s+(\S+)\s\s+((?:(?!\s\s).)*)\s\s+(.*)"#
-let regex = try! Regex(compiling: pattern)
+let regex = try! Regex(pattern)
 // regex: Regex<AnyRegexOutput>
 
 let regex: Regex<(Substring, Substring, Substring, Substring, Substring)> =
-  try! Regex(compiling: pattern)
+  try! Regex(pattern)
 ```
 
 ### Syntax

Documentation/Evolution/RegexTypeOverview.md

@@ -134,11 +134,11 @@ Regexes can be created at run time from a string containing familiar regex synta
 
 ```swift
 let pattern = #"(\w+)\s\s+(\S+)\s\s+((?:(?!\s\s).)*)\s\s+(.*)"#
-let regex = try! Regex(compiling: pattern)
+let regex = try! Regex(pattern)
 // regex: Regex<AnyRegexOutput>
 
 let regex: Regex<(Substring, Substring, Substring, Substring, Substring)> =
-  try! Regex(compiling: pattern)
+  try! Regex(pattern)
 ```
 
 *Note*: The syntax accepted and further details on run-time compilation, including `AnyRegexOutput` and extended syntaxes, are discussed in [Run-time Regex Construction][pitches].
@@ -300,7 +300,7 @@ Regex targets [UTS\#18 Level 2](https://www.unicode.org/reports/tr18/#Extended_U
 ```swift
 /// A regex represents a string processing algorithm.
 ///
-///     let regex = try Regex(compiling: "a(.*)b")
+///     let regex = try Regex("a(.*)b")
 ///     let match = "cbaxb".firstMatch(of: regex)
 ///     print(match.0) // "axb"
 ///     print(match.1) // "x"

Sources/Exercises/Participants/RegexParticipant.swift

@@ -70,7 +70,7 @@ private func graphemeBreakPropertyDataLiteral(
   forLine line: String
 ) -> GraphemeBreakEntry? {
   let regex = try! Regex(
-    compiling: #"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+(\w+).*"#,
+      #"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+(\w+).*"#,
     as: (Substring, Substring, Substring?, Substring).self)
   return graphemeBreakPropertyData(forLine: line, using: regex)
 }

Sources/_StringProcessing/Regex/AnyRegexOutput.swift

@@ -14,7 +14,7 @@
 @available(SwiftStdlib 5.7, *)
 extension Regex where Output == AnyRegexOutput {
   /// Parse and compile `pattern`, resulting in an existentially-typed capture list.
-  public init(compiling pattern: String) throws {
+  public init(_ pattern: String) throws {
     self.init(ast: try parse(pattern, .traditional))
   }
 }
@@ -23,7 +23,7 @@ extension Regex where Output == AnyRegexOutput {
 extension Regex {
   /// Parse and compile `pattern`, resulting in a strongly-typed capture list.
   public init(
-    compiling pattern: String,
+    _ pattern: String,
     as: Output.Type = Output.self
   ) throws {
     self.init(ast: try parse(pattern, .traditional))

Sources/_StringProcessing/Regex/Core.swift

@@ -21,7 +21,7 @@ public protocol RegexComponent {
 
 /// A regex represents a string processing algorithm.
 ///
-///     let regex = try Regex(compiling: "a(.*)b")
+///     let regex = try Regex("a(.*)b")
 ///     let match = "cbaxb".firstMatch(of: regex)
 ///     print(match.0) // "axb"
 ///     print(match.1) // "x"

Tests/RegexBuilderTests/MotivationTests.swift

@@ -139,7 +139,7 @@ private func processWithRuntimeDynamicRegex(
   _ line: String
 ) -> Transaction? {
   // FIXME: Shouldn't this init throw?
-  let regex = try! Regex(compiling: pattern)
+  let regex = try! Regex(pattern)
 
 //      guard let result = line.match(regex) else { return nil }
 //
@@ -156,7 +156,7 @@ private func processWithRuntimeDynamicRegex(
 @available(macOS 12.0, *)
 private func processWithRuntimeStaticRegex(_ line: String) -> Transaction? {
   let regex: Regex<(Substring, Substring, Substring, Substring, Substring)>
-  = try! Regex(compiling: pattern)
+  = try! Regex(pattern)
 
   return process(line, using: regex)
 }

Tests/RegexBuilderTests/RegexDSLTests.swift

@@ -666,7 +666,7 @@ class RegexDSLTests: XCTestCase {
 
     do {
       let regexLiteral = try Regex(
-        compiling: #"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+(\w+).*"#,
+          #"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+(\w+).*"#,
         as: (Substring, Substring, Substring?, Substring).self)
       let maybeMatchResult = line.wholeMatch(of: regexLiteral)
       let matchResult = try XCTUnwrap(maybeMatchResult)
@@ -680,7 +680,7 @@ class RegexDSLTests: XCTestCase {
 
   func testDynamicCaptures() throws {
     do {
-      let regex = try Regex(compiling: "aabcc.")
+      let regex = try Regex("aabcc.")
       let line = "aabccd"
       let match = try XCTUnwrap(line.wholeMatch(of: regex))
       XCTAssertEqual(match.0, line[...])
@@ -689,7 +689,7 @@ class RegexDSLTests: XCTestCase {
     }
     do {
       let regex = try Regex(
-        compiling: #"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+(\w+).*"#)
+        #"([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+(\w+).*"#)
       let line = """
         A6F0..A6F1    ; Extend # Mn   [2] BAMUM COMBINING MARK KOQNDON..BAMUM \
         COMBINING MARK TUKWENTIS

Tests/RegexTests/AlgorithmsTests.swift

@@ -32,7 +32,7 @@ class RegexConsumerTests: XCTestCase {
       _ expected: [Range<Int>],
       file: StaticString = #file, line: UInt = #line
     ) {
-      let regex = try! Regex(compiling: regex)
+      let regex = try! Regex(regex)
 
       let actualSeq: [Range<Int>] = string[...].ranges(of: regex).map(string.offsets(of:))
       XCTAssertEqual(actualSeq, expected, file: file, line: line)
@@ -69,7 +69,7 @@ class RegexConsumerTests: XCTestCase {
       _ expected: [Substring],
       file: StaticString = #file, line: UInt = #line
     ) {
-      let regex = try! Regex(compiling: regex)
+      let regex = try! Regex(regex)
       let actual = Array(string.split(by: regex))
       XCTAssertEqual(actual, expected, file: file, line: line)
     }
@@ -89,7 +89,7 @@ class RegexConsumerTests: XCTestCase {
       _ expected: String,
       file: StaticString = #file, line: UInt = #line
     ) {
-      let regex = try! Regex(compiling: regex)
+      let regex = try! Regex(regex)
       let actual = string.replacing(regex, with: replacement)
       XCTAssertEqual(actual, expected, file: file, line: line)
     }
@@ -108,7 +108,7 @@ class RegexConsumerTests: XCTestCase {
   }
 
   func testAdHoc() {
-    let r = try! Regex(compiling: "a|b+")
+    let r = try! Regex("a|b+")
 
     XCTAssert("palindrome".contains(r))
     XCTAssert("botany".contains(r))
@@ -142,7 +142,7 @@ class RegexConsumerTests: XCTestCase {
     let s = "aaa | aaaaaa | aaaaaaaaaa"
     let s1 = s.dropFirst(6)  // "aaaaaa | aaaaaaaaaa"
     let s2 = s1.dropLast(17) // "aa"
-    let regex = try! Regex(compiling: "a+")
+    let regex = try! Regex("a+")
 
     XCTAssertEqual(s.firstMatch(of: regex)?.0, "aaa")
     XCTAssertEqual(s1.firstMatch(of: regex)?.0, "aaaaaa")

Tests/RegexTests/MatchTests.swift

@@ -1272,11 +1272,11 @@ extension RegexTests {
       04: Arkansas
       05: California
       """
-    XCTAssertTrue(string.contains(try Regex(compiling: #"^\d+"#)))
-    XCTAssertEqual(string.ranges(of: try Regex(compiling: #"^\d+"#)).count, 1)
-    XCTAssertEqual(string.ranges(of: try Regex(compiling: #"(?m)^\d+"#)).count, 5)
+    XCTAssertTrue(string.contains(try Regex(#"^\d+"#)))
+    XCTAssertEqual(string.ranges(of: try Regex(#"^\d+"#)).count, 1)
+    XCTAssertEqual(string.ranges(of: try Regex(#"(?m)^\d+"#)).count, 5)
 
-    let regex = try Regex(compiling: #"^\d+: [\w ]+$"#)
+    let regex = try Regex(#"^\d+: [\w ]+$"#)
     XCTAssertFalse(string.contains(regex))
     let allRanges = string.ranges(of: regex.anchorsMatchLineEndings())
     XCTAssertEqual(allRanges.count, 5)
@@ -1304,7 +1304,7 @@ extension RegexTests {
   }
 
   func testOptionMethods() throws {
-    let regex = try Regex(compiling: "c.f.")
+    let regex = try Regex("c.f.")
     XCTAssertTrue ("cafe".contains(regex))
     XCTAssertFalse("CaFe".contains(regex))