External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add tests and single digit case

Browse Source
This commit is contained in:
Jin S 2024-01-16 21:15:17 -05:00
parent 7e96e39d14
commit e81ef54b30
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/fmt/chrono.h
View File

@ -1161,23 +1161,37 @@ void write_fractional_seconds(OutputIt& out, Duration d, int precision = -1) {
const int old_num_digits = detail::count_digits(n); const int old_num_digits = detail::count_digits(n);
auto roundingDigit = n % 10; auto roundingDigit = n % 10;
n /= 10; n /= 10;
if (roundingDigit > 5 || (roundingDigit == 5 && n % 10 % 2 != 0)) { if (n) {
n += 1; if (roundingDigit > 5 || (roundingDigit == 5 && n % 10 % 2 != 0)) {
} n += 1;
if (old_num_digits == detail::count_digits(n)) { }
if (leading_zeroes) { if (old_num_digits == detail::count_digits(n)) {
out = std::fill_n(out, leading_zeroes-1, '0'); if (leading_zeroes) {
*out++ = '1'; out = std::fill_n(out, leading_zeroes-1, '0');
out = std::fill_n(out, remaining, '0'); *out++ = '1';
out = std::fill_n(out, remaining, '0');
}
else {
n -= 1;
out = format_decimal<Char>(out, n, remaining).end;
}
} }
else { else {
n -= 1; out = std::fill_n(out, leading_zeroes, '0');
out = format_decimal<Char>(out, n, remaining).end; out = format_decimal<Char>(out, n, remaining).end;
} }
} }
else { else {
out = std::fill_n(out, leading_zeroes, '0'); if (roundingDigit >= 5) {
out = format_decimal<Char>(out, n, remaining).end; if (leading_zeroes) {
out = std::fill_n(out, leading_zeroes-1, '0');
*out++ = '1';
out = std::fill_n(out, remaining, '0');
}
}
else {
out = std::fill_n(out, leading_zeroes, '0');
}
} }
return; return;
} }

4
test/chrono-test.cc
View File

@ -803,6 +803,10 @@ TEST(chrono_test, cpp20_duration_subsecond_support) {
"12.1"); "12.1");
EXPECT_EQ(fmt::format("{:.2%S}", std::chrono::milliseconds{99999}), EXPECT_EQ(fmt::format("{:.2%S}", std::chrono::milliseconds{99999}),
"39.99"); "39.99");
EXPECT_EQ(fmt::format("{:.2%S}", std::chrono::milliseconds{1000}),
"01.00");
EXPECT_EQ(fmt::format("{:.3%S}", std::chrono::milliseconds{1}),
"00.001");
EXPECT_EQ(fmt::format("{:.3%S}", std::chrono::seconds{1234}), "34.000"); EXPECT_EQ(fmt::format("{:.3%S}", std::chrono::seconds{1234}), "34.000");
EXPECT_EQ(fmt::format("{:.3%S}", std::chrono::hours{1234}), "00.000"); EXPECT_EQ(fmt::format("{:.3%S}", std::chrono::hours{1234}), "00.000");
EXPECT_EQ(fmt::format("{:.5%S}", dms(1.234)), "00.00123"); EXPECT_EQ(fmt::format("{:.5%S}", dms(1.234)), "00.00123");