Solve bootstrap issues on dynamic options to quote

Author: josevalim

lib/elixir/src/elixir_expand.erl

@@ -178,20 +178,8 @@ expand({quote, Meta, [Opts, Do]}, S, E) when is_list(Do) ->
       false -> file_error(Meta, E, ?MODULE, {missing_option, 'quote', [do]})
     end,
 
-  {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),
+  ValidOpts = [context, location, line, file, unquote, bind_quoted, generated],
+  {EOpts, ST, ET} = expand_opts(Meta, quote, ValidOpts, Opts, S, E),
 
   Context = proplists:get_value(context, EOpts, case ?key(E, module) of
     nil -> 'Elixir';
@@ -205,12 +193,44 @@ 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, Prelude} = elixir_quote:build(Meta, Line, File, Context, Unquote, Generated, ET),
-  Quoted = elixir_quote:quote(Meta, Exprs, Binding, Q, Prelude),
-  expand(Quoted, ST, ET);
+  {Q, QContext, QPrelude} = elixir_quote:build(Meta, Line, File, Context, Unquote, Generated, ET),
+  {EPrelude, SP, EP} = expand(QPrelude, ST, ET),
+  {EContext, SC, EC} = expand(QContext, SP, EP),
+  Quoted = elixir_quote:quote(Exprs, Q),
+  {EQuoted, ES, EQ} = expand(Quoted, SC, EC),
+
+  EBinding =
+      [{'{}', [],
+        ['=', [], [
+          {'{}', [], [K, Meta, EContext]},
+          V
+        ]
+       ]} || {K, V} <- Binding],
+
+  EBindingQuoted =
+    case EBinding of
+      [] -> EQuoted;
+      _ -> {'{}', [], ['__block__', [], EBinding ++ [EQuoted]]}
+    end,
+
+  case EPrelude of
+    [] -> {EBindingQuoted, ES, EQ};
+    _ -> {{'__block__', [], EPrelude ++ [EBindingQuoted]}, ES, EQ}
+  end;
 
 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/7, quote/5, has_unquotes/1, fun_to_quoted/1]).
+-export([escape/3, linify/3, linify_with_context_counter/3, build/7, quote/2, has_unquotes/1, fun_to_quoted/1]).
 -export([dot/5, tail_list/3, list/2, validate_runtime/2]). %% Quote callbacks
 
 -include("elixir.hrl").
@@ -202,24 +202,24 @@ bad_escape(Arg) ->
 
 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),
-  {EContext, Acc3} = validate_compile(Meta, context, Context, Acc2),
+  {VLine, Acc1} = validate_compile(Meta, line, Line, Acc0),
+  {VFile, Acc2} = validate_compile(Meta, file, File, Acc1),
+  {VContext, Acc3} = validate_compile(Meta, context, Context, Acc2),
   validate_runtime(unquote, Unquote),
   validate_runtime(generated, Generated),
 
   Q = #elixir_quote{
     op=add_context,
     aliases_hygiene=E,
     imports_hygiene=E,
-    line=ELine,
-    file=EFile,
+    line=VLine,
+    file=VFile,
     unquote=Unquote,
-    context=EContext,
+    context=VContext,
     generated=Generated
   },
 
-  {Q, Acc3}.
+  {Q, VContext, Acc3}.
 
 validate_compile(_Meta, line, Value, Acc) when is_boolean(Value) ->
   {Value, Acc};
@@ -255,31 +255,11 @@ 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(_Meta, {unquote_splicing, _, [_]}, _Binding, #elixir_quote{unquote=true}, _) ->
+quote({unquote_splicing, _, [_]}, #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(Meta, Expr, Binding, Q, Prelude) ->
-  Context = Q#elixir_quote.context,
-
-  Vars = [{'{}', [],
-    ['=', [], [
-      {'{}', [], [K, Meta, Context]},
-      V
-    ]]
-  } || {K, V} <- Binding],
-
-  Quoted = do_quote(Expr, Q),
-
-  WithVars = case Vars of
-    [] -> Quoted;
-    _ -> {'{}', [], ['__block__', [], Vars ++ [Quoted]]}
-  end,
-
-  case Prelude of
-    [] -> WithVars;
-    _ -> {'__block__', [], Prelude ++ [WithVars]}
-  end.
+quote(Expr, Q) ->
+  do_quote(Expr, Q).
 
 %% quote/unquote