Skip to content
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

Mechanical refactor of Descr, avoid intermediate lists #14230

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Mechanical refactor of Descr, avoid intermediate lists #14230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e63610
Mechanical refactor of Descr, avoid intermediate lists
sabiwara Jan 26, 2025
29b280c
Rename function
sabiwara Jan 27, 2025
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
28 changes: 15 additions & 13 deletions lib/elixir/lib/module/types/descr.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ defmodule Module.Types.Descr do
[{name, [], arguments} | acc]
else
negs
|> Enum.map(fn {ty, lst} ->
|> non_empty_map_or(fn {ty, lst} ->
args =
if subtype?(lst, @empty_list) do
[to_quoted(ty, opts)]
Expand All @@ -1113,7 +1113,6 @@ defmodule Module.Types.Descr do

{name, [], args}
end)
|> Enum.reduce(&{:or, [], [&2, &1]})
|> Kernel.then(
&[
{:and, [], [{name, [], arguments}, {:not, [], [&1]}]}
Expand Down Expand Up @@ -1853,10 +1852,10 @@ defmodule Module.Types.Descr do
end

# Use heuristics to normalize a map dnf for pretty printing.
defp map_normalize(dnf) do
dnf
|> Enum.reject(&map_empty?([&1]))
|> Enum.map(fn {tag, fields, negs} ->
defp map_normalize(dnfs) do
for dnf <- dnfs, not map_empty?([dnf]) do
{tag, fields, negs} = dnf

{fields, negs} =
Enum.reduce(negs, {fields, []}, fn neg = {neg_tag, neg_fields}, {acc_fields, acc_negs} ->
if map_empty_negation?(tag, acc_fields, neg) do
Expand All @@ -1874,7 +1873,7 @@ defmodule Module.Types.Descr do
end)

{tag, fields, negs}
end)
end
|> map_fusion()
end

Expand Down Expand Up @@ -1954,8 +1953,7 @@ defmodule Module.Types.Descr do

_ ->
negative_maps
|> Enum.map(&map_literal_to_quoted(&1, opts))
|> Enum.reduce(&{:or, [], [&2, &1]})
|> non_empty_map_or(&map_literal_to_quoted(&1, opts))
|> Kernel.then(
&{:and, [], [map_literal_to_quoted({tag, positive_map}, opts), {:not, [], [&1]}]}
)
Expand Down Expand Up @@ -2308,8 +2306,7 @@ defmodule Module.Types.Descr do

_ ->
negative_tuples
|> Enum.map(&tuple_literal_to_quoted(&1, opts))
|> Enum.reduce(&{:or, [], [&2, &1]})
|> non_empty_map_or(&tuple_literal_to_quoted(&1, opts))
|> Kernel.then(
&{:and, [], [tuple_literal_to_quoted({tag, positive_tuple}, opts), {:not, [], [&1]}]}
)
Expand Down Expand Up @@ -2574,8 +2571,9 @@ defmodule Module.Types.Descr do
none()
else
n..(m - 1)//1
|> Enum.map(&tuple_values(:closed, tuple_fill(elements, &1), negs))
|> Enum.reduce(none(), &union/2)
|> Enum.reduce(none(), fn i, acc ->
tuple_values(:closed, tuple_fill(elements, i), negs) |> union(acc)
end)
|> union(
if neg_tag == :open do
none()
Expand Down Expand Up @@ -2970,4 +2968,8 @@ defmodule Module.Types.Descr do
end

defp iterator_non_disjoint_intersection?(:none, _map), do: false

defp non_empty_map_or([head | tail], fun) do
Enum.reduce(tail, fun.(head), &{:or, [], [&2, fun.(&1)]})
end
end
Loading