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

Cleanup arg_formatter_base

Browse Source
This commit is contained in:
Victor Zverovich 2020-06-07 20:55:38 -07:00
parent 5e7c70e206
commit d3107f8551
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
include/fmt/format.h
View File

@ -1672,7 +1672,7 @@ template <> struct is_integral<int128_t> : std::true_type {};
template <> struct is_integral<uint128_t> : std::true_type {}; template <> struct is_integral<uint128_t> : std::true_type {};
template <typename OutputIt, typename Char, template <typename OutputIt, typename Char,
typename ErrorHandler = detail::error_handler> typename ErrorHandler = error_handler>
class arg_formatter_base { class arg_formatter_base {
public: public:
using iterator = OutputIt; using iterator = OutputIt;
@ -1752,6 +1752,36 @@ class arg_formatter_base {
out_ = write_ptr<char_type>(out_, to_uintptr(p), specs_); out_ = write_ptr<char_type>(out_, to_uintptr(p), specs_);
} }
struct char_spec_handler : ErrorHandler {
arg_formatter_base& formatter;
char_type value;
char_spec_handler(arg_formatter_base& f, char_type val)
: formatter(f), value(val) {}
void on_int() {
// char is only formatted as int if there are specs.
formatter.write_int(static_cast<int>(value), *formatter.specs_);
}
void on_char() {
if (formatter.specs_)
formatter.out_ = write_char(formatter.out_, value, *formatter.specs_);
else
formatter.write(value);
}
};
struct cstring_spec_handler : error_handler {
arg_formatter_base& formatter;
const char_type* value;
cstring_spec_handler(arg_formatter_base& f, const char_type* val)
: formatter(f), value(val) {}
void on_string() { formatter.write(value); }
void on_pointer() { formatter.write_pointer(value); }
};
protected: protected:
iterator out() { return out_; } iterator out() { return out_; }
format_specs* specs() { return specs_; } format_specs* specs() { return specs_; }
@ -1811,38 +1841,6 @@ class arg_formatter_base {
return out_; return out_;
} }
struct char_spec_handler : ErrorHandler {
arg_formatter_base& formatter;
char_type value;
char_spec_handler(arg_formatter_base& f, char_type val)
: formatter(f), value(val) {}
void on_int() {
if (formatter.specs_)
formatter.write_int(static_cast<int>(value), *formatter.specs_);
else
formatter.write(value);
}
void on_char() {
if (formatter.specs_)
formatter.out_ = write_char(formatter.out_, value, *formatter.specs_);
else
formatter.write(value);
}
};
struct cstring_spec_handler : detail::error_handler {
arg_formatter_base& formatter;
const char_type* value;
cstring_spec_handler(arg_formatter_base& f, const char_type* val)
: formatter(f), value(val) {}
void on_string() { formatter.write(value); }
void on_pointer() { formatter.write_pointer(value); }
};
iterator operator()(const char_type* value) { iterator operator()(const char_type* value) {
if (!specs_) return write(value), out_; if (!specs_) return write(value), out_;
handle_cstring_type_spec(specs_->type, cstring_spec_handler(*this, value)); handle_cstring_type_spec(specs_->type, cstring_spec_handler(*this, value));