Merge pull request #629 from apple/dewing/CharacterClassDSLConversion

Fix an issue where named character classes weren't getting converted …

Author: DaveEwing

Sources/_StringProcessing/PrintAsPattern.swift

@@ -518,6 +518,14 @@ extension PrettyPrinter {
         } else {
           output(base.0)
         }
+
+      case let .characterClass(cc):
+        if wrap {
+          output("One(\(cc._patternBase))")
+        } else {
+          output(cc._patternBase)
+        }
+
       default:
         print(" // TODO: Atom \(a)")
       }

Tests/RegexTests/RenderDSLTests.swift

@@ -276,4 +276,40 @@ extension RenderDSLTests {
       }
       """#)
   }
+
+  func testCharacterClass() throws {
+    try testConversion(#"[abc]+"#, #"""
+      Regex {
+        OneOrMore(.anyOf("abc"))
+      }
+      """#)
+
+    try testConversion(#"[[:whitespace:]]"#, #"""
+      Regex {
+        One(.whitespace)
+      }
+      """#)
+
+    try testConversion(#"[\b\w]+"#, #"""
+      Regex {
+        OneOrMore {
+          CharacterClass(
+            .anyOf("\u{8}"),
+            .word
+          )
+        }
+      }
+      """#)
+
+    try testConversion(#"[abc\sd]+"#, #"""
+      Regex {
+        OneOrMore {
+          CharacterClass(
+            .anyOf("abcd"),
+            .whitespace
+          )
+        }
+      }
+      """#)
+  }
 }