Skip to content

Commit 3cd65cd

Browse files
rxweiAzoy
authored andcommitted
Merge pull request #287 from apple/impl-import
Import _RegexParser as implementation only
1 parent 0d41bb2 commit 3cd65cd

19 files changed

+20
-19
lines changed

Sources/_StringProcessing/ByteCodeGen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import _RegexParser
1+
@_implementationOnly import _RegexParser
22

33
extension Compiler {
44
struct ByteCodeGen {

Sources/_StringProcessing/Capture.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
/// A structured capture
1515
struct StructuredCapture {

Sources/_StringProcessing/Compiler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
class Compiler {
1515
let tree: DSLTree

Sources/_StringProcessing/ConsumerInterface.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
extension DSLTree.Node {
1515
/// Attempt to generate a consumer from this AST node

Sources/_StringProcessing/Engine/MEBuilder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser // For errors
12+
@_implementationOnly import _RegexParser // For errors
1313

1414
extension MEProgram where Input.Element: Hashable {
1515
struct Builder {

Sources/_StringProcessing/Engine/MECapture.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
/*
1515

Sources/_StringProcessing/Engine/MEProgram.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
struct MEProgram<Input: Collection> where Input.Element: Equatable {
1515
typealias ConsumeFunction = (Input, Range<Input.Index>) -> Input.Index?

Sources/_StringProcessing/Engine/Registers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
struct SentinelValue: Hashable, CustomStringConvertible {
1515
var description: String { "<value sentinel>" }

Sources/_StringProcessing/Engine/Structuralize.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import _RegexParser
1+
@_implementationOnly import _RegexParser
22

33
extension CaptureStructure {
44
var optionalCount: Int {

Sources/_StringProcessing/Executor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
struct Executor {
1515
// TODO: consider let, for now lets us toggle tracing

Sources/_StringProcessing/MatchingOptions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
/// A type that represents the current state of regex matching options, with
1515
/// stack-based scoping.

Sources/_StringProcessing/PrintAsPattern.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
// TODO: Add an expansion level, both from top to bottom.
1515
// After `printAsCanonical` is fleshed out, these two
1616
// printers can call each other. This would enable
1717
// incremental conversion, such that leaves remain
1818
// as canonical regex literals.
1919

20+
@_spi(PatternConverter)
2021
extension AST {
2122
/// Render as a Pattern DSL
2223
@_spi(PatternConverter)

Sources/_StringProcessing/Regex/ASTConversion.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
extension AST {
1515
var dslTree: DSLTree {

Sources/_StringProcessing/Regex/AnyRegexOutput.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
@available(SwiftStdlib 5.7, *)
1515
extension Regex where Output == AnyRegexOutput {

Sources/_StringProcessing/Regex/Core.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414

1515
/// A type that represents a regular expression.

Sources/_StringProcessing/Regex/DSLTree.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
@_spi(RegexBuilder)
1515
public struct DSLTree {

Sources/_StringProcessing/Regex/Options.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
@available(SwiftStdlib 5.7, *)
1515
extension RegexComponent {

Sources/_StringProcessing/Utility/ASTBuilder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ AST.
2525

2626
*/
2727

28-
import _RegexParser
28+
@_implementationOnly import _RegexParser
2929

3030
func alt(_ asts: [AST.Node]) -> AST.Node {
3131
return .alternation(

Sources/_StringProcessing/_CharacterClassModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
import _RegexParser
12+
@_implementationOnly import _RegexParser
1313

1414
// NOTE: This is a model type. We want to be able to get one from
1515
// an AST, but this isn't a natural thing to produce in the context

0 commit comments

Comments
 (0)