emulator: Add a fourth element in exception stacktraces

This commit is a preparation for introducing location information
(filename/line number) in stacktraces in exceptions. Currently
a stack trace looks like:

  [{Mod1,Function1,Arity1},
   .
   .
   .
   {ModN,FunctionN,ArityN}]

Add a forth element to each tuple that can be used indication
the filename and line number of the source file:

  [{Mod1,Function1,Arity1,Location1},
   .
   .
   .
   {ModN,FunctionN,ArityN,LocationN}]

In this commit, the fourth element will just be an empty list,
and we will change all code that look at or manipulate stacktraces.

10 files changed, 61 insertions, 46 deletions

diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index febfdd6285..a920921a5e 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -797,7 +797,7 @@ appcall(App, M, F, Args) ->
     catch
 	error:undef ->
 	    case erlang:get_stacktrace() of
-		[{M,F,Args}|_] ->
+		[{M,F,Args,_}|_] ->
 		    Arity = length(Args),
 		    io:format("Call to ~w:~w/~w in application ~w failed.\n",
 			      [M,F,Arity,App]);
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index d67617260e..2325bb63e5 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -866,7 +866,7 @@ hidden_apply(App, M, F, Args) ->
     catch
 	error:undef ->
 	    case erlang:get_stacktrace() of
-		[{M,F,Args} | _] ->
+		[{M,F,Args,_} | _] ->
 		    Arity = length(Args),
 		    Text = io_lib:format("Call to ~w:~w/~w in application ~w failed.\n",
 					 [M, F, Arity, App]),
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl
index 1c4a73680b..d1dd074fba 100644
--- a/lib/stdlib/src/gen_event.erl
+++ b/lib/stdlib/src/gen_event.erl
@@ -667,16 +667,16 @@ report_error(_Handler, {swapped,_,_}, _, _, _)      -> ok;
 report_error(Handler, Reason, State, LastIn, SName) ->
     Reason1 = 
 	case Reason of
-	    {'EXIT',{undef,[{M,F,A}|MFAs]}} ->
+	    {'EXIT',{undef,[{M,F,A,L}|MFAs]}} ->
 		case code:is_loaded(M) of
 		    false ->
-			{'module could not be loaded',[{M,F,A}|MFAs]};
+			{'module could not be loaded',[{M,F,A,L}|MFAs]};
 		    _ ->
 			case erlang:function_exported(M, F, length(A)) of
 			    true ->
-				{undef,[{M,F,A}|MFAs]};
+				{undef,[{M,F,A,L}|MFAs]};
 			    false ->
-				{'function not exported',[{M,F,A}|MFAs]}
+				{'function not exported',[{M,F,A,L}|MFAs]}
 			end
 		end;
 	    {'EXIT',Why} ->
diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl
index f2f1365d3d..ea21136bdb 100644
--- a/lib/stdlib/src/gen_fsm.erl
+++ b/lib/stdlib/src/gen_fsm.erl
@@ -561,16 +561,16 @@ terminate(Reason, Name, Msg, Mod, StateName, StateData, Debug) ->
 error_info(Reason, Name, Msg, StateName, StateData, Debug) ->
     Reason1 = 
 	case Reason of
-	    {undef,[{M,F,A}|MFAs]} ->
+	    {undef,[{M,F,A,L}|MFAs]} ->
 		case code:is_loaded(M) of
 		    false ->
-			{'module could not be loaded',[{M,F,A}|MFAs]};
+			{'module could not be loaded',[{M,F,A,L}|MFAs]};
 		    _ ->
 			case erlang:function_exported(M, F, length(A)) of
 			    true ->
 				Reason;
 			    false ->
-				{'function not exported',[{M,F,A}|MFAs]}
+				{'function not exported',[{M,F,A,L}|MFAs]}
 			end
 		end;
 	    _ ->
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 09d94a9c40..b8ea3a4de2 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -729,16 +729,16 @@ error_info(_Reason, application_controller, _Msg, _State, _Debug) ->
 error_info(Reason, Name, Msg, State, Debug) ->
     Reason1 = 
 	case Reason of
-	    {undef,[{M,F,A}|MFAs]} ->
+	    {undef,[{M,F,A,L}|MFAs]} ->
 		case code:is_loaded(M) of
 		    false ->
-			{'module could not be loaded',[{M,F,A}|MFAs]};
+			{'module could not be loaded',[{M,F,A,L}|MFAs]};
 		    _ ->
 			case erlang:function_exported(M, F, length(A)) of
 			    true ->
 				Reason;
 			    false ->
-				{'function not exported',[{M,F,A}|MFAs]}
+				{'function not exported',[{M,F,A,L}|MFAs]}
 			end
 		end;
 	    _ ->
diff --git a/lib/stdlib/src/lib.erl b/lib/stdlib/src/lib.erl
index c303ae60b5..314fd60903 100644
--- a/lib/stdlib/src/lib.erl
+++ b/lib/stdlib/src/lib.erl
@@ -173,12 +173,12 @@ format_fun(Fun) when is_function(Fun) ->
 
 analyze_exception(error, Term, Stack) ->
     case {is_stacktrace(Stack), Stack, Term} of
-        {true, [{_M,_F,As}=MFA|MFAs], function_clause} when is_list(As) -> 
-            {Term,[MFA],MFAs};
-        {true, [{shell,F,A}], function_clause} when is_integer(A) ->
+        {true, [{_,_,As,_}=MFAL|MFAs], function_clause} when is_list(As) ->
+            {Term,[MFAL],MFAs};
+        {true, [{shell,F,A,_}], function_clause} when is_integer(A) ->
             {Term, [{F,A}], []};
-        {true, [{_M,_F,_AorAs}=MFA|MFAs], undef} ->
-            {Term,[MFA],MFAs};
+        {true, [{_,_,_,_}=MFAL|MFAs], undef} ->
+            {Term,[MFAL],MFAs};
 	{true, _, _} ->
 	    {Term,[],Stack};
 	{false, _, _} ->
@@ -194,9 +194,11 @@ analyze_exception(_Class, Term, Stack) ->
 
 is_stacktrace([]) ->
     true;
-is_stacktrace([{M,F,A}|Fs]) when is_atom(M), is_atom(F), is_integer(A) ->
+is_stacktrace([{M,F,A,I}|Fs])
+  when is_atom(M), is_atom(F), is_integer(A), is_list(I) ->
     is_stacktrace(Fs);
-is_stacktrace([{M,F,As}|Fs]) when is_atom(M), is_atom(F), length(As) >= 0 ->
+is_stacktrace([{M,F,As,I}|Fs])
+  when is_atom(M), is_atom(F), length(As) >= 0, is_list(I) ->
     is_stacktrace(Fs);
 is_stacktrace(_) ->
     false.
@@ -225,9 +227,9 @@ explain_reason(function_clause, error, [{F,A}], _PF, _S) ->
     %% Shell commands
     FAs = io_lib:fwrite(<<"~w/~w">>, [F, A]),
     [<<"no function clause matching call to ">> | FAs];
-explain_reason(function_clause, error=Cl, [{M,F,As}], PF, S) ->
+explain_reason(function_clause, error=Cl, [{M,F,As,Loc}], PF, S) ->
     Str = <<"no function clause matching ">>,
-    format_errstr_call(Str, Cl, {M,F}, As, PF, S);
+    [format_errstr_call(Str, Cl, {M,F}, As, PF, S),$\s|location(Loc)];
 explain_reason(if_clause, error, [], _PF, _S) ->
     <<"no true branch found when evaluating an if expression">>;
 explain_reason(noproc, error, [], _PF, _S) ->
@@ -242,11 +244,11 @@ explain_reason({try_clause,V}, error=Cl, [], PF, S) ->
     %% "there is no try clause with a true guard sequence and a
     %% pattern matching..."
     format_value(V, <<"no try clause matching ">>, Cl, PF, S);
-explain_reason(undef, error, [{M,F,A}], _PF, _S) ->
+explain_reason(undef, error, [{M,F,A,_}], _PF, _S) ->
     %% Only the arity is displayed, not the arguments, if there are any.
     io_lib:fwrite(<<"undefined function ~s">>, 
                   [mfa_to_string(M, F, n_args(A))]);
-explain_reason({shell_undef,F,A}, error, [], _PF, _S) ->
+explain_reason({shell_undef,F,A,_}, error, [], _PF, _S) ->
     %% Give nicer reports for undefined shell functions
     %% (but not when the user actively calls shell_default:F(...)).
     io_lib:fwrite(<<"undefined shell command ~s/~w">>, [F, n_args(A)]);
@@ -292,17 +294,19 @@ argss(I) ->
     io_lib:fwrite(<<"~w arguments">>, [I]).
 
 format_stacktrace1(S0, Stack0, PF, SF) ->
-    Stack1 = lists:dropwhile(fun({M,F,A}) -> SF(M, F, A)
+    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).
 
-format_stacktrace2(S, [{M,F,A}|Fs], N, PF) when is_integer(A) ->
-    [io_lib:fwrite(<<"~s~s ~s">>, 
-                   [sep(N, S), origin(N, M, F, A), mfa_to_string(M, F, A)])
+format_stacktrace2(S, [{M,F,A,L}|Fs], N, PF) when is_integer(A) ->
+    [io_lib:fwrite(<<"~s~s ~s ~s">>,
+                   [sep(N, S), origin(N, M, F, A),
+		    mfa_to_string(M, F, A),
+		    location(L)])
      | format_stacktrace2(S, Fs, N + 1, PF)];
-format_stacktrace2(S, [{M,F,As}|Fs], N, PF) when is_list(As) ->
+format_stacktrace2(S, [{M,F,As,_}|Fs], N, PF) when is_list(As) ->
     A = length(As),
     CalledAs = [S,<<"   called as ">>],
     C = format_call("", CalledAs, {M,F}, As, PF),
@@ -313,6 +317,16 @@ format_stacktrace2(S, [{M,F,As}|Fs], N, PF) when is_list(As) ->
 format_stacktrace2(_S, [], _N, _PF) ->
     "".
 
+location(L) ->
+    File = proplists:get_value(file, L),
+    Line = proplists:get_value(line, L),
+    if
+	File =/= undefined, Line =/= undefined ->
+	    io_lib:format("(~s, line ~w)", [File, Line]);
+	true ->
+	    ""
+    end.
+
 sep(1, S) -> S;
 sep(_, S) -> [$\n | S].
 
diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index 5ca04ff023..f5e180b4bd 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -123,7 +123,7 @@
 
 -record(setup, {parent}).
 
--define(THROWN_ERROR, {?MODULE, throw_error, _}).
+-define(THROWN_ERROR, {?MODULE, throw_error, _, _}).
 
 -export_type([query_handle/0]).
 
@@ -3701,7 +3701,8 @@ lookup_join(F1, C1, LuF, C2, Rev) ->
 maybe_error_logger(allowed, _) ->
     ok;
 maybe_error_logger(Name, Why) ->
-    [_, _, {?MODULE,maybe_error_logger,_} | Stacktrace] = expand_stacktrace(),
+    [_, _, {?MODULE,maybe_error_logger,_,_} | Stacktrace] =
+	expand_stacktrace(),
     Trimmer = fun(M, _F, _A) -> M =:= erl_eval end,
     Formater = fun(Term, I) -> io_lib:print(Term, I, 80, -1) end,
     X = lib:format_stacktrace(1, Stacktrace, Trimmer, Formater),
@@ -3720,7 +3721,7 @@ expand_stacktrace() ->
 expand_stacktrace(D) ->
     _ = erlang:system_flag(backtrace_depth, D),
     {'EXIT', {foo, Stacktrace}} = (catch erlang:error(foo)),
-    L = lists:takewhile(fun({M,_,_}) -> M =/= ?MODULE 
+    L = lists:takewhile(fun({M,_,_,_}) -> M =/= ?MODULE
                         end, lists:reverse(Stacktrace)),
     if
         length(L) < 3 andalso length(Stacktrace) =:= D ->
diff --git a/lib/stdlib/src/re.erl b/lib/stdlib/src/re.erl
index e08258a535..99bcbd722e 100644
--- a/lib/stdlib/src/re.erl
+++ b/lib/stdlib/src/re.erl
@@ -573,10 +573,10 @@ ucompile(RE,Options) ->
 	re:compile(unicode:characters_to_binary(RE,unicode),Options)
     catch
 	error:AnyError ->
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,Loc}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [RE,Options])),
-	    erlang:raise(error,AnyError,[{Mod,compile,L}|Rest])
+	    erlang:raise(error,AnyError,[{Mod,compile,L,Loc}|Rest])
     end.
 	
 
@@ -585,10 +585,10 @@ urun(Subject,RE,Options) ->
 	urun2(Subject,RE,Options)
     catch
 	error:AnyError ->
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,Loc}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [Subject,RE,Options])),
-	    erlang:raise(error,AnyError,[{Mod,run,L}|Rest])
+	    erlang:raise(error,AnyError,[{Mod,run,L,Loc}|Rest])
     end.
 
 urun2(Subject0,RE0,Options0) ->
@@ -625,20 +625,20 @@ grun(Subject,RE,{Options,NeedClean}) ->
 	grun2(Subject,RE,{Options,NeedClean})
     catch
 	error:AnyError ->
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,Loc}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [Subject,RE,Options])),
-	    erlang:raise(error,AnyError,[{Mod,run,L}|Rest])
+	    erlang:raise(error,AnyError,[{Mod,run,L,Loc}|Rest])
     end;
 grun(Subject,RE,{Options,NeedClean,OrigRE}) ->
     try
 	grun2(Subject,RE,{Options,NeedClean})
     catch
 	error:AnyError ->
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,Loc}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [Subject,OrigRE,Options])),
-	    erlang:raise(error,AnyError,[{Mod,run,L}|Rest])
+	    erlang:raise(error,AnyError,[{Mod,run,L,Loc}|Rest])
     end.
 
 grun2(Subject,RE,{Options,NeedClean}) ->
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index e3e23e09bc..964697cae6 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -1088,7 +1088,7 @@ shell_default(F,As,Bs) ->
     end.
 
 shell_undef(F,A) ->
-    erlang:error({shell_undef,F,A}).
+    erlang:error({shell_undef,F,A,[]}).
 
 local_func_handler(Shell, RT, Ef) ->
     H = fun(Lf) -> 
diff --git a/lib/stdlib/src/unicode.erl b/lib/stdlib/src/unicode.erl
index a5d9965ca2..e9b90befe6 100644
--- a/lib/stdlib/src/unicode.erl
+++ b/lib/stdlib/src/unicode.erl
@@ -73,7 +73,7 @@ characters_to_list_int(ML, Encoding) ->
 			   _ ->
 			       badarg
 		       end,
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [ML,Encoding])),
 	    erlang:raise(error,TheError,[{Mod,characters_to_list,L}|Rest])
@@ -109,7 +109,7 @@ characters_to_binary(ML) ->
 			   _ ->
 			       badarg
 		       end,
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [ML])),
 	    erlang:raise(error,TheError,[{Mod,characters_to_binary,L}|Rest])
@@ -127,7 +127,7 @@ characters_to_binary_int(ML,InEncoding) ->
 			   _ ->
 			       badarg
 		       end,
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [ML,InEncoding])),
 	    erlang:raise(error,TheError,[{Mod,characters_to_binary,L}|Rest])
@@ -159,7 +159,7 @@ characters_to_binary(ML, latin1, Uni) when is_binary(ML) and ((Uni =:= utf8) or
 				       _ ->
 					   badarg
 				   end,
-			{'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+			{'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 			    (catch erlang:error(new_stacktrace,
 						[ML,latin1,Uni])),
 			erlang:raise(error,TheError,
@@ -181,7 +181,7 @@ characters_to_binary(ML,Uni,latin1) when is_binary(ML) and ((Uni =:= utf8) or
 				       _ ->
 					   badarg
 				   end,
-			{'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+			{'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 			    (catch erlang:error(new_stacktrace,
 						[ML,Uni,latin1])),
 			erlang:raise(error,TheError,
@@ -200,7 +200,7 @@ characters_to_binary(ML, InEncoding, OutEncoding) ->
 			   _ ->
 			       badarg
 		       end,
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [ML,InEncoding,OutEncoding])),
 	    erlang:raise(error,TheError,[{Mod,characters_to_binary,L}|Rest])