diff options
author | Björn Gustavsson <[email protected]> | 2012-02-09 13:29:24 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2012-02-09 13:29:24 +0100 |
commit | 0b45f106f19756bcef0ee51a8f5d4147dc253bcb (patch) | |
tree | 442a24fe05a9d2e998bd68e0060c7db77afb2d82 /lib/hipe/cerl/erl_bif_types.erl | |
parent | 4408f9f30a48fca6d51ecef6ba92ef2978f59e92 (diff) | |
parent | 8ddf2aa53544e01b26d7fd55ef68f80f4af6307d (diff) | |
download | otp-0b45f106f19756bcef0ee51a8f5d4147dc253bcb.tar.gz otp-0b45f106f19756bcef0ee51a8f5d4147dc253bcb.tar.bz2 otp-0b45f106f19756bcef0ee51a8f5d4147dc253bcb.zip |
Merge branch 'maint'
* maint:
Update primary bootstrap
HiPE: Remove support for is_constant/1
erl_lint: Remove handling of constant/1
erl_bif_types: Remove type for is_constant/1
erl_eval: Remove support for is_constant/1
Remove support for is_constant/1 in ms_transform
Remove references to is_constant/1 from the match spec documentation
Conflicts:
lib/hipe/cerl/erl_bif_types.erl
Also re-instate the type for erlang:is_boolean/1 which was
accidentally omitted in the master branch.
Diffstat (limited to 'lib/hipe/cerl/erl_bif_types.erl')
-rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index b822f182c2..bb9dc44a0c 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -52,7 +52,6 @@ t_cons/2, t_cons_hd/1, t_cons_tl/1, - t_constant/0, t_fixnum/0, t_non_neg_fixnum/0, t_pos_fixnum/0, @@ -77,7 +76,6 @@ t_is_bitstr/1, t_is_boolean/1, t_is_cons/1, - t_is_constant/1, t_is_float/1, t_is_float/1, t_is_fun/1, @@ -584,11 +582,11 @@ type(erlang, is_bitstring, 1, Xs) -> check_guard(X, fun (Y) -> t_is_bitstr(Y) end, t_bitstr()) end, strict(arg_types(erlang, is_bitstring, 1), Xs, Fun); -type(erlang, is_constant, 1, Xs) -> +type(erlang, is_boolean, 1, Xs) -> Fun = fun (X) -> - check_guard(X, fun (Y) -> t_is_constant(Y) end, t_constant()) + check_guard(X, fun (Y) -> t_is_boolean(Y) end, t_boolean()) end, - strict(arg_types(erlang, is_constant, 1), Xs, Fun); + strict(arg_types(erlang, is_boolean, 1), Xs, Fun); type(erlang, is_float, 1, Xs) -> Fun = fun (X) -> check_guard(X, fun (Y) -> t_is_float(Y) end, t_float()) @@ -2228,8 +2226,6 @@ arg_types(erlang, is_bitstring, 1) -> [t_any()]; arg_types(erlang, is_boolean, 1) -> [t_any()]; -arg_types(erlang, is_constant, 1) -> - [t_any()]; arg_types(erlang, is_float, 1) -> [t_any()]; arg_types(erlang, is_function, 1) -> |