Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions lib/elixir/lib/record.ex
Original file line number Diff line number Diff line change
Expand Up @@ -444,13 +444,14 @@ defmodule Record do
raise ArgumentError, "cannot invoke update style macro inside match"
end

{keyword, exprs} = hoist_expressions(keyword, caller)

if Keyword.has_key?(keyword, :_) do
message = "updating a record with a default (:_) is equivalent to creating a new record"
IO.warn(message, caller)
create(tag, fields, keyword, caller)
else
{[{:record, var} | keyword], exprs} =
hoist_expressions([{:record, var} | keyword], caller)

updates =
Enum.map(keyword, fn {key, value} ->
if index = find_index(fields, key, 2) do
Expand All @@ -465,14 +466,18 @@ defmodule Record do
end

defp hoist_expressions(keyword, %{context: nil, module: module}) do
Enum.map_reduce(keyword, [], fn {key, expr}, acc ->
if simple_argument?(expr) do
{{key, expr}, acc}
else
var = Macro.unique_var(key, module)
{{key, var}, [{:=, [], [var, expr]} | acc]}
end
end)
if Enum.all?(keyword, fn {_, expr} -> simple_argument?(expr) end) do
{keyword, []}
else
Enum.map_reduce(keyword, [], fn {key, expr}, acc ->
if Macro.quoted_literal?(expr) do
{{key, expr}, acc}
else
var = Macro.unique_var(key, module)
{{key, var}, [{:=, [], [var, expr]} | acc]}
end
end)
end
end

defp hoist_expressions(keyword, _), do: {keyword, []}
Expand Down
21 changes: 21 additions & 0 deletions lib/elixir/test/elixir/record_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -396,4 +396,25 @@ defmodule RecordTest do
:code.delete(module)
end
end

test "records preserve variable reads before rebinding" do
x = 1
assert user(name: x, age: x = 2) == {RecordTest, 1, 2}
assert x == 2

x = 1
assert user(user(), age: x, name: x = 2) == {RecordTest, 2, 1}
assert x == 2
end

test "record updates evaluate the base before fields" do
record = user()
assert user(record, name: record = :name) == {RecordTest, :name, 25}
assert record == :name

assert user(user(name: send(self(), :base)), age: send(self(), :field)) ==
{RecordTest, :base, :field}

assert for(_ <- 1..2, do: assert_receive(_)) == [:base, :field]
end
end