Base DSL on DSLTree

Author: milseman

Sources/VariadicsGenerator/VariadicsGenerator.swift

@@ -251,13 +251,13 @@ struct VariadicsGenerator: ParsableCommand {
     output("  init(")
     outputForEach(0..<arity, separator: ", ") { "_ x\($0): T\($0)" }
     output(") {\n")
-    output("    \(patternProtocolRequirementName) = .init(ast: concat(\n      ")
+    output("    \(patternProtocolRequirementName) = .init(node: .concatenation([\n      ")
     outputForEach(
       0..<arity, separator: ", ", lineTerminator: ""
     ) { i in
-      "x\(i).\(patternProtocolRequirementName).ast.root"
+      "x\(i).\(patternProtocolRequirementName).root"
     }
-    output("))\n")
+    output("]))\n")
     output("  }\n}\n\n")
 
     // Emit concatenation builders.

Sources/_StringProcessing/ByteCodeGen.swift

@@ -287,11 +287,13 @@ extension Compiler.ByteCodeGen {
     let (low, high) = amount.bounds
     switch (low, high) {
     case (_, 0):
-      throw Unsupported(
-        "TODO: Should error out earlier, maybe DSL and parser has validation logic?")
+      // TODO: Should error out earlier, maybe DSL and parser
+      // has validation logic?
+      return
     case let (n, m?) where n > m:
-      throw Unsupported(
-        "TODO: Should error out earlier, maybe DSL and parser has validation logic?")
+      // TODO: Should error out earlier, maybe DSL and parser
+      // has validation logic?
+      return
 
     case let (n, m) where m == nil || n <= m!:
       // Ok
@@ -505,7 +507,7 @@ extension Compiler.ByteCodeGen {
     case let .atom(a):
       try emitAtom(a)
 
-    case let .stringLiteral(s):
+    case let .quotedLiteral(s):
       // TODO: Should this incorporate options?
       builder.buildMatchSequence(s)
 

Sources/_StringProcessing/Compiler.swift

@@ -17,19 +17,23 @@ struct RegexProgram {
 }
 
 class Compiler {
-  let ast: AST
+  let tree: DSLTree
+
+  // TODO: Or are these stored on the tree?
   var options = MatchingOptions()
 
   init(ast: AST) {
-    self.ast = ast
+    self.tree = ast.dslTree
+  }
+
+  init(tree: DSLTree) {
+    self.tree = tree
   }
 
   __consuming func emit() throws -> RegexProgram {
     // TODO: Handle global options
-    let converted = ast.root.dslTreeNode
-
     var codegen = ByteCodeGen(options: options)
-    try codegen.emitNode(converted)
+    try codegen.emitNode(tree.root)
     let program = codegen.finish()
     return RegexProgram(program: program)
   }

Sources/_StringProcessing/ConsumerInterface.swift

@@ -56,7 +56,7 @@ extension DSLTree.Node {
     case .customCharacterClass(let ccc):
       return try ccc.generateConsumer(opts)
 
-    case .stringLiteral:
+    case .quotedLiteral:
       // TODO: Should we handle this here?
       return nil
 

Sources/_StringProcessing/PrintAsPattern.swift

@@ -133,7 +133,7 @@ extension PrettyPrinter {
     case .empty:
       print("")
 
-    case let .stringLiteral(v):
+    case let .quotedLiteral(v):
       print(v._quoted)
 
     case .regexLiteral: