File 1091-erts-Expand-error-2-3-to-take-none-as-argu... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1091-erts-Expand-error-2-3-to-take-none-as-argument.patch of Package erlang (Revision e1f10e83284c40c0723d62272451c182)

Currently displaying revision e1f10e83284c40c0723d62272451c182 , Show latest

From 322673fdca72b39011f587bd7d9530cdd26685c5 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 26 Apr 2021 09:54:33 +0200
Subject: [PATCH 11/13] erts: Expand error/2,3 to take none as argument

This has always been possible, we just document that it
should work this way if you want to raise an error using
the arity of the calling function.
---
 erts/doc/src/erlang.xml                | 18 ++++++++++--------
 erts/emulator/test/exception_SUITE.erl |  8 +++++++-
 erts/preloaded/src/erlang.erl          |  4 ++--
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 6b3a2ea96e..38d382f7bf 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -1790,10 +1790,11 @@ b</pre>
 <desc>
 Raises an exception of class <c>error</c> with the reason
 <c><anno>Reason</anno></c>. <c><anno>Args</anno></c> is expected to be the
- list of arguments for the current function; it is used
- to provide the arguments for the current function in
- the term <c>Where</c>. As evaluating this function causes
- an exception to be raised, it has no return value.
+ list of arguments for the current function or the atom <c>none</c>.
+ If it is a list, it is used to provide the arguments for the current
+ function in the stack back-trace. If it is <c>none</c>, the arity of
+ the calling function is used in the stacktrace. As evaluating this
+ function causes an exception to be raised, it has no return value.
 The intent of the exception class <c>error</c> is to
 signal that an unexpected error has happened (for example, a
 function is called with a parameter that has an incorrect
@@ -1826,10 +1827,11 @@ example_fun(A1, A2) ->
 <desc>
 Raises an exception of class <c>error</c> with the reason
 <c><anno>Reason</anno></c>. <c><anno>Args</anno></c> is expected to be the
- list of arguments for the current function; it is used to
- provide the arguments for the current function in the stack
- back-trace. As evaluating this function causes an exception to be
-	 raised, it has no return value.
+ list of arguments for the current function or the atom <c>none</c>.
+ If it is a list, it is used to provide the arguments for the current
+ function in the stack back-trace. If it is <c>none</c>, the arity of
+ the calling function is used in the stacktrace. As evaluating this
+ function causes an exception to be raised, it has no return value.
 If the <c>error_info</c> option is given, the <c><anno>ErrorInfoMap</anno></c>
 will be inserted into the stacktrace. The information given in the
 <c><anno>ErrorInfoMap</anno></c> is to be used by error formatters such as
diff --git a/erts/emulator/test/exception_SUITE.erl b/erts/emulator/test/exception_SUITE.erl
index 8345eb4a1b..4c3e2f779f 100644
--- a/erts/emulator/test/exception_SUITE.erl
+++ b/erts/emulator/test/exception_SUITE.erl
@@ -323,6 +323,10 @@ stacktrace(Conf) when is_list(Conf) ->
 stacktrace_1({value,V}, error, {value,V}),
 {caught2,{throw,V},[{?MODULE,foo,1,_}|_]} =
 stacktrace_1({value,V}, error, {throw,V}),
+ {caught2,{error,V},[{?MODULE,foo,[a],_}|_]} =
+ stacktrace_1({value,V}, error, {error,{V,[a]}}),
+ {caught2,{error,V},[{?MODULE,foo,1,_}|_]} =
+ stacktrace_1({value,V}, error, {error,{V,none}}),
 
 try
 stacktrace_2()
@@ -442,7 +446,9 @@ foo({'add',{A,B}}) ->
 my_add(A, B);
 foo({'abs',X}) ->
 my_abs(X);
-foo({error,Error}) -> 
+foo({error,{Error, Args}}) ->
+ erlang:error(Error, Args);
+foo({error,Error}) ->
 erlang:error(Error);
 foo({throw,Throw}) ->
 erlang:throw(Throw);
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index d5596e6db5..7f23c21d45 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -860,7 +860,7 @@ error(_Reason) ->
 %% Shadowed by erl_bif_types: erlang:error/2
 -spec error(Reason, Args) -> no_return() when
 Reason :: term(),
- Args :: [term()].
+ Args :: [term()] | none.
 error(_Reason, _Args) ->
 erlang:nif_error(undefined).
 
@@ -868,7 +868,7 @@ error(_Reason, _Args) ->
 %% Shadowed by erl_bif_types: erlang:error/3
 -spec error(Reason, Args, Options) -> no_return() when
 Reason :: term(),
- Args :: [term()],
+ Args :: [term()] | none,
 Options :: [Option],
 Option :: {'error_info', ErrorInfoMap},
 ErrorInfoMap :: #{'cause' => term(),
-- 
2.26.2

Places

File 1091-erts-Expand-error-2-3-to-take-none-as-argument.patch of Package erlang (Revision e1f10e83284c40c0723d62272451c182)

Places