[5.7] Flatten optional nesting for regex literal captures #552
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
This was referenced Jul 6, 2022
stephentyrone
approved these changes
Jul 6, 2022
This doesn't appear to be used.
Previously we would wrap a `nil` in `optionalCount - 1` outer layers of `.some(...)`. Change this to return an `optionalCount` nested optional with a top-level value of `nil`.
When computing the CaptureList for AST nodes, including converted AST -> DSL nodes, only permit at most one level of optionality. This means that regex literal captures are now either `Substring` or `Substring?`. Optional nesting is however still performed in the DSL (due to result builder limitations). If a regex literal is nested in the DSL, it may only add at most one extra level of optionality to the current nesting level.
This is no longer needed as the capture list has the right nesting information.
|
@swift-ci please test |
Previously we would ignore the case where the match fails, but the test expects the match to succeed.
|
@swift-ci please test |
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.
5.7 cherry-pick of #545
When computing the
CaptureListfor AST nodes, including converted AST -> DSL nodes, only permit at most one level of optionality. This means that regex literal captures are now eitherSubstringorSubstring?.Optional nesting is however still performed in the DSL (due to result builder limitations). If a regex literal is nested in the DSL, it may only add at most one extra level of optionality to the current nesting level.
Additionally, change the value of a failed nested optional capture from
.some(nil)tonil.Resolves #399
Resolves #543
rdar://96505893