Rename _MatchingEngine to _RegexParser and fix CMake.

The _MatchingEngine module no longer contains the matching engine. It has the regex AST and parser. This patch renames it to `_RegexParser`.

Also fix the CMake build which has been broken for a while.

Author: rxwei

Package.swift

@@ -14,8 +14,8 @@ let package = Package(
             name: "Prototypes",
             targets: ["Prototypes"]),
         .library(
-            name: "_MatchingEngine",
-            targets: ["_MatchingEngine"]),
+            name: "_RegexParser",
+            targets: ["_RegexParser"]),
         .executable(
             name: "VariadicsGenerator",
             targets: ["VariadicsGenerator"])
@@ -27,27 +27,27 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
-            name: "_MatchingEngine",
+            name: "_RegexParser",
             dependencies: [],
             swiftSettings: [
                 .unsafeFlags(["-enable-library-evolution"])
             ]),
         .testTarget(
             name: "MatchingEngineTests",
             dependencies: [
-              "_MatchingEngine", "_StringProcessing"]),
+              "_RegexParser", "_StringProcessing"]),
         .target(
             name: "_CUnicode",
             dependencies: []),
         .target(
             name: "_StringProcessing",
-            dependencies: ["_MatchingEngine", "_CUnicode"],
+            dependencies: ["_RegexParser", "_CUnicode"],
             swiftSettings: [
                 .unsafeFlags(["-enable-library-evolution"]),
             ]),
         .target(
             name: "RegexBuilder",
-            dependencies: ["_StringProcessing", "_MatchingEngine"],
+            dependencies: ["_StringProcessing", "_RegexParser"],
             swiftSettings: [
                 .unsafeFlags(["-enable-library-evolution"]),
                 .unsafeFlags(["-Xfrontend", "-enable-experimental-pairwise-build-block"])
@@ -63,7 +63,7 @@ let package = Package(
             ]),
         .target(
             name: "Prototypes",
-            dependencies: ["_MatchingEngine", "_StringProcessing"]),
+            dependencies: ["_RegexParser", "_StringProcessing"]),
 
         // MARK: Scripts
         .executableTarget(
@@ -75,14 +75,14 @@ let package = Package(
             name: "PatternConverter",
             dependencies: [
               .product(name: "ArgumentParser", package: "swift-argument-parser"),
-              "_MatchingEngine",
+              "_RegexParser",
               "_StringProcessing"
             ]),
 
         // MARK: Exercises
         .target(
           name: "Exercises",
-          dependencies: ["_MatchingEngine", "Prototypes", "_StringProcessing", "RegexBuilder"],
+          dependencies: ["_RegexParser", "Prototypes", "_StringProcessing", "RegexBuilder"],
           swiftSettings: [
               .unsafeFlags(["-Xfrontend", "-enable-experimental-pairwise-build-block"])
           ]),

README.md

@@ -1,6 +1,6 @@
 
-add_subdirectory(_Unicode)
-add_subdirectory(_MatchingEngine)
+add_subdirectory(RegexBuilder)
+add_subdirectory(_RegexParser)
 add_subdirectory(_StringProcessing)
 add_subdirectory(Prototypes)
 add_subdirectory(VariadicsGenerator)

Sources/CMakeLists.txt

@@ -12,7 +12,7 @@
 // swift run PatternConverter <regex>
 
 import ArgumentParser
-import _MatchingEngine
+import _RegexParser
 import _StringProcessing
 
 @main
@@ -52,7 +52,7 @@ struct PatternConverter: ParsableCommand {
     let delim = experimentalSyntax ? "|" : "/"
     print("Converting '\(delim)\(regex)\(delim)'")
 
-    let ast = try _MatchingEngine.parse(
+    let ast = try _RegexParser.parse(
       regex,
       experimentalSyntax ? .experimental : .traditional)
 

Sources/PatternConverter/PatternConverter.swift

@@ -15,4 +15,4 @@ add_library(Prototypes
   TourOfTypes/CharacterClass.swift
   TourOfTypes/Literal.swift)
 target_link_libraries(Prototypes PUBLIC
-  _MatchingEngine)
+  _RegexParser)

Sources/Prototypes/CMakeLists.txt

@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _RegexParser
 
 /*
 

Sources/Prototypes/Combinators/Combinators.swift

@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _RegexParser
 @_spi(RegexBuilder) import _StringProcessing
 
 public struct Anchor {

Sources/RegexBuilder/Anchor.swift

@@ -0,0 +1,10 @@
+
+add_library(RegexBuilder
+  Anchor.swift
+  Builder.swift
+  DSL.swift
+  Match.swift
+  Variadics.swift)
+target_compile_options(RegexBuilder PRIVATE
+  -enable-library-evolution
+  -Xfrontend -enable-experimental-pairwise-build-block)

Sources/RegexBuilder/CMakeLists.txt

@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _RegexParser
 @_spi(RegexBuilder) import _StringProcessing
 
 extension Regex {

Sources/RegexBuilder/DSL.swift

@@ -11,7 +11,7 @@
 
 // BEGIN AUTO-GENERATED CONTENT
 
-import _MatchingEngine
+import _RegexParser
 @_spi(RegexBuilder) import _StringProcessing
 
 extension RegexComponentBuilder {