Fix CharacterClass.any

This should map to `.any`, not `.dot`.

rdar://96509234

Author: hamishknight

Sources/RegexBuilder/CharacterClass.swift

@@ -42,7 +42,7 @@ extension CharacterClass {
 @available(SwiftStdlib 5.7, *)
 extension RegexComponent where Self == CharacterClass {
   public static var any: CharacterClass {
-    .init(DSLTree.CustomCharacterClass(members: [.atom(.dot)]))
+    .init(DSLTree.CustomCharacterClass(members: [.atom(.any)]))
   }
 
   public static var anyGraphemeCluster: CharacterClass {

Sources/_StringProcessing/ConsumerInterface.swift

@@ -128,7 +128,7 @@ extension DSLTree.Atom {
       // can match a single scalar in scalar semantic mode.
       return try Character(s).generateConsumer(opts)
 
-    case .any, .dot:
+    case .any:
       // FIXME: Should this be a total ordering?
       if opts.semanticLevel == .graphemeCluster {
         return { input, bounds in
@@ -140,6 +140,9 @@ extension DSLTree.Atom {
         }
       }
 
+    case .dot:
+      throw Unreachable(".atom(.dot) should be handled by emitDot")
+
     case .assertion:
       // TODO: We could handle, should this be total?
       return nil

Sources/_StringProcessing/PrintAsPattern.swift

@@ -920,8 +920,8 @@ extension AST.Atom {
       return (" /* TODO: named character */", false)
 
     case .dot:
-      // FIXME: This is wrong, the DSL doesn't have an equivalent to .dot.
-      return (".any", true)
+      // The DSL does not have an equivalent to '.', print as a regex.
+      return ("/./", false)
 
     case .startOfLine, .endOfLine:
       fatalError("unreachable")
@@ -1128,8 +1128,8 @@ extension DSLTree.Atom {
       return (".any", true)
 
     case .dot:
-      // FIXME: This is wrong, the DSL doesn't have an equivalent to .dot.
-      return (".any", true)
+      // The DSL does not have an equivalent to '.', print as a regex.
+      return ("/./", false)
 
     case let .char(c):
       return (String(c)._quoted, false)

Tests/RegexBuilderTests/RegexDSLTests.swift

@@ -73,6 +73,9 @@ class RegexDSLTests: XCTestCase {
     XCTAssertTrue(match.output == substringMatch.output)
   }
 
+  let allNewlines = "\u{A}\u{B}\u{C}\u{D}\r\n\u{85}\u{2028}\u{2029}"
+  let asciiNewlines = "\u{A}\u{B}\u{C}\u{D}\r\n"
+
   func testCharacterClasses() throws {
     try _testDSLCaptures(
       ("a c", ("a c", " ", "c")),
@@ -115,9 +118,6 @@ class RegexDSLTests: XCTestCase {
       }
     }
 
-    let allNewlines = "\u{A}\u{B}\u{C}\u{D}\r\n\u{85}\u{2028}\u{2029}"
-    let asciiNewlines = "\u{A}\u{B}\u{C}\u{D}\r\n"
-
     // `.newlineSequence` and `.verticalWhitespace` match the same set of
     // newlines in grapheme semantic mode, and scalar mode when applied with
     // OneOrMore.
@@ -247,6 +247,20 @@ class RegexDSLTests: XCTestCase {
     }
   }
 
+  func testAny() throws {
+    // .any matches newlines regardless of matching options.
+    for dotMatchesNewline in [true, false] {
+      try _testDSLCaptures(
+        ("abc\(allNewlines)def", "abc\(allNewlines)def"),
+        matchType: Substring.self, ==)
+      {
+        Regex {
+          OneOrMore(.any)
+        }.dotMatchesNewlines(dotMatchesNewline)
+      }
+    }
+  }
+
   func testMatchResultDotZeroWithoutCapture() throws {
     let match = try XCTUnwrap("aaa".wholeMatch { OneOrMore { "a" } })
     XCTAssertEqual(match.0, "aaa")

Tests/RegexTests/RenderDSLTests.swift

@@ -68,6 +68,23 @@ extension RenderDSLTests {
       }
       """)
   }
+
+  func testDot() throws {
+    try testConversion(#".+"#, #"""
+      Regex {
+        OneOrMore {
+          /./
+        }
+      }
+      """#)
+    try testConversion(#"a.c"#, #"""
+      Regex {
+        "a"
+        /./
+        "c"
+      }
+      """#)
+  }
 
   func testOptions() throws {
     try XCTExpectFailure("Options like '(?i)' aren't converted") {