Skip to content

Commit 1f99047

Browse files
authored
Rename CustomPrefixMatchRegexComponent to CustomConsumingRegexComponent (#326)
1 parent 06f40f6 commit 1f99047

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

Documentation/Evolution/ProposalOverview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Covers the "interior" syntax, extended syntaxes, run-time construction of a rege
3939

4040
Proposes a slew of Regex-powered algorithms.
4141

42-
Introduces `CustomPrefixMatchRegexComponent`, which is a monadic-parser style interface for external parsers to be used as components of a regex.
42+
Introduces `CustomConsumingRegexComponent`, which is a monadic-parser style interface for external parsers to be used as components of a regex.
4343

4444
## Unicode for String Processing
4545

Documentation/Evolution/RegexTypeOverview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ The result builder allows for inline failable value construction, which particip
231231

232232
Swift regexes describe an unambiguous algorithm, where choice is ordered and effects can be reliably observed. For example, a `print()` statement inside the `TryCapture`'s transform function will run whenever the overall algorithm naturally dictates an attempt should be made. Optimizations can only elide such calls if they can prove it is behavior-preserving (e.g. "pure").
233233

234-
`CustomPrefixMatchRegexComponent`, discussed in [String Processing Algorithms][pitches], allows industrial-strength parsers to be used a regex components. This allows us to drop the overly-permissive pre-parsing step:
234+
`CustomConsumingRegexComponent`, discussed in [String Processing Algorithms][pitches], allows industrial-strength parsers to be used a regex components. This allows us to drop the overly-permissive pre-parsing step:
235235

236236
```swift
237237
func processEntry(_ line: String) -> Transaction? {
@@ -431,7 +431,7 @@ Regular expressions have a deservedly mixed reputation, owing to their historica
431431

432432
* "Regular expressions are bad because you should use a real parser"
433433
- In other systems, you're either in or you're out, leading to a gravitational pull to stay in when... you should get out
434-
- Our remedy is interoperability with real parsers via `CustomPrefixMatchRegexComponent`
434+
- Our remedy is interoperability with real parsers via `CustomConsumingRegexComponent`
435435
- Literals with refactoring actions provide an incremental off-ramp from regex syntax to result builders and real parsers
436436
* "Regular expressions are bad because ugly unmaintainable syntax"
437437
- We propose literals with source tools support, allowing for better syntax highlighting and analysis
@@ -516,7 +516,7 @@ Regex are compiled into an intermediary representation and fairly simple analysi
516516

517517
### Future work: parser combinators
518518

519-
What we propose here is an incremental step towards better parsing support in Swift using parser-combinator style libraries. The underlying execution engine supports recursive function calls and mechanisms for library extensibility. `CustomPrefixMatchRegexComponent`'s protocol requirement is effectively a [monadic parser](https://homepages.inf.ed.ac.uk/wadler/papers/marktoberdorf/baastad.pdf), meaning `Regex` provides a regex-flavored combinator-like system.
519+
What we propose here is an incremental step towards better parsing support in Swift using parser-combinator style libraries. The underlying execution engine supports recursive function calls and mechanisms for library extensibility. `CustomConsumingRegexComponent`'s protocol requirement is effectively a [monadic parser](https://homepages.inf.ed.ac.uk/wadler/papers/marktoberdorf/baastad.pdf), meaning `Regex` provides a regex-flavored combinator-like system.
520520

521521
An issues with traditional parser combinator libraries are the compilation barriers between call-site and definition, resulting in excessive and overly-cautious backtracking traffic. These can be eliminated through better [compilation techniques](https://core.ac.uk/download/pdf/148008325.pdf). As mentioned above, Swift's support for custom static compilation is still under development.
522522

@@ -565,7 +565,7 @@ Regexes are often used for tokenization and tokens can be represented with Swift
565565
566566
### Future work: baked-in localized processing
567567
568-
- `CustomPrefixMatchRegexComponent` gives an entry point for localized processors
568+
- `CustomConsumingRegexComponent` gives an entry point for localized processors
569569
- Future work includes (sub?)protocols to communicate localization intent
570570
571571
-->

Documentation/Evolution/StringProcessingAlgorithms.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ We propose:
88

99
1. New regex-powered algorithms over strings, bringing the standard library up to parity with scripting languages
1010
2. Generic `Collection` equivalents of these algorithms in terms of subsequences
11-
3. `protocol CustomPrefixMatchRegexComponent`, which allows 3rd party libraries to provide their industrial-strength parsers as intermixable components of regexes
11+
3. `protocol CustomConsumingRegexComponent`, which allows 3rd party libraries to provide their industrial-strength parsers as intermixable components of regexes
1212

1313
This proposal is part of a larger [regex-powered string processing initiative](https://github.com/apple/swift-evolution/blob/main/proposals/0350-regex-type-overview.md), the status of each proposal is tracked [here](https://github.com/apple/swift-experimental-string-processing/blob/main/Documentation/Evolution/ProposalOverview.md). Further discussion of regex specifics is out of scope of this proposal and better discussed in their relevant reviews.
1414

@@ -132,7 +132,7 @@ Parsing a currency string such as `$3,020.85` with regex is also tricky, as it c
132132

133133
### Complex string processing
134134

135-
We propose a `CustomPrefixMatchRegexComponent` protocol which allows types from outside the standard library participate in regex builders and `RegexComponent` algorithms. This allows types, such as `Date.ParseStrategy` and `FloatingPointFormatStyle.Currency`, to be used directly within a regex:
135+
We propose a `CustomConsumingRegexComponent` protocol which allows types from outside the standard library participate in regex builders and `RegexComponent` algorithms. This allows types, such as `Date.ParseStrategy` and `FloatingPointFormatStyle.Currency`, to be used directly within a regex:
136136

137137
```swift
138138
let dateRegex = Regex {
@@ -169,14 +169,14 @@ We also propose the following regex-powered algorithms as well as their generic
169169

170170
## Detailed design
171171

172-
### `CustomPrefixMatchRegexComponent`
172+
### `CustomConsumingRegexComponent`
173173

174-
`CustomPrefixMatchRegexComponent` inherits from `RegexComponent` and satisfies its sole requirement. Conformers can be used with all of the string algorithms generic over `RegexComponent`.
174+
`CustomConsumingRegexComponent` inherits from `RegexComponent` and satisfies its sole requirement. Conformers can be used with all of the string algorithms generic over `RegexComponent`.
175175

176176
```swift
177177
/// A protocol allowing custom types to function as regex components by
178178
/// providing the raw functionality backing `prefixMatch`.
179-
public protocol CustomPrefixMatchRegexComponent: RegexComponent {
179+
public protocol CustomConsumingRegexComponent: RegexComponent {
180180
/// Process the input string within the specified bounds, beginning at the given index, and return
181181
/// the end position (upper bound) of the match and the produced output.
182182
/// - Parameters:
@@ -199,7 +199,7 @@ public protocol CustomPrefixMatchRegexComponent: RegexComponent {
199199
We use Foundation `FloatingPointFormatStyle<Decimal>.Currency` as an example for protocol conformance. It would implement the `match` function with `Match` being a `Decimal`. It could also add a static function `.localizedCurrency(code:)` as a member of `RegexComponent`, so it can be referred as `.localizedCurrency(code:)` in the `Regex` result builder:
200200

201201
```swift
202-
extension FloatingPointFormatStyle<Decimal>.Currency : CustomPrefixMatchRegexComponent {
202+
extension FloatingPointFormatStyle<Decimal>.Currency : CustomConsumingRegexComponent {
203203
public func consuming(
204204
_ input: String,
205205
startingAt index: String.Index,

Sources/_StringProcessing/Regex/CustomComponents.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@available(SwiftStdlib 5.7, *)
1313
/// A protocol allowing custom types to function as regex components by
1414
/// providing the raw functionality backing `prefixMatch`.
15-
public protocol CustomPrefixMatchRegexComponent: RegexComponent {
15+
public protocol CustomConsumingRegexComponent: RegexComponent {
1616
/// Process the input string within the specified bounds, beginning at the given index, and return
1717
/// the end position (upper bound) of the match and the produced output.
1818
/// - Parameters:
@@ -29,7 +29,7 @@ public protocol CustomPrefixMatchRegexComponent: RegexComponent {
2929
}
3030

3131
@available(SwiftStdlib 5.7, *)
32-
extension CustomPrefixMatchRegexComponent {
32+
extension CustomConsumingRegexComponent {
3333
public var regex: Regex<RegexOutput> {
3434
let node: DSLTree.Node = .matcher(RegexOutput.self, { input, index, bounds in
3535
try consuming(input, startingAt: index, in: bounds)

Tests/RegexBuilderTests/CustomTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import _StringProcessing
1414
@testable import RegexBuilder
1515

1616
// A nibbler processes a single character from a string
17-
private protocol Nibbler: CustomPrefixMatchRegexComponent {
17+
private protocol Nibbler: CustomConsumingRegexComponent {
1818
func nibble(_: Character) -> RegexOutput?
1919
}
2020

@@ -49,7 +49,7 @@ private struct Asciibbler: Nibbler {
4949
}
5050
}
5151

52-
private struct IntParser: CustomPrefixMatchRegexComponent {
52+
private struct IntParser: CustomConsumingRegexComponent {
5353
struct ParseError: Error, Hashable {}
5454
typealias RegexOutput = Int
5555
func consuming(_ input: String,
@@ -71,7 +71,7 @@ private struct IntParser: CustomPrefixMatchRegexComponent {
7171
}
7272
}
7373

74-
private struct CurrencyParser: CustomPrefixMatchRegexComponent {
74+
private struct CurrencyParser: CustomConsumingRegexComponent {
7575
enum Currency: String, Hashable {
7676
case usd = "USD"
7777
case ntd = "NTD"

Tests/RegexBuilderTests/RegexDSLTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ class RegexDSLTests: XCTestCase {
863863
var patch: Int
864864
var dev: String?
865865
}
866-
struct SemanticVersionParser: CustomPrefixMatchRegexComponent {
866+
struct SemanticVersionParser: CustomConsumingRegexComponent {
867867
typealias RegexOutput = SemanticVersion
868868
func consuming(
869869
_ input: String,

0 commit comments

Comments
 (0)