mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-24 21:16:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify dynamic_specs_handler

Browse Source
This commit is contained in:
Victor Zverovich 2017-09-16 15:30:13 -07:00
parent 5a8ae0bb05
commit 83dd2ab919
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fmt/format.h
View File

@ -3238,22 +3238,24 @@ class dynamic_specs_handler: public specs_setter<Char> {
template <typename Id> template <typename Id>
void on_dynamic_width(Id arg_id) { void on_dynamic_width(Id arg_id) {
set(specs_.width_ref, arg_id); specs_.width_ref = make_arg_ref(arg_id);
} }
template <typename Id> template <typename Id>
void on_dynamic_precision(Id arg_id) { void on_dynamic_precision(Id arg_id) {
set(specs_.precision_ref, arg_id); specs_.precision_ref = make_arg_ref(arg_id);
} }
private: private:
using arg_ref = arg_ref<Char>;
template <typename Id> template <typename Id>
void set(arg_ref<Char> &ref, Id arg_id) { arg_ref make_arg_ref(Id arg_id) {
ref = arg_ref<Char>(arg_id); return arg_ref(arg_id);
} }
void set(arg_ref<Char> &ref, auto_id) { arg_ref make_arg_ref(auto_id) {
ref.kind = arg_ref<Char>::NONE; return arg_ref(arg_ref::NONE);
} }
dynamic_format_specs<Char> &specs_; dynamic_format_specs<Char> &specs_;
@ -3291,7 +3293,7 @@ Iterator parse_arg_id(Iterator it, Handler handler) {
// format specifiers. // format specifiers.
template <typename Iterator, typename Handler> template <typename Iterator, typename Handler>
Iterator parse_format_specs(Iterator it, Handler &handler) { Iterator parse_format_specs(Iterator it, Handler &handler) {
typedef typename Iterator::value_type char_type; using char_type = typename Iterator::value_type;
// Parse fill and alignment. // Parse fill and alignment.
if (char_type c = *it) { if (char_type c = *it) {
auto p = it + 1; auto p = it + 1;