Simplify escaping logic by reducing the number of vars

Author: josevalim

lib/elixir/lib/kernel/utils.ex

@@ -120,7 +120,7 @@ defmodule Kernel.Utils do
     mapper = fn
       {key, val} when is_atom(key) ->
         try do
-          :elixir_quote.escape(val, false, :none)
+          :elixir_quote.escape(val, :none, false)
         rescue
           e in [ArgumentError] ->
             raise ArgumentError, "invalid value for struct field #{key}, " <> Exception.message(e)

lib/elixir/lib/macro/env.ex

@@ -103,7 +103,7 @@ defmodule Macro.Env do
 
   # Define the __struct__ callbacks by hand for bootstrap reasons.
   {struct, [], kv, body} = Kernel.Utils.defstruct(__MODULE__, fields, false, __ENV__)
-  def __struct__(), do: unquote(:elixir_quote.escape(struct, false, :none))
+  def __struct__(), do: unquote(:elixir_quote.escape(struct, :none, false))
   def __struct__(unquote(kv)), do: unquote(body)
 
   @doc """

lib/elixir/src/elixir_expand.erl

@@ -207,8 +207,8 @@ expand({quote, Meta, [Opts, Do]}, S, E) when is_list(Do) ->
   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),
-  Quoted = elixir_quote:quote(Meta, Exprs, Binding, Q, Prelude, ET),
+  {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) ->