diff options
| author | Hans Bolinder <[email protected]> | 2012-05-15 10:50:26 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2012-05-15 10:50:26 +0200 |
| commit | 77c47cd3f6a464a3074790acab0535bce3dbe6b2 (patch) | |
| tree | 7e2f916430c835f9c018e927c3de77cba5a8df68 /lib/stdlib/src | |
| parent | f53ec2c7e604fb03ae0e4f86695efad78ab9b339 (diff) | |
| parent | a1a8c859540dae42ac287a495301f7e6317ff3c3 (diff) | |
| download | otp-77c47cd3f6a464a3074790acab0535bce3dbe6b2.tar.gz otp-77c47cd3f6a464a3074790acab0535bce3dbe6b2.tar.bz2 otp-77c47cd3f6a464a3074790acab0535bce3dbe6b2.zip | |
Merge branch 'maint'
* maint:
Improve the nice 'badarith' message displayed by the shell
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/lib.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/lib.erl b/lib/stdlib/src/lib.erl index 314fd60903..cf4b87d7eb 100644 --- a/lib/stdlib/src/lib.erl +++ b/lib/stdlib/src/lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -209,7 +209,7 @@ explain_reason(badarg, error, [], _PF, _S) -> explain_reason({badarg,V}, error=Cl, [], PF, S) -> % orelse, andalso format_value(V, <<"bad argument: ">>, Cl, PF, S); explain_reason(badarith, error, [], _PF, _S) -> - <<"bad argument in an arithmetic expression">>; + <<"an error occurred when evaluating an arithmetic expression">>; explain_reason({badarity,{Fun,As}}, error, [], _PF, _S) when is_function(Fun) -> %% Only the arity is displayed, not the arguments As. |