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

Make # handling consistent with std::format

Browse Source
This commit is contained in:
Victor Zverovich 2023-02-26 10:15:16 -08:00
parent 48dfbcaa95
commit 98699719f8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/fmt/format.h
View File

@ -2631,7 +2631,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
abort_fuzzing_if(num_zeros > 5000); abort_fuzzing_if(num_zeros > 5000);
if (fspecs.showpoint) { if (fspecs.showpoint) {
++size; ++size;
if (num_zeros <= 0 && fspecs.format != float_format::fixed) num_zeros = 1; if (num_zeros <= 0 && fspecs.format != float_format::fixed) num_zeros = 0;
if (num_zeros > 0) size += to_unsigned(num_zeros); if (num_zeros > 0) size += to_unsigned(num_zeros);
} }
auto grouping = Grouping(loc, fspecs.locale); auto grouping = Grouping(loc, fspecs.locale);

6
test/format-test.cc
View File

@ -755,8 +755,8 @@ TEST(format_test, hash_flag) {
EXPECT_EQ("0x42", fmt::format("{0:#x}", 0x42ull)); EXPECT_EQ("0x42", fmt::format("{0:#x}", 0x42ull));
EXPECT_EQ("042", fmt::format("{0:#o}", 042ull)); EXPECT_EQ("042", fmt::format("{0:#o}", 042ull));
EXPECT_EQ("-42.0", fmt::format("{0:#}", -42.0)); EXPECT_EQ("-42.", fmt::format("{0:#}", -42.0));
EXPECT_EQ("-42.0", fmt::format("{0:#}", -42.0l)); EXPECT_EQ("-42.", fmt::format("{0:#}", -42.0l));
EXPECT_EQ("4.e+01", fmt::format("{:#.0e}", 42.0)); EXPECT_EQ("4.e+01", fmt::format("{:#.0e}", 42.0));
EXPECT_EQ("0.", fmt::format("{:#.0f}", 0.01)); EXPECT_EQ("0.", fmt::format("{:#.0f}", 0.01));
EXPECT_EQ("0.50", fmt::format("{:#.2g}", 0.5)); EXPECT_EQ("0.50", fmt::format("{:#.2g}", 0.5));
@ -836,7 +836,7 @@ TEST(format_test, width) {
EXPECT_EQ("str ", fmt::format("{0:12}", "str")); EXPECT_EQ("str ", fmt::format("{0:12}", "str"));
EXPECT_EQ(fmt::format("{:*^6}", "🤡"), "**🤡**"); EXPECT_EQ(fmt::format("{:*^6}", "🤡"), "**🤡**");
EXPECT_EQ(fmt::format("{:*^8}", "你好"), "**你好**"); EXPECT_EQ(fmt::format("{:*^8}", "你好"), "**你好**");
EXPECT_EQ(fmt::format("{:#6}", 42.0), " 42.0"); EXPECT_EQ(fmt::format("{:#6}", 42.0), " 42.");
EXPECT_EQ(fmt::format("{:6c}", static_cast<int>('x')), "x "); EXPECT_EQ(fmt::format("{:6c}", static_cast<int>('x')), "x ");
EXPECT_EQ(fmt::format("{:>06.0f}", 0.00884311), " 0"); EXPECT_EQ(fmt::format("{:>06.0f}", 0.00884311), " 0");
} }