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 /erts/preloaded/src | |
| 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 'erts/preloaded/src')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 8 | ||||
| -rw-r--r-- | erts/preloaded/src/init.erl | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 3d152c4e92..4c456bbed4 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -977,17 +977,15 @@ group_leader(_GroupLeader, _Pid) -> erlang:nif_error(undefined). %% halt/0 -%% Shadowed by erl_bif_types: erlang:halt/0 -spec halt() -> no_return(). halt() -> - erlang:nif_error(undefined). + erlang:halt(0, []). %% halt/1 -%% Shadowed by erl_bif_types: erlang:halt/1 -spec halt(Status) -> no_return() when Status :: non_neg_integer() | 'abort' | string(). -halt(_Status) -> - erlang:nif_error(undefined). +halt(Status) -> + erlang:halt(Status, []). %% halt/2 %% Shadowed by erl_bif_types: erlang:halt/2 diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index 04c5210aa3..e8f02f5056 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -316,6 +316,7 @@ limit_halt_string(String) -> %% List = [string() | atom() | pid() | number()] %% Any other items in List, such as tuples, are ignored when creating %% the string used as argument to erlang:halt/1. +-spec crash(_, _) -> no_return(). crash(String, List) -> halt(halt_string(String, List)). |