AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move parsing optimization one level up

Browse Source
This commit is contained in:
Victor Zverovich 2020-10-21 18:18:53 -07:00
parent 86287b8d56
commit f0a42346a4
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/fmt/format.h
View File

@ -2340,12 +2340,11 @@ template <typename Context> class custom_formatter {
Context& ctx) Context& ctx)
: parse_ctx_(parse_ctx), ctx_(ctx) {} : parse_ctx_(parse_ctx), ctx_(ctx) {}
bool operator()(typename basic_format_arg<Context>::handle h) const { void operator()(typename basic_format_arg<Context>::handle h) const {
h.format(parse_ctx_, ctx_); h.format(parse_ctx_, ctx_);
return true;
} }
template <typename T> bool operator()(T) const { return false; } template <typename T> void operator()(T) const {}
}; };
template <typename T> template <typename T>
@ -2739,6 +2738,10 @@ FMT_CONSTEXPR int code_point_length(const Char* begin) {
return len + !len; return len + !len;
} }
template <typename Char> constexpr bool is_ascii_letter(Char c) {
return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}
// Converts a character to ASCII. Returns a number > 127 on conversion failure. // Converts a character to ASCII. Returns a number > 127 on conversion failure.
template <typename Char, FMT_ENABLE_IF(std::is_integral<Char>::value)> template <typename Char, FMT_ENABLE_IF(std::is_integral<Char>::value)>
constexpr Char to_ascii(Char value) { constexpr Char to_ascii(Char value) {
@ -2832,11 +2835,6 @@ FMT_CONSTEXPR const Char* parse_precision(const Char* begin, const Char* end,
return begin; return begin;
} }
template <typename Char>
constexpr bool is_ascii_letter(Char c) {
return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}
// Parses standard format specifiers and sends notifications about parsed // Parses standard format specifiers and sends notifications about parsed
// components to handler. // components to handler.
template <typename Char, typename SpecHandler> template <typename Char, typename SpecHandler>
@ -2844,11 +2842,6 @@ FMT_CONSTEXPR const Char* parse_format_specs(const Char* begin, const Char* end,
SpecHandler&& handler) { SpecHandler&& handler) {
if (begin == end) return begin; if (begin == end) return begin;
if (is_ascii_letter(*begin) && (begin + 1 == end || begin[1] == '}')) {
handler.on_type(*begin++);
return begin;
}
begin = parse_align(begin, end, handler); begin = parse_align(begin, end, handler);
if (begin == end) return begin; if (begin == end) return begin;
@ -3051,18 +3044,25 @@ struct format_handler : detail::error_handler {
} }
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) {
advance_to(parse_context, begin);
auto arg = get_arg(context, id); auto arg = get_arg(context, id);
custom_formatter<Context> f(parse_context, context); if (arg.type() == type::custom_type) {
if (visit_format_arg(f, arg)) return parse_context.begin(); advance_to(parse_context, begin);
basic_format_specs<Char> specs; visit_format_arg(custom_formatter<Context>(parse_context, context), arg);
return parse_context.begin();
}
auto specs = basic_format_specs<Char>();
if (begin + 1 < end && begin[1] == '}' && is_ascii_letter(*begin)) {
specs.type = *begin++;
} else {
using parse_context_t = basic_format_parse_context<Char>; using parse_context_t = basic_format_parse_context<Char>;
specs_checker<specs_handler<parse_context_t, Context>> handler( specs_checker<specs_handler<parse_context_t, Context>> handler(
specs_handler<parse_context_t, Context>(specs, parse_context, context), specs_handler<parse_context_t, Context>(specs, parse_context,
context),
arg.type()); arg.type());
begin = parse_format_specs(begin, end, handler); begin = parse_format_specs(begin, end, handler);
if (begin == end || *begin != '}') on_error("missing '}' in format string"); if (begin == end || *begin != '}')
advance_to(parse_context, begin); on_error("missing '}' in format string");
}
context.advance_to( context.advance_to(
visit_format_arg(ArgFormatter(context, &parse_context, &specs), arg)); visit_format_arg(ArgFormatter(context, &parse_context, &specs), arg));
return begin; return begin;