diff options
| author | Sverker Eriksson <[email protected]> | 2018-09-04 14:03:55 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-09-04 14:03:55 +0200 |
| commit | c227e4aa03196dfa8c0228e1d9537299f66ba376 (patch) | |
| tree | a75f11c7628bf9d3118a8c4d3647506a73ea8ec8 /erts/emulator | |
| parent | 31e7b5ab0b72acbbca649b99ade82bba145cc390 (diff) | |
| parent | 8593638d1ab72a26ca85a7ef189bb8b0c2e831e8 (diff) | |
| download | otp-c227e4aa03196dfa8c0228e1d9537299f66ba376.tar.gz otp-c227e4aa03196dfa8c0228e1d9537299f66ba376.tar.bz2 otp-c227e4aa03196dfa8c0228e1d9537299f66ba376.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/sys/common/erl_sys_common_misc.c | 3 | ||||
| -rw-r--r-- | erts/emulator/test/num_bif_SUITE.erl | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_sys_common_misc.c b/erts/emulator/sys/common/erl_sys_common_misc.c index 2541ab5d31..d34e1a9ec0 100644 --- a/erts/emulator/sys/common/erl_sys_common_misc.c +++ b/erts/emulator/sys/common/erl_sys_common_misc.c @@ -176,6 +176,7 @@ sys_double_to_chars_fast(double f, char *buffer, int buffer_size, int decimals, double af; Uint64 int_part, frac_part; int neg; + int has_decimals = decimals != 0; char *p = buffer; if (decimals < 0) @@ -257,7 +258,7 @@ sys_double_to_chars_fast(double f, char *buffer, int buffer_size, int decimals, } /* Delete trailing zeroes */ - if (compact) + if (compact && has_decimals) p = find_first_trailing_zero(p); *p = '\0'; return p - buffer; diff --git a/erts/emulator/test/num_bif_SUITE.erl b/erts/emulator/test/num_bif_SUITE.erl index 700734cd0b..f15217814a 100644 --- a/erts/emulator/test/num_bif_SUITE.erl +++ b/erts/emulator/test/num_bif_SUITE.erl @@ -161,6 +161,7 @@ t_float_to_string(Config) when is_list(Config) -> test_fts("1.000",1.0, [{decimals, 3}]), test_fts("1.0",1.0, [{decimals, 1}]), test_fts("1.0",1.0, [{decimals, 3}, compact]), + test_fts("10",10.0, [{decimals, 0}, compact]), test_fts("1.12",1.123, [{decimals, 2}]), test_fts("1.123",1.123, [{decimals, 3}]), test_fts("1.123",1.123, [{decimals, 3}, compact]), |