Expand current module macros with Macro.expand, closes #815

Author: José Valim

lib/elixir/lib/macro.ex

@@ -478,8 +478,16 @@ defmodule Macro do
     case not is_partial?(args) do
       false -> original
       true  ->
+        module = env.module
+
+        extra  = if function_exported?(module, :__info__, 1) do
+          [{ module, module.__info__(:macros) }]
+        else
+          []
+        end
+
         expand = :elixir_dispatch.expand_import(line, { atom, length(args) }, args,
-          env.module, env.function, env.requires, env.macros, env)
+          env.module, env.function, env.requires, extra ++ env.macros, env)
         case expand do
           { :ok, _, expanded } -> expanded
           { :error, _ }     -> original

lib/elixir/test/elixir/macro_test.exs

@@ -82,6 +82,14 @@ defmodule MacroTest do
     assert Macro.expand(quote(do: :foo), __ENV__) == :foo
   end
 
+  defmacro local_macro do
+    :local_macro
+  end
+
+  test :expand_local_macro do
+    assert Macro.expand(quote(do: local_macro), __ENV__) == :local_macro
+  end
+
   test :expand_with_imported_macro do
     assert Macro.expand(quote(do: 1 || false), __ENV__) == (quote var_context: Kernel do
       case 1 do