From a585571e90e7f5645bcf6548cef42078db940f49 Mon Sep 17 00:00:00 2001 From: Shawn Zhong Date: Fri, 23 Dec 2022 19:16:24 -0600 Subject: [PATCH] Ignore 0 character with align --- include/fmt/core.h | 4 +++- test/format-test.cc | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/fmt/core.h b/include/fmt/core.h index 1e7f4f24..e295d367 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -2237,7 +2237,9 @@ template class specs_setter { FMT_CONSTEXPR void on_localized() { specs_.localized = true; } 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'); } diff --git a/test/format-test.cc b/test/format-test.cc index 519da0b7..890d5a3b 100644 --- a/test/format-test.cc +++ b/test/format-test.cc @@ -799,6 +799,16 @@ TEST(format_test, zero_flag) { 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) { char format_str[buffer_size]; 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("{:#6}", 42.0), " 42.0"); EXPECT_EQ(fmt::format("{:6c}", static_cast('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) {