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

Add support for exotic string_view iterators (#1156)

Browse Source
This commit is contained in:
Victor Zverovich
2019-05-12 10:03:10 -07:00
parent b488df6cfe
commit 98b3775297
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/fmt/format.h
View File

@ -2207,7 +2207,7 @@ class format_string_checker {
FMT_CONSTEXPR void on_replacement_field(const Char*) {} FMT_CONSTEXPR void on_replacement_field(const Char*) {}
FMT_CONSTEXPR const Char* on_format_specs(const Char* begin, const Char*) { FMT_CONSTEXPR const Char* on_format_specs(const Char* begin, const Char*) {
context_.advance_to(begin); advance_to(context_, begin);
return arg_id_ < NUM_ARGS ? parse_funcs_[arg_id_](context_) : begin; return arg_id_ < NUM_ARGS ? parse_funcs_[arg_id_](context_) : begin;
} }
@ -3215,6 +3215,12 @@ basic_format_context<Range, Char>::arg(basic_string_view<char_type> name) {
return arg; return arg;
} }
template <typename Char, typename ErrorHandler>
FMT_CONSTEXPR void advance_to(basic_parse_context<Char, ErrorHandler>& ctx,
const Char* p) {
ctx.advance_to(ctx.begin() + (p - &*ctx.begin()));
}
template <typename ArgFormatter, typename Char, typename Context> template <typename ArgFormatter, typename Char, typename Context>
struct format_handler : internal::error_handler { struct format_handler : internal::error_handler {
typedef typename ArgFormatter::range range; typedef typename ArgFormatter::range range;
@ -3242,7 +3248,7 @@ struct format_handler : internal::error_handler {
void on_arg_id(basic_string_view<Char> id) { arg = context.arg(id); } void on_arg_id(basic_string_view<Char> id) { arg = context.arg(id); }
void on_replacement_field(const Char* p) { void on_replacement_field(const Char* p) {
parse_context.advance_to(p); advance_to(parse_context, p);
internal::custom_formatter<Context> f(parse_context, context); internal::custom_formatter<Context> f(parse_context, context);
if (!visit_format_arg(f, arg)) if (!visit_format_arg(f, arg))
context.advance_to( context.advance_to(
@ -3250,7 +3256,7 @@ struct format_handler : internal::error_handler {
} }
const Char* on_format_specs(const Char* begin, const Char* end) { const Char* on_format_specs(const Char* begin, const Char* end) {
parse_context.advance_to(begin); advance_to(parse_context, begin);
internal::custom_formatter<Context> f(parse_context, context); internal::custom_formatter<Context> f(parse_context, context);
if (visit_format_arg(f, arg)) return parse_context.begin(); if (visit_format_arg(f, arg)) return parse_context.begin();
basic_format_specs<Char> specs; basic_format_specs<Char> specs;
@ -3261,7 +3267,7 @@ struct format_handler : internal::error_handler {
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 != '}') on_error("missing '}' in format string");
parse_context.advance_to(begin); advance_to(parse_context, begin);
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;

2
include/fmt/prepare.h
View File

@ -310,7 +310,7 @@ class prepared_format {
const format_part_t& part) const { const format_part_t& part) const {
const auto view = to_string_view(format_); const auto view = to_string_view(format_);
const auto specification_begin = view.data() + part.end_of_argument_id; const auto specification_begin = view.data() + part.end_of_argument_id;
parse_ctx.advance_to(specification_begin); advance_to(parse_ctx, specification_begin);
} }
template <typename Range, typename Context, typename Id> template <typename Range, typename Context, typename Id>