diff options
| author | Hans Bolinder <[email protected]> | 2019-06-11 08:58:35 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2019-06-11 09:46:14 +0200 |
| commit | acc3b04fb0128fca1770a3823b6651f632d73939 (patch) | |
| tree | 4e1518facb2fd9d038cb35f8a9b79c271a06f807 | |
| parent | 7fe7fa3dde556b5b92522f8279d465bb52baf1f6 (diff) | |
| download | otp-acc3b04fb0128fca1770a3823b6651f632d73939.tar.gz otp-acc3b04fb0128fca1770a3823b6651f632d73939.tar.bz2 otp-acc3b04fb0128fca1770a3823b6651f632d73939.zip | |
stdlib: Fix a bug concerning io_lib option 'chars_limit'
See also https://bugs.erlang.org/browse/ERL-967.
| -rw-r--r-- | lib/stdlib/src/io_lib_pretty.erl | 4 | ||||
| -rw-r--r-- | lib/stdlib/test/io_SUITE.erl | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl index 8f2fd7ea8f..19e4140893 100644 --- a/lib/stdlib/src/io_lib_pretty.erl +++ b/lib/stdlib/src/io_lib_pretty.erl @@ -462,7 +462,9 @@ find_upper(Lower, Term, T, Dl, Dd, D, RF, Enc, Str) -> case If of {_, _, _Dots=0, _} -> % even if Len > T If; - {_, Len, _, _} when Len =< T, D1 < D orelse D < 0 -> + {_, _Len=T, _, _} -> % increasing the depth is meaningless + If; + {_, Len, _, _} when Len < T, D1 < D orelse D < 0 -> find_upper(If, Term, T, D1, Dd2, D, RF, Enc, Str); _ -> search_depth(Lower, If, Term, T, Dl, D1, RF, Enc, Str) diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl index 824f5d19f2..29c09da2e0 100644 --- a/lib/stdlib/test/io_SUITE.erl +++ b/lib/stdlib/test/io_SUITE.erl @@ -32,7 +32,7 @@ io_with_huge_message_queue/1, format_string/1, maps/1, coverage/1, otp_14178_unicode_atoms/1, otp_14175/1, otp_14285/1, limit_term/1, otp_14983/1, otp_15103/1, otp_15076/1, - otp_15159/1, otp_15639/1]). + otp_15159/1, otp_15639/1, otp_15875/1]). -export([pretty/2, trf/3]). @@ -65,7 +65,7 @@ all() -> io_lib_width_too_small, io_with_huge_message_queue, format_string, maps, coverage, otp_14178_unicode_atoms, otp_14175, otp_14285, limit_term, otp_14983, otp_15103, otp_15076, otp_15159, - otp_15639]. + otp_15639, otp_15875]. %% Error cases for output. error_1(Config) when is_list(Config) -> @@ -2680,3 +2680,7 @@ otp_15639(_Config) -> "\"12345678\"..." = pretty("123456789"++[x], UOpts), "[[...]|...]" = pretty(["1","2","3","4","5","6","7","8"], UOpts), ok. + +otp_15875(_Config) -> + S = io_lib:format("~tp", [[{0, [<<"00">>]}]], [{chars_limit, 18}]), + "[{0,[<<48,...>>]}]" = lists:flatten(S). |