Remove check_require in favor of a meta tag

Author: José Valim

lib/elixir/include/elixir.hrl

@@ -11,7 +11,6 @@
 -record(elixir_scope, {
   context=nil,             %% can be assign, guards or nil
   noname=false,            %% when true, don't add new names (used by try)
-  check_requires=true,     %% when true, check requires
   check_clauses=true,      %% when true, check def clauses ordering
   super=false,             %% when true, it means super was invoked
   caller=false,            %% when true, it means caller was invoked

lib/elixir/src/elixir_dispatch.erl

@@ -155,7 +155,7 @@ expand_require(Meta, Receiver, { Name, Arity } = Tuple, Args, Module, S) ->
 
 expand_macro_fun(Meta, Fun, Receiver, Name, Args, Module, S) ->
   Requires = S#elixir_scope.requires,
-  case (Receiver == Module) or is_element(Receiver, Requires) or not(S#elixir_scope.check_requires) of
+  case (Receiver == Module) or is_element(Receiver, Requires) or skip_require(Meta) of
     true  -> ok;
     false ->
       Tuple = { unrequired_module, { Receiver, Name, length(Args), Requires } },
@@ -196,12 +196,8 @@ merge_aliases(A1, A2) ->
 
 %% Helpers
 
-% case lists:keyfind(import, 1, Meta) of
-%   { import, Receiver } ->
-%     { TRes, TS } = translate_each({ { '.', Meta, [Receiver, Atom] }, Meta, Args },
-%       S#elixir_scope{check_requires=false}),
-%     { TRes, TS#elixir_scope{check_requires=S#elixir_scope.check_requires} };
-%   false ->
+skip_require(Meta) ->
+  lists:keyfind(require, 1, Meta) == { require, false }.
 
 find_dispatch(Meta, Tuple, S) ->
   find_dispatch(Meta, Tuple, [], S).

lib/elixir/src/elixir_module.erl

@@ -324,10 +324,10 @@ else_clause() ->
 % HELPERS
 
 eval_callbacks(Line, Module, Name, Args, RawS) ->
-  S         = RawS#elixir_scope{check_clauses=false,check_requires=false},
+  S         = RawS#elixir_scope{check_clauses=false},
   Binding   = binding_for_eval(Module, []),
   Callbacks = lists:reverse(ets:lookup_element(data_table(Module), Name, 2)),
-  Meta      = [{line,Line}],
+  Meta      = [{line,Line},{require,false}],
 
   lists:foreach(fun({M,F}) ->
     { Tree, _ } = elixir_dispatch:dispatch_require(Meta, M, F, Args, S, fun() ->

lib/elixir/src/elixir_translator.erl

@@ -429,9 +429,7 @@ translate_each({ Atom, Meta, Args } = Original, S) when is_atom(Atom) ->
         error ->
           case lists:keyfind(import, 1, Meta) of
             { import, Receiver } ->
-              { TRes, TS } = translate_each({ { '.', Meta, [Receiver, Atom] }, Meta, Args },
-                S#elixir_scope{check_requires=false}),
-              { TRes, TS#elixir_scope{check_requires=S#elixir_scope.check_requires} };
+              translate_each({ { '.', [{require,false}|Meta], [Receiver, Atom] }, Meta, Args }, S);
             false ->
               Callback = fun() ->
                 case S#elixir_scope.context of