Ensure record args are evaluated in the parent context, closes #1065

Author: José Valim

lib/elixir/lib/kernel.ex

@@ -1485,8 +1485,14 @@ defmodule Kernel do
 
   See `Record.import/2` and `defrecordp/2` documentation for more information
   """
-  defmacro defrecord(name, fields, opts // [], do_block // []) do
-    Record.defrecord(name, fields, Keyword.merge(opts, do_block))
+
+  defmacro defrecord(name, fields, do_block // [])
+
+  defmacro defrecord(name, fields, do_block) do
+    case is_list(fields) and Keyword.get(fields, :do, false) do
+      false -> Record.defrecord(name, fields, do_block)
+      other -> Record.defrecord(name, Keyword.delete(fields, :do), do: other)
+    end
   end
 
   @doc """

lib/elixir/lib/record.ex

@@ -27,15 +27,15 @@ defmodule Record do
     opts  = Keyword.delete(opts, :do)
 
     quote do
+      values = unquote(values)
+
       defmodule unquote(name) do
         @moduledoc false
         import Record.DSL
 
         @record_fields []
         @record_types  []
 
-        values = unquote(values)
-        opts   = unquote(opts)
         Record.deffunctions(values, __ENV__)
         value = unquote(block)
         Record.deftypes(values, @record_types, __ENV__)

lib/elixir/test/elixir/record_test.exs

@@ -33,6 +33,11 @@ defrecord name, a: 0, b: 1 do
   end
 end
 
+defmodule RecordTest.DynamicOpts do
+  @a [foo: 1..30]
+  defrecord State, (lc {name, _interval} inlist @a, do: {name, nil})
+end
+
 ## With types
 
 defrecord RecordTest.WithTypeOverriden, a: 0, b: 1 do