Ensure nested modules are properly defined, closes #1057

Author: José Valim

lib/elixir/src/elixir_macros.erl

@@ -325,17 +325,24 @@ rewrite_case_clauses([{do,[{in,_,[{'_',_,_},[false,nil]]}],False},{do,[{'_',_,_}
 rewrite_case_clauses(Clauses) ->
   Clauses.
 
+%% defmodule :foo
 expand_module(Raw, Module, #elixir_scope{module=Nesting}) when is_atom(Raw); Nesting == nil ->
   Module;
 
-expand_module({ '__aliases__', _, List } = Alias, Module, S) when List /= ['Elixir'] ->
+%% defmodule Hello
+expand_module({ '__aliases__', _, [H] }, _Module, S) ->
+  elixir_aliases:concat([S#elixir_scope.module, H]);
+
+%% defmodule Hello.World
+expand_module({ '__aliases__', _, _ } = Alias, Module, S) ->
   case elixir_aliases:expand(Alias, S#elixir_scope.aliases, S#elixir_scope.macro_aliases) of
     Atom when is_atom(Atom) ->
       Module;
     Aliases when is_list(Aliases) ->
       elixir_aliases:concat([S#elixir_scope.module, Module])
   end;
 
+%% defmodule Elixir.Hello.World
 expand_module(_Raw, Module, S) ->
   elixir_aliases:concat([S#elixir_scope.module, Module]).
 

lib/elixir/test/elixir/kernel/nested_module_test.exs

@@ -0,0 +1,13 @@
+Code.require_file "../test_helper.exs", __DIR__
+
+# If it compiles, we are good.
+defmodule Kernel.NestedModuleTest do
+  defrecord State, a: nil
+
+  defmodule B do
+    defrecord State, b: nil
+    def get(State[b: b]), do: b
+  end
+
+  def get(State[a: a]), do: a
+end

lib/elixir/test/elixir/record_test.exs

@@ -3,6 +3,11 @@ Code.require_file "test_helper.exs", __DIR__
 defrecord RecordTest.FileInfo,
   Record.extract(:file_info, from_lib: "kernel/include/file.hrl")
 
+defrecord RecordTest.SomeRecord, a: 0, b: 1
+defrecord RecordTest.WithNoField, []
+
+## Record import
+
 defmodule RecordTest.FileInfo.Helper do
   Record.import RecordTest.FileInfo, as: :file_info
 
@@ -13,8 +18,7 @@ defmodule RecordTest.FileInfo.Helper do
   def size(file_info(size: size)), do: size
 end
 
-defrecord RecordTest.SomeRecord, a: 0, b: 1
-defrecord RecordTest.WithNoField, []
+## Dynamic names and overridable
 
 name = RecordTest.DynamicName
 defrecord name, a: 0, b: 1 do