fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-31 19:24:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use p2197 format for complex by default

Browse Source
This commit is contained in:
Victor Zverovich
2024-03-19 07:55:45 +09:00
parent bb882c03bc
commit c0dac83982
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/fmt/std.h
View File

@@ -595,8 +595,8 @@ struct formatter<std::complex<F>, Char> : nested_formatter<F, Char> {
template <typename OutputIt> template <typename OutputIt>
FMT_CONSTEXPR auto operator()(OutputIt out) -> OutputIt { FMT_CONSTEXPR auto operator()(OutputIt out) -> OutputIt {
auto format = auto format = detail::string_literal<Char, '(', '{', '}', '+', '{', '}',
detail::string_literal<Char, '(', '{', '}', ',', '{', '}', ')'>{}; 'i', ')'>{};
return fmt::format_to(out, basic_string_view<Char>(format), return fmt::format_to(out, basic_string_view<Char>(format),
f->nested(c.real()), f->nested(c.imag())); f->nested(c.real()), f->nested(c.imag()));
} }

4
test/std-test.cc
View File

@@ -66,9 +66,9 @@ TEST(std_test, thread_id) {
} }
TEST(std_test, complex) { TEST(std_test, complex) {
EXPECT_EQ(fmt::format("{}", std::complex<double>(1, 2.2)), "(1,2.2)"); EXPECT_EQ(fmt::format("{}", std::complex<double>(1, 2.2)), "(1+2.2i)");
EXPECT_EQ(fmt::format("{:>20.2f}", std::complex<double>(1, 2.2)), EXPECT_EQ(fmt::format("{:>20.2f}", std::complex<double>(1, 2.2)),
" (1.00,2.20)"); " (1.00+2.20i)");
} }
#ifdef __cpp_lib_source_location #ifdef __cpp_lib_source_location

6
test/xchar-test.cc
View File

@@ -584,9 +584,9 @@ TEST(locale_test, sign) {
TEST(std_test_xchar, complex) { TEST(std_test_xchar, complex) {
auto s = fmt::format(L"{}", std::complex<double>(1, 2)); auto s = fmt::format(L"{}", std::complex<double>(1, 2));
EXPECT_EQ(s, L"(1,2)"); EXPECT_EQ(s, L"(1+2i)");
EXPECT_EQ(fmt::format(L"{:.2f}", std::complex<double>(1, 2)), L"(1.00,2.00)"); EXPECT_EQ(fmt::format(L"{:.2f}", std::complex<double>(1, 2)), L"(1.00+2.00i)");
EXPECT_EQ(fmt::format(L"{:8}", std::complex<double>(1, 2)), L"(1,2) "); EXPECT_EQ(fmt::format(L"{:8}", std::complex<double>(1, 2)), L"(1+2i) ");
} }
TEST(std_test_xchar, optional) { TEST(std_test_xchar, optional) {