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

Optimize format string parsing

Browse Source
This commit is contained in:
Victor Zverovich 2020-06-06 08:51:17 -07:00
parent 8f7a824e47
commit 50bad7d62d
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/fmt/format.h
View File

@ -2569,10 +2569,9 @@ struct format_handler : detail::error_handler {
int on_arg_id(basic_string_view<Char> id) { return context.arg_id(id); } int on_arg_id(basic_string_view<Char> id) { return context.arg_id(id); }
void on_replacement_field(int id, const Char* p) { void on_replacement_field(int id, const Char* p) {
advance_to(parse_context, p);
auto arg = get_arg(context, id); auto arg = get_arg(context, id);
context.advance_to( context.advance_to(visit_format_arg(
visit_format_arg(ArgFormatter(context, &parse_context), arg)); ArgFormatter(context, &parse_context, nullptr, p), arg));
} }
const Char* on_format_specs(int id, const Char* begin, const Char* end) { const Char* on_format_specs(int id, const Char* begin, const Char* end) {
@ -2754,6 +2753,7 @@ class arg_formatter : public detail::arg_formatter_base<OutputIt, Char> {
context_type& ctx_; context_type& ctx_;
basic_format_parse_context<char_type>* parse_ctx_; basic_format_parse_context<char_type>* parse_ctx_;
const Char* ptr_;
public: public:
using iterator = typename base::iterator; using iterator = typename base::iterator;
@ -2769,15 +2769,17 @@ class arg_formatter : public detail::arg_formatter_base<OutputIt, Char> {
explicit arg_formatter( explicit arg_formatter(
context_type& ctx, context_type& ctx,
basic_format_parse_context<char_type>* parse_ctx = nullptr, basic_format_parse_context<char_type>* parse_ctx = nullptr,
format_specs* specs = nullptr) format_specs* specs = nullptr, const Char* ptr = nullptr)
: base(ctx.out(), specs, ctx.locale()), : base(ctx.out(), specs, ctx.locale()),
ctx_(ctx), ctx_(ctx),
parse_ctx_(parse_ctx) {} parse_ctx_(parse_ctx),
ptr_(ptr) {}
using base::operator(); using base::operator();
/** Formats an argument of a user-defined type. */ /** Formats an argument of a user-defined type. */
iterator operator()(typename basic_format_arg<context_type>::handle handle) { iterator operator()(typename basic_format_arg<context_type>::handle handle) {
if (ptr_) advance_to(*parse_ctx_, ptr_);
handle.format(*parse_ctx_, ctx_); handle.format(*parse_ctx_, ctx_);
return ctx_.out(); return ctx_.out();
} }
@ -3139,8 +3141,9 @@ typename Context::iterator vformat_to(
loc); loc);
if (format_str.size() == 2 && detail::equal2(format_str.data(), "{}")) { if (format_str.size() == 2 && detail::equal2(format_str.data(), "{}")) {
auto arg = detail::get_arg(h.context, 0); auto arg = detail::get_arg(h.context, 0);
h.parse_context.advance_to(&format_str[1]); return visit_format_arg(
return visit_format_arg(ArgFormatter(h.context, &h.parse_context), arg); ArgFormatter(h.context, &h.parse_context, nullptr, &format_str[1]),
arg);
} }
detail::parse_format_string<false>(format_str, h); detail::parse_format_string<false>(format_str, h);
return h.context.out(); return h.context.out();

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

@ -24,7 +24,8 @@ class custom_arg_formatter
custom_arg_formatter(fmt::format_context& ctx, custom_arg_formatter(fmt::format_context& ctx,
fmt::format_parse_context* parse_ctx, fmt::format_parse_context* parse_ctx,
fmt::format_specs* s = nullptr) fmt::format_specs* s = nullptr,
const char* = nullptr)
: base(ctx, parse_ctx, s) {} : base(ctx, parse_ctx, s) {}
using base::operator(); using base::operator();

2
test/format-test.cc
View File

@ -1821,7 +1821,7 @@ class mock_arg_formatter
using base = fmt::detail::arg_formatter_base<buffer_iterator, char>; using base = fmt::detail::arg_formatter_base<buffer_iterator, char>;
mock_arg_formatter(fmt::format_context& ctx, fmt::format_parse_context*, mock_arg_formatter(fmt::format_context& ctx, fmt::format_parse_context*,
fmt::format_specs* s = nullptr) fmt::format_specs* s = nullptr, const char* = nullptr)
: base(ctx.out(), s, ctx.locale()) { : base(ctx.out(), s, ctx.locale()) {
EXPECT_CALL(*this, call(42)); EXPECT_CALL(*this, call(42));
} }