Merge branch 'hb/dialyzer/fix_opaque_types/OTP-12493'

* hb/dialyzer/fix_opaque_types/OTP-12493:
  dialyzer: Fix a minor bug concerning opaque types
  dialyzer: Modify warning for comparison of opaque types
  dialyzer: Modify the handling of parametrized opaque types

12 files changed, 8 insertions, 34 deletions

diff --git a/lib/stdlib/doc/src/array.xml b/lib/stdlib/doc/src/array.xml
index b03a2fa0cc..af23cd95d9 100644
--- a/lib/stdlib/doc/src/array.xml
+++ b/lib/stdlib/doc/src/array.xml
@@ -93,9 +93,6 @@ the default value cannot be confused with the values of set entries.</p>
   </datatype>
   <datatype>
     <name name="array" n_vars="0"/>
-    <desc>
-      <p><c>array()</c> is equivalent to <c>array(term())</c>.</p>
-    </desc>
   </datatype>
   <datatype>
     <name name="array_indx"/>
diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml
index 0771682a25..b456b97578 100644
--- a/lib/stdlib/doc/src/dict.xml
+++ b/lib/stdlib/doc/src/dict.xml
@@ -46,9 +46,6 @@
     </datatype>
     <datatype>
       <name name="dict" n_vars="0"/>
-      <desc>
-        <p><c>dict()</c> is equivalent to <c>dict(term(), term())</c>.</p>
-      </desc>
     </datatype>
   </datatypes>
   <funcs>
diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml
index 405bae5698..99e92d8680 100644
--- a/lib/stdlib/doc/src/gb_sets.xml
+++ b/lib/stdlib/doc/src/gb_sets.xml
@@ -120,9 +120,6 @@
     </datatype>
     <datatype>
       <name name="set" n_vars="0"/>
-      <desc>
-        <p><c>set()</c> is equivalent to <c>set(term())</c>.</p>
-      </desc>
     </datatype>
     <datatype>
       <name name="iter" n_vars="1"/>
@@ -130,9 +127,6 @@
     </datatype>
     <datatype>
       <name name="iter" n_vars="0"/>
-      <desc>
-        <p><c>iter()</c> is equivalent to <c>iter(term())</c>.</p>
-      </desc>
     </datatype>
   </datatypes>
   <funcs>
diff --git a/lib/stdlib/doc/src/gb_trees.xml b/lib/stdlib/doc/src/gb_trees.xml
index 82167e1083..99ca2d6a9a 100644
--- a/lib/stdlib/doc/src/gb_trees.xml
+++ b/lib/stdlib/doc/src/gb_trees.xml
@@ -64,9 +64,6 @@
     </datatype>
     <datatype>
       <name name="tree" n_vars="0"/>
-      <desc>
-        <p><c>tree()</c> is equivalent to <c>tree(term(), term())</c>.</p>
-      </desc>
     </datatype>
     <datatype>
       <name name="iter" n_vars="2"/>
@@ -74,9 +71,6 @@
     </datatype>
     <datatype>
       <name name="iter" n_vars="0"/>
-      <desc>
-        <p><c>iter()</c> is equivalent to <c>iter(term(), term())</c>.</p>
-      </desc>
     </datatype>
   </datatypes>
   <funcs>
diff --git a/lib/stdlib/doc/src/queue.xml b/lib/stdlib/doc/src/queue.xml
index 9c994154d4..f689412988 100644
--- a/lib/stdlib/doc/src/queue.xml
+++ b/lib/stdlib/doc/src/queue.xml
@@ -95,9 +95,6 @@
     </datatype>
     <datatype>
       <name name="queue" n_vars="0"/>
-      <desc>
-        <p><c>queue()</c> is equivalent to <c>queue(term())</c>.</p>
-      </desc>
     </datatype>
   </datatypes>
 
diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml
index 4a31648f8f..eecddb7fd4 100644
--- a/lib/stdlib/doc/src/sets.xml
+++ b/lib/stdlib/doc/src/sets.xml
@@ -50,9 +50,6 @@
     </datatype>
     <datatype>
       <name name="set" n_vars="0"/>
-      <desc>
-        <p><c>set()</c> is equivalent to <c>set(term())</c>.</p>
-      </desc>
     </datatype>
   </datatypes>
   <funcs>
diff --git a/lib/stdlib/src/array.erl b/lib/stdlib/src/array.erl
index 10d2ccea45..f98a587c55 100644
--- a/lib/stdlib/src/array.erl
+++ b/lib/stdlib/src/array.erl
@@ -164,7 +164,7 @@
                 elements :: elements(_)         %% the tuple tree
 	       }).
 
--opaque array() :: array(term()).
+-type array() :: array(term()).
 
 -opaque array(Type) ::
           #array{default :: Type, elements :: elements(Type)}.
diff --git a/lib/stdlib/src/dict.erl b/lib/stdlib/src/dict.erl
index 5a9f63c5e2..d2af9554a1 100644
--- a/lib/stdlib/src/dict.erl
+++ b/lib/stdlib/src/dict.erl
@@ -70,7 +70,7 @@
 	}).
 
 
--opaque dict() :: dict(_, _).
+-type dict() :: dict(_, _).
 
 -opaque dict(Key, Value) :: #dict{segs :: segs(Key, Value)}.
 
diff --git a/lib/stdlib/src/gb_sets.erl b/lib/stdlib/src/gb_sets.erl
index d3fbd542f7..d099737d8f 100644
--- a/lib/stdlib/src/gb_sets.erl
+++ b/lib/stdlib/src/gb_sets.erl
@@ -203,11 +203,10 @@
 -export_type([set/0, set/1, iter/0, iter/1]).
 
 -type gb_set_node(Element) :: 'nil' | {Element, _, _}.
--type gb_set_node() :: gb_set_node(_).
 -opaque set(Element) :: {non_neg_integer(), gb_set_node(Element)}.
--opaque set() :: set(_).
+-type set() :: set(_).
 -opaque iter(Element) :: [gb_set_node(Element)].
--opaque iter() :: [gb_set_node()].
+-type iter() :: iter(_).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/stdlib/src/gb_trees.erl b/lib/stdlib/src/gb_trees.erl
index 259e8f718b..2cbfd8fd2a 100644
--- a/lib/stdlib/src/gb_trees.erl
+++ b/lib/stdlib/src/gb_trees.erl
@@ -160,11 +160,10 @@
 
 -type gb_tree_node(K, V) :: 'nil'
                           | {K, V, gb_tree_node(K, V), gb_tree_node(K, V)}.
--type gb_tree_node() :: gb_tree_node(_, _).
 -opaque tree(Key, Value) :: {non_neg_integer(), gb_tree_node(Key, Value)}.
--opaque tree() :: tree(_, _).
+-type tree() :: tree(_, _).
 -opaque iter(Key, Value) :: [gb_tree_node(Key, Value)].
--opaque iter() :: [gb_tree_node()].
+-type iter() :: iter(_, _).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/stdlib/src/queue.erl b/lib/stdlib/src/queue.erl
index 472d503b99..d2e6848258 100644
--- a/lib/stdlib/src/queue.erl
+++ b/lib/stdlib/src/queue.erl
@@ -48,7 +48,7 @@
 
 -opaque queue(Item) :: {list(Item), list(Item)}.
 
--opaque queue() :: queue(_).
+-type queue() :: queue(_).
 
 %% Creation, inspection and conversion
 
diff --git a/lib/stdlib/src/sets.erl b/lib/stdlib/src/sets.erl
index 167a676281..041d281148 100644
--- a/lib/stdlib/src/sets.erl
+++ b/lib/stdlib/src/sets.erl
@@ -70,7 +70,7 @@
 	 segs                :: segs(_)			% Segments
 	}).
 
--opaque set() :: set(_).
+-type set() :: set(_).
 
 -opaque set(Element) :: #set{segs :: segs(Element)}.