diff options
| author | Stavros Aronis <[email protected]> | 2011-12-22 16:38:21 +0200 |
|---|---|---|
| committer | Stavros Aronis <[email protected]> | 2012-02-22 13:04:27 +0100 |
| commit | 2f8daabdbdd3d03a4db8e1680a8b2773f0561d5e (patch) | |
| tree | 0e75e4613ecb7d3e263f83077d89414c722de785 | |
| parent | 8900a242fb35212b64b6b4246caa0ace128ca9b4 (diff) | |
| download | otp-2f8daabdbdd3d03a4db8e1680a8b2773f0561d5e.tar.gz otp-2f8daabdbdd3d03a4db8e1680a8b2773f0561d5e.tar.bz2 otp-2f8daabdbdd3d03a4db8e1680a8b2773f0561d5e.zip | |
Allow t_opaque_structure to handle multiple opaque types
| -rw-r--r-- | lib/dialyzer/test/opaque_SUITE_data/results/multiple_wrong_opaques | 2 | ||||
| -rw-r--r-- | lib/dialyzer/test/opaque_SUITE_data/src/multiple_wrong_opaques.erl | 8 | ||||
| -rw-r--r-- | lib/hipe/cerl/erl_types.erl | 7 |
3 files changed, 11 insertions, 6 deletions
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/multiple_wrong_opaques b/lib/dialyzer/test/opaque_SUITE_data/results/multiple_wrong_opaques new file mode 100644 index 0000000000..18ece8820c --- /dev/null +++ b/lib/dialyzer/test/opaque_SUITE_data/results/multiple_wrong_opaques @@ -0,0 +1,2 @@ + +multiple_wrong_opaques.erl:5: Invalid type specification for function multiple_wrong_opaques:weird/1. The success typing is ('gazonk') -> 42 diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/multiple_wrong_opaques.erl b/lib/dialyzer/test/opaque_SUITE_data/src/multiple_wrong_opaques.erl new file mode 100644 index 0000000000..9e695cec1d --- /dev/null +++ b/lib/dialyzer/test/opaque_SUITE_data/src/multiple_wrong_opaques.erl @@ -0,0 +1,8 @@ +-module(multiple_wrong_opaques). + +-export([weird/1]). + +-spec weird(dict() | gb_tree()) -> 42. + +weird(gazonk) -> 42. + diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl index 620fed365e..aa4758c1d3 100644 --- a/lib/hipe/cerl/erl_types.erl +++ b/lib/hipe/cerl/erl_types.erl @@ -424,12 +424,7 @@ t_has_opaque_subtype(T) -> -spec t_opaque_structure(erl_type()) -> erl_type(). t_opaque_structure(?opaque(Elements)) -> - case ordsets:size(Elements) of - 1 -> - [#opaque{struct = Struct}] = ordsets:to_list(Elements), - Struct; - _ -> throw({error, "Unexpected multiple opaque types"}) - end. + t_sup([Struct || #opaque{struct = Struct} <- ordsets:to_list(Elements)]). -spec t_opaque_module(erl_type()) -> module(). |