[sasl] Improve handling of unicode in rb

1 files changed, 18 insertions, 103 deletions

diff --git a/lib/sasl/src/format_lib_supp.erl b/lib/sasl/src/format_lib_supp.erl
index 0b474a0232..f4bad1a3c6 100644
--- a/lib/sasl/src/format_lib_supp.erl
+++ b/lib/sasl/src/format_lib_supp.erl
@@ -25,15 +25,12 @@
 %%% tools. 
 %%% The main parts are:
 %%% 1) print_info.  Prints information tagged by 'header', 'data',
-%%%    'table', 'items' and 'newline'.
+%%%    'items' and 'newline'.
 %%%---------------------------------------------------------------------
 
 %% intermodule exports
 -export([print_info/2, print_info/3]).
 
-%% exports for use within module
--export([maxcol/2]).
-
 %%---------------------------------------------------------------------
 %% Format is an ordered list of:
 %%   {header, HeaderString}
@@ -42,10 +39,6 @@
 %%        (if possible); 'Key:     Value'.
 %%        Elements in the list may also be single terms, which are
 %%        printed as they are.
-%%   {table, {TableName, ColumnNames, Columns}}
-%%        ColumnNames is a tuple of names for the columns, and
-%%        Columns is a list, where each element is a tuple of
-%%        data for that column.
 %%   {items, {Name, Items}}
 %%        Items is a list of KeyValue_tuples. Will be printed as:
 %%        'Name:
@@ -77,9 +70,6 @@ print_format(Device, _Line, []) ->
 print_format(Device, Line, [{data, Data}|T]) ->
     print_data(Device, Line, Data),
     print_format(Device, Line, T);
-print_format(Device, Line, [{table, Table}|T]) ->
-    _ = print_table(Device, Line, Table),
-    print_format(Device, Line, T);
 print_format(Device, Line, [{items, Items}|T]) ->
     print_items(Device, Line, Items),
     print_format(Device, Line, T);
@@ -94,51 +84,49 @@ print_data(Device, Line, [{Key, Value}|T]) ->
     print_one_line(Device, Line, Key, Value),
     print_data(Device, Line, T);
 print_data(Device, Line, [Value|T]) ->
-    io:format(Device, "~p~n", [Value]),
+    Modifier = misc_supp:modifier(Device),
+    io:format(Device, "~"++Modifier++"p~n", [Value]),
     print_data(Device, Line, T).
 
+
 print_items(Device, Line, {Name, Items}) ->
     print_items(Device, Line, Name, Items).
 
-print_table(Device, Line, {TableName, ColumnNames, Columns}) ->
-    print_table(Device, Line, TableName, ColumnNames, Columns).
-
 print_newlines(_Device, 0) -> ok;
 print_newlines(Device, N) when N > 0 ->
     io:format(Device, '~n', []),
     print_newlines(Device, N-1).
 
 print_one_line(Device, Line, Key, Value) ->
-    StrKey = term_to_string(Key),
+    Modifier = misc_supp:modifier(Device),
+    StrKey = term_to_string(Key,Modifier),
     KeyLen = lists:min([length(StrKey), Line]),
     ValueLen = Line - KeyLen,
-    Format1 = lists:concat(["~-", KeyLen, s]),
-    Format2 = lists:concat(["~", ValueLen, "s~n"]),
+    Format1 = lists:concat(["~-", KeyLen, Modifier, "s"]),
+    Format2 = lists:concat(["~", ValueLen, Modifier, "s~n"]),
     io:format(Device, Format1, [StrKey]),
-    Try = term_to_string(Value),
+    Try = term_to_string(Value,Modifier),
     Length = length(Try),
     if
 	Length < ValueLen ->
 	    io:format(Device, Format2, [Try]);
 	true ->
 	    io:format(Device, "~n         ", []),
-	    Format3 = lists:concat(["~", Line, ".9p~n"]),
+	    Format3 = lists:concat(["~", Line, ".9", Modifier, "p~n"]),
 	    io:format(Device, Format3, [Value])
     end.
 
-term_to_string(Value) ->
-    lists:flatten(io_lib:format(get_format(Value), [Value])).
+term_to_string(Value,Modifier) ->
+    lists:flatten(io_lib:format(get_format(Value,Modifier), [Value])).
 
-get_format(Value) ->
-    case misc_supp:is_string(Value) of
-	true -> "~s";
-	false -> "~p"
+get_format([],_) ->
+    "~p";
+get_format(Value,Modifier) ->
+    case io_lib:printable_list(Value) of
+	true -> "~"++Modifier++"s";
+	false -> "~"++Modifier++"p"
     end.
 
-make_list(0, _Elem) -> [];
-make_list(N, Elem) -> [Elem|make_list(N-1, Elem)].
-
-
 %%-----------------------------------------------------------------
 %% Items
 %%-----------------------------------------------------------------
@@ -150,76 +138,3 @@ print_item_elements(_Device, _Line, []) -> ok;
 print_item_elements(Device, Line, [{Key, Value}|T]) ->
     print_one_line(Device, Line, lists:concat(["   ", Key]), Value),
     print_item_elements(Device, Line, T).
-
-%%-----------------------------------------------------------------
-%% Table handling
-%%-----------------------------------------------------------------
-extra_space_between_columns() -> 3.
-
-find_max_col([Row | T], ColumnSizes) ->
-    find_max_col(T, misc_supp:multi_map({format_lib_supp, maxcol},
-					[Row, ColumnSizes]));
-
-find_max_col([], ColumnSizes) -> ColumnSizes.
-
-maxcol(Term, OldMax) ->
-    lists:max([length(term_to_string(Term)), OldMax]).
-
-make_column_format(With) ->
-    lists:concat(["~", With + extra_space_between_columns(), s]).
-
-is_correct_column_length(_Length, []) -> true;
-is_correct_column_length(Length, [Tuple|T]) ->
-    case size(Tuple) of
-	Length -> is_correct_column_length(Length, T);
-	_ -> false
-    end;
-is_correct_column_length(_, _) -> false.
-
-print_table(Device, Line, TableName, _TupleOfColumnNames, []) ->
-    print_one_line(Device, Line, TableName, "<empty table>"),
-    io:format(Device, "~n", []);
-
-print_table(Device, Line, TableName, TupleOfColumnNames, ListOfTuples) 
-                when is_list(ListOfTuples), is_tuple(TupleOfColumnNames) ->
-    case is_correct_column_length(size(TupleOfColumnNames),
-				  ListOfTuples) of
-	true -> 
-	    print_one_line(Device, Line, TableName, " "),
-	    ListOfColumnNames = tuple_to_list(TupleOfColumnNames),
-	    ListOfLists = lists:map(fun(Tuple) ->
-					    tuple_to_list(Tuple)
-				    end,
-				    ListOfTuples),
-	    ColWidths = find_max_col([ListOfColumnNames |
-				      ListOfLists],
-				     make_list(length(ListOfColumnNames),0)),
-	    Format = lists:flatten([lists:map(fun(CW) ->
-						      make_column_format(CW)
-					      end,
-					      ColWidths), "~n"]),
-	    io:format(Device, Format, ListOfColumnNames),
-	    io:format(Device,
-		      lists:concat(['~', extra_space_between_columns(),
-				    'c', '~', lists:sum(ColWidths)
-				    + (length(ColWidths) - 1)
-				    * extra_space_between_columns(),
-				    'c~n']), [$ , $-]),
-	    lists:foreach(fun(List) ->
-				  print_row(List, Device, Format)
-			  end,
-			  ListOfLists),
-	    io:format(Device, '~n', []),
-	    true;
-	false ->
-	    {error, {'a tuple has wrong size',
-		     {TableName, TupleOfColumnNames, ListOfTuples}}}
-    end.
-
-%%--------------------------------------------------
-%% Device MUST be 2nd arg because of extraarg ni foreach...
-%%--------------------------------------------------
-print_row(Row, Device, Format) ->
-    io:format(Device, Format,
-	      lists:map(fun(Term) -> term_to_string(Term) end,
-			Row)).