diff options
| author | Hans Bolinder <[email protected]> | 2017-04-19 16:10:15 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2017-04-24 14:51:03 +0200 |
| commit | ef0dbc4f2a43d629d086c3e2b9a762bbc00d034b (patch) | |
| tree | de3dd7b8d268f0819453920f8b6e8efb7212477e /lib/stdlib/src/io_lib_format.erl | |
| parent | 739bca3fc267c55d84c8f5c193d16c0b2a7eee13 (diff) | |
| download | otp-ef0dbc4f2a43d629d086c3e2b9a762bbc00d034b.tar.gz otp-ef0dbc4f2a43d629d086c3e2b9a762bbc00d034b.tar.bz2 otp-ef0dbc4f2a43d629d086c3e2b9a762bbc00d034b.zip | |
stdlib: Add Unicode modifier t to control sequences w and W
As of the introduction of Unicode characters in atoms, the control
sequences 'w' and 'W' can return non-Latin-1 characters, unless some
measure is taken.
This commit makes sure that '~w' and '~W' always return Latin-1
characters, or bytes, which can be output to ports or written to raw
files.
The Unicode translation modifier 't' is needed to return non-Latin-1
characters.
Diffstat (limited to 'lib/stdlib/src/io_lib_format.erl')
| -rw-r--r-- | lib/stdlib/src/io_lib_format.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/stdlib/src/io_lib_format.erl b/lib/stdlib/src/io_lib_format.erl index 3113767614..14d925bacf 100644 --- a/lib/stdlib/src/io_lib_format.erl +++ b/lib/stdlib/src/io_lib_format.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2016. All Rights Reserved. +%% Copyright Ericsson AB 1996-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -257,12 +257,12 @@ indentation([], I) -> I. %% This is the main dispatch function for the various formatting commands. %% Field widths and precisions have already been calculated. -control($w, [A], F, Adj, P, Pad, _Enc, _Str, _I) -> - term(io_lib:write(A, -1), F, Adj, P, Pad); +control($w, [A], F, Adj, P, Pad, Enc, _Str, _I) -> + term(io_lib:write(A, [{depth,-1}, {encoding, Enc}]), F, Adj, P, Pad); control($p, [A], F, Adj, P, Pad, Enc, Str, I) -> print(A, -1, F, Adj, P, Pad, Enc, Str, I); -control($W, [A,Depth], F, Adj, P, Pad, _Enc, _Str, _I) when is_integer(Depth) -> - term(io_lib:write(A, Depth), F, Adj, P, Pad); +control($W, [A,Depth], F, Adj, P, Pad, Enc, _Str, _I) when is_integer(Depth) -> + term(io_lib:write(A, [{depth,Depth}, {encoding, Enc}]), F, Adj, P, Pad); control($P, [A,Depth], F, Adj, P, Pad, Enc, Str, I) when is_integer(Depth) -> print(A, Depth, F, Adj, P, Pad, Enc, Str, I); control($s, [A], F, Adj, P, Pad, latin1, _Str, _I) when is_atom(A) -> |