From 2ca6b53da655b4c1377e8ddb818ce70c71e3538e Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Wed, 14 Jun 2017 13:16:47 +0200
Subject: stdlib: Modify handling of Unicode in proc_lib

---
 lib/stdlib/src/proc_lib.erl        | 24 ++++++++++++------------
 lib/stdlib/test/proc_lib_SUITE.erl | 33 +++++++++++++++++++++++++--------
 2 files changed, 37 insertions(+), 20 deletions(-)

(limited to 'lib/stdlib')

diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
index d4d1bdccec..8e10cbe93b 100644
--- a/lib/stdlib/src/proc_lib.erl
+++ b/lib/stdlib/src/proc_lib.erl
@@ -823,22 +823,22 @@ to_string(A, _) ->
     io_lib:write_atom(A).
 
 pp_fun({Enc,Depth}) ->
-    {Letter,Tl} = case Depth of
-		      unlimited -> {"p",[]};
-		      _ -> {"P",[Depth]}
-		  end,
-    P = modifier(Enc) ++ Letter,
+    {P,Tl} = p(Enc, Depth),
     fun(Term, I) -> 
             io_lib:format("~." ++ integer_to_list(I) ++ P, [Term|Tl])
     end.
 
-format_tag(Indent, Tag, Data, {_Enc,Depth}) ->
-    case Depth of
-	unlimited ->
-	    io_lib:format("~s~p: ~80.18p~n", [Indent, Tag, Data]);
-	_ ->
-            io_lib:format("~s~p: ~80.18P~n", [Indent, Tag, Data, Depth])
-    end.
+format_tag(Indent, Tag, Data, {Enc,Depth}) ->
+    {P,Tl} = p(Enc, Depth),
+    io_lib:format("~s~p: ~80.18" ++ P ++ "\n", [Indent, Tag, Data|Tl]).
+
+p(Encoding, Depth) ->
+    {Letter, Tl}  = case Depth of
+                        unlimited -> {"p", []};
+                        _         -> {"P", [Depth]}
+                    end,
+    P = modifier(Encoding) ++ Letter,
+    {P, Tl}.
 
 modifier(latin1) -> "";
 modifier(_) -> "t".
diff --git a/lib/stdlib/test/proc_lib_SUITE.erl b/lib/stdlib/test/proc_lib_SUITE.erl
index c4fafe82a4..7686889360 100644
--- a/lib/stdlib/test/proc_lib_SUITE.erl
+++ b/lib/stdlib/test/proc_lib_SUITE.erl
@@ -552,14 +552,17 @@ t_format(_Config) ->
 
 t_format() ->
     error_logger:add_report_handler(?MODULE, self()),
-    Pid = proc_lib:spawn(fun t_format_looper/0),
+    Pid = proc_lib:spawn(fun '\x{aaa}t_format_looper'/0),
     HugeData = gb_sets:from_list(lists:seq(1, 100)),
-    Pid ! {die,HugeData},
+    SomeData1 = list_to_atom([246]),
+    SomeData2 = list_to_atom([1024]),
+    Pid ! {SomeData1,SomeData2},
+    Pid ! {die,{HugeData,SomeData1,SomeData2}},
     Report = receive
 		 {crash_report, Pid, Report0} -> Report0
 	     end,
-    Usz = do_test_format(Report, unlimited),
-    Tsz = do_test_format(Report, 20),
+    Usz = do_test_format(Report, latin1, unlimited),
+    Tsz = do_test_format(Report, latin1, 20),
 
     if
 	Tsz >= Usz ->
@@ -568,6 +571,16 @@ t_format() ->
 	    ok
     end,
 
+    UszU = do_test_format(Report, unicode, unlimited),
+    TszU = do_test_format(Report, unicode, 20),
+
+    if
+	TszU >= UszU ->
+	    ct:fail(failed);
+	true ->
+	    ok
+    end,
+
     ok.
 
 t_format_arbitrary(_Config) ->
@@ -597,15 +610,19 @@ do_test_format(Report, Encoding, Depth) ->
     io:format("*** Depth = ~p, Encoding = ~p", [Depth, Encoding]),
     S0 = proc_lib:format(Report, Encoding, Depth),
     S = lists:flatten(S0),
-    io:put_chars(S),
+    case Encoding of
+        latin1 -> io:format("~s\n", [S]);
+        _ -> io:format("~ts\n", [S])
+    end,
     length(S).
 
-t_format_looper() ->
+'\x{aaa}t_format_looper'() ->
     receive
 	{die,Data} ->
 	    exit(Data);
-	_ ->
-	    t_format_looper()
+	M ->
+            put(M, M),
+	    '\x{aaa}t_format_looper'()
     end.
 
 %%-----------------------------------------------------------------
-- 
cgit v1.2.3