Improvements to prune binding

Author: josevalim

lib/elixir/src/elixir.erl

@@ -272,15 +272,15 @@ eval_forms(Tree, Binding, OrigE, Opts) ->
   Prune = proplists:get_value(prune_binding, Opts, false),
   {ExVars, ErlVars, ErlBinding} = elixir_erl_var:load_binding(Binding),
   E = elixir_env:with_vars(OrigE, ExVars),
-  ExS = elixir_env:env_to_ex(E, Prune),
+  ExS = elixir_env:env_to_ex(E),
   ErlS = elixir_erl_var:from_env(E, ErlVars),
   {Erl, NewErlS, NewExS, NewE} = quoted_to_erl(Tree, ErlS, ExS, E),
 
   case Erl of
-    {Literal, _, Literal} when Literal == atom; Literal == float; Literal == integer ->
+    {Literal, _, Value} when Literal == atom; Literal == float; Literal == integer ->
       if
-        Prune -> {Literal, [], NewE};
-        true -> {Literal, Binding, NewE}
+        Prune -> {Value, [], NewE#{versioned_vars := #{}}};
+        true -> {Value, Binding, NewE}
       end;
 
     _  ->

lib/elixir/src/elixir_compiler.erl

@@ -37,7 +37,8 @@ eval_or_compile(Forms, Args, E) ->
         (not elixir_config:is_bootstrap()) of
     true  -> fast_compile(Forms, E);
     false -> compile(Forms, Args, E)
-  end.
+  end,
+  ok.
 
 compile(Quoted, ArgsList, E) ->
   {Expanded, SE, EE} = elixir_expand:expand(Quoted, elixir_env:env_to_ex(E), E),

lib/elixir/src/elixir_env.erl

@@ -1,7 +1,7 @@
 -module(elixir_env).
 -include("elixir.hrl").
 -export([
-  new/0, to_caller/1, with_vars/2, reset_vars/1, env_to_ex/1, env_to_ex/2,
+  new/0, to_caller/1, with_vars/2, reset_vars/1, env_to_ex/1,
   reset_unused_vars/1, check_unused_vars/2, merge_and_check_unused_vars/3,
   trace/2, format_error/1,
   reset_read/2, prepare_write/1, close_write/2
@@ -47,19 +47,11 @@ reset_vars(Env) ->
 
 %% CONVERSIONS
 
-env_to_ex(Env) ->
-  env_to_ex(Env, false).
-
-env_to_ex(#{context := match, versioned_vars := Vars}, Prune) ->
+env_to_ex(#{context := match, versioned_vars := Vars}) ->
   Counter = map_size(Vars),
-  Unused = unused(Vars, Prune),
-  #elixir_ex{prematch={Vars, Counter}, vars={Vars, false}, unused={Unused, Counter}};
-env_to_ex(#{versioned_vars := Vars}, Prune) ->
-  Unused = unused(Vars, Prune),
-  #elixir_ex{vars={Vars, false}, unused={Unused, map_size(Vars)}}.
-
-unused(_Vars, false) -> #{};
-unused(Vars, true) -> maps:from_list([{K, {0, false}} || K <- maps:to_list(Vars)]).
+  #elixir_ex{prematch={Vars, Counter}, vars={Vars, false}, unused={#{}, Counter}};
+env_to_ex(#{versioned_vars := Vars}) ->
+  #elixir_ex{vars={Vars, false}, unused={#{}, map_size(Vars)}}.
 
 %% VAR HANDLING
 

lib/elixir/src/elixir_erl_var.erl

@@ -109,7 +109,7 @@ dump_binding(Binding, ErlS, ExS, PruneBefore) ->
     %% If the variable is part of the pruning (usually the input binding)
     %% and is unused, we removed it from vars.
     (Pair, Version, {B, V})
-    when Version < PruneBefore, map_get({Pair, Version}, Unused) /= false ->
+    when Version < PruneBefore, not is_map_key({Pair, Version}, Unused) ->
       {B, maps:remove(Pair, V)};
 
     ({Var, Kind} = Pair, Version, {B, V}) when is_atom(Kind) ->