diff options
| author | Hans Bolinder <hasse@erlang.org> | 2016-01-26 09:20:57 +0100 |
|---|---|---|
| committer | Hans Bolinder <hasse@erlang.org> | 2016-01-26 09:20:57 +0100 |
| commit | d5b4f05e4294886492bc9a1e840da8472af60e77 (patch) | |
| tree | 2292c20d2a234a5fdbb82904eda46bdd0f373fb7 /lib/hipe | |
| parent | 6165f613a5b33aec2b9505a193fe7e309e2be7fd (diff) | |
| parent | f79348f3838c67b1d22b3824e9c6a5b4f91e8395 (diff) | |
| download | otp-d5b4f05e4294886492bc9a1e840da8472af60e77.tar.gz otp-d5b4f05e4294886492bc9a1e840da8472af60e77.tar.bz2 otp-d5b4f05e4294886492bc9a1e840da8472af60e77.zip | |
Merge branch 'lucafavatella/dialyzer-minor-improvements/pr840'
* lucafavatella/dialyzer-minor-improvements/pr840:
Clarify computation of exported types in Dialyzer
Split race_data_server out of dialyzer_callgraph
Refactor dialyzer_analysis_callgraph
Refactor usage of opaques() type
Clarify that dialyzer_callgraph:callgraph() type is opaque
Delete a couple of leftover chars in Dialyzer doc
Diffstat (limited to 'lib/hipe')
| -rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 2 | ||||
| -rw-r--r-- | lib/hipe/cerl/erl_types.erl | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index 622c235638..e36643e090 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -137,7 +137,7 @@ type(M, F, A) -> type(M, F, A, Xs) -> type(M, F, A, Xs, 'universe'). --type opaques() :: 'universe' | [erl_types:erl_type()]. +-type opaques() :: erl_types:opaques(). -type arg_types() :: [erl_types:erl_type()]. diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl index 69654088d5..14b4ba215e 100644 --- a/lib/hipe/cerl/erl_types.erl +++ b/lib/hipe/cerl/erl_types.erl @@ -225,7 +225,7 @@ -export([t_is_identifier/1]). -endif. --export_type([erl_type/0, type_table/0, var_table/0]). +-export_type([erl_type/0, opaques/0, type_table/0, var_table/0]). %%-define(DEBUG, true). @@ -2425,8 +2425,7 @@ t_inf(T1, T2) -> t_inf(T1, T2, 'universe'). %% 'match' should be used from t_find_unknown_opaque() only --type t_inf_opaques() :: 'universe' - | [erl_type()] | {'match', [erl_type() | 'universe']}. +-type t_inf_opaques() :: opaques() | {'match', [erl_type() | 'universe']}. -spec t_inf(erl_type(), erl_type(), t_inf_opaques()) -> erl_type(). @@ -3604,7 +3603,7 @@ t_is_instance(ConcreteType, Type) -> t_unopaque(T) -> t_unopaque(T, 'universe'). --spec t_unopaque(erl_type(), 'universe' | [erl_type()]) -> erl_type(). +-spec t_unopaque(erl_type(), opaques()) -> erl_type(). t_unopaque(?opaque(_) = T, Opaques) -> case Opaques =:= 'universe' orelse is_opaque_type(T, Opaques) of |