fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-11-02 23:21:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

More iteratification

Browse Source
This commit is contained in:
Victor Zverovich
2018-01-21 14:30:38 -08:00
parent 0a402056bc
commit bd8a7e7ea1
6 changed files with 90 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/custom-formatter-test.cc
View File

@@ -18,9 +18,11 @@ class CustomArgFormatter :
public fmt::arg_formatter<fmt::back_insert_range<fmt::internal::buffer>> {
public:
using range = fmt::back_insert_range<fmt::internal::buffer>;
using iterator = decltype(std::declval<range>().begin());
using base = fmt::arg_formatter<range>;
CustomArgFormatter(fmt::basic_context<range> &ctx, fmt::format_specs &s)
CustomArgFormatter(fmt::basic_context<iterator, char> &ctx,
fmt::format_specs &s)
: base(ctx, s) {}
using base::operator();

9
test/ostream-test.cc
View File

@@ -58,14 +58,17 @@ TEST(OStreamTest, Enum) {
EXPECT_EQ("0", fmt::format("{}", A));
}
struct test_arg_formatter : fmt::arg_formatter<fmt::context::range_type> {
using range = fmt::back_insert_range<fmt::internal::buffer>;
struct test_arg_formatter: fmt::arg_formatter<range> {
test_arg_formatter(fmt::context &ctx, fmt::format_specs &s)
: fmt::arg_formatter<fmt::context::range_type>(ctx, s) {}
: fmt::arg_formatter<range>(ctx, s) {}
};
TEST(OStreamTest, CustomArg) {
fmt::memory_buffer buffer;
fmt::context ctx(buffer, "", fmt::format_args());
fmt::internal::buffer &base = buffer;
fmt::context ctx(std::back_inserter(base), "", fmt::format_args());
fmt::format_specs spec;
test_arg_formatter af(ctx, spec);
visit(af, fmt::internal::make_arg<fmt::context>(TestEnum()));

12
test/util-test.cc
View File

@@ -81,9 +81,10 @@ struct formatter<Test, Char> {
return ctx.begin();
}
using range = fmt::back_insert_range<basic_buffer<Char>>;
using iterator = std::back_insert_iterator<basic_buffer<Char>>;
auto format(Test, basic_context<range> &ctx) -> decltype(ctx.begin()) {
auto format(Test, basic_context<iterator, char> &ctx)
-> decltype(ctx.begin()) {
const Char *test = "test";
return std::copy_n(test, std::strlen(test), ctx.begin());
}
@@ -521,8 +522,8 @@ VISIT_TYPE(float, double);
#define CHECK_ARG_(Char, expected, value) { \
testing::StrictMock<MockVisitor<decltype(expected)>> visitor; \
EXPECT_CALL(visitor, visit(expected)); \
using range = fmt::back_insert_range<basic_buffer<Char>>; \
fmt::visit(visitor, make_arg<fmt::basic_context<range>>(value)); \
using iterator = std::back_insert_iterator<basic_buffer<Char>>; \
fmt::visit(visitor, make_arg<fmt::basic_context<iterator, Char>>(value)); \
}
#define CHECK_ARG(value) { \
@@ -600,7 +601,8 @@ TEST(UtilTest, CustomArg) {
testing::StrictMock<visitor> v;
EXPECT_CALL(v, visit(_)).WillOnce(testing::Invoke([&](handle h) {
fmt::memory_buffer buffer;
fmt::context ctx(buffer, "", fmt::format_args());
fmt::internal::basic_buffer<char> &base = buffer;
fmt::context ctx(std::back_inserter(base), "", fmt::format_args());
h.format(ctx);
EXPECT_EQ("test", std::string(buffer.data(), buffer.size()));
return visitor::Result();