diff options
| author | Sverker Eriksson <[email protected]> | 2016-05-20 15:58:04 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-05-25 14:29:29 +0200 |
| commit | f9cb80861f169743a96099a06d68149a91f18dfa (patch) | |
| tree | 6ace6c3a87c45e97614183e144700f236b17cc72 /lib | |
| parent | ab7bcce2778d04daec2276e568deba954c6f9b57 (diff) | |
| download | otp-f9cb80861f169743a96099a06d68149a91f18dfa.tar.gz otp-f9cb80861f169743a96099a06d68149a91f18dfa.tar.bz2 otp-f9cb80861f169743a96099a06d68149a91f18dfa.zip | |
erts: Implement halt/0 and halt/1 in Erlang
just to make things simpler.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 6 | ||||
| -rw-r--r-- | lib/stdlib/src/erl_compile.erl | 1 | ||||
| -rw-r--r-- | lib/stdlib/src/escript.erl | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index 9453ca6c6f..f649c6e599 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -154,8 +154,6 @@ type(M, F, A, Xs) -> erl_types:erl_type(). %%-- erlang ------------------------------------------------------------------- -type(erlang, halt, 0, _, _) -> t_none(); -type(erlang, halt, 1, _, _) -> t_none(); type(erlang, halt, 2, _, _) -> t_none(); type(erlang, exit, 1, _, _) -> t_none(); type(erlang, error, 1, _, _) -> t_none(); @@ -2341,10 +2339,6 @@ arg_types(erlang, bit_size, 1) -> %% Guard bif, needs to be here. arg_types(erlang, byte_size, 1) -> [t_bitstr()]; -arg_types(erlang, halt, 0) -> - []; -arg_types(erlang, halt, 1) -> - [t_sup([t_non_neg_fixnum(), t_atom('abort'), t_string()])]; arg_types(erlang, halt, 2) -> [t_sup([t_non_neg_fixnum(), t_atom('abort'), t_string()]), t_list(t_tuple([t_atom('flush'), t_boolean()]))]; diff --git a/lib/stdlib/src/erl_compile.erl b/lib/stdlib/src/erl_compile.erl index ef54076ee3..a6ae398d03 100644 --- a/lib/stdlib/src/erl_compile.erl +++ b/lib/stdlib/src/erl_compile.erl @@ -60,6 +60,7 @@ compile_cmdline() -> _ -> my_halt(2) end. +-spec my_halt(_) -> no_return(). my_halt(Reason) -> erlang:halt(Reason). diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl index b8ce311c35..f53b0e2246 100644 --- a/lib/stdlib/src/escript.erl +++ b/lib/stdlib/src/escript.erl @@ -906,6 +906,7 @@ anno(L) -> fatal(Str) -> throw(Str). +-spec my_halt(_) -> no_return(). my_halt(Reason) -> erlang:halt(Reason). |