shadps4-emu/ext-fmt
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-fmt.git synced 2025-02-02 00:04:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a regression in named argument handling introduced by prepare

Browse Source
This commit is contained in:
Victor Zverovich 2019-06-05 16:50:04 -07:00
parent aa31028b2c
commit a38b99a188
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/format.h
View File

@ -1806,11 +1806,9 @@ struct string_view_metadata {
: offset_(view.data() - primary_string.data()), size_(view.size()) {} : offset_(view.data() - primary_string.data()), size_(view.size()) {}
FMT_CONSTEXPR string_view_metadata(std::size_t offset, std::size_t size) FMT_CONSTEXPR string_view_metadata(std::size_t offset, std::size_t size)
: offset_(offset), size_(size) {} : offset_(offset), size_(size) {}
template <typename S, typename Char = enable_if_t< template <typename Char>
internal::is_string<S>::value, char_t<S>>> FMT_CONSTEXPR basic_string_view<Char> to_view(const Char* str) const {
FMT_CONSTEXPR basic_string_view<Char> to_view(S&& str) const { return {str + offset_, size_};
const auto view = to_string_view(str);
return basic_string_view<Char>(view.data() + offset_, size_);
} }
std::size_t offset_; std::size_t offset_;

11
include/fmt/prepare.h
View File

@ -262,7 +262,7 @@ class prepared_format {
switch (part.which) { switch (part.which) {
case format_part_t::which_value::text: { case format_part_t::which_value::text: {
const auto text = value.text.to_view(format_view); const auto text = value.text.to_view(format_view.data());
auto output = ctx.out(); auto output = ctx.out();
auto&& it = internal::reserve(output, text.size()); auto&& it = internal::reserve(output, text.size());
it = std::copy_n(text.begin(), text.size(), it); it = std::copy_n(text.begin(), text.size(), it);
@ -276,16 +276,17 @@ class prepared_format {
case format_part_t::which_value::named_argument_id: { case format_part_t::which_value::named_argument_id: {
advance_parse_context_to_specification(parse_ctx, part); advance_parse_context_to_specification(parse_ctx, part);
const auto named_arg_id = value.named_arg_id.to_view(format_view); const auto named_arg_id =
value.named_arg_id.to_view(format_view.data());
format_arg<Range>(parse_ctx, ctx, named_arg_id); format_arg<Range>(parse_ctx, ctx, named_arg_id);
} break; } break;
case format_part_t::which_value::specification: { case format_part_t::which_value::specification: {
const auto& arg_id_value = value.spec.arg_id.val; const auto& arg_id_value = value.spec.arg_id.val;
const auto arg = const auto arg = value.spec.arg_id.which ==
value.spec.arg_id.which ==
format_part_t::argument_id::which_arg_id::index format_part_t::argument_id::which_arg_id::index
? ctx.arg(arg_id_value.index) ? ctx.arg(arg_id_value.index)
: ctx.arg(arg_id_value.named_index.to_view(format_)); : ctx.arg(arg_id_value.named_index.to_view(
to_string_view(format_).data()));
auto specs = value.spec.parsed_specs; auto specs = value.spec.parsed_specs;