make plus flag for printf not be ignored for char argument (#1683)

* make plus flag for printf not be ignored for char argument * clarify overwriting of alignment specifiers for printf with char argument
fmtlib · May 15, 2020 · 96c18b2 · 96c18b2
1 parent 981b517
commit 96c18b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/include/fmt/printf.h b/include/fmt/printf.h
@@ -257,7 +257,10 @@ class printf_arg_formatter : public detail::arg_formatter_base<Range> {
         return (*this)(static_cast<int>(value));
       fmt_specs.sign = sign::none;
       fmt_specs.alt = false;
-      fmt_specs.align = align::right;
+      // align::numeric needs to be overwritten here since the '0' flag is
+      // ignored for non-numeric types
+      if (fmt_specs.align == align::none || fmt_specs.align == align::numeric)
+        fmt_specs.align = align::right;
       return base::operator()(value);
     } else {
       return base::operator()(value);

diff --git a/test/printf-test.cc b/test/printf-test.cc
@@ -156,6 +156,10 @@ TEST(PrintfTest, PlusFlag) {
 TEST(PrintfTest, MinusFlag) {
   EXPECT_PRINTF("abc  ", "%-5s", "abc");
   EXPECT_PRINTF("abc  ", "%0--5s", "abc");
+
+  EXPECT_PRINTF("7    ", "%-5d", 7);
+  EXPECT_PRINTF("97   ", "%-5hhi", 'a');
+  EXPECT_PRINTF("a    ", "%-5c", 'a');
 }
 
 TEST(PrintfTest, SpaceFlag) {