Simplify current module macro handling

Author: José Valim

lib/elixir/src/elixir_dispatch.erl

@@ -190,21 +190,12 @@ expand_require(Meta, ?builtin, { Name, Arity } = Tuple, Args, Module, S) ->
 expand_require(Meta, Receiver, { Name, Arity } = Tuple, Args, Module, S) ->
   Function = S#elixir_scope.function,
 
-  Fun = (Module == Receiver) andalso (Function /= nil) andalso
-        (Function /= Tuple) andalso elixir_def_local:macro_for(Tuple, false, S),
-
-  case Fun of
-    false ->
-      case is_element(Tuple, get_optional_macros(Receiver)) of
-        true  ->
-          elixir_lexical:record_remote(Receiver, S#elixir_scope.lexical_tracker),
-          elixir_tracker:record_remote(Tuple, Receiver, Module, Function),
-          { ok, Receiver, expand_macro_named(Meta, Receiver, Name, Arity, Args, Module, S) };
-        false -> { error, noexpansion }
-      end;
-    _ ->
-      elixir_tracker:record_local(Tuple, Module, Function),
-      { ok, Receiver, expand_macro_fun(Meta, Fun(), Receiver, Name, Args, Module, S) }
+  case is_element(Tuple, get_optional_macros(Receiver)) of
+    true  ->
+      elixir_lexical:record_remote(Receiver, S#elixir_scope.lexical_tracker),
+      elixir_tracker:record_remote(Tuple, Receiver, Module, Function),
+      { ok, Receiver, expand_macro_named(Meta, Receiver, Name, Arity, Args, Module, S) };
+    false -> { error, noexpansion }
   end.
 
 %% Expansion helpers

lib/elixir/src/elixir_translator.erl

@@ -34,10 +34,6 @@ forms(String, StartLine, File, Opts) ->
 translate(Forms, S) ->
   lists:mapfoldl(fun translate_each/2, S, Forms).
 
-%% Those macros are "low-level". They are the basic mechanism
-%% that makes the language work and cannot be partially applied
-%% nor overwritten.
-
 %% Assignment operator
 
 translate_each({ '=', Meta, [Left, Right] }, S) ->
@@ -294,7 +290,7 @@ translate_each({ fn, Meta, [{ '->', _, Pairs }] }, S) ->
 translate_each({ Kind, Meta, Args }, S) when is_list(Args), (Kind == lc) orelse (Kind == bc) ->
   translate_comprehension(Meta, Kind, Args, S);
 
-%% Super (exceptionally supports partial application)
+%% Super
 
 translate_each({ super, Meta, Args }, S) when is_list(Args) ->
   assert_no_match_or_guard_scope(Meta, super, S),

lib/elixir/test/elixir/kernel/def_clauses_test.exs

@@ -2,6 +2,10 @@ Code.require_file "../test_helper.exs", __DIR__
 
 defmodule Kernel.MacrosTest.Nested do
   defmacro value, do: 1
+
+  defmacro do_identity!(do: x) do
+    x
+  end
 end
 
 defmodule Kernel.MacrosTest do
@@ -21,10 +25,6 @@ defmodule Kernel.MacrosTest do
     quote do: 1 + unquote(value)
   end
 
-  defmacro do_identity!(do: x) do
-    x
-  end
-
   test :require do
     assert Kernel.MacrosTest.Nested.value == 1
   end
@@ -42,10 +42,6 @@ defmodule Kernel.MacrosTest do
     assert result
   end
 
-  test :locals_macros do
-    assert __MODULE__.my_macro == 2
-  end
-
   test :local_but_private_macro do
     assert my_private_macro == 4
   end
@@ -60,7 +56,8 @@ defmodule Kernel.MacrosTest do
   end
 
   test :bang_do_block do
+    import Kernel.MacrosTest.Nested
     assert (do_identity! do 1 end) == 1
-    assert (__MODULE__.do_identity! do 1 end) == 1
+    assert (Kernel.MacrosTest.Nested.do_identity! do 1 end) == 1
   end
 end