Support named args in dynamic_format_arg_store (#1655). #1663
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
named_args will be added in a separate PR. Pending: avoid Args types from dynamic_format_arg_store template parameters, replace std::forward_list<std::variant> with a custom list.
Pending: cleanup.
Removed constexpr
Pending -- move dyn-args.h to core.h
`internal::std_string_veiew` alias
Changed dispatching from tag to explicit `if`. However I would prefer tag-based dispatching if `if constexpr`, but the later is not available in older standards.
Conflicts: include/fmt/core.h test/format-dyn-args-test.cc
vitaut
reviewed
May 5, 2020
vitaut
reviewed
May 7, 2020
vitaut
reviewed
May 7, 2020
vitaut
reviewed
May 7, 2020
vitaut
reviewed
May 7, 2020
|
@vitaut , could you take a look eventually? |
|
Will take a look shortly, sorry for slow response. |
vitaut
reviewed
May 8, 2020
| @@ -1131,6 +1132,7 @@ template <typename Context> class basic_format_arg { | |||
|
|
|||
| friend class basic_format_args<Context>; | |||
| friend class internal::arg_map<Context>; | |||
| friend class dynamic_format_arg_store<Context>; | |||
There was a problem hiding this comment.
Yes, basic_format_arg is constructed from dynamic_format_arg_store::emplace_arg() and needs to access private ctor. Also there's a need to update named_args with new size and pointer to array of named_arg_info after potential relocation.
include/fmt/core.h
Outdated
| @@ -1500,19 +1578,53 @@ class dynamic_format_arg_store | |||
| if (internal::const_check(need_copy<T>::value)) | |||
| emplace_arg(dynamic_args_.push<stored_type<T>>(arg)); | |||
| else | |||
| emplace_arg(arg); | |||
| emplace_arg(static_cast<const internal::unwrap_reference_t<T>&>(arg)); | |||
There was a problem hiding this comment.
Same here. Then unwrap_reference_t can be removed.
| emplace_arg( | ||
| fmt::arg(arg_name, dynamic_args_.push<stored_type<T>>(arg.value))); | ||
| } else | ||
| emplace_arg(fmt::arg(arg_name, arg.value)); |
There was a problem hiding this comment.
Nit: please wrap the else condition in a compound statement ({}) for consistency.
|
Thank you, great work! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I agree that my contributions are licensed under the {fmt} license, and agree to future changes to the licensing.