Fix Macro.to_string with &

Author: José Valim

lib/elixir/lib/macro.ex

@@ -225,11 +225,6 @@ defmodule Macro do
     "fn\n  " <> block <> "\nend"
   end
 
-  # Partial call
-  def to_string({ :&, _, [num] }) do
-    "&#{num}"
-  end
-
   # left -> right
   def to_string({ :->, _, _ } = arrow) do
     "(" <> arrow_to_string(arrow, true) <> ")"

lib/elixir/test/elixir/macro_test.exs

@@ -199,49 +199,49 @@ defmodule MacroTest do
     end)
   end
 
-  ## to_binary
+  ## to_string
 
-  test :var_to_binary do
+  test :var_to_string do
     assert Macro.to_string(quote do: foo) == "foo"
   end
 
-  test :local_call_to_binary do
+  test :local_call_to_string do
     assert Macro.to_string(quote do: foo(1, 2, 3)) == "foo(1, 2, 3)"
     assert Macro.to_string(quote do: foo([1, 2, 3])) == "foo([1, 2, 3])"
   end
 
-  test :remote_call_to_binary do
+  test :remote_call_to_string do
     assert Macro.to_string(quote do: foo.bar(1, 2, 3)) == "foo.bar(1, 2, 3)"
     assert Macro.to_string(quote do: foo.bar([1, 2, 3])) == "foo.bar([1, 2, 3])"
   end
 
-  test :low_atom_remote_call_to_binary do
+  test :low_atom_remote_call_to_string do
     assert Macro.to_string(quote do: :foo.bar(1, 2, 3)) == ":foo.bar(1, 2, 3)"
   end
 
-  test :big_atom_remote_call_to_binary do
+  test :big_atom_remote_call_to_string do
     assert Macro.to_string(quote do: Foo.Bar.bar(1, 2, 3)) == "Foo.Bar.bar(1, 2, 3)"
   end
 
-  test :remote_and_fun_call_to_binary do
+  test :remote_and_fun_call_to_string do
     assert Macro.to_string(quote do: foo.bar.(1, 2, 3)) == "foo.bar().(1, 2, 3)"
     assert Macro.to_string(quote do: foo.bar.([1, 2, 3])) == "foo.bar().([1, 2, 3])"
   end
 
-  test :atom_call_to_binary do
+  test :atom_call_to_string do
     assert Macro.to_string(quote do: :foo.(1, 2, 3)) == ":foo.(1, 2, 3)"
   end
 
-  test :aliases_call_to_binary do
+  test :aliases_call_to_string do
     assert Macro.to_string(quote do: Foo.Bar.baz(1, 2, 3)) == "Foo.Bar.baz(1, 2, 3)"
     assert Macro.to_string(quote do: Foo.Bar.baz([1, 2, 3])) == "Foo.Bar.baz([1, 2, 3])"
   end
 
-  test :arrow_to_binary do
+  test :arrow_to_string do
     assert Macro.to_string(quote do: foo(1, (2 -> 3))) == "foo(1, (2 -> 3))"
   end
 
-  test :blocks_to_binary do
+  test :blocks_to_string do
     assert Macro.to_string(quote do: (1; 2; (:foo; :bar); 3)) <> "\n" == """
     (
       1
@@ -255,7 +255,7 @@ defmodule MacroTest do
     """
   end
 
-  test :if_else_to_binary do
+  test :if_else_to_string do
     assert Macro.to_string(quote do: (if foo, do: bar, else: baz)) <> "\n" == """
     if(foo) do
       bar
@@ -265,7 +265,7 @@ defmodule MacroTest do
     """
   end
 
-  test :case_to_binary do
+  test :case_to_string do
     assert Macro.to_string(quote do: (case foo do true -> 0; false -> (1; 2) end)) <> "\n" == """
     case(foo) do
       true ->
@@ -277,7 +277,7 @@ defmodule MacroTest do
     """
   end
 
-  test :fn_to_binary do
+  test :fn_to_string do
     assert Macro.to_string(quote do: (fn -> 1 + 2 end)) == "fn -> 1 + 2 end"
     assert Macro.to_string(quote do: (fn(x) -> x + 1 end)) == "fn x -> x + 1 end"
 
@@ -306,11 +306,7 @@ defmodule MacroTest do
     assert Macro.to_string(quote do: ((x, y) when z -> w)) == "((x, y) when z -> w)"
   end
 
-  test :partial_to_binary do
-    assert Macro.to_string(quote do: identity(&1)) == "identity(&1)"
-  end
-
-  test :nested_to_binary do
+  test :nested_to_string do
     assert Macro.to_string(quote do: (defmodule Foo do def foo do 1 + 1 end end)) <> "\n" == """
     defmodule(Foo) do
       def(foo) do
@@ -320,28 +316,30 @@ defmodule MacroTest do
     """
   end
 
-  test :op_precedence_to_binary do
+  test :op_precedence_to_string do
     assert Macro.to_string(quote do: (1 + 2) * (3 - 4)) == "(1 + 2) * (3 - 4)"
     assert Macro.to_string(quote do: ((1 + 2) * 3) - 4) == "((1 + 2) * 3) - 4"
   end
 
-  test :containers_to_binary do
+  test :containers_to_string do
     assert Macro.to_string(quote do: { 1, 2, 3 })   == "{1, 2, 3}"
     assert Macro.to_string(quote do: [ 1, 2, 3 ])   == "[1, 2, 3]"
     assert Macro.to_string(quote do: << 1, 2, 3 >>) == "<<1, 2, 3>>"
   end
 
-  test :binary_ops_to_binary do
+  test :binary_ops_to_string do
     assert Macro.to_string(quote do: 1 + 2)   == "1 + 2"
     assert Macro.to_string(quote do: [ 1, 2 | 3 ]) == "[1, 2 | 3]"
     assert Macro.to_string(quote do: [h|t] = [1, 2, 3]) == "[h | t] = [1, 2, 3]"
   end
 
-  test :unary_ops_to_binary do
+  test :unary_ops_to_string do
     assert Macro.to_string(quote do: not 1) == "not 1"
     assert Macro.to_string(quote do: not foo) == "not foo"
     assert Macro.to_string(quote do: -1) == "-1"
     assert Macro.to_string(quote do: @foo(bar)) == "@foo(bar)"
+    assert Macro.to_string(quote do: identity(&1)) == "identity(&1)"
+    assert Macro.to_string(quote do: identity(&foo)) == "identity(&foo)"
   end
 
   ## safe_term