Handle bind_quoted with context correctly, closes #13590

Author: josevalim

lib/elixir/src/elixir_expand.erl

@@ -161,9 +161,9 @@ expand({Unquote, Meta, [_]}, _S, E) when Unquote == unquote; Unquote == unquote_
   file_error(Meta, E, ?MODULE, {unquote_outside_quote, Unquote});
 
 expand({quote, Meta, [Opts]}, S, E) when is_list(Opts) ->
-  case lists:keyfind(do, 1, Opts) of
-    {do, Do} ->
-      expand({quote, Meta, [lists:keydelete(do, 1, Opts), [{do, Do}]]}, S, E);
+  case lists:keytake(do, 1, Opts) of
+    {value, {do, Do}, DoOpts} ->
+      expand({quote, Meta, [DoOpts, [{do, Do}]]}, S, E);
     false ->
       file_error(Meta, E, ?MODULE, {missing_option, 'quote', [do]})
   end;
@@ -178,8 +178,20 @@ expand({quote, Meta, [Opts, Do]}, S, E) when is_list(Do) ->
       false -> file_error(Meta, E, ?MODULE, {missing_option, 'quote', [do]})
     end,
 
-  ValidOpts = [context, location, line, file, unquote, bind_quoted, generated],
-  {EOpts, ST, ET} = expand_opts(Meta, quote, ValidOpts, Opts, S, E),
+  {Binding, DefaultUnquote, ToExpandOpts} =
+    case is_list(Opts) andalso lists:keytake(bind_quoted, 1, Opts) of
+      {value, {bind_quoted, BQ}, BQOpts} ->
+        case is_list(BQ) andalso
+              lists:all(fun({Key, _}) when is_atom(Key) -> true; (_) -> false end, BQ) of
+          true -> {BQ, false, BQOpts};
+          false -> file_error(Meta, E, ?MODULE, {invalid_bind_quoted_for_quote, BQ})
+        end;
+      false ->
+        {[], true, Opts}
+    end,
+
+  ValidKeys = [context, location, line, file, unquote, bind_quoted, generated],
+  {EOpts, ST, ET} = expand_opts(Meta, quote, ValidKeys, ToExpandOpts, S, E),
 
   Context = proplists:get_value(context, EOpts, case ?key(E, module) of
     nil -> 'Elixir';
@@ -193,28 +205,12 @@ expand({quote, Meta, [Opts, Do]}, S, E) when is_list(Do) ->
       {proplists:get_value(file, EOpts, nil), proplists:get_value(line, EOpts, false)}
   end,
 
-  {Binding, DefaultUnquote} = case lists:keyfind(bind_quoted, 1, EOpts) of
-    {bind_quoted, BQ} ->
-      case is_list(BQ) andalso
-            lists:all(fun({Key, _}) when is_atom(Key) -> true; (_) -> false end, BQ) of
-        true -> {BQ, false};
-        false -> file_error(Meta, E, ?MODULE, {invalid_bind_quoted_for_quote, BQ})
-      end;
-    false ->
-      {[], true}
-  end,
-
   Unquote = proplists:get_value(unquote, EOpts, DefaultUnquote),
   Generated = proplists:get_value(generated, EOpts, false),
 
-  {Q, EBinding, Prelude} = elixir_quote:build(Meta, Line, File, Context, Unquote, Generated, Binding, ET),
-  Quoted = elixir_quote:quote(Exprs, Q, Prelude),
-  {EQuoted, ES, EQ} = expand(Quoted, ST, ET),
-
-  case EBinding of
-    [] -> {EQuoted, ES, EQ};
-     _ -> {{'{}', [], ['__block__', [], EBinding ++ [EQuoted]]}, ES, EQ}
-  end;
+  {Q, Prelude} = elixir_quote:build(Meta, Line, File, Context, Unquote, Generated, ET),
+  Quoted = elixir_quote:quote(Meta, Exprs, Binding, Q, Prelude),
+  expand(Quoted, ST, ET);
 
 expand({quote, Meta, [_, _]}, _S, E) ->
   file_error(Meta, E, ?MODULE, {invalid_args, 'quote'});

lib/elixir/src/elixir_quote.erl

@@ -1,5 +1,5 @@
 -module(elixir_quote).
--export([escape/3, linify/3, linify_with_context_counter/3, build/8, quote/3, has_unquotes/1, fun_to_quoted/1]).
+-export([escape/3, linify/3, linify_with_context_counter/3, build/7, quote/5, has_unquotes/1, fun_to_quoted/1]).
 -export([dot/5, tail_list/3, list/2, validate_runtime/2]). %% Quote callbacks
 
 -include("elixir.hrl").
@@ -200,7 +200,7 @@ bad_escape(Arg) ->
 
 %% Quote entry points
 
-build(Meta, Line, File, Context, Unquote, Generated, Binding, E) ->
+build(Meta, Line, File, Context, Unquote, Generated, E) ->
   Acc0 = [],
   {ELine, Acc1} = validate_compile(Meta, line, Line, Acc0),
   {EFile, Acc2} = validate_compile(Meta, file, File, Acc1),
@@ -219,15 +219,7 @@ build(Meta, Line, File, Context, Unquote, Generated, Binding, E) ->
     generated=Generated
   },
 
-  Vars =
-    [{'{}', [],
-      ['=', [], [
-        {'{}', [], [K, Meta, EContext]},
-        V
-      ]
-     ]} || {K, V} <- Binding],
-
-  {Q, Vars, Acc3}.
+  {Q, Acc3}.
 
 validate_compile(_Meta, line, Value, Acc) when is_boolean(Value) ->
   {Value, Acc};
@@ -263,16 +255,30 @@ is_valid(context, Context) -> is_atom(Context) andalso (Context /= nil);
 is_valid(generated, Generated) -> is_boolean(Generated);
 is_valid(unquote, Unquote) -> is_boolean(Unquote).
 
-quote({unquote_splicing, _, [_]}, #elixir_quote{unquote=true}, _) ->
+quote(_Meta, {unquote_splicing, _, [_]}, _Binding, #elixir_quote{unquote=true}, _) ->
   argument_error(<<"unquote_splicing only works inside arguments and block contexts, "
     "wrap it in parens if you want it to work with one-liners">>);
 
-quote(Expr, Q, Prelude) ->
+quote(Meta, Expr, Binding, Q, Prelude) ->
+  Context = Q#elixir_quote.context,
+
+  Vars = [{'{}', [],
+    ['=', [], [
+      {'{}', [], [K, Meta, Context]},
+      V
+    ]]
+  } || {K, V} <- Binding],
+
   Quoted = do_quote(Expr, Q),
 
-  case Prelude of
+  WithVars = case Vars of
     [] -> Quoted;
-    _ -> {'__block__', [], Prelude ++ [Quoted]}
+    _ -> {'{}', [], ['__block__', [], Vars ++ [Quoted]]}
+  end,
+
+  case Prelude of
+    [] -> WithVars;
+    _ -> {'__block__', [], Prelude ++ [WithVars]}
   end.
 
 %% quote/unquote

lib/elixir/test/elixir/kernel/quote_test.exs

@@ -71,6 +71,14 @@ defmodule Kernel.QuoteTest do
     end
   end
 
+  test "quote context bind_quoted" do
+    assert {:__block__, _,
+            [{:=, [], [{:some_var, _, :fallback}, 321]}, {:some_var, _, :fallback}]} =
+             (quote bind_quoted: [some_var: 321], context: __ENV__.context || :fallback do
+                some_var
+              end)
+  end
+
   test "operator precedence" do
     assert {:+, _, [{:+, _, [1, _]}, 1]} = quote(do: 1 + Foo.l() + 1)
     assert {:+, _, [1, {_, _, [{:+, _, [1]}]}]} = quote(do: 1 + Foo.l(+1))