feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

The n specifier for ranges (#2981)

Browse Source 
* The n specifier for ranges.

* Flipping flag polarity.
This commit is contained in:
Barry Revzin
2022-07-12 12:08:38 -05:00
committed by GitHub
parent 0db43cf7fe
commit 92d36e82c4
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/fmt/ranges.h
View File

@ -428,6 +428,7 @@ struct formatter<
detail::range_formatter_type<Char, detail::uncvref_type<range_type>>; detail::range_formatter_type<Char, detail::uncvref_type<range_type>>;
formatter_type underlying_; formatter_type underlying_;
bool custom_specs_ = false; bool custom_specs_ = false;
bool no_brackets_ = false;
template <typename ParseContext> template <typename ParseContext>
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
@ -435,8 +436,13 @@ struct formatter<
auto end = ctx.end(); auto end = ctx.end();
if (it == end || *it == '}') return it; if (it == end || *it == '}') return it;
if (*it == 'n') {
no_brackets_ = true;
++it;
}
if (*it != ':') if (*it != ':')
FMT_THROW(format_error("no top-level range formatters supported")); FMT_THROW(format_error("no other top-level range formatters supported"));
custom_specs_ = true; custom_specs_ = true;
++it; ++it;
@ -451,7 +457,7 @@ struct formatter<
Char postfix = detail::is_set<R>::value ? '}' : ']'; Char postfix = detail::is_set<R>::value ? '}' : ']';
detail::range_mapper<buffer_context<Char>> mapper; detail::range_mapper<buffer_context<Char>> mapper;
auto out = ctx.out(); auto out = ctx.out();
*out++ = prefix; if (!no_brackets_) *out++ = prefix;
int i = 0; int i = 0;
auto it = detail::range_begin(range); auto it = detail::range_begin(range);
auto end = detail::range_end(range); auto end = detail::range_end(range);
@ -465,7 +471,7 @@ struct formatter<
} }
++i; ++i;
} }
*out++ = postfix; if (!no_brackets_) *out++ = postfix;
return out; return out;
} }
}; };

2
test/ranges-test.cc
View File

@ -47,12 +47,14 @@ TEST(ranges_test, format_vector) {
auto v = std::vector<int>{1, 2, 3, 5, 7, 11}; auto v = std::vector<int>{1, 2, 3, 5, 7, 11};
EXPECT_EQ(fmt::format("{}", v), "[1, 2, 3, 5, 7, 11]"); 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("{::#x}", v), "[0x1, 0x2, 0x3, 0x5, 0x7, 0xb]");
EXPECT_EQ(fmt::format("{:n:#x}", v), "0x1, 0x2, 0x3, 0x5, 0x7, 0xb");
} }
TEST(ranges_test, format_vector2) { TEST(ranges_test, format_vector2) {
auto v = std::vector<std::vector<int>>{{1, 2}, {3, 5}, {7, 11}}; auto v = std::vector<std::vector<int>>{{1, 2}, {3, 5}, {7, 11}};
EXPECT_EQ(fmt::format("{}", v), "[[1, 2], [3, 5], [7, 11]]"); 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("{:::#x}", v), "[[0x1, 0x2], [0x3, 0x5], [0x7, 0xb]]");
EXPECT_EQ(fmt::format("{:n:n:#x}", v), "0x1, 0x2, 0x3, 0x5, 0x7, 0xb");
} }
TEST(ranges_test, format_map) { TEST(ranges_test, format_map) {