Skip to content

Deterministic struct expansion #12418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josevalim merged 5 commits into from
Feb 19, 2023
Merged

Deterministic struct expansion #12418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6352b3a
Deterninistic struct expansion
sabiwara Feb 18, 2023
dbf8a78
Deterministic struct typing
sabiwara Feb 18, 2023
d693ae6
Revert "Deterministic struct typing"
sabiwara Feb 19, 2023
90a917a
Replace map_join by join
sabiwara Feb 19, 2023
997e18e
Make struct type tests deterministic
sabiwara Feb 19, 2023
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
2 changes: 1 addition & 1 deletion lib/elixir/lib/module/types.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ defmodule Module.Types do
"undefined field \"#{atom}\" ",
format_expr(expr, location),
"expected one of the following fields: ",
Enum.map_join(Enum.sort(known_atoms), ", ", & &1),
Enum.join(Enum.sort(known_atoms), ", "),
"\n\n",
traces,
format_message_hints(hints),
Expand Down
2 changes: 1 addition & 1 deletion lib/elixir/src/elixir_map.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ expand_struct(Meta, Left, {'%{}', MapMeta, MapArgs}, S, #{context := Context} =
AssocKeys = [K || {K, _} <- Assocs],
Struct = load_struct(Meta, ELeft, [Assocs], AssocKeys, EE),
Keys = ['__struct__'] ++ AssocKeys,
WithoutKeys = maps:to_list(maps:without(Keys, Struct)),
WithoutKeys = lists:sort(maps:to_list(maps:without(Keys, Struct))),
StructAssocs = elixir_quote:escape(WithoutKeys, none, false),
{{'%', Meta, [ELeft, {'%{}', MapMeta, StructAssocs ++ Assocs}]}, SE, EE};

Expand Down
38 changes: 19 additions & 19 deletions lib/elixir/test/elixir/module/types/pattern_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,25 +140,25 @@ defmodule Module.Types.PatternTest do
end

test "struct" do
assert quoted_pattern(%:"Elixir.Module.Types.PatternTest.Struct"{}) ==
{:ok,
{:map,
[
{:required, {:atom, :__struct__}, {:atom, Module.Types.PatternTest.Struct}},
{:required, {:atom, :bar}, :dynamic},
{:required, {:atom, :baz}, :dynamic},
{:required, {:atom, :foo}, :dynamic}
]}}

assert quoted_pattern(%:"Elixir.Module.Types.PatternTest.Struct"{foo: 123, bar: :atom}) ==
{:ok,
{:map,
[
{:required, {:atom, :foo}, :integer},
{:required, {:atom, :bar}, {:atom, :atom}},
{:required, {:atom, :__struct__}, {:atom, Module.Types.PatternTest.Struct}},
{:required, {:atom, :baz}, :dynamic}
]}}
assert {:ok, {:map, fields}} = quoted_pattern(%:"Elixir.Module.Types.PatternTest.Struct"{})

assert Enum.sort(fields) == [
{:required, {:atom, :__struct__}, {:atom, Module.Types.PatternTest.Struct}},
{:required, {:atom, :bar}, :dynamic},
{:required, {:atom, :baz}, :dynamic},
{:required, {:atom, :foo}, :dynamic}
]

assert {:ok, {:map, fields}} =
quoted_pattern(%:"Elixir.Module.Types.PatternTest.Struct"{foo: 123, bar: :atom})

assert Enum.sort(fields) ==
[
{:required, {:atom, :__struct__}, {:atom, Module.Types.PatternTest.Struct}},
{:required, {:atom, :bar}, {:atom, :atom}},
{:required, {:atom, :baz}, :dynamic},
{:required, {:atom, :foo}, :integer}
]
end

test "struct var" do
Expand Down