AuroraMiddleware/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-22 10:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore 0 character with align

Browse Source
This commit is contained in:
Shawn Zhong 2022-12-23 19:16:24 -06:00 committed by Victor Zverovich
parent 840ec8569d
commit a585571e90
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/fmt/core.h
View File

@ -2237,7 +2237,9 @@ template <typename Char> class specs_setter {
FMT_CONSTEXPR void on_localized() { specs_.localized = true; } FMT_CONSTEXPR void on_localized() { specs_.localized = true; }
FMT_CONSTEXPR void on_zero() { FMT_CONSTEXPR void on_zero() {
if (specs_.align == align::none) specs_.align = align::numeric; // If the 0 character and an align option both appear, the 0 character is ignored.
if (specs_.align != align::none) return;
specs_.align = align::numeric;
specs_.fill[0] = Char('0'); specs_.fill[0] = Char('0');
} }

12
test/format-test.cc
View File

@ -799,6 +799,16 @@ TEST(format_test, zero_flag) {
format_error, "format specifier requires numeric argument"); format_error, "format specifier requires numeric argument");
} }
TEST(format_test, zero_flag_and_align) {
// If the 0 character and an align option both appear, the 0 character is ignored.
EXPECT_EQ("42 ", fmt::format("{0:<05}", 42));
EXPECT_EQ("-42 ", fmt::format("{0:<05}", -42));
EXPECT_EQ(" 42 ", fmt::format("{0:^05}", 42));
EXPECT_EQ(" -42 ", fmt::format("{0:^05}", -42));
EXPECT_EQ(" 42", fmt::format("{0:>05}", 42));
EXPECT_EQ(" -42", fmt::format("{0:>05}", -42));
}
TEST(format_test, width) { TEST(format_test, width) {
char format_str[buffer_size]; char format_str[buffer_size];
safe_sprintf(format_str, "{0:%u", UINT_MAX); safe_sprintf(format_str, "{0:%u", UINT_MAX);
@ -833,7 +843,7 @@ TEST(format_test, width) {
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.0");
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), "000000"); EXPECT_EQ(fmt::format("{:>06.0f}", 0.00884311), " 0");
} }
TEST(format_test, runtime_width) { TEST(format_test, runtime_width) {