Cleanup and followup to PR #17830: parsing changes #19430
Merged
+170
−103
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
| // continue by trying to parse the `:ident` after `$name` | ||
| if self.token == token::Colon && self.look_ahead(1, |t| t.is_ident() && | ||
| !t.is_strict_keyword() && | ||
| !t.is_reserved_keyword()) { |
There was a problem hiding this comment.
these two checks fix #18775
pczarn
force-pushed
the
interp_tt-cleanup
branch
from
ef137bf to
583b16e
Compare
|
r? @pnkfelix |
pczarn
force-pushed
the
interp_tt-cleanup
branch
2 times, most recently
from
8f5bfaa to
02d60f4
Compare
pczarn
force-pushed
the
interp_tt-cleanup
branch
from
02d60f4 to
f3f1a47
Compare
|
Needs a rebase... And an actual reviewer 😞 |
pczarn
force-pushed
the
interp_tt-cleanup
branch
from
f3f1a47 to
cadb136
Compare
|
Rebased, updated the reference. Still waiting for review |
|
r=me with a rebase. |
|
Actually, should wait for macro reform to land first. |
pczarn
force-pushed
the
interp_tt-cleanup
branch
2 times, most recently
from
26046d9 to
4ffa69f
Compare
Prevents breaking down `$name` tokens into separate `$` and `name`. Reports unknown macro variables. Fixes rust-lang#18775 Fixes rust-lang#18839 Fixes rust-lang#15640
pczarn
force-pushed
the
interp_tt-cleanup
branch
from
191c80b to
d85c017
Compare
|
@cmr Tested, pushed with some changes |
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Jan 7, 2015
Conflicts: src/libsyntax/parse/parser.rs
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.
Followup to PR #17830. Prevents breaking down unquoted
$nametokens into separate$andname.Reports unknown macro variables (with correct span).
Fixes #18775 (finally...)
Fixes #18839
Fixes #15640