mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-04-16 14:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve default formatting

Browse Source
This commit is contained in:
Victor Zverovich 2020-06-09 07:17:55 -07:00
parent 47ae521557
commit 2453ee576a
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/fmt/core.h
View File

@ -1341,6 +1341,7 @@ template <typename OutputIt, typename Char> class basic_format_context {
format_arg arg(int id) const { return args_.get(id); } format_arg arg(int id) const { return args_.get(id); }
format_arg arg(basic_string_view<char_type> name) { return args_.get(name); } format_arg arg(basic_string_view<char_type> name) { return args_.get(name); }
int arg_id(basic_string_view<char_type> name) { return args_.get_id(name); } int arg_id(basic_string_view<char_type> name) { return args_.get_id(name); }
const basic_format_args<basic_format_context>& args() const { return args_; }
detail::error_handler error_handler() { return {}; } detail::error_handler error_handler() { return {}; }
void on_error(const char* message) { error_handler().on_error(message); } void on_error(const char* message) { error_handler().on_error(message); }

23
include/fmt/format.h
View File

@ -1750,8 +1750,8 @@ template <typename OutputIt, typename Char> struct default_arg_formatter {
} }
OutputIt operator()(typename basic_format_arg<context>::handle handle) { OutputIt operator()(typename basic_format_arg<context>::handle handle) {
Char s[] = {Char('}')}; auto s = Char('}');
basic_format_parse_context<Char> parse_ctx(basic_string_view<Char>(s, 1)); basic_format_parse_context<Char> parse_ctx(basic_string_view<Char>(&s, 1));
basic_format_context<OutputIt, Char> format_ctx(out, args, loc); basic_format_context<OutputIt, Char> format_ctx(out, args, loc);
handle.format(parse_ctx, format_ctx); handle.format(parse_ctx, format_ctx);
return format_ctx.out(); return format_ctx.out();
@ -2617,9 +2617,9 @@ struct format_handler : detail::error_handler {
: parse_context(str), context(out, format_args, loc) {} : parse_context(str), context(out, format_args, loc) {}
void on_text(const Char* begin, const Char* end) { void on_text(const Char* begin, const Char* end) {
auto size = detail::to_unsigned(end - begin); auto size = to_unsigned(end - begin);
auto out = context.out(); auto out = context.out();
auto&& it = detail::reserve(out, size); auto&& it = reserve(out, size);
it = std::copy_n(begin, size, it); it = std::copy_n(begin, size, it);
context.advance_to(out); context.advance_to(out);
} }
@ -2632,21 +2632,22 @@ struct format_handler : detail::error_handler {
return arg_id; return arg_id;
} }
void on_replacement_field(int id, const Char* p) { void on_replacement_field(int id, const Char*) {
auto arg = get_arg(context, id); auto arg = get_arg(context, id);
context.advance_to(visit_format_arg( context.advance_to(visit_format_arg(
ArgFormatter(context, &parse_context, nullptr, p), arg)); default_arg_formatter<typename ArgFormatter::iterator, Char>{
context.out(), context.args(), context.locale()},
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) {
advance_to(parse_context, begin); advance_to(parse_context, begin);
auto arg = get_arg(context, id); auto arg = get_arg(context, id);
detail::custom_formatter<Context> f(parse_context, context); 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;
using detail::specs_handler;
using parse_context_t = basic_format_parse_context<Char>; using parse_context_t = basic_format_parse_context<Char>;
detail::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);
@ -3204,9 +3205,9 @@ typename Context::iterator vformat_to(
if (format_str.size() == 2 && detail::equal2(format_str.data(), "{}")) { if (format_str.size() == 2 && detail::equal2(format_str.data(), "{}")) {
auto arg = args.get(0); auto arg = args.get(0);
if (!arg) detail::error_handler().on_error("argument not found"); if (!arg) detail::error_handler().on_error("argument not found");
using it = typename ArgFormatter::iterator; using iterator = typename ArgFormatter::iterator;
return visit_format_arg( return visit_format_arg(
detail::default_arg_formatter<it, Char>{out, args, loc}, arg); detail::default_arg_formatter<iterator, Char>{out, args, loc}, arg);
} }
detail::format_handler<ArgFormatter, Char, Context> h(out, format_str, args, detail::format_handler<ArgFormatter, Char, Context> h(out, format_str, args,
loc); loc);