Parse macro invocations containing $ #96
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
aryx
suggested changes
Jan 5, 2022
|
|
||
| _non_delim_token: $ => choice( | ||
| $._non_special_token, | ||
| '$' |
There was a problem hiding this comment.
do we need other characters here? This is needed just for '$'?
There was a problem hiding this comment.
I believe $ is the only character we need to add here. _non_special_token is analogous to the first branch of the MacroMatch construction in the reference, which allows any token other than $ and delimiters.
|
Sorry, I've been away from github for a few months. I'll take a look at this and see if I can rebase & address comments soon. |
Metavariables can only occur in macro transcribers, so matching them in invocations makes little sense. Instead, match $ and an identifier separately.
Allows deduplicating _common_token and _non_special_token
ninevra
force-pushed
the
macro-invocation-dollar-sign
branch
from
e3ad491 to
ae4bf74
Compare
|
Rebased to resolve merge conflicts. Removed special handling of metavariables ( |
aryx
approved these changes
Mar 8, 2022
|
This looks good! I guess this can unblock your other PRs now! |
|
Thanks for merging! I'll work on rebasing #93. |
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.
Closes #95.
Adds a set of productions for general delimited token trees. These productions do not attempt to find
macro_rules!-specific features like repetitions, and consider$to be a normal token. For backwards compatibility, use of the new productions aliases them totoken_tree.Blocks draft #93, which adds similar productions; #93 could be rebased on top of this if relevant.