Merge pull request swiftlang#42161 from hamishknight/update-string-processing

Author: hamishknight

test/IDE/complete_regex.swift

@@ -4,7 +4,7 @@
 // RUN: %target-swift-ide-test -enable-experimental-string-processing -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
 
 func testLiteral() {
-    re'foo'.#^RE_LITERAL_MEMBER^#
+  #/foo/#.#^RE_LITERAL_MEMBER^#
 // RE_LITERAL_MEMBER: Begin completions
 // RE_LITERAL_MEMBER-DAG: Keyword[self]/CurrNominal:          self[#Regex<Substring>#];
 // RE_LITERAL_MEMBER: End completions

test/SourceKit/Sema/sema_regex.swift

@@ -1,5 +1,5 @@
 public func retRegex() -> Regex<Substring> {
-  re'foo'
+  #/foo/#
 }
 
 // REQUIRES: swift_in_compiler

test/StringProcessing/Parse/regex.swift

@@ -2,30 +2,19 @@
 // REQUIRES: swift_in_compiler
 
 _ = #/abc/#
-_ = #|abc|#
-_ = re'abc'
+_ = ##/abc/##
 
 func foo<T>(_ x: T...) {}
-foo(#/abc/#, #|abc|#, re'abc')
+foo(#/abc/#, ##/abc/##)
 
-let arr = [#/abc/#, #|abc|#, re'abc']
+let arr = [#/abc/#, ##/abc/##]
 
 _ = #/\w+/#.self
-_ = #|\w+|#.self
-_ = re'\w+'.self
+_ = ##/\w+/##.self
 
 _ = #/#/\/\#\\/#
-_ = #|#|\|\#\\|#
-_ = re're\r\e\'\\'
+_ = ##/#|\|\#\\/##
 
 _ = (#/[*/#, #/+]/#, #/.]/#)
 // expected-error@-1 {{cannot parse regular expression: quantifier '+' must appear after expression}}
 // expected-error@-2 {{cannot parse regular expression: expected ']'}}
-
-// Make sure we can skip over `'` characters in the regex body.
-_ = re'(?'xA0_-y1'x)'
-_ = re'(?('xA0_')\')'
-_ = re'\'(?('-20'))'
-_ = re'\k'+2-1'\''
-_ = re'\g'xA0_''
-_ = re'(?C'9,3, pg(')'

test/StringProcessing/Parse/regex_parse_error.swift

@@ -1,48 +1,38 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-string-processing
 // REQUIRES: swift_in_compiler
 
-_ = re'(' // expected-error {{expected ')'}}
+_ = #/(/# // expected-error {{expected ')'}}
 
 // FIXME: Should be 'group openings'
-_ = re')' // expected-error {{closing ')' does not balance any groups openings}}
+_ = #/)/# // expected-error {{closing ')' does not balance any groups openings}}
 
 _ = #/\\/''/ // expected-error {{unterminated regex literal}}
-_ = #|\| // expected-error {{unterminated regex literal}}
+_ = #/\| // expected-error {{unterminated regex literal}}
 _ = #// // expected-error {{unterminated regex literal}}
-_ = re'x // expected-error {{unterminated regex literal}}
 
 _ = #/xy // expected-error {{unterminated regex literal}}
 
-_ = re'(?' // expected-error {{expected group specifier}}
+_ = #/(?/# // expected-error {{expected group specifier}}
+_ = #/(?'/# // expected-error {{expected group name}}
+_ = #/(?'abc/# // expected-error {{expected '''}}
+_ = #/(?'abc /# // expected-error {{expected '''}}
 
-_ = re'(?'' // expected-error {{unterminated regex literal}}
-// expected-error@-1 {{expected group name}}
+do {
+  _ = #/(?'a
+  // expected-error@-1 {{unterminated regex literal}}
+  // expected-error@-2 {{cannot parse regular expression: expected '''}}
+}
 
-_ = re'(?'abc' // expected-error {{unterminated regex literal}}
-// expected-error@-1 {{expected ')'}}
+_ = #/\(?'abc/#
 
-// TODO: Maybe change "unterminated string literal" to "unterminated single quote"?
-_ = re'(?'abc ' // expected-error {{unterminated string literal}}
-// expected-error@-1 {{expected group specifier}}
-// expected-error@-2 {{consecutive statements on a line must be separated by ';'}}
-
-_ = re'(?'a // expected-error {{expected group specifier}}
-// expected-error@-1 {{cannot find 'a' in scope}}
-// expected-error@-2 {{consecutive statements on a line must be separated by ';'}}
-
-_ = re'\(?'abc' // expected-error {{unterminated string literal}}
-// expected-error@-1 {{consecutive statements on a line must be separated by ';'}}
-
- _ = re'\
- '
+_ = #/\
+/#
 // expected-error@-2 {{unterminated regex literal}}
 // expected-error@-3 {{expected escape sequence}}
-// expected-error@-3 {{unterminated string literal}}
+// expected-error@-3 {{expected expression}}
 
 func foo<T>(_ x: T, _ y: T) {}
-foo(re'(?', re'abc') // expected-error {{expected group specifier}}
-foo(re'(?C', re'abc') // expected-error {{expected ')'}}
+foo(#/(?/#, #/abc/#) // expected-error {{expected group specifier}}
+foo(#/(?C/#, #/abc/#) // expected-error {{expected ')'}}
 
-foo(re'(?'', re'abc') // expected-error {{expected group name}}
-// expected-error@-1 {{unterminated string literal}}
-// expected-error@-2 {{expected ',' separator}}
+foo(#/(?'/#, #/abc/#) // expected-error {{expected group name}}

test/StringProcessing/Runtime/regex_basic.swift

@@ -12,7 +12,7 @@ extension String {
     file: String = #file,
     line: UInt = #line
   ) -> Regex<T>.Match {
-    guard let result = match(regex) else {
+    guard let result = matchWhole(regex) else {
       expectUnreachable("Failed match", file: file, line: line)
       fatalError()
     }
@@ -35,7 +35,9 @@ RegexBasicTests.test("Basic") {
 RegexBasicTests.test("Modern") {
   let input = "aabccd"
 
-  let match1 = input.expectMatch(#|a a  bc c /*hello*/ .|#)
+  let match1 = input.expectMatch(#/
+    a a  bc c (?#hello) . # comment
+  /#)
   expectEqual("aabccd", match1.0)
   expectTrue("aabccd" == match1.output)
 }