From 339e4dc3005d15e7fcea61a401b1bda7f5783fdd Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Tue, 22 Aug 2017 14:44:31 +0200
Subject: stdlib: add Unicode translation modifier in debug format funs

This is now ok since sys opens the debug file with encoding utf8.

Conflicts:
	lib/stdlib/src/gen_server.erl
---
 lib/stdlib/src/gen_server.erl | 16 ++++++++--------
 lib/stdlib/src/gen_statem.erl | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'lib/stdlib/src')

diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index c789613702..7daa7a9fe4 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -785,21 +785,21 @@ system_replace_state(StateFun, [Name, State, Mod, Time, HibernateAfterTimeout])
 print_event(Dev, {in, Msg}, Name) ->
     case Msg of
 	{'$gen_call', {From, _Tag}, Call} ->
-	    io:format(Dev, "*DBG* ~p got call ~p from ~w~n",
+	    io:format(Dev, "*DBG* ~tp got call ~tp from ~w~n",
 		      [Name, Call, From]);
 	{'$gen_cast', Cast} ->
-	    io:format(Dev, "*DBG* ~p got cast ~p~n",
+	    io:format(Dev, "*DBG* ~tp got cast ~tp~n",
 		      [Name, Cast]);
 	_ ->
-	    io:format(Dev, "*DBG* ~p got ~p~n", [Name, Msg])
+	    io:format(Dev, "*DBG* ~tp got ~tp~n", [Name, Msg])
     end;
 print_event(Dev, {out, Msg, To, State}, Name) ->
-    io:format(Dev, "*DBG* ~p sent ~p to ~w, new state ~w~n", 
+    io:format(Dev, "*DBG* ~tp sent ~tp to ~w, new state ~tp~n",
 	      [Name, Msg, To, State]);
 print_event(Dev, {noreply, State}, Name) ->
-    io:format(Dev, "*DBG* ~p new state ~w~n", [Name, State]);
+    io:format(Dev, "*DBG* ~tp new state ~tp~n", [Name, State]);
 print_event(Dev, Event, Name) ->
-    io:format(Dev, "*DBG* ~p dbg  ~p~n", [Name, Event]).
+    io:format(Dev, "*DBG* ~tp dbg  ~tp~n", [Name, Event]).
 
 
 %%% ---------------------------------------------------
@@ -881,7 +881,7 @@ error_info(Reason, Name, From, Msg, State, Debug) ->
 	end,    
     {ClientFmt, ClientArgs} = client_stacktrace(From),
     LimitedState = error_logger:limit_term(State),
-    error_logger:format("** Generic server ~p terminating \n"
+    error_logger:format("** Generic server ~tp terminating \n"
                         "** Last message in was ~tp~n"
                         "** When Server state == ~tp~n"
                         "** Reason for termination == ~n** ~tp~n" ++ ClientFmt,
@@ -901,7 +901,7 @@ client_stacktrace(From) when is_pid(From), node(From) =:= node() ->
              "** ~tp~n",
              [From, Stacktrace]};
         [{current_stacktrace, Stacktrace}, {registered_name, Name}]  ->
-            {"** Client ~p stacktrace~n"
+            {"** Client ~tp stacktrace~n"
              "** ~tp~n",
              [Name, Stacktrace]}
     end;
diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index 8d5eedb67a..1110d18af6 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -791,34 +791,34 @@ format_status(
 
 print_event(Dev, {in,Event}, {Name,State}) ->
     io:format(
-      Dev, "*DBG* ~p receive ~s in state ~p~n",
+      Dev, "*DBG* ~tp receive ~ts in state ~tp~n",
       [Name,event_string(Event),State]);
 print_event(Dev, {out,Reply,{To,_Tag}}, {Name,State}) ->
     io:format(
-      Dev, "*DBG* ~p send ~p to ~p from state ~p~n",
+      Dev, "*DBG* ~tp send ~tp to ~p from state ~tp~n",
       [Name,Reply,To,State]);
 print_event(Dev, {terminate,Reason}, {Name,State}) ->
     io:format(
-      Dev, "*DBG* ~p terminate ~p in state ~p~n",
+      Dev, "*DBG* ~tp terminate ~tp in state ~tp~n",
       [Name,Reason,State]);
 print_event(Dev, {Tag,Event,NextState}, {Name,State}) ->
     StateString =
 	case NextState of
 	    State ->
-		io_lib:format("~p", [State]);
+		io_lib:format("~tp", [State]);
 	    _ ->
-		io_lib:format("~p => ~p", [State,NextState])
+		io_lib:format("~tp => ~tp", [State,NextState])
 	end,
     io:format(
-      Dev, "*DBG* ~p ~w ~s in state ~s~n",
+      Dev, "*DBG* ~tp ~tw ~ts in state ~ts~n",
       [Name,Tag,event_string(Event),StateString]).
 
 event_string(Event) ->
     case Event of
 	{{call,{Pid,_Tag}},Request} ->
-	    io_lib:format("call ~p from ~w", [Request,Pid]);
+	    io_lib:format("call ~tp from ~w", [Request,Pid]);
 	{EventType,EventContent} ->
-	    io_lib:format("~w ~p", [EventType,EventContent])
+	    io_lib:format("~tw ~tp", [EventType,EventContent])
     end.
 
 sys_debug(Debug, #{name := Name}, State, Entry) ->
-- 
cgit v1.2.3