Update to_quoted logic

Author: sabiwara

lib/elixir/lib/module/types/descr.ex

@@ -1080,7 +1080,7 @@ defmodule Module.Types.Descr do
   defp list_tl_static(%{}), do: none()
 
   defp list_improper_term?(:term), do: true
-  defp list_improper_term?(term), do: equal?(term, @not_list) or equal?(term, @not_non_empty_list)
+  defp list_improper_term?(term), do: equal?(term, @not_non_empty_list)
 
   defp list_to_quoted(dnf, empty?, opts) do
     dnf = list_normalize(dnf)
@@ -1092,17 +1092,14 @@ defmodule Module.Types.Descr do
             name = if empty?, do: :list, else: :non_empty_list
             {name, [to_quoted(list_type, opts)], empty?}
           else
-            type =
-              if subtype?(@empty_list, last_type),
-                do: :non_empty_maybe_improper_list,
-                else: :improper_list
+            name = if empty?, do: :maybe_improper_list, else: :non_empty_maybe_improper_list
 
-            # mark improper_list(term(), term()) as such rather than:
-            # improper_list(term(), atom() or binary() or float() or ...)
+            # mark non_empty_maybe_improper_list(term(), term()) as such rather than:
+            # non_empty_maybe_improper_list(term(), atom() or binary() or float() or ...)
             rendered_last_type = if list_improper_term?(last_type), do: :term, else: last_type
 
             args = [to_quoted(list_type, opts), to_quoted(rendered_last_type, opts)]
-            {type, args, list_rendered?}
+            {name, args, empty?}
           end
 
         acc =

lib/elixir/test/elixir/module/types/descr_test.exs

@@ -1328,13 +1328,13 @@ defmodule Module.Types.DescrTest do
                "non_empty_list(atom()) or non_empty_list(integer())"
 
       assert list(term(), integer()) |> to_quoted_string() ==
-               "empty_list() or improper_list(term(), integer())"
+               "maybe_improper_list(term(), integer())"
 
       assert difference(list(term(), atom()), list(term(), boolean())) |> to_quoted_string() ==
-               "improper_list(term(), atom() and not boolean())"
+               "non_empty_maybe_improper_list(term(), atom() and not boolean())"
 
       assert list(term(), term()) |> to_quoted_string() ==
-               "empty_list() or non_empty_maybe_improper_list(term(), term())"
+               "maybe_improper_list(term(), term())"
 
       assert non_empty_maybe_improper_list(term(), term()) |> to_quoted_string() ==
                "non_empty_maybe_improper_list(term(), term())"
@@ -1347,20 +1347,19 @@ defmodule Module.Types.DescrTest do
                "non_empty_maybe_improper_list(integer(), integer())"
 
       assert union(empty_list(), non_empty_maybe_improper_list(integer(), integer()))
-             |> to_quoted_string() ==
-               "empty_list() or non_empty_maybe_improper_list(integer(), integer())"
+             |> to_quoted_string() == "maybe_improper_list(integer(), integer())"
 
       assert union(non_empty_list(integer()), non_empty_maybe_improper_list(integer(), integer()))
              |> to_quoted_string() ==
                "non_empty_maybe_improper_list(integer(), empty_list() or integer())"
 
       assert union(list(integer()), non_empty_maybe_improper_list(integer(), integer()))
              |> to_quoted_string() ==
-               "empty_list() or non_empty_maybe_improper_list(integer(), empty_list() or integer())"
+               "maybe_improper_list(integer(), empty_list() or integer())"
 
       assert union(list(term()), non_empty_maybe_improper_list(term(), term()))
              |> to_quoted_string() ==
-               "empty_list() or non_empty_maybe_improper_list(term(), term())"
+               "maybe_improper_list(term(), term())"
 
       # Test normalization
 
@@ -1369,15 +1368,15 @@ defmodule Module.Types.DescrTest do
 
       # Merge subtypes
       assert union(list(float(), pid()), list(number(), pid())) |> to_quoted_string() ==
-               "empty_list() or improper_list(float() or integer(), pid())"
+               "maybe_improper_list(float() or integer(), pid())"
 
       # Merge last element types
       assert union(list(atom([:ok]), integer()), list(atom([:ok]), float())) |> to_quoted_string() ==
-               "empty_list() or improper_list(:ok, float() or integer())"
+               "maybe_improper_list(:ok, float() or integer())"
 
       assert union(dynamic(list(integer(), float())), dynamic(list(integer(), pid())))
              |> to_quoted_string() ==
-               "dynamic(empty_list() or improper_list(integer(), float() or pid()))"
+               "dynamic(maybe_improper_list(integer(), float() or pid()))"
     end
 
     test "tuples" do

lib/elixir/test/elixir/module/types/integration_test.exs

@@ -487,7 +487,7 @@ defmodule Module.Types.IntegrationTest do
                 dynamic(
                   %Date{} or %DateTime{} or %NaiveDateTime{} or %Time{} or %URI{} or %Version{} or
                     %Version.Requirement{}
-                ) or atom() or binary() or empty_list() or float() or integer() or non_empty_maybe_improper_list(term(), term())
+                ) or atom() or binary() or float() or integer() or maybe_improper_list(term(), term())
 
             where "data" was given the type:
 
@@ -511,7 +511,7 @@ defmodule Module.Types.IntegrationTest do
                 dynamic(
                   %Date{} or %DateTime{} or %NaiveDateTime{} or %Time{} or %URI{} or %Version{} or
                     %Version.Requirement{}
-                ) or atom() or binary() or empty_list() or float() or integer() or non_empty_maybe_improper_list(term(), term())
+                ) or atom() or binary() or float() or integer() or maybe_improper_list(term(), term())
 
             where "data" was given the type:
 
@@ -551,7 +551,7 @@ defmodule Module.Types.IntegrationTest do
                 dynamic(
                   %Date.Range{} or %File.Stream{} or %GenEvent.Stream{} or %HashDict{} or %HashSet{} or
                     %IO.Stream{} or %MapSet{} or %Range{} or %Stream{}
-                ) or empty_list() or fun() or non_empty_maybe_improper_list(term(), term()) or non_struct_map()
+                ) or fun() or maybe_improper_list(term(), term()) or non_struct_map()
 
             where "date" was given the type:
 
@@ -580,7 +580,7 @@ defmodule Module.Types.IntegrationTest do
             but expected a type that implements the Collectable protocol, it must be one of:
 
                 dynamic(%File.Stream{} or %HashDict{} or %HashSet{} or %IO.Stream{} or %MapSet{}) or binary() or
-                  empty_list() or non_empty_maybe_improper_list(term(), term()) or non_struct_map()
+                  maybe_improper_list(term(), term()) or non_struct_map()
 
             hint: the :into option in for-comprehensions use the Collectable protocol to build its result. Either pass a valid data type or implement the protocol accordingly
         """