mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-26 09:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing formatting of range of range of char. (#3158)

Browse Source
This commit is contained in:
Barry Revzin 2022-11-02 13:04:54 -05:00 committed by GitHub
parent 80f8d34427
commit 66d71a1b35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/fmt/ranges.h
View File

@ -475,7 +475,7 @@ struct range_formatter<
auto end = ctx.end();
if (it == end || *it == '}') {
maybe_set_debug_format();
return it;
return underlying_.parse(ctx);
}
if (*it == 'n') {
@ -485,7 +485,8 @@ struct range_formatter<
if (*it == '}') {
maybe_set_debug_format();
return it;
ctx.advance_to(it);
return underlying_.parse(ctx);
}
if (*it != ':')

8
test/ranges-test.cc
View File

@ -50,6 +50,14 @@ TEST(ranges_test, format_vector) {
EXPECT_EQ(fmt::format("{}", v), "[1, 2, 3, 5, 7, 11]");
EXPECT_EQ(fmt::format("{::#x}", v), "[0x1, 0x2, 0x3, 0x5, 0x7, 0xb]");
EXPECT_EQ(fmt::format("{:n:#x}", v), "0x1, 0x2, 0x3, 0x5, 0x7, 0xb");
auto vc = std::vector<char>{'a', 'b', 'c'};
auto vvc = std::vector<std::vector<char>>{vc, vc};
EXPECT_EQ(fmt::format("{}", vc), "['a', 'b', 'c']");
EXPECT_EQ(fmt::format("{}", vvc), "[['a', 'b', 'c'], ['a', 'b', 'c']]");
EXPECT_EQ(fmt::format("{:n}", vvc), "['a', 'b', 'c'], ['a', 'b', 'c']");
EXPECT_EQ(fmt::format("{:n:n}", vvc), "'a', 'b', 'c', 'a', 'b', 'c'");
EXPECT_EQ(fmt::format("{:n:n:}", vvc), "a, b, c, a, b, c");
}
TEST(ranges_test, format_vector2) {