aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2018-03-09 10:50:12 +0100
committerGitHub <[email protected]>2018-03-09 10:50:12 +0100
commitffcef65abb8e83861ace13c6d4d79edb918cab73 (patch)
treed343818c071c6f3a803763c6218d5f48ad4ef01e /lib/stdlib
parente6b2f8a503e427015672d82d97244eca870a6a4e (diff)
parent6ff26316ffb80fbd2d7daa79986671f0e8c2db70 (diff)
downloadotp-ffcef65abb8e83861ace13c6d4d79edb918cab73.tar.gz
otp-ffcef65abb8e83861ace13c6d4d79edb918cab73.tar.bz2
otp-ffcef65abb8e83861ace13c6d4d79edb918cab73.zip
Merge pull request #1735 from richcarl/io_lib-unscan-fix
Make io_lib:unscan_format/1 work with pad char and default precision OTP-14958
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/src/io_lib_format.erl7
-rw-r--r--lib/stdlib/test/io_SUITE.erl1
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/stdlib/src/io_lib_format.erl b/lib/stdlib/src/io_lib_format.erl
index e345810ca0..2ef4e517d8 100644
--- a/lib/stdlib/src/io_lib_format.erl
+++ b/lib/stdlib/src/io_lib_format.erl
@@ -95,7 +95,7 @@ print([]) ->
[].
print(C, F, Ad, P, Pad, Encoding, Strings) ->
- [$~] ++ print_field_width(F, Ad) ++ print_precision(P) ++
+ [$~] ++ print_field_width(F, Ad) ++ print_precision(P, Pad) ++
print_pad_char(Pad) ++ print_encoding(Encoding) ++
print_strings(Strings) ++ [C].
@@ -103,8 +103,9 @@ print_field_width(none, _Ad) -> "";
print_field_width(F, left) -> integer_to_list(-F);
print_field_width(F, right) -> integer_to_list(F).
-print_precision(none) -> "";
-print_precision(P) -> [$. | integer_to_list(P)].
+print_precision(none, $\s) -> "";
+print_precision(none, _Pad) -> "."; % pad must be second dot
+print_precision(P, _Pad) -> [$. | integer_to_list(P)].
print_pad_char($\s) -> ""; % default, no need to make explicit
print_pad_char(Pad) -> [$., Pad].
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index d29f4c016d..ac61e3753b 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -2005,6 +2005,7 @@ writes(N, F1) ->
format_string(_Config) ->
%% All but padding is tested by fmt/2.
+ "xxxxxxxsss" = fmt("~10..xs", ["sss"]),
"xxxxxxsssx" = fmt("~10.4.xs", ["sss"]),
"xxxxxxsssx" = fmt("~10.4.*s", [$x, "sss"]),
ok.