External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

preserve alignment

Browse Source
This commit is contained in:
Matthias Liedtke 2021-05-27 19:09:55 +02:00
parent cc7c6af436
commit 96e08b0cda
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/fmt/core.h
View File

@ -1948,7 +1948,7 @@ template <typename Char> class specs_setter {
FMT_CONSTEXPR void on_localized() { specs_.localized = true; }
FMT_CONSTEXPR void on_zero() {
specs_.align = align::numeric;
if (specs_.align == align::none) specs_.align = align::numeric;
specs_.fill[0] = Char('0');
}

12
test/format-test.cc
View File

@ -1273,10 +1273,8 @@ TEST(format_test, format_nan) {
EXPECT_EQ("nan", fmt::format("{}", nan));
EXPECT_EQ("+nan", fmt::format("{:+}", nan));
EXPECT_EQ(" +nan", fmt::format("{:+06}", nan));
// '0'-fill option sets alignment to numeric overwriting any user-provided
// alignment
EXPECT_EQ(" +nan", fmt::format("{:^+06}", nan));
EXPECT_EQ(" +nan", fmt::format("{:<+06}", nan));
EXPECT_EQ("+nan ", fmt::format("{:<+06}", nan));
EXPECT_EQ(" +nan ", fmt::format("{:^+06}", nan));
EXPECT_EQ(" +nan", fmt::format("{:>+06}", nan));
if (std::signbit(-nan)) {
EXPECT_EQ("-nan", fmt::format("{}", -nan));
@ -1297,10 +1295,8 @@ TEST(format_test, format_infinity) {
EXPECT_EQ("-inf", fmt::format("{}", -inf));
EXPECT_EQ(" +inf", fmt::format("{:+06}", inf));
EXPECT_EQ(" -inf", fmt::format("{:+06}", -inf));
// '0'-fill option sets alignment to numeric overwriting any user-provided
// alignment
EXPECT_EQ(" +inf", fmt::format("{:^+06}", inf));
EXPECT_EQ(" +inf", fmt::format("{:<+06}", inf));
EXPECT_EQ("+inf ", fmt::format("{:<+06}", inf));
EXPECT_EQ(" +inf ", fmt::format("{:^+06}", inf));
EXPECT_EQ(" +inf", fmt::format("{:>+06}", inf));
EXPECT_EQ(" inf", fmt::format("{: }", inf));
EXPECT_EQ("INF", fmt::format("{:F}", inf));