Fix a bug with nested record definitions

Author: José Valim

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * bug fix
   * [Dict] `Enum.to_list` and `Dict.to_list` now return the same results for dicts
+  * [Record] Fix a bug where nested records cannot be defined
   * [Mix] Fix a bug where `mix deps.get` was not retrieving nested dependencies
 
 * deprecations

lib/elixir/lib/kernel/special_forms.ex

@@ -424,6 +424,9 @@ defmodule Kernel.SpecialForms do
   module name. This means that the variable is associated to the
   ContextSample module and only code generated by this module
   will be able to access that particular `world` variable.
+  While this means macros from the same module could have
+  conflicting variables, it also allows different quotes from
+  the same module to access them.
 
   The context can be disabled or changed by explicitly setting
   the context option. All hygiene mechanisms are based on such

lib/elixir/lib/record.ex

@@ -26,7 +26,7 @@ defmodule Record do
     block = Keyword.get(opts, :do, nil)
 
     quote do
-      values = unquote(values)
+      unquoted_values = unquote(values)
 
       defmodule unquote(name) do
         @moduledoc false
@@ -35,6 +35,10 @@ defmodule Record do
         @record_fields []
         @record_types  []
 
+        # Reassign values to inner scope to
+        # avoid conflicts in nested records
+        values = unquoted_values
+
         Record.deffunctions(values, __ENV__)
         value = unquote(block)
         Record.deftypes(values, @record_types, __ENV__)

lib/elixir/test/elixir/record_test.exs

@@ -56,6 +56,8 @@ defmodule RecordTest.Macros do
     def nested_record_alias?(Nested[]) do
       true
     end
+
+    defrecord NestedInNested, it_compiles: true
   end
 
   def new() do