fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-31 03:07:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify on_format_specs

Browse Source
This commit is contained in:
Victor Zverovich
2021-03-10 08:46:16 -08:00
parent 87c5cd46ac
commit 30e1302e73
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/fmt/format.h
View File

@ -3019,8 +3019,14 @@ FMT_CONSTEXPR const Char* parse_precision(const Char* begin, const Char* end,
// 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>
FMT_CONSTEXPR const Char* parse_format_specs(const Char* begin, const Char* end, FMT_CONSTEXPR_DECL FMT_INLINE const Char* parse_format_specs(
SpecHandler&& handler) { const Char* begin, const Char* end, SpecHandler&& handler) {
if (begin + 1 < end && begin[1] == '}' && is_ascii_letter(*begin) &&
*begin != 'L') {
handler.on_type(*begin++);
return begin;
}
if (begin == end) return begin; if (begin == end) return begin;
begin = parse_align(begin, end, handler); begin = parse_align(begin, end, handler);
@ -3233,19 +3239,12 @@ struct format_handler : detail::error_handler {
return parse_context.begin(); return parse_context.begin();
} }
auto specs = basic_format_specs<Char>(); auto specs = basic_format_specs<Char>();
if (begin + 1 < end && begin[1] == '}' && is_ascii_letter(*begin) && using parse_context_t = basic_format_parse_context<Char>;
*begin != 'L') { specs_checker<specs_handler<parse_context_t, Context>> handler(
specs.type = static_cast<char>(*begin++); specs_handler<parse_context_t, Context>(specs, parse_context, context),
} else { arg.type());
using parse_context_t = basic_format_parse_context<Char>; begin = parse_format_specs(begin, end, handler);
specs_checker<specs_handler<parse_context_t, Context>> handler( if (begin == end || *begin != '}') on_error("missing '}' in format string");
specs_handler<parse_context_t, Context>(specs, parse_context,
context),
arg.type());
begin = parse_format_specs(begin, end, handler);
if (begin == end || *begin != '}')
on_error("missing '}' in format string");
}
context.advance_to(visit_format_arg( context.advance_to(visit_format_arg(
arg_formatter<OutputIt, Char>(context, &parse_context, &specs), arg)); arg_formatter<OutputIt, Char>(context, &parse_context, &specs), arg));
return begin; return begin;