Merge pull request #453 from hamishknight/main-merge

Author: hamishknight

Sources/_RegexParser/Utility/TypeConstruction.swift

@@ -60,7 +60,7 @@ public enum TypeConstruction {
       flags |= 0x10000
     }
 
-    let result = elementTypes.withContiguousStorageIfAvailable { elementTypesBuffer in
+    let result = elementTypes.withContiguousStorageIfAvailable { elementTypesBuffer -> (value: Any.Type, state: Int) in
       if let labels = labels {
         return labels.withCString { labelsPtr in
           swift_getTupleTypeMetadata(

Sources/_StringProcessing/PrintAsPattern.swift

@@ -578,7 +578,7 @@ extension PrettyPrinter {
 extension String {
   // TODO: Escaping?
   fileprivate var _quoted: String {
-    "\"\(self._replacing("\"", with: "\\\""))\""
+    "\"\(self._replacing(#"\"#, with: #"\\"#)._replacing(#"""#, with: #"\""#))\""
   }
 }
 

Tests/RegexTests/MatchTests.swift

@@ -1305,6 +1305,14 @@ extension RegexTests {
     firstMatchTest(#"(?xx)[ \t]+"#, input: " \t \t", match: "\t")
 
     firstMatchTest("(?xx)[ a && ab ]+", input: " aaba ", match: "aa")
+    
+    // Preserve whitespace in quoted section inside extended syntax region
+    firstMatchTest(
+      #"(?x) a b \Q c d \E e f"#, input: "ab c d ef", match: "ab c d ef")
+    firstMatchTest(
+      #"(?x)[a b]+ _ [a\Q b\E]+"#, input: "aba_ a b a", match: "aba_ a b a")
+    firstMatchTest(
+      #"(?x)[a b]+ _ [a\Q b\E]+"#, input: "aba _ a b a", match: nil)
   }
 
   func testASCIIClasses() {

Tests/RegexTests/RenderDSLTests.swift

@@ -114,4 +114,12 @@ extension RenderDSLTests {
         """)
     }
   }
+  
+  func testQuoting() throws {
+    try testConversion(#"\\"a""#, #"""
+      Regex {
+        "\\\"a\""
+      }
+      """#)
+  }
 }