Fix format of negative std::complex without sign option in format string

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
phprus · Jul 3, 2024 · e205a70 · e205a70
1 parent 991856a
commit e205a70
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/include/fmt/std.h b/include/fmt/std.h
@@ -631,8 +631,7 @@ struct formatter<std::atomic_flag, Char> : formatter<bool, Char> {
 #endif  // __cpp_lib_atomic_flag_test
 
 FMT_EXPORT
-template <typename T, typename Char>
-struct formatter<std::complex<T>, Char> {
+template <typename T, typename Char> struct formatter<std::complex<T>, Char> {
  private:
   int width_;
   detail::fill_t fill_;
@@ -666,7 +665,13 @@ struct formatter<std::complex<T>, Char> {
       if (c.real() != 0) {
         auto format_full = detail::string_literal<Char, '(', '{', '}', '+', '{',
                                                   '}', 'i', ')'>{};
-        return fmt::format_to(out, basic_string_view<Char>(format_full),
+        auto format_full_neg =
+            detail::string_literal<Char, '(', '{', '}', '{', '}', 'i', ')'>{};
+
+        if (c.imag() >= 0)
+          return fmt::format_to(out, basic_string_view<Char>(format_full),
+                                f->nested(c.real()), f->nested(c.imag()));
+        return fmt::format_to(out, basic_string_view<Char>(format_full_neg),
                               f->nested(c.real()), f->nested(c.imag()));
       }
       auto format_imag = detail::string_literal<Char, '{', '}', 'i'>{};

diff --git a/test/std-test.cc b/test/std-test.cc
@@ -67,9 +67,15 @@ TEST(std_test, thread_id) {
 
 TEST(std_test, complex) {
   EXPECT_EQ(fmt::format("{}", std::complex<double>(1, 2.2)), "(1+2.2i)");
+  EXPECT_EQ(fmt::format("{}", std::complex<double>(1, -2.2)), "(1-2.2i)");
   EXPECT_EQ(fmt::format("{}", std::complex<double>(0, 2.2)), "2.2i");
+  EXPECT_EQ(fmt::format("{}", std::complex<double>(0, -2.2)), "-2.2i");
   EXPECT_EQ(fmt::format("{:>20.2f}", std::complex<double>(1, 2.2)),
             "        (1.00+2.20i)");
+  EXPECT_EQ(fmt::format("{:<20.2f}", std::complex<double>(1, 2.2)),
+            "(1.00+2.20i)        ");
+  EXPECT_EQ(fmt::format("{:<20.2f}", std::complex<double>(1, -2.2)),
+            "(1.00-2.20i)        ");
 }
 
 #ifdef __cpp_lib_source_location