-
Notifications
You must be signed in to change notification settings - Fork 71
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enable use of macros as macro args #265
Open
d1ll0n
wants to merge
7
commits into
huff-language:main
Choose a base branch
from
d1ll0n:macro-args
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
… freeze due to mutex deadlock
…tex deadlock in the constants lookup
jtriley-eth
previously approved these changes
Mar 31, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm!
jtriley-eth
requested changes
Mar 31, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changes look good, though this should be branched from huff-language:stage
, not main
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.
Overview
relies on #264
Allows use of macros as macro args.
This only partially enables this feature as it does not support providing arguments to the macros given as args. I didn't implement this because I believe it would require modification to the parser/lexer, and I don't know rust or this repo well enough to try that. It does at least restore the original functionality from Aztec's version though.
To make this work with bubbled args, I had to modify the resolution order for
MacroArg::Ident
, as it seemed to be causing a deadlock with the constants mutex. I'm too much of a rust noob to figure that one out, but the change I made seems to have fixed it, maybe because the rust compiler sees that the reference is dropped, or maybe it's a completely different issue unrelated to the mutex.