Ensure eval callbacks gets a fresh vars dict

Author: José Valim

lib/elixir/src/elixir.erl

@@ -137,48 +137,18 @@ translate_forms(Tree, Binding, Opts) when is_list(Opts) ->
   translate_forms(Tree, Binding, scope_for_eval(Opts));
 
 translate_forms(Tree, Binding, #elixir_scope{} = Scope) ->
-  elixir_translator:translate(Tree, Scope#elixir_scope{
-    vars=binding_dict(Binding),
-    temp_vars=[],
-    clause_vars=nil,
-    counter=[]
-  }).
+  elixir_translator:translate(Tree, elixir_scope:vars_from_binding(Scope, Binding)).
 
 eval_forms(Tree, Binding, Scope) ->
   { ParseTree, NewScope } = translate_forms(Tree, Binding, Scope),
   case ParseTree of
     [] -> { nil, Binding, NewScope };
     _  ->
-      {value, Value, NewBinding} = erl_eval:exprs(ParseTree, normalize_binding(Binding)),
-      {Value, final_binding(NewBinding, NewScope#elixir_scope.vars), NewScope }
+      {value, Value, NewBinding} = erl_eval:exprs(ParseTree, elixir_scope:binding_for_eval(Binding, nil)),
+      {Value, elixir_scope:binding_from_vars(NewScope, NewBinding), NewScope }
   end.
 
 %% INTERNAL HELPERS
 
 to_binary(Bin)  when is_binary(Bin) -> Bin;
 to_binary(List) when is_list(List) -> list_to_binary(List).
-
-binding_dict(List) -> binding_dict(List, orddict:new()).
-binding_dict([{{H,Kind},_}|T], Dict) -> binding_dict(T, orddict:store({ H, Kind }, H, Dict));
-binding_dict([{H,_}|T], Dict) -> binding_dict(T, orddict:store({ H, nil }, H, Dict));
-binding_dict([], Dict) -> Dict.
-
-final_binding(Binding, Vars) -> final_binding(Binding, [], Binding, Vars).
-final_binding([{Var,_}|T], Acc, Binding, Vars) ->
-  case lists:member($@, atom_to_list(Var)) of
-    true  ->
-      final_binding(T, Acc, Binding, Vars);
-    false ->
-      RealName  = orddict:fetch({ Var, nil }, Vars),
-      RealValue = proplists:get_value(RealName, Binding, nil),
-      final_binding(T, [{Var, RealValue}|Acc], Binding, Vars)
-  end;
-
-final_binding([], Acc, _Binding, _Vars) -> lists:reverse(Acc).
-
-normalize_binding(Binding) ->
-  Keyword = orddict:from_list(Binding),
-  case orddict:find('_@MODULE', Keyword) of
-    { ok, _ } -> Keyword;
-    _ -> orddict:store('_@MODULE', nil, Keyword)
-  end.

lib/elixir/src/elixir_compiler.erl

@@ -84,12 +84,12 @@ eval_forms(Forms, Line, Vars, S) ->
 %% Compile the module by forms based on the scope information
 %% executes the callback in case of success. This automatically
 %% handles errors and warnings. Used by this module and elixir_module.
-module(Forms, S, Callback) ->
+module(Forms, File, Callback) ->
   Options = case get_opt(debug_info) of
     true -> [debug_info];
     _ -> []
   end,
-  module(Forms, S#elixir_scope.file, Options, false, Callback).
+  module(Forms, File, Options, false, Callback).
 
 module(Forms, File, RawOptions, Bootstrap, Callback) when
     is_binary(File), is_list(Forms), is_list(RawOptions), is_boolean(Bootstrap), is_function(Callback) ->

lib/elixir/src/elixir_module.erl

@@ -8,7 +8,7 @@
 -define(persisted_attr, '__persisted_attributes').
 
 eval_quoted(Module, Quoted, RawBinding, Opts) ->
-  Binding = binding_for_eval(Module, RawBinding),
+  Binding = elixir_scope:binding_for_eval(RawBinding, Module),
   Scope   = scope_for_eval(Module, Opts),
 
   elixir_def:reset_last(Module),
@@ -27,8 +27,6 @@ scope_for_eval(Module, #elixir_scope{} = S) ->
 scope_for_eval(Module, Opts) ->
   scope_for_eval(Module, elixir:scope_for_eval(Opts)).
 
-binding_for_eval(Module, Binding) -> [{'_@MODULE',Module}|Binding].
-
 %% TABLE METHODS
 
 data_table(Module) ->
@@ -247,7 +245,7 @@ spec_for_macro(Else) -> Else.
 %% Loads the form into the code server.
 
 load_form(Line, Forms, S) ->
-  elixir_compiler:module(Forms, S, fun(Module, Binary) ->
+  elixir_compiler:module(Forms, S#elixir_scope.file, fun(Module, Binary) ->
     EvalS = scope_for_eval(Module, S),
     Env = elixir_scope:to_ex_env({ Line, EvalS }),
     eval_callbacks(Line, Module, after_compile, [Env, Binary], EvalS),
@@ -332,8 +330,9 @@ else_clause() ->
 
 % HELPERS
 
-eval_callbacks(Line, Module, Name, Args, S) ->
-  Binding   = binding_for_eval(Module, []),
+eval_callbacks(Line, Module, Name, Args, RawS) ->
+  Binding   = elixir_scope:binding_for_eval([], Module),
+  S         = elixir_scope:vars_from_binding(RawS, Binding),
   Callbacks = lists:reverse(ets:lookup_element(data_table(Module), Name, 2)),
   Meta      = [{line,Line},{require,false}],
 

lib/elixir/src/elixir_scope.erl

@@ -5,6 +5,7 @@
   serialize/1, deserialize/1,
   serialize_with_vars/2, deserialize_with_vars/2,
   to_erl_env/1, to_ex_env/1,
+  vars_from_binding/2, binding_for_eval/2, binding_from_vars/2,
   umergev/2, umergec/2, umergea/2, merge_clause_vars/2
 ]).
 -include("elixir.hrl").
@@ -200,3 +201,40 @@ var_merger(_Var, K1, K2) ->
 var_number([$@|T], _Acc) -> var_number(T, []);
 var_number([H|T], Acc)   -> var_number(T, [H|Acc]);
 var_number([], Acc)      -> list_to_integer(lists:reverse(Acc)).
+
+%% Setup the vars in scope from binding
+
+vars_from_binding(Scope, Binding) ->
+  Scope#elixir_scope{
+    vars=binding_dict(Binding),
+    temp_vars=[],
+    clause_vars=nil,
+    counter=[]
+  }.
+
+binding_dict(List) -> binding_dict(List, orddict:new()).
+binding_dict([{{H,Kind},_}|T], Dict) -> binding_dict(T, orddict:store({ H, Kind }, H, Dict));
+binding_dict([{H,_}|T], Dict) -> binding_dict(T, orddict:store({ H, nil }, H, Dict));
+binding_dict([], Dict) -> Dict.
+
+binding_for_eval(Binding, Module) ->
+  Keyword = orddict:from_list(Binding),
+  case orddict:find('_@MODULE', Keyword) of
+    { ok, _ } -> Keyword;
+    _ -> orddict:store('_@MODULE', Module, Keyword)
+  end.
+
+binding_from_vars(#elixir_scope{vars=Vars}, Binding) ->
+  binding_from_vars(Binding, [], Binding, Vars).
+
+binding_from_vars([{Var,_}|T], Acc, Binding, Vars) ->
+  case lists:member($@, atom_to_list(Var)) of
+    true  ->
+      binding_from_vars(T, Acc, Binding, Vars);
+    false ->
+      RealName  = orddict:fetch({ Var, nil }, Vars),
+      RealValue = proplists:get_value(RealName, Binding, nil),
+      binding_from_vars(T, [{Var, RealValue}|Acc], Binding, Vars)
+  end;
+
+binding_from_vars([], Acc, _Binding, _Vars) -> lists:reverse(Acc).