Move MatchingEngine out of the _MatchingEngine module (#143)

Author: milseman

Package.swift

@@ -34,7 +34,8 @@ let package = Package(
             ]),
         .testTarget(
             name: "MatchingEngineTests",
-            dependencies: ["_MatchingEngine"]),
+            dependencies: [
+              "_MatchingEngine", "_StringProcessing"]),
         .target(
             name: "_StringProcessing",
             dependencies: ["_MatchingEngine"],
@@ -50,7 +51,7 @@ let package = Package(
             ]),
         .target(
             name: "Prototypes",
-            dependencies: ["_MatchingEngine"]),
+            dependencies: ["_MatchingEngine", "_StringProcessing"]),
 
         // MARK: Scripts
         .executableTarget(

Sources/Exercises/Participants/PEGParticipant.swift

@@ -40,7 +40,7 @@ private func graphemeBreakPropertyData(forLine line: String) -> GraphemeBreakEnt
   let program = PEG.Program(start: "Entry", environment: ["Entry": entry])
 
   let vm = program.compile(for: String.self)
-  let engine = try! program.transpile(for: String.self)
+  let engine = try! program.transpile()
   _ = (vm, engine)
 
   fatalError("Unsupported")

Sources/Prototypes/PEG/PEGCode.swift

@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _StringProcessing
 
 extension PEG.VM {
   struct Code {

Sources/Prototypes/PEG/PEGCompile.swift

@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _StringProcessing
 
 extension PEG.VM {
   typealias InIndex = Input.Index

Sources/Prototypes/PEG/PEGCore.swift

@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _StringProcessing
 let emitComments = true
 
 struct PEGCore<

Sources/Prototypes/PEG/PEGTranspile.swift

@@ -10,12 +10,13 @@
 //===----------------------------------------------------------------------===//
 
 import _MatchingEngine
+import _StringProcessing
 
-extension PEG.VM {
-  typealias MEProgram = _MatchingEngine.Program<Input>
-  func transpile() throws -> MEProgram {
-    typealias Builder = MEProgram.Builder
-    var builder = MEProgram.Builder()
+extension PEG.VM where Input == String {
+  typealias MEProg = MEProgram<String>
+  func transpile() throws -> MEProg {
+    typealias Builder = MEProg.Builder
+    var builder = MEProg.Builder()
 
     // Address token info
     //
@@ -110,10 +111,9 @@ extension PEG.VM {
   }
 }
 
-extension PEG.Program {
-  public func transpile<Input: Collection>(
-    for input: Input.Type = Input.self
-  ) throws -> Engine<Input> where Input.Element == Element {
-    try Engine(compile(for: input).vm.transpile())
+extension PEG.Program where Element == Character {
+  public func transpile(
+  ) throws -> Engine<String> {
+    try Engine(compile(for: String.self).vm.transpile())
   }
 }

Sources/Prototypes/PEG/PEGVM.swift

@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _StringProcessing
 
 extension PEG {
 

Sources/Prototypes/PEG/Printing.swift

@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _StringProcessing
 
 extension PEGCore.Instruction: InstructionProtocol {
   var operandPC: InstructionAddress? { self.pc }

Sources/_StringProcessing/ByteCodeGen.swift

@@ -3,10 +3,10 @@ import _MatchingEngine
 extension Compiler {
   struct ByteCodeGen {
     var options: MatchingOptions
-    var builder = _MatchingEngine.Program<String>.Builder()
+    var builder = Program.Builder()
 
     mutating func finish(
-    ) throws -> _MatchingEngine.Program<String> {
+    ) throws -> Program {
       builder.buildAccept()
       return try builder.assemble()
     }

Sources/_StringProcessing/Compiler.swift

@@ -11,11 +11,6 @@
 
 import _MatchingEngine
 
-struct RegexProgram {
-  typealias Program = _MatchingEngine.Program<String>
-  var program: Program
-}
-
 class Compiler {
   let tree: DSLTree
 
@@ -30,12 +25,12 @@ class Compiler {
     self.tree = tree
   }
 
-  __consuming func emit() throws -> RegexProgram {
+  __consuming func emit() throws -> Program {
     // TODO: Handle global options
     var codegen = ByteCodeGen(options: options)
     try codegen.emitNode(tree.root)
     let program = try codegen.finish()
-    return RegexProgram(program: program)
+    return program
   }
 }