mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-02-28 06:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't emit decimal point if there are no trailing digits (#1210)

Browse Source
This commit is contained in:
Victor Zverovich 2019-06-30 08:44:59 -07:00
parent bd3fd3bfda
commit ab0ba8a9d0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/format.h
View File

@ -1096,14 +1096,16 @@ It grisu_prettify(const char* digits, int size, int exp, It it,
} else { } else {
// 1234e-6 -> 0.001234 // 1234e-6 -> 0.001234
*it++ = static_cast<Char>('0'); *it++ = static_cast<Char>('0');
*it++ = static_cast<Char>('.');
int num_zeros = -full_exp; int num_zeros = -full_exp;
if (params.num_digits >= 0 && params.num_digits < num_zeros) if (params.num_digits >= 0 && params.num_digits < num_zeros)
num_zeros = params.num_digits; num_zeros = params.num_digits;
it = std::fill_n(it, num_zeros, static_cast<Char>('0'));
if (!params.trailing_zeros) if (!params.trailing_zeros)
while (size > 0 && digits[size - 1] == '0') --size; while (size > 0 && digits[size - 1] == '0') --size;
it = copy_str<Char>(digits, digits + size, it); if (num_zeros != 0 || size != 0) {
*it++ = static_cast<Char>('.');
it = std::fill_n(it, num_zeros, static_cast<Char>('0'));
it = copy_str<Char>(digits, digits + size, it);
}
} }
return it; return it;
} }

1
test/format-test.cc
View File

@ -1453,6 +1453,7 @@ TEST(FormatterTest, FormatDouble) {
TEST(FormatterTest, PrecisionRounding) { TEST(FormatterTest, PrecisionRounding) {
EXPECT_EQ("0", format("{:.0f}", 0.0)); EXPECT_EQ("0", format("{:.0f}", 0.0));
EXPECT_EQ("0", format("{:.0f}", 0.01));
EXPECT_EQ("0", format("{:.0f}", 0.1)); EXPECT_EQ("0", format("{:.0f}", 0.1));
EXPECT_EQ("0.000", format("{:.3f}", 0.00049)); EXPECT_EQ("0.000", format("{:.3f}", 0.00049));
EXPECT_EQ("0.001", format("{:.3f}", 0.0005)); EXPECT_EQ("0.001", format("{:.3f}", 0.0005));