mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-04-16 14:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixed precision tests

Browse Source
This commit is contained in:
Victor Zverovich 2019-03-15 08:42:14 -07:00
parent dd6cc0e6ac
commit 97619e27a2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/fmt/format-inl.h
View File

@ -588,7 +588,7 @@ struct fixed_handler {
} }
digits::result on_digit(char digit, uint64_t divisor, uint64_t remainder, digits::result on_digit(char digit, uint64_t divisor, uint64_t remainder,
uint64_t error, int& exp, bool integral) { uint64_t error, int, bool integral) {
FMT_ASSERT(remainder < divisor, ""); FMT_ASSERT(remainder < divisor, "");
buf[size++] = digit; buf[size++] = digit;
if (size != precision) return digits::more; if (size != precision) return digits::more;
@ -601,7 +601,6 @@ struct fixed_handler {
FMT_ASSERT(error == 1 && divisor > 2, ""); FMT_ASSERT(error == 1 && divisor > 2, "");
} }
auto dir = get_round_direction(divisor, remainder, error); auto dir = get_round_direction(divisor, remainder, error);
// TODO: test rounding
if (dir != up) return dir == down ? digits::done : digits::error; if (dir != up) return dir == down ? digits::done : digits::error;
++buf[size - 1]; ++buf[size - 1];
for (int i = size - 1; i > 0 && buf[i] > '9'; --i) { for (int i = size - 1; i > 0 && buf[i] > '9'; --i) {
@ -610,7 +609,7 @@ struct fixed_handler {
} }
if (buf[0] > '9') { if (buf[0] > '9') {
buf[0] = '1'; buf[0] = '1';
++exp; buf[size++] = '0';
} }
return digits::done; return digits::done;
} }

6
test/format-test.cc
View File

@ -1476,7 +1476,13 @@ TEST(FormatterTest, PrecisionRounding) {
EXPECT_EQ("0.001", format("{:.3f}", 0.0005)); EXPECT_EQ("0.001", format("{:.3f}", 0.0005));
EXPECT_EQ("0.001", format("{:.3f}", 0.00149)); EXPECT_EQ("0.001", format("{:.3f}", 0.00149));
EXPECT_EQ("0.002", format("{:.3f}", 0.0015)); EXPECT_EQ("0.002", format("{:.3f}", 0.0015));
EXPECT_EQ("1.000", format("{:.3f}", 0.9999));
EXPECT_EQ("0.00123", format("{:.3}", 0.00123)); EXPECT_EQ("0.00123", format("{:.3}", 0.00123));
// Trigger rounding error in Grisu by a carefully chosen number.
auto n = 3788512123356.985352;
char buffer[64];
sprintf(buffer, "%f", n);
EXPECT_EQ(buffer, format("{:f}", n));
} }
TEST(FormatterTest, FormatNaN) { TEST(FormatterTest, FormatNaN) {