WIP: Update for main, some tests failing

Author: milseman

Sources/_StringProcessing/CharacterClass.swift

@@ -477,6 +477,13 @@ extension DSLTree.CustomCharacterClass {
           lhs: .characterClass(lhs),
           op: .symmetricDifference,
           rhs: .characterClass(rhs)))
+
+      case let .quotedLiteral(s):
+        // Decompose quoted literal into literal characters.
+        result += s.map { .character($0) }
+
+      case .trivia:
+        break
       }
     }
     let cc = CharacterClass.custom(result)

Sources/_StringProcessing/ConsumerInterface.swift

@@ -37,10 +37,9 @@ struct Unsupported: Error, CustomStringConvertible {
 func unsupported(
   _ s: String,
   file: StaticString = #file,
-  line: Int = #line
+  line: UInt = #line
 ) -> Unsupported {
-  return Unsupported(
-    message: s, file: String(describing: file), line: line)
+  return Unsupported(s, file: file, line: line)
 }
 
 struct Unreachable: Error, CustomStringConvertible {
@@ -289,6 +288,19 @@ extension DSLTree.CustomCharacterClass.Member {
         }
         return rhs(input, bounds)
       }
+    case .quotedLiteral(let s):
+      return { input, bounds in
+        guard input[bounds].starts(with: s) else {
+          return nil
+        }
+        // TODO: Don't double count
+        return input.index(bounds.lowerBound, offsetBy: s.count)
+      }
+    case .trivia:
+      // TODO: Should probably strip this earlier...
+      return { _, bounds in
+        return bounds.lowerBound
+      }
     }
 
   }

Sources/_StringProcessing/PrintAsPattern.swift

@@ -197,12 +197,12 @@ extension PrettyPrinter {
       } else {
         print(" // TODO: Atom \(a) ")
       }
-    case .quote(let q):
-      print("// TODO: quote \(q.literal._quoted) in custom character classes (should we split it?)")
+    case .quotedLiteral(let s):
+      print("// TODO: quote \(s._quoted) in custom character classes (should we split it?)")
     case .trivia(let t):
       // TODO: We might want to output comments...
       _ = t
-case .symmetricDifference, .intersection, .subtraction:
+    case .symmetricDifference, .intersection, .subtraction:
       print("// TODO: Set operation: \(member)")
     }
   }

Sources/_StringProcessing/RegexDSL/DSLTree.swift

@@ -99,6 +99,10 @@ extension DSLTree {
       case range(Atom, Atom)
       case custom(CustomCharacterClass)
 
+      case quotedLiteral(String)
+
+      case trivia(String)
+
       indirect case intersection(CustomCharacterClass, CustomCharacterClass)
       indirect case subtraction(CustomCharacterClass, CustomCharacterClass)
       indirect case symmetricDifference(CustomCharacterClass, CustomCharacterClass)
@@ -321,10 +325,7 @@ extension AST.CustomCharacterClass {
         return .atom(a.dslTreeAtom)
 
       case let .quote(q):
-        // TODO: Probably should flatten instead of nest
-        return .custom(.init(
-          members: q.literal.map { .atom(.char($0)) },
-          isInverted: false))
+        return .quotedLiteral(q.literal)
 
       case let .setOperation(lhs, op, rhs):
         let lhs = DSLTree.CustomCharacterClass(
@@ -342,6 +343,8 @@ extension AST.CustomCharacterClass {
         case .symmetricDifference:
           return .symmetricDifference(lhs, rhs)
         }
+      case let .trivia(t):
+        return .trivia(t.contents)
       }
     }