Macro.escape/2 honors unquote: true when nested in maps #14830
+30
−4
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
| do_escape({quote, Meta, Args}, #elixir_quote{unquote=true} = Q) when is_list(Meta), is_list(Args) -> | ||
| do_quote({quote, Meta, Args}, Q#elixir_quote{unquote=false}); | ||
|
|
||
| do_escape({unquote, Meta, [Expr]}, #elixir_quote{unquote=true} = Q) when is_list(Meta) -> |
There was a problem hiding this comment.
Do we need unquote_splicing here?
There was a problem hiding this comment.
I think so yes!
Will add it if we agree on the approach.
There was a problem hiding this comment.
OK, so actually it is not needed here, but when escaping lists.
Which currently works (c2aafb4), since it delegates to do_quote_tail.
But we should probably implement a do_escape_tail here too to completely separate these implementations.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Close #14829
The problem is that
do_quote(Map, Q)callsdo_escape(Map, Q), and that onlydo_quotewas supporting{:unquote, meta, [expr]}tuples.In the second commit, I went further to split
do_quote/do_escapecompletely, which also fixes this for remote unquote calls. We need to duplicate some of the quote/unquote handling fromdo_quote, although it is simpler.