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

Remove get_dynamic_spec

Browse Source
This commit is contained in:
Victor Zverovich
2025-09-13 10:23:41 -07:00
parent 9bb14ffc47
commit 83189189a1
2 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/fmt/format.h
View File

@@ -1893,7 +1893,7 @@ template <typename Char> class digit_grouping {
return count; return count;
} }
// Applies grouping to digits and write the output to out. // Applies grouping to digits and writes the output to out.
template <typename Out, typename C> template <typename Out, typename C>
auto apply(Out out, basic_string_view<C> digits) const -> Out { auto apply(Out out, basic_string_view<C> digits) const -> Out {
auto num_digits = static_cast<int>(digits.size()); auto num_digits = static_cast<int>(digits.size());
@@ -3696,32 +3696,18 @@ struct dynamic_spec_getter {
} }
}; };
template <typename Context, typename ID>
FMT_CONSTEXPR auto get_arg(Context& ctx, ID id) -> basic_format_arg<Context> {
auto arg = ctx.arg(id);
if (!arg) report_error("argument not found");
return arg;
}
template <typename Context>
FMT_CONSTEXPR auto get_dynamic_spec(
arg_id_kind kind, const arg_ref<typename Context::char_type>& ref,
Context& ctx) -> int {
FMT_ASSERT(kind != arg_id_kind::none, "");
auto arg =
kind == arg_id_kind::index ? ctx.arg(ref.index) : ctx.arg(ref.name);
if (!arg) report_error("argument not found");
unsigned long long value = arg.visit(dynamic_spec_getter());
if (value > to_unsigned(max_value<int>()))
report_error("width/precision is out of range");
return static_cast<int>(value);
}
template <typename Context> template <typename Context>
FMT_CONSTEXPR void handle_dynamic_spec( FMT_CONSTEXPR void handle_dynamic_spec(
arg_id_kind kind, int& value, arg_id_kind kind, int& value,
const arg_ref<typename Context::char_type>& ref, Context& ctx) { const arg_ref<typename Context::char_type>& ref, Context& ctx) {
if (kind != arg_id_kind::none) value = get_dynamic_spec(kind, ref, ctx); if (kind == arg_id_kind::none) return;
auto arg =
kind == arg_id_kind::index ? ctx.arg(ref.index) : ctx.arg(ref.name);
if (!arg) report_error("argument not found");
unsigned long long result = arg.visit(dynamic_spec_getter());
if (result > to_unsigned(max_value<int>()))
report_error("width/precision is out of range");
value = static_cast<int>(result);
} }
#if FMT_USE_NONTYPE_TEMPLATE_ARGS #if FMT_USE_NONTYPE_TEMPLATE_ARGS
@@ -3785,7 +3771,8 @@ template <typename Char = char> struct format_handler {
auto on_format_specs(int id, const Char* begin, const Char* end) auto on_format_specs(int id, const Char* begin, const Char* end)
-> const Char* { -> const Char* {
auto arg = get_arg(ctx, id); auto arg = ctx.arg(id);
if (!arg) report_error("argument not found");
// Not using a visitor for custom types gives better codegen. // Not using a visitor for custom types gives better codegen.
if (arg.format_custom(begin, parse_ctx, ctx)) return parse_ctx.begin(); if (arg.format_custom(begin, parse_ctx, ctx)) return parse_ctx.begin();

4
include/fmt/printf.h
View File

@@ -403,7 +403,9 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
arg_index = parse_ctx.next_arg_id(); arg_index = parse_ctx.next_arg_id();
else else
parse_ctx.check_arg_id(--arg_index); parse_ctx.check_arg_id(--arg_index);
return detail::get_arg(context, arg_index); auto arg = context.arg(arg_index);
if (!arg) report_error("argument not found");
return arg;
}; };
const Char* start = parse_ctx.begin(); const Char* start = parse_ctx.begin();