Fix #15514 in Parser #15524
Merged
Fix #15514 in Parser #15524
Conversation
This file contains 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
There was a missing set of parentheses in parser which caused a lookahead from INTERPOLATIONID, which should be illegal, since the lookahead then migth set the next TokenData which is subsequently overwritten by reset. We now demand that lookahead cannot be called if the current token is a INTERPOLATIONID. There were two many variants `lookahead` in the Scanner, which only differered in camelCase or not. Rename one to`peekAhead` to make the code clearer.
odersky
commented
Jun 25, 2022
|
This was really hard to diagnose. I was stumped until I looked more closely at @som-snytt's first PR #15518, which pointed at the problem. |
|
Lgtm. I looked at that line a couple of times. I'm on the phone app for the first time and not sure I will see how to approve. I tried not to think about parser during our visit to Grove of Titans redwoods. |
|
@som-snytt Thanks! I am going to merge now. |
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.
There was a missing set of parentheses in parser which caused a lookahead
from INTERPOLATIONID, which should be illegal, since the lookahead then
might set the next TokenData which is subsequently overwritten by reset.
We now demand that lookahead cannot be called if the current token is
a INTERPOLATIONID.
There were two variants of
lookaheadin the Scanner, which only differedin camelCase or not. Rename one to
peekAheadto make the code clearer.Alternative for #15518 and #15519.