AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Inherit arg_formatter_base from basic_writer

Browse Source
This commit is contained in:
Victor Zverovich 2020-05-03 21:02:09 -07:00
parent bab3f58003
commit 7b66e2f219
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/fmt/format.h
View File

@ -1768,7 +1768,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 Range, typename ErrorHandler = internal::error_handler> template <typename Range, typename ErrorHandler = internal::error_handler>
class arg_formatter_base { class arg_formatter_base : private basic_writer<Range> {
public: public:
using char_type = typename Range::value_type; using char_type = typename Range::value_type;
using iterator = typename Range::iterator; using iterator = typename Range::iterator;
@ -1776,9 +1776,12 @@ class arg_formatter_base {
private: private:
using writer_type = basic_writer<Range>; using writer_type = basic_writer<Range>;
writer_type writer_;
format_specs* specs_; format_specs* specs_;
using writer_type::write;
using writer_type::write_int;
using writer_type::write_pointer;
struct char_writer { struct char_writer {
char_type value; char_type value;
@ -1792,24 +1795,23 @@ class arg_formatter_base {
void write_char(char_type value) { void write_char(char_type value) {
if (specs_) if (specs_)
writer_.out() = out() = write_padded(out(), *specs_, 1, char_writer{value});
write_padded(writer_.out(), *specs_, 1, char_writer{value});
else else
writer_.write(value); write(value);
} }
void write_pointer(const void* p) { void write_pointer(const void* p) {
writer_.write_pointer(internal::to_uintptr(p), specs_); write_pointer(internal::to_uintptr(p), specs_);
} }
protected: protected:
writer_type& writer() { return writer_; } using writer_type::out;
writer_type& writer() { return *this; }
format_specs* specs() { return specs_; } format_specs* specs() { return specs_; }
iterator out() { return writer_.out(); }
void write(bool value) { void write(bool value) {
string_view sv(value ? "true" : "false"); string_view sv(value ? "true" : "false");
specs_ ? writer_.write(sv, *specs_) : writer_.write(sv); specs_ ? write(sv, *specs_) : write(sv);
} }
void write(const char_type* value) { void write(const char_type* value) {
@ -1818,13 +1820,13 @@ class arg_formatter_base {
} else { } else {
auto length = std::char_traits<char_type>::length(value); auto length = std::char_traits<char_type>::length(value);
basic_string_view<char_type> sv(value, length); basic_string_view<char_type> sv(value, length);
specs_ ? writer_.write(sv, *specs_) : writer_.write(sv); specs_ ? write(sv, *specs_) : write(sv);
} }
} }
public: public:
arg_formatter_base(Range r, format_specs* s, locale_ref loc) arg_formatter_base(Range r, format_specs* s, locale_ref loc)
: writer_(r, loc), specs_(s) {} : basic_writer<Range>(r, loc), specs_(s) {}
iterator operator()(monostate) { iterator operator()(monostate) {
FMT_ASSERT(false, "invalid argument type"); FMT_ASSERT(false, "invalid argument type");
@ -1834,9 +1836,9 @@ class arg_formatter_base {
template <typename T, FMT_ENABLE_IF(is_integral<T>::value)> template <typename T, FMT_ENABLE_IF(is_integral<T>::value)>
iterator operator()(T value) { iterator operator()(T value) {
if (specs_) if (specs_)
writer_.write_int(value, *specs_); write_int(value, *specs_);
else else
writer_.write(value); write(value);
return out(); return out();
} }
@ -1855,7 +1857,7 @@ class arg_formatter_base {
template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)> template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
iterator operator()(T value) { iterator operator()(T value) {
if (const_check(is_supported_floating_point(value))) if (const_check(is_supported_floating_point(value)))
writer_.write(value, specs_ ? *specs_ : format_specs()); write(value, specs_ ? *specs_ : format_specs());
else else
FMT_ASSERT(false, "unsupported float argument type"); FMT_ASSERT(false, "unsupported float argument type");
return out(); return out();
@ -1870,9 +1872,9 @@ class arg_formatter_base {
void on_int() { void on_int() {
if (formatter.specs_) if (formatter.specs_)
formatter.writer_.write_int(static_cast<int>(value), *formatter.specs_); formatter.write_int(static_cast<int>(value), *formatter.specs_);
else else
formatter.writer_.write(value); formatter.write(value);
} }
void on_char() { formatter.write_char(value); } void on_char() { formatter.write_char(value); }
}; };
@ -1898,9 +1900,9 @@ class arg_formatter_base {
iterator operator()(basic_string_view<char_type> value) { iterator operator()(basic_string_view<char_type> value) {
if (specs_) { if (specs_) {
internal::check_string_type_spec(specs_->type, internal::error_handler()); internal::check_string_type_spec(specs_->type, internal::error_handler());
writer_.write(value, *specs_); write(value, *specs_);
} else { } else {
writer_.write(value); write(value);
} }
return out(); return out();
} }