From fe227eac8af30e646ade187eaf194bdd9c92b2c2 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Thu, 14 Feb 2013 15:33:00 +0100
Subject: Make printing of UTF-8 in binaries behave like lists.

This means that only UTF-8 characters in binaries that conform
to the printable_range are printed as <<"..."/utf8>> in io_lib_pretty.
---
 lib/stdlib/src/io_lib_pretty.erl | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'lib/stdlib/src/io_lib_pretty.erl')

diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl
index 525b534249..4a61b033b0 100644
--- a/lib/stdlib/src/io_lib_pretty.erl
+++ b/lib/stdlib/src/io_lib_pretty.erl
@@ -485,7 +485,7 @@ printable_bin(Bin, Len, D, latin1) ->
             false
     end;
 printable_bin(Bin, Len, D, _Uni) ->
-    case printable_unicode(Bin, Len, []) of
+    case printable_unicode(Bin, Len, [], io:printable_range()) of
         {_, <<>>, L} ->
             {byte_size(Bin) =:= length(L), L};
         {NC, Bin1, L} when D > 0, Len - NC >= D ->
@@ -522,24 +522,27 @@ printable_latin1_list([$\e | Cs], N) -> printable_latin1_list(Cs, N - 1);
 printable_latin1_list([], _) -> all;
 printable_latin1_list(_, N) -> N.
 
-printable_unicode(<<C/utf8, R/binary>>=Bin, I, L) when I > 0 ->
-    case printable_char(C) of
+printable_unicode(<<C/utf8, R/binary>>=Bin, I, L, Range) when I > 0 ->
+    case printable_char(C,Range) of
         true ->
-            printable_unicode(R, I - 1, [C | L]);
+            printable_unicode(R, I - 1, [C | L],Range);
         false ->
             {I, Bin, lists:reverse(L)}
     end;
-printable_unicode(Bin, I, L) ->
+printable_unicode(Bin, I, L,_) ->
     {I, Bin, lists:reverse(L)}.
 
-printable_char($\n) -> true;
-printable_char($\r) -> true;
-printable_char($\t) -> true;
-printable_char($\v) -> true;
-printable_char($\b) -> true;
-printable_char($\f) -> true;
-printable_char($\e) -> true;
-printable_char(C) ->
+printable_char($\n,_) -> true;
+printable_char($\r,_) -> true;
+printable_char($\t,_) -> true;
+printable_char($\v,_) -> true;
+printable_char($\b,_) -> true;
+printable_char($\f,_) -> true;
+printable_char($\e,_) -> true;
+printable_char(C,latin1) ->
+    C >= $\s andalso C =< $~ orelse
+    C >= 16#A0 andalso C =< 16#FF;
+printable_char(C,unicode) ->
     C >= $\s andalso C =< $~ orelse
     C >= 16#A0 andalso C < 16#D800 orelse
     C > 16#DFFF andalso C < 16#FFFE orelse
-- 
cgit v1.2.3