File 1082-stdlib-Implement-reason-key-for-error_info... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1082-stdlib-Implement-reason-key-for-error_info.patch of Package erlang (Revision 80b0611796fed61ea3605dc255d0c6fb)

Currently displaying revision 80b0611796fed61ea3605dc255d0c6fb , Show latest

From b38977e18f2e2ee5854d947f2416129d1c5aa85b Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 23 Apr 2021 14:58:32 +0200
Subject: [PATCH 02/13] stdlib: Implement `reason` key for error_info

Add so that the `reason` key if returned from format_error/2
is used to print the reason for the error when pretty printing.

Add so that also functions without arguments call format_error/2.

Both of these changes are there in order to integrate better
with the way that Elixir does error handling.
---
 lib/stdlib/src/erl_error.erl | 44 +++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/lib/stdlib/src/erl_error.erl b/lib/stdlib/src/erl_error.erl
index 63f09e6fbf..8dea6cf313 100644
--- a/lib/stdlib/src/erl_error.erl
+++ b/lib/stdlib/src/erl_error.erl
@@ -95,9 +95,15 @@ format_exception(I, Class, Reason, StackTrace, StackFun, FormatFun, Encoding,
                       %% Reserve one third for the stacktrace.
                       CharsLimit div 3
               end,
-    St = format_stacktrace1(S, Trace, FormatFun, StackFun, Encoding, StLimit, Reason),
+
+    ErrorMap = get_extended_error(Reason, Trace),
+
+    St = format_stacktrace1(S, Trace, FormatFun, StackFun,
+                            Encoding, StLimit, Reason, ErrorMap),
     Lim = sub(sub(CharsLimit, exited(Class), latin1), St, Encoding),
-    Expl0 = explain_reason(Term, Class, Trace1, FormatFun, S, Encoding, Lim),
+    DefaultReason = explain_reason(Term, Class, Trace1, FormatFun, S, Encoding, Lim),
+    Expl0 = maps:get(reason, ErrorMap, DefaultReason),
+
     FormatString = case Encoding of
                        latin1 -> "~s~s";
                        _ -> "~s~ts"
@@ -282,39 +288,43 @@ argss(2) ->
 argss(I) ->
     io_lib:fwrite(<<"~w arguments">>, [I]).
 
-format_stacktrace1(S0, Stack0, PF, SF, Enc, CL, Reason) ->
+format_stacktrace1(Sep, Stack, PF, SF, Enc, CL, Reason) ->
+    format_stacktrace1(Sep, Stack, PF, SF, Enc, CL, Reason,
+                       get_extended_error(Reason, Stack)).
+format_stacktrace1(S0, Stack0, PF, SF, Enc, CL, Reason, ErrorMap) ->
     Stack1 = lists:dropwhile(fun({M,F,A,_}) -> SF(M, F, A)
                              end, lists:reverse(Stack0)),
     S = ["  " | S0],
     Stack = lists:reverse(Stack1),
-    format_stacktrace2(S, Stack, 1, PF, Enc, CL, Reason).
+    format_stacktrace2(S, Stack, 1, PF, Enc, CL, Reason, ErrorMap).
 
-format_stacktrace2(_S, _Stack, _N, _PF, _Enc, _CL=0, _Reason) ->
+format_stacktrace2(_S, _Stack, _N, _PF, _Enc, _CL=0, _Reason, _ErrorMap) ->
     [];
-format_stacktrace2(S, [{M,F,A,L}|Fs], N, PF, Enc, CL, Reason) when is_integer(A) ->
-    Cs = io_lib:fwrite(<<"~s~s ~ts ~ts">>,
+format_stacktrace2(S, [{M,F,A,L}|Fs], N, PF, Enc, CL, Reason, ErrorMap)
+  when is_integer(A) ->
+    FormattedError = call_format_error(ErrorMap, A, sep(N, S)),
+    Cs = io_lib:fwrite(<<"~s~s ~ts ~ts~ts">>,
                        [sep(N, S), origin(N, M, F, A),
                         mfa_to_string(M, F, A, Enc),
-                        location(L)]),
+                        location(L), FormattedError]),
     CL1 = sub(CL, Cs, Enc),
-    [Cs | format_stacktrace2(S, Fs, N + 1, PF, Enc, CL1, Reason)];
-format_stacktrace2(S, [{M,F,As,_Info}|Fs]=StackTrace, N, PF, Enc, CL, Reason)
+    [Cs | format_stacktrace2(S, Fs, N + 1, PF, Enc, CL1, Reason, #{})];
+format_stacktrace2(S, [{M,F,As,_Info}|Fs], N, PF, Enc, CL, Reason, ErrorMap)
   when is_list(As) ->
     A = length(As),
     CalledAs = [S,<<"   called as ">>],
     C = format_call("", CalledAs, {M,F}, As, PF, Enc, CL),
-    FormattedError = call_format_error(Reason, StackTrace, sep(N, S)),
+    FormattedError = call_format_error(ErrorMap, As, sep(N, S)),
     Cs = io_lib:fwrite(<<"~s~s ~ts\n~s~ts~ts">>,
                        [sep(N, S), origin(N, M, F, A),
                         mfa_to_string(M, F, A, Enc),
                         CalledAs, C, FormattedError]),
     CL1 = sub(CL, Enc, Cs),
-    [Cs | format_stacktrace2(S, Fs, N + 1, PF, Enc, CL1, Reason)];
-format_stacktrace2(_S, [], _N, _PF, _Enc, _CL, _Reason) ->
+    [Cs | format_stacktrace2(S, Fs, N + 1, PF, Enc, CL1, Reason, #{})];
+format_stacktrace2(_S, [], _N, _PF, _Enc, _CL, _Reason, _ErrorMap) ->
     "".
 
-call_format_error(Reason, [{M,_F,As,Info}|_]=StackTrace, Sep) ->
-    ErrorMap = get_extended_error(Reason, M, Info, StackTrace),
+call_format_error(ErrorMap, As, Sep) ->
     case format_arg_errors(1, As, ErrorMap) of
         [] ->
             [];
@@ -322,7 +332,7 @@ call_format_error(Reason, [{M,_F,As,Info}|_]=StackTrace, Sep) ->
             lists:join([$\n,Sep,<<"   ">>], [""|Errors])
     end.
 
-get_extended_error(Reason, M, Info, StackTrace) ->
+get_extended_error(Reason, [{M,_F,_As,Info}|_] = StackTrace) ->
     case lists:keyfind(error_info, 1, Info) of
         {error_info,ErrorInfoMap} when is_map(ErrorInfoMap) ->
             FormatModule = maps:get(module, ErrorInfoMap, M),
@@ -339,6 +349,8 @@ get_extended_error(Reason, M, Info, StackTrace) ->
             #{}
     end.
 
+format_arg_errors(ArgNum, A, ErrorMap) when is_integer(A) ->
+    format_arg_errors(ArgNum, lists:duplicate(A, A), ErrorMap);
 format_arg_errors(ArgNum, [_|As], ErrorMap) ->
     case ErrorMap of
         #{ArgNum := Err} ->
-- 
2.26.2

Places

File 1082-stdlib-Implement-reason-key-for-error_info.patch of Package erlang (Revision 80b0611796fed61ea3605dc255d0c6fb)

Places