Skip to content

Change map updates type checking direction #11713

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
ericmj merged 2 commits into from
Mar 21, 2022
Merged

Change map updates type checking direction #11713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fe3f4f
Give better names to types regression tests
michallepicki Mar 18, 2022
7826436
Change map updates type checking direction
michallepicki Mar 19, 2022
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/expr.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ defmodule Module.Types.Expr do
dynamic_value_pairs =
Enum.map(arg_pairs, fn {:required, key, _value} -> {:required, key, :dynamic} end),
args_type = {:map, dynamic_value_pairs ++ [{:optional, :dynamic, :dynamic}]},
{:ok, type, context} <- unify(args_type, map_type, stack, context) do
{:ok, type, context} <- unify(map_type, args_type, stack, context) do
# Retrieve map type and overwrite with the new value types from the map update
{:map, pairs} = resolve_var(type, context)

Expand Down
10 changes: 5 additions & 5 deletions lib/elixir/test/elixir/module/types/map_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ defmodule Module.Types.MapTest do

assert {:error,
{:unable_unify,
{{:map, [{:required, {:atom, :bar}, :dynamic}, {:optional, :dynamic, :dynamic}]},
{:map, [{:required, {:atom, :foo}, {:atom, :a}}]},
{{:map, [{:required, {:atom, :foo}, {:atom, :a}}]},
{:map, [{:required, {:atom, :bar}, :dynamic}, {:optional, :dynamic, :dynamic}]},
_}}} =
quoted_expr(
(
Expand Down Expand Up @@ -231,8 +231,8 @@ defmodule Module.Types.MapTest do
{:unable_unify,
{{:map,
[
{:required, {:atom, :field}, {:atom, :b}},
{:required, {:atom, :foo}, {:var, 1}},
{:required, {:atom, :field}, {:atom, :b}},
{:optional, :dynamic, :dynamic}
]},
{:map,
Expand Down Expand Up @@ -276,12 +276,12 @@ defmodule Module.Types.MapTest do
assert {:error,
{:unable_unify,
{{:map,
[{:required, {:atom, :not_field}, :dynamic}, {:optional, :dynamic, :dynamic}]},
{:map,
[
{:required, {:atom, :field}, {:atom, nil}},
{:required, {:atom, :__struct__}, {:atom, Module.Types.MapTest.Struct2}}
]},
{:map,
[{:required, {:atom, :not_field}, :dynamic}, {:optional, :dynamic, :dynamic}]},
_}}} =
quoted_expr(
(
Expand Down
16 changes: 14 additions & 2 deletions lib/elixir/test/elixir/module/types/types_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ defmodule Module.Types.TypesTest do
) == :none
end

test "other recursive" do
test "map patterns with pinned keys and field access" do
assert warning(
[x, y],
(
Expand All @@ -719,7 +719,7 @@ defmodule Module.Types.TypesTest do
) == :none
end

test "other recursive2" do
test "map patterns with pinned keys" do
assert warning(
[x, y],
(
Expand All @@ -732,5 +732,17 @@ defmodule Module.Types.TypesTest do
)
) == :none
end

test "map updates with var key" do
assert warning(
[state0, key0],
(
state1 = %{state0 | key0 => true}
key1 = key0
state2 = %{state1 | key1 => true}
state2
)
) == :none
end
end
end