swiftlang · rxwei · Mar 29, 2022 · Mar 28, 2022
diff --git a/Package.swift b/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"])
           ]),

diff --git a/README.md b/README.md
@@ -12,13 +12,13 @@ See [Declarative String Processing Overview][decl-string]
 
 ## Integration with Swift
 
-`_MatchingEngine`, `_CUnicode` and `_StringProcessing` are specially integrated modules that are built as part of apple/swift.
+`_RegexParser` and `_StringProcessing` are specially integrated modules that are built as part of apple/swift.
 
-Specifically, `_MatchingEngine` contains the parser for regular expression literals and is built both as part of the compiler and as a core library. `_CUnicode` and `_StringProcessing` are built together as a core library named `_StringProcessing`.
+Specifically, `_RegexParser` contains the parser for regular expression literals and is built both as part of the compiler and as a core library. `_CUnicode` and `_StringProcessing` are built together as a core library named `_StringProcessing`.
 
 | Module              | Swift toolchain component                                                            |
 | ------------------- | ------------------------------------------------------------------------------------ |
-| `_MatchingEngine`   | `SwiftCompilerSources/Sources/ExperimentalRegex` and `stdlib/public/_MatchingEngine` |
+| `_RegexParser`      | `SwiftCompilerSources/Sources/_RegexParser` and `stdlib/public/_RegexParser` |
 | `_CUnicode`         | `stdlib/public/_StringProcessing`                                                    |
 | `_StringProcessing` | `stdlib/public/_StringProcessing`                                                    |
 
@@ -65,10 +65,9 @@ To integrate the latest changes in apple/swift-experimental-string-processing to
 
 ### Development notes
 
-Compiler integration can be tricky. Use special caution when developing `_MatchingEngine`, `_CUnicode` and `_StringProcessing` modules.
+Compiler integration can be tricky. Use special caution when developing `_RegexParser` and `_StringProcessing` modules.
 
 - Do not change the names of these modules without due approval from compiler and infrastructure teams.
 - Do not modify the existing ABI (e.g. C API, serialization format) between the regular expression parser and the Swift compiler unless absolutely necessary. 
 - Always minimize the number of lockstep integrations, i.e. when apple/swift-experimental-string-processing and apple/swift have to change together. Whenever possible, introduce new API first, migrate Swift compiler onto it, and then deprecate old API. Use versioning if helpful.
 - In `_StringProcessing`, do not write fully qualified references to symbols in `_CUnicode`, and always wrap `import _CUnicode` in a `#if canImport(_CUnicode)`. This is because `_CUnicode` is built as part of `_StringProcessing` with CMake.
-- In `_MatchingEngine`, do not write fully qualified references to `_MatchingEngine` itself. This is because `_MatchingEngine` is built as `ExperimentalRegex` in `SwiftCompilerSources/` with CMake. 
diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
@@ -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)
diff --git a/Sources/PatternConverter/PatternConverter.swift b/Sources/PatternConverter/PatternConverter.swift
@@ -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)
 

diff --git a/Sources/Prototypes/CMakeLists.txt b/Sources/Prototypes/CMakeLists.txt
@@ -15,4 +15,4 @@ add_library(Prototypes
   TourOfTypes/CharacterClass.swift
   TourOfTypes/Literal.swift)
 target_link_libraries(Prototypes PUBLIC
-  _MatchingEngine)
+  _RegexParser)
diff --git a/Sources/Prototypes/Combinators/Combinators.swift b/Sources/Prototypes/Combinators/Combinators.swift
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _RegexParser
 
 /*
 

diff --git a/Sources/RegexBuilder/Anchor.swift b/Sources/RegexBuilder/Anchor.swift
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _RegexParser
 @_spi(RegexBuilder) import _StringProcessing
 
 public struct Anchor {

diff --git a/Sources/RegexBuilder/CMakeLists.txt b/Sources/RegexBuilder/CMakeLists.txt
@@ -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)
diff --git a/Sources/RegexBuilder/DSL.swift b/Sources/RegexBuilder/DSL.swift
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _RegexParser
 @_spi(RegexBuilder) import _StringProcessing
 
 extension Regex {

diff --git a/Sources/RegexBuilder/Variadics.swift b/Sources/RegexBuilder/Variadics.swift
@@ -11,7 +11,7 @@
 
 // BEGIN AUTO-GENERATED CONTENT
 
-import _MatchingEngine
+import _RegexParser
 @_spi(RegexBuilder) import _StringProcessing
 
 extension RegexComponentBuilder {

diff --git a/Sources/VariadicsGenerator/VariadicsGenerator.swift b/Sources/VariadicsGenerator/VariadicsGenerator.swift
@@ -120,7 +120,7 @@ struct VariadicsGenerator: ParsableCommand {
 
       // BEGIN AUTO-GENERATED CONTENT
 
-      import _MatchingEngine
+      import _RegexParser
       @_spi(RegexBuilder) import _StringProcessing
 
 

diff --git a/Sources/_MatchingEngine/CMakeLists.txt b/Sources/_MatchingEngine/CMakeLists.txt
diff --git a/Sources/_RegexParser/CMakeLists.txt b/Sources/_RegexParser/CMakeLists.txt
@@ -0,0 +1,28 @@
+
+add_library(_RegexParser
+  AST/AST.swift
+  AST/ASTAction.swift
+  AST/ASTProtocols.swift
+  AST/Atom.swift
+  AST/Conditional.swift
+  AST/CustomCharClass.swift
+  AST/Group.swift
+  AST/MatchingOptions.swift
+  AST/Quantification.swift
+  Parse/CaptureStructure.swift
+  Parse/CharacterPropertyClassification.swift
+  Parse/DelimiterLexing.swift
+  Parse/Diagnostics.swift
+  Parse/LexicalAnalysis.swift
+  Parse/Mocking.swift
+  Parse/Parse.swift
+  Parse/Source.swift
+  Parse/SourceLocation.swift
+  Parse/SyntaxOptions.swift
+  Printing/DumpAST.swift
+  Printing/PrettyPrinter.swift
+  Printing/PrintAsCanonical.swift
+  Printing/RenderRanges.swift
+  TreeProtocols.swift)
+target_compile_options(_RegexParser PRIVATE
+  -enable-library-evolution)
diff --git a/Sources/_MatchingEngine/Regex/AST/AST.swift → Sources/_RegexParser/Regex/AST/AST.swift b/Sources/_MatchingEngine/Regex/AST/AST.swift → Sources/_RegexParser/Regex/AST/AST.swift
diff --git a/..._MatchingEngine/Regex/AST/ASTAction.swift → ...es/_RegexParser/Regex/AST/ASTAction.swift b/..._MatchingEngine/Regex/AST/ASTAction.swift → ...es/_RegexParser/Regex/AST/ASTAction.swift
diff --git a/...tchingEngine/Regex/AST/ASTProtocols.swift → ..._RegexParser/Regex/AST/ASTProtocols.swift b/...tchingEngine/Regex/AST/ASTProtocols.swift → ..._RegexParser/Regex/AST/ASTProtocols.swift
diff --git a/Sources/_MatchingEngine/Regex/AST/Atom.swift → Sources/_RegexParser/Regex/AST/Atom.swift b/Sources/_MatchingEngine/Regex/AST/Atom.swift → Sources/_RegexParser/Regex/AST/Atom.swift
diff --git a/...atchingEngine/Regex/AST/Conditional.swift → .../_RegexParser/Regex/AST/Conditional.swift b/...atchingEngine/Regex/AST/Conditional.swift → .../_RegexParser/Regex/AST/Conditional.swift
diff --git a/...ingEngine/Regex/AST/CustomCharClass.swift → ...gexParser/Regex/AST/CustomCharClass.swift b/...ingEngine/Regex/AST/CustomCharClass.swift → ...gexParser/Regex/AST/CustomCharClass.swift
diff --git a/...ces/_MatchingEngine/Regex/AST/Group.swift → Sources/_RegexParser/Regex/AST/Group.swift b/...ces/_MatchingEngine/Regex/AST/Group.swift → Sources/_RegexParser/Regex/AST/Group.swift
diff --git a/...ingEngine/Regex/AST/MatchingOptions.swift → ...gexParser/Regex/AST/MatchingOptions.swift b/...ingEngine/Regex/AST/MatchingOptions.swift → ...gexParser/Regex/AST/MatchingOptions.swift
diff --git a/...hingEngine/Regex/AST/Quantification.swift → ...egexParser/Regex/AST/Quantification.swift b/...hingEngine/Regex/AST/Quantification.swift → ...egexParser/Regex/AST/Quantification.swift
diff --git a/...Engine/Regex/Parse/CaptureStructure.swift → ...Parser/Regex/Parse/CaptureStructure.swift b/...Engine/Regex/Parse/CaptureStructure.swift → ...Parser/Regex/Parse/CaptureStructure.swift
diff --git a/...rse/CharacterPropertyClassification.swift → ...rse/CharacterPropertyClassification.swift b/...rse/CharacterPropertyClassification.swift → ...rse/CharacterPropertyClassification.swift
diff --git a/...gEngine/Regex/Parse/DelimiterLexing.swift → ...xParser/Regex/Parse/DelimiterLexing.swift b/...gEngine/Regex/Parse/DelimiterLexing.swift → ...xParser/Regex/Parse/DelimiterLexing.swift
diff --git a/...chingEngine/Regex/Parse/Diagnostics.swift → ...RegexParser/Regex/Parse/Diagnostics.swift b/...chingEngine/Regex/Parse/Diagnostics.swift → ...RegexParser/Regex/Parse/Diagnostics.swift
diff --git a/...gEngine/Regex/Parse/LexicalAnalysis.swift → ...xParser/Regex/Parse/LexicalAnalysis.swift b/...gEngine/Regex/Parse/LexicalAnalysis.swift → ...xParser/Regex/Parse/LexicalAnalysis.swift
diff --git a/..._MatchingEngine/Regex/Parse/Mocking.swift → ...es/_RegexParser/Regex/Parse/Mocking.swift b/..._MatchingEngine/Regex/Parse/Mocking.swift → ...es/_RegexParser/Regex/Parse/Mocking.swift
diff --git a/...s/_MatchingEngine/Regex/Parse/Parse.swift → Sources/_RegexParser/Regex/Parse/Parse.swift b/...s/_MatchingEngine/Regex/Parse/Parse.swift → Sources/_RegexParser/Regex/Parse/Parse.swift
diff --git a/.../_MatchingEngine/Regex/Parse/Source.swift → ...ces/_RegexParser/Regex/Parse/Source.swift b/.../_MatchingEngine/Regex/Parse/Source.swift → ...ces/_RegexParser/Regex/Parse/Source.swift
diff --git a/...ngEngine/Regex/Parse/SourceLocation.swift → ...exParser/Regex/Parse/SourceLocation.swift b/...ngEngine/Regex/Parse/SourceLocation.swift → ...exParser/Regex/Parse/SourceLocation.swift
diff --git a/...ingEngine/Regex/Parse/SyntaxOptions.swift → ...gexParser/Regex/Parse/SyntaxOptions.swift b/...ingEngine/Regex/Parse/SyntaxOptions.swift → ...gexParser/Regex/Parse/SyntaxOptions.swift
diff --git a/...tchingEngine/Regex/Printing/DumpAST.swift → ..._RegexParser/Regex/Printing/DumpAST.swift b/...tchingEngine/Regex/Printing/DumpAST.swift → ..._RegexParser/Regex/Printing/DumpAST.swift
diff --git a/...Engine/Regex/Printing/PrettyPrinter.swift → ...Parser/Regex/Printing/PrettyPrinter.swift b/...Engine/Regex/Printing/PrettyPrinter.swift → ...Parser/Regex/Printing/PrettyPrinter.swift
diff --git a/...ine/Regex/Printing/PrintAsCanonical.swift → ...ser/Regex/Printing/PrintAsCanonical.swift b/...ine/Regex/Printing/PrintAsCanonical.swift → ...ser/Regex/Printing/PrintAsCanonical.swift
diff --git a/...gEngine/Regex/Printing/RenderRanges.swift → ...xParser/Regex/Printing/RenderRanges.swift b/...gEngine/Regex/Printing/RenderRanges.swift → ...xParser/Regex/Printing/RenderRanges.swift
diff --git a/..._MatchingEngine/Regex/TreeProtocols.swift → ...es/_RegexParser/Regex/TreeProtocols.swift b/..._MatchingEngine/Regex/TreeProtocols.swift → ...es/_RegexParser/Regex/TreeProtocols.swift
diff --git a/.../_MatchingEngine/Utility/AllScalars.swift → ...ces/_RegexParser/Utility/AllScalars.swift b/.../_MatchingEngine/Utility/AllScalars.swift → ...ces/_RegexParser/Utility/AllScalars.swift
diff --git a/Sources/_MatchingEngine/Utility/Errors.swift → Sources/_RegexParser/Utility/Errors.swift b/Sources/_MatchingEngine/Utility/Errors.swift → Sources/_RegexParser/Utility/Errors.swift
diff --git a/Sources/_MatchingEngine/Utility/Misc.swift → Sources/_RegexParser/Utility/Misc.swift b/Sources/_MatchingEngine/Utility/Misc.swift → Sources/_RegexParser/Utility/Misc.swift
diff --git a/...tchingEngine/Utility/MissingUnicode.swift → ..._RegexParser/Utility/MissingUnicode.swift b/...tchingEngine/Utility/MissingUnicode.swift → ..._RegexParser/Utility/MissingUnicode.swift
diff --git a/...hingEngine/Utility/TypeConstruction.swift → ...egexParser/Utility/TypeConstruction.swift b/...hingEngine/Utility/TypeConstruction.swift → ...egexParser/Utility/TypeConstruction.swift
diff --git a/Sources/_StringProcessing/ByteCodeGen.swift b/Sources/_StringProcessing/ByteCodeGen.swift
@@ -1,4 +1,4 @@
-import _MatchingEngine
+import _RegexParser
 
 extension Compiler {
   struct ByteCodeGen {

diff --git a/Sources/_StringProcessing/CMakeLists.txt b/Sources/_StringProcessing/CMakeLists.txt
@@ -12,31 +12,67 @@ add_library(_StringProcessing
   Algorithms/Consumers/ManyConsumer.swift
   Algorithms/Consumers/PredicateConsumer.swift
   Algorithms/Consumers/RegexConsumer.swift
+  Algorithms/Matching/FirstMatch.swift
+  Algorithms/Matching/Matches.swift
+  Algorithms/Matching/MatchingCollectionConsumer.swift
+  Algorithms/Matching/MatchingCollectionSearcher.swift
+  Algorithms/Matching/MatchReplace.swift
+  Algorithms/Matching/MatchResult.swift
   Algorithms/Searchers/CollectionSearcher.swift
   Algorithms/Searchers/ConsumerSearcher.swift
   Algorithms/Searchers/NaivePatternSearcher.swift
   Algorithms/Searchers/PatternOrEmpty.swift
   Algorithms/Searchers/PredicateSearcher.swift
   Algorithms/Searchers/TwoWaySearcher.swift
   Algorithms/Searchers/ZSearcher.swift
-  ASTBuilder.swift
+  Engine/Backtracking.swift
+  Engine/Consume.swift
+  Engine/Engine.swift
+  Engine/InstPayload.swift
+  Engine/Instruction.swift
+  Engine/MEBuilder.swift
+  Engine/MECapture.swift
+  Engine/MEProgram.swift
+  Engine/Processor.swift
+  Engine/Register.swift
+  Engine/Structuralize.swift
+  Engine/Tracing.swift
+  Regex/AnyRegexOutput.swift
+  Regex/ASTConversion.swift
+  Regex/Core.swift
+  Regex/DSLConsumers.swift
+  Regex/DSLTree.swift
+  Regex/Match.swift
+  Regex/Options.swift
+  Unicode/CaseConversion.swift
+  Unicode/CharacterProps.swift
+  Unicode/Comparison.swift
+  Unicode/Data.swift
+  Unicode/Decoding.swift
+  Unicode/Encodings.swift
+  Unicode/Formatting.swift
+  Unicode/Graphemes.swift
+  Unicode/NecessaryEvils.swift
+  Unicode/Normalization.swift
+  Unicode/NumberParsing.swift
+  Unicode/ScalarProps.swift
+  Unicode/Transcoding.swift
+  Unicode/UCD.swift
+  Unicode/Validation.swift
+  Utility/ASTBuilder.swift
+  Utility/Protocols.swift
+  Utility/Traced.swift
+  Utility/TypedIndex.swift
+  Utility/TypedInt.swift
+  ByteCodeGen.swift
   Capture.swift
   CharacterClass.swift
   Compiler.swift
   ConsumerInterface.swift
   Executor.swift
-  Legacy/HareVM.swift
-  Legacy/LegacyCompile.swift
-  Legacy/RECode.swift
-  Legacy/TortoiseVM.swift
-  Legacy/VirtualMachine.swift
-  RegexDSL/Builder.swift
-  RegexDSL/Concatenation.swift
-  RegexDSL/Core.swift
-  RegexDSL/DSL.swift
-  RegexDSL/DSLCapture.swift
-  RegexDSL/DynamicCaptures.swift)
+  MatchingOptions.swift
+  PrintAsPattern.swift)
 target_compile_options(_StringProcessing PRIVATE
   -enable-library-evolution)
 target_link_libraries(_StringProcessing PUBLIC
-  _MatchingEngine)
+  _RegexParser)
diff --git a/Sources/_StringProcessing/Capture.swift b/Sources/_StringProcessing/Capture.swift
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _RegexParser
 
 /// A structured capture
 struct StructuredCapture {

diff --git a/Sources/_StringProcessing/CharacterClass.swift b/Sources/_StringProcessing/CharacterClass.swift
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _RegexParser
 
 // NOTE: This is a model type. We want to be able to get one from
 // an AST, but this isn't a natural thing to produce in the context

diff --git a/Sources/_StringProcessing/Compiler.swift b/Sources/_StringProcessing/Compiler.swift
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _RegexParser
 
 class Compiler {
   let tree: DSLTree

diff --git a/Sources/_StringProcessing/ConsumerInterface.swift b/Sources/_StringProcessing/ConsumerInterface.swift
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine
+import _RegexParser
 
 extension DSLTree.Node {
   /// Attempt to generate a consumer from this AST node

diff --git a/Sources/_StringProcessing/Engine/MEBuilder.swift b/Sources/_StringProcessing/Engine/MEBuilder.swift
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _MatchingEngine // For errors
+import _RegexParser // For errors
 
 extension MEProgram where Input.Element: Hashable {
   struct Builder {
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ @@
     //
     //===----------------------------------------------------------------------===//
-    import _MatchingEngine
+    import _RegexParser
     /*
@@ Expand Down @@