Raise proper exception on invalid quoted expression

We also documented valid types in Macro.t

Closes #1411

Author: José Valim

lib/elixir/lib/macro.ex

@@ -5,6 +5,8 @@ defmodule Macro do
   This module provides conveniences for working with macros.
   """
 
+  @type t :: { t, t } | { t, Keyword.t, t } | atom | number | binary | list
+
   @doc """
   Returns a list of binary operators. This is available
   as a macro so it can be used in guard clauses.

lib/elixir/src/elixir_dispatch.erl

@@ -189,7 +189,7 @@ expand_macro_fun(Meta, Fun, Receiver, Name, Args, Module, S) ->
     apply(Fun, [SArg|Args])
   catch
     Kind:Reason ->
-      Info = { Receiver, Name, length(Args), [{ file, S#elixir_scope.file }, { line, Line }] },
+      Info = { Receiver, Name, length(Args), location(Line, S) },
       erlang:raise(Kind, Reason, munge_stacktrace(Info, erlang:get_stacktrace(), SArg))
   end.
 
@@ -200,10 +200,29 @@ expand_macro_named(Meta, Receiver, Name, Arity, Args, Module, S) ->
   expand_macro_fun(Meta, Fun, Receiver, Name, Args, Module, S).
 
 translate_expansion(Meta, Tree, S) ->
-  elixir_translator:translate_each(
-    elixir_quote:linify(?line(Meta), Tree),
-    S
-  ).
+  Line = ?line(Meta),
+
+  try
+    elixir_translator:translate_each(
+      elixir_quote:linify(Line, Tree),
+      S
+    )
+  catch
+    Kind:Reason ->
+      erlang:raise(Kind, Reason, [mfa(Line, S)|erlang:get_stacktrace()])
+  end.
+
+mfa(Line, #elixir_scope{module=nil} = S) ->
+  { elixir_compiler, '__FILE__', 2, location(Line, S) };
+
+mfa(Line, #elixir_scope{module=Module,function=nil} = S) ->
+  { Module, '__MODULE__', 0, location(Line, S) };
+
+mfa(Line, #elixir_scope{module=Module,function={ Name, Arity }} = S) ->
+  { Module, Name, Arity, location(Line, S) }.
+
+location(Line, S) ->
+  [{ file, S#elixir_scope.file }, { line, Line }].
 
 %% Helpers
 

lib/elixir/src/elixir_literal.erl

@@ -65,7 +65,11 @@ translate(Atom, S) when is_atom(Atom) ->
   { { atom, 0, Atom }, S };
 
 translate(Bitstring, S) when is_bitstring(Bitstring) ->
-  { elixir_tree_helpers:elixir_to_erl(Bitstring), S }.
+  { elixir_tree_helpers:elixir_to_erl(Bitstring), S };
+
+translate(Other, S) ->
+  elixir_errors:compile_error(0, S#elixir_scope.file, "invalid quoted expression: ~ts",
+                              ['Elixir.Kernel':inspect(Other)]).
 
 %% Helpers
 

lib/elixir/test/elixir/kernel/errors_test.exs

@@ -329,6 +329,20 @@ defmodule Kernel.ErrorsTest do
       '''
   end
 
+  test :invalid_macro do
+    assert_compile_fail CompileError,
+      "nofile: invalid quoted expression: {:foo, :bar, :baz, :bat}",
+      '''
+      defmodule ErrorsTest do
+        defmacrop oops do
+          { :foo, :bar, :baz, :bat }
+        end
+
+        def test, do: oops
+      end
+      '''
+  end
+
   test :unloaded_module do
     assert_compile_fail CompileError,
       "nofile:1: module Certainly.Doesnt.Exist is not loaded and could not be found",