[5.7-04182022] [Parse] Split prefix operators from regex in the lexer #58838
+190
−73
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
We already check this in `Parser::tryLexRegexLiteral`, and the failure case doesn't make sense here as we call `discardToken` afterwards.
Teach the lexer not to consider `/` an operator character when attempting to re-lex a regex literal. This allows us to split off a prefix operator. Previously this was done after-the-fact in the parser, but that didn't cover the unapplied infix operator case, and didn't form a `tok::amp_prefix` for `foo(&/.../)`, which led to a suboptimal diagnostic. This also now means we'll split an operator for cases such as `foo(!/^/)` rather than treating it as an unapplied infix operator. rdar://92469917
|
@swift-ci please test |
airspeedswift
approved these changes
May 12, 2022
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-04182022 cherry-pick of #58505
Teach the lexer not to consider
/an operator character when attempting to re-lex a regex literal. This allows us to split off a prefix operator for cases such asfoo(!/^/)andfoo(!/, /)rather than treating them as unapplied infix operators. This matches the behavior outside of an argument list.This also improves diagnostics for cases such as
foo(&/.../), as we now correctly produce atok::amp_prefix.rdar://92469917