Add primary associated type to RegexComponent #454
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
rxwei
approved these changes
May 28, 2022
|
@swift-ci Please test |
natecook1000
added a commit
to natecook1000/swift-experimental-string-processing
that referenced
this pull request
May 29, 2022
* Add a primary associated type to RegexComponent * Switch algorithms methods to using opaque params * Use primary assoc type in RegexBuilder algorithms
Comment on lines
51
to
56
| @available(SwiftStdlib 5.7, *) | ||
| public func contains<R: RegexComponent>( | ||
| @RegexComponentBuilder _ content: () -> R | ||
| public func contains( | ||
| @RegexComponentBuilder _ content: () -> some RegexComponent | ||
| ) -> Bool { | ||
| contains(content()) | ||
| } |
There was a problem hiding this comment.
Unfortunately I believe these will fail to integrate with the current Swift compiler due to rdar://92459215, see the comment at the top of the file (I don't know if some RegexComponent<Output> works tho)
There was a problem hiding this comment.
Oh huh, I see swiftlang/swift#42532 passed, maybe that's just an issue on main?
There was a problem hiding this comment.
Opened #458 to verify
There was a problem hiding this comment.
Hmm, seems to be fixed now (other test failure unrelated)
Edit: Looks like it was fixed by swiftlang/swift#58991
hamishknight
pushed a commit
to hamishknight/swift-experimental-string-processing
that referenced
this pull request
May 30, 2022
* Add a primary associated type to RegexComponent * Switch algorithms methods to using opaque params * Use primary assoc type in RegexBuilder algorithms
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 PR makes the
RegexOutputassociated type primary forRegexComponent, and adopts the new lightweight generics syntax across the algorithms methods. With this change, methods that don't rely on the specific output type no longer have an explicit generic parameter:And methods that do are generic over that type instead of over the regex component type:
(Technically these are all just sugared versions of the old ones, but they do look nicer.)