AuroraMiddleware/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-22 10:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of dynamic specs

Browse Source
This commit is contained in:
Victor Zverovich 2024-08-04 09:25:50 -07:00
parent 928a07bb04
commit 15f939c3de
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/fmt/format.h
View File

@ -3698,17 +3698,22 @@ FMT_CONSTEXPR auto get_arg(Context& ctx, ID id) -> basic_format_arg<Context> {
} }
template <typename Context> template <typename Context>
FMT_CONSTEXPR void handle_dynamic_spec(int& value, FMT_CONSTEXPR int get_dynamic_spec(
arg_ref<typename Context::char_type> ref, const arg_ref<typename Context::char_type>& ref, Context& ctx) {
Context& ctx) { FMT_ASSERT(ref.kind != arg_id_kind::none, "");
if (ref.kind == arg_id_kind::none) return;
auto arg = ref.kind == arg_id_kind::index ? ctx.arg(ref.val.index) auto arg = ref.kind == arg_id_kind::index ? ctx.arg(ref.val.index)
: ctx.arg(ref.val.name); : ctx.arg(ref.val.name);
if (!arg) report_error("argument not found"); if (!arg) report_error("argument not found");
unsigned long long arg_value = arg.visit(dynamic_spec_getter()); unsigned long long value = arg.visit(dynamic_spec_getter());
if (arg_value > to_unsigned(max_value<int>())) if (value > to_unsigned(max_value<int>()))
report_error("width/precision is out of range"); report_error("width/precision is out of range");
value = static_cast<int>(arg_value); return static_cast<int>(value);
}
template <typename Context>
FMT_CONSTEXPR void handle_dynamic_spec(
int& value, const arg_ref<typename Context::char_type>& ref, Context& ctx) {
if (ref.kind != arg_id_kind::none) value = get_dynamic_spec(ref, ctx);
} }
#if FMT_USE_USER_DEFINED_LITERALS #if FMT_USE_USER_DEFINED_LITERALS
@ -4168,9 +4173,12 @@ void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
return parse_context.begin(); return parse_context.begin();
auto specs = detail::dynamic_format_specs<Char>(); auto specs = detail::dynamic_format_specs<Char>();
begin = parse_format_specs(begin, end, specs, parse_context, arg.type()); begin = parse_format_specs(begin, end, specs, parse_context, arg.type());
detail::handle_dynamic_spec(specs.width, specs.width_ref, context); if (specs.width_ref.kind != detail::arg_id_kind::none)
detail::handle_dynamic_spec(specs.precision, specs.precision_ref, specs.width = detail::get_dynamic_spec(specs.width_ref, context);
context); if (specs.precision_ref.kind != detail::arg_id_kind::none) {
specs.precision =
detail::get_dynamic_spec(specs.precision_ref, context);
}
if (begin == end || *begin != '}') if (begin == end || *begin != '}')
report_error("missing '}' in format string"); report_error("missing '}' in format string");
context.advance_to(arg.visit( context.advance_to(arg.visit(