diff options
| author | Erlang/OTP <[email protected]> | 2010-12-28 14:34:51 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-12-28 14:34:51 +0100 |
| commit | 56dc83847776b400b7122a2e378a65f221096bed (patch) | |
| tree | f6d5ff9b3f913e0aaaf78a50f0500bb4888f48e9 /lib/hipe/cerl/erl_types.erl | |
| parent | 149a68f24671702ac0dfd3fcea9e35f18b8d9b53 (diff) | |
| parent | 0fe99329f6d39a5dfddda689a90917982fa2ee0b (diff) | |
| download | otp-56dc83847776b400b7122a2e378a65f221096bed.tar.gz otp-56dc83847776b400b7122a2e378a65f221096bed.tar.bz2 otp-56dc83847776b400b7122a2e378a65f221096bed.zip | |
Merge branch 'pan/r14b01-dialyzer-patch/OTP-9008' into maint-r14
* pan/r14b01-dialyzer-patch/OTP-9008:
Correct type specs in io
Remove dead code (and dialyzer errors) from filename and re
Set types correctly for open_port({spawn_executable, ...
Fix native code compiler infinite loop and update type info for 're'
Diffstat (limited to 'lib/hipe/cerl/erl_types.erl')
| -rw-r--r-- | lib/hipe/cerl/erl_types.erl | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl index 1ed85af172..080d6936b2 100644 --- a/lib/hipe/cerl/erl_types.erl +++ b/lib/hipe/cerl/erl_types.erl @@ -62,6 +62,7 @@ t_boolean/0, t_byte/0, t_char/0, + t_charlist/0, t_collect_vars/1, t_cons/0, t_cons/2, @@ -195,6 +196,7 @@ t_tuple_size/1, t_tuple_sizes/1, t_tuple_subtypes/1, + t_unicode_string/0, t_unify/2, t_unify/3, t_unit/0, @@ -1455,6 +1457,26 @@ t_is_tuple(_) -> false. %% Non-primitive types, including some handy syntactic sugar types %% +-spec t_unicode_string() -> erl_type(). + +t_unicode_string() -> + t_list(t_unicode_char()). + +-spec t_charlist() -> erl_type(). + +t_charlist() -> + t_charlist(1). + +-spec t_charlist(non_neg_integer()) -> erl_type(). + +t_charlist(N) when N > 0 -> + t_maybe_improper_list(t_sup([t_unicode_char(), + t_unicode_binary(), + t_charlist(N-1)]), + t_sup(t_unicode_binary(), t_nil())); +t_charlist(0) -> + t_maybe_improper_list(t_any(), t_sup(t_unicode_binary(), t_nil())). + -spec t_constant() -> erl_type(). t_constant() -> @@ -1549,6 +1571,16 @@ t_parameterized_module() -> t_timeout() -> t_sup(t_non_neg_integer(), t_atom('infinity')). +-spec t_unicode_binary() -> erl_type(). + +t_unicode_binary() -> + t_binary(). % with characters encoded in UTF-8 coding standard + +-spec t_unicode_char() -> erl_type(). + +t_unicode_char() -> + t_integer(). % representing a valid unicode codepoint + %%----------------------------------------------------------------------------- %% Some built-in opaque types %% @@ -2825,7 +2857,7 @@ t_subtract(?list(Contents1, Termination1, Size1) = T, true -> case {Size1, Size2} of {?nonempty_qual, ?unknown_qual} -> ?none; - {?unknown_qual, ?nonempty_qual} -> Termination1; + {?unknown_qual, ?nonempty_qual} -> ?nil; {S, S} -> ?none end; false -> |