Switch back to Swift tuples for typed captures #127
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
milseman
reviewed
Jan 25, 2022
rxwei
force-pushed
the
swift-tuples
branch
3 times, most recently
from
12c7e6e to
3db17b5
Compare
|
@swift-ci please test linux |
milseman
approved these changes
Feb 8, 2022
| input[range], DynamicCaptures(captures) | ||
| ) as! Match | ||
| if Match.self == (Substring, DynamicCaptures).self { | ||
| convertedMatch = (input[range], DynamicCaptures(captures)) as! Match |
There was a problem hiding this comment.
I was wondering, what is this code path for?
There was a problem hiding this comment.
See testDynamicCaptures(). This is used for compiling and running a regex string that's not known at compile time (#36).
…ions. This allows for a lot more flexibility with overloading a quantifier based on the input `Match` type. The immediate benefit of this is getting rid of void and nested void types (see example below), and as a result eliminate the need for void-filtering within concatenation. A more important benefit is being able to get rid of nominal tuples and switch back to Swift tuples, as Swift tuples enable strongly typed named captures and eliminates the complexity that comes with nominal tuples. ----- Before: ```swift let r0 = OneOrMore(.digit) // => `.Match == Tuple2<Substring, [()]>` let r1 = Optionally(.digit) // => `.Match == Tuple2<Substring, ()?>` let r2 = OneOrMore(Repeat(Optionally(.digit))) // => `.Match == Tuple2<Substring, [[()?]]>` "123".match(r2) // => `RegexMatch<Tuple2<Substring, [[()?]]>>?` ``` After: ```swift let r0 = oneOrMore(.digit) // => `.Match == Substring` let r1 = optionally(.digit) // => `.Match == Substring` let r2 = oneOrMore(many(optionally(.digit))) // => `.Match == Substring` "123".match(r2) // => `RegexMatch<Substring>` ``` ----- Before: ```swift /(?<number>\d+)/ // => `Regex<Tuple2<Substring, Substring>>` ``` After: ```swift /(?<number>\d+)/ // => `Regex<(Substring, number: Substring)>` ```
|
@swift-ci please test Linux |
rxwei
added a commit
to rxwei/swift
that referenced
this pull request
Feb 10, 2022
Typed captures no longer use ad-hoc nominal tuples. We use Swift native tuples instead. See swiftlang/swift-experimental-string-processing#127. Update checkout tag to dev/6.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This depends on #114 and #126. Please review 3db17b5.