From f85d5f4dac89eaf5f9fd87f2673d2b910dd804e4 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Sat, 22 Oct 2016 08:04:20 -0700 Subject: [PATCH] BasicFormatter -> basic_formatter --- fmt/format.cc | 7 +++-- fmt/format.h | 59 ++++++++++++++++++----------------- fmt/ostream.h | 6 ++-- fmt/posix.h | 2 +- fmt/printf.h | 2 +- fmt/time.h | 2 +- test/custom-formatter-test.cc | 6 ++-- test/format-test.cc | 10 +++--- test/ostream-test.cc | 4 +-- test/util-test.cc | 6 ++-- 10 files changed, 53 insertions(+), 51 deletions(-) diff --git a/fmt/format.cc b/fmt/format.cc index 2f43762f..b770fc02 100644 --- a/fmt/format.cc +++ b/fmt/format.cc @@ -362,9 +362,10 @@ FMT_FUNC void internal::format_windows_error( buffer.resize(INLINE_BUFFER_SIZE); for (;;) { wchar_t *system_message = &buffer[0]; - int result = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - 0, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - system_message, static_cast(buffer.size()), 0); + int result = FormatMessageW( + FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + 0, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + system_message, static_cast(buffer.size()), 0); if (result != 0) { UTF16ToUTF8 utf8_message; if (utf8_message.convert(system_message) == ERROR_SUCCESS) { diff --git a/fmt/format.h b/fmt/format.h index 6ed68352..62796d11 100644 --- a/fmt/format.h +++ b/fmt/format.h @@ -379,7 +379,7 @@ class BasicPrintfArgFormatter; template > -class BasicFormatter; +class basic_formatter; /** \rst @@ -1405,7 +1405,7 @@ struct NamedArg : Arg { template NamedArg(BasicStringRef argname, const T &value) - : Arg(MakeArg< BasicFormatter >(value)), name(argname) {} + : Arg(MakeArg< basic_formatter >(value)), name(argname) {} }; class RuntimeError : public std::runtime_error { @@ -1526,8 +1526,8 @@ class basic_format_args { } }; -typedef basic_format_args> format_args; -typedef basic_format_args> wformat_args; +typedef basic_format_args> format_args; +typedef basic_format_args> wformat_args; #define FMT_DISPATCH(call) static_cast(this)->call @@ -2160,7 +2160,7 @@ private: template class BasicArgFormatter : public internal::ArgFormatterBase { private: - BasicFormatter &formatter_; + basic_formatter &formatter_; const Char *format_; public: @@ -2172,7 +2172,7 @@ class BasicArgFormatter : public internal::ArgFormatterBase { to the part of the format string being parsed for custom argument types. \endrst */ - BasicArgFormatter(BasicFormatter &formatter, + BasicArgFormatter(basic_formatter &formatter, FormatSpec &spec, const Char *fmt) : internal::ArgFormatterBase(formatter.writer(), spec), formatter_(formatter), format_(fmt) {} @@ -2188,15 +2188,15 @@ template class ArgFormatter : public BasicArgFormatter, Char> { public: /** Constructs an argument formatter object. */ - ArgFormatter(BasicFormatter &formatter, + ArgFormatter(basic_formatter &formatter, FormatSpec &spec, const Char *fmt) : BasicArgFormatter, Char>(formatter, spec, fmt) {} }; /** This template formats data and writes the output to a writer. */ template -class BasicFormatter : - private internal::FormatterBase> { +class basic_formatter : + private internal::FormatterBase> { public: /** The character type for the output. */ typedef CharType Char; @@ -2205,9 +2205,9 @@ class BasicFormatter : BasicWriter &writer_; internal::ArgMap map_; - FMT_DISALLOW_COPY_AND_ASSIGN(BasicFormatter); + FMT_DISALLOW_COPY_AND_ASSIGN(basic_formatter); - typedef internal::FormatterBase Base; + typedef internal::FormatterBase Base; using Base::get_arg; // Checks if manual indexing is used and returns the argument with @@ -2223,12 +2223,12 @@ class BasicFormatter : public: /** \rst - Constructs a ``BasicFormatter`` object. References to the arguments and + Constructs a ``basic_formatter`` object. References to the arguments and the writer are stored in the formatter object so make sure they have appropriate lifetimes. \endrst */ - BasicFormatter(basic_format_args args, BasicWriter &w) + basic_formatter(basic_format_args args, BasicWriter &w) : Base(args), writer_(w) {} /** Returns a reference to the writer associated with this formatter. */ @@ -2275,7 +2275,7 @@ class SystemError : public internal::RuntimeError { */ template SystemError(int error_code, CStringRef message, const Args & ... args) { - init(error_code, message, make_format_args>(args...)); + init(error_code, message, make_format_args>(args...)); } ~SystemError() throw(); @@ -2470,8 +2470,8 @@ class BasicWriter { } void vwrite(BasicCStringRef format, - basic_format_args> args) { - BasicFormatter(args, *this).format(format); + basic_format_args> args) { + basic_formatter(args, *this).format(format); } /** @@ -2501,7 +2501,7 @@ class BasicWriter { */ template void write(BasicCStringRef format, const Args & ... args) { - vwrite(format, make_format_args>(args...)); + vwrite(format, make_format_args>(args...)); } BasicWriter &operator<<(int value) { @@ -3129,7 +3129,7 @@ class WindowsError : public SystemError { */ template WindowsError(int error_code, CStringRef message, const Args & ... args) { - init(error_code, message, make_format_args>(args...)); + init(error_code, message, make_format_args>(args...)); } }; @@ -3154,7 +3154,7 @@ template inline void print_colored(Color c, CStringRef format_str, const Args & ... args) { vprint_colored(c, format_str, - make_format_args>(args...)); + make_format_args>(args...)); } inline std::string vformat(CStringRef format_str, format_args args) { @@ -3174,7 +3174,7 @@ inline std::string vformat(CStringRef format_str, format_args args) { */ template inline std::string format(CStringRef format_str, const Args & ... args) { - return vformat(format_str, make_format_args>(args...)); + return vformat(format_str, make_format_args>(args...)); } inline std::wstring vformat(WCStringRef format_str, wformat_args args) { @@ -3185,7 +3185,7 @@ inline std::wstring vformat(WCStringRef format_str, wformat_args args) { template inline std::wstring format(WCStringRef format_str, const Args & ... args) { - auto vargs = make_format_args>(args...); + auto vargs = make_format_args>(args...); return vformat(format_str, vargs); } @@ -3202,7 +3202,7 @@ FMT_API void vprint(std::FILE *f, CStringRef format_str, format_args args); */ template inline void print(std::FILE *f, CStringRef format_str, const Args & ... args) { - vprint(f, format_str, make_format_args>(args...)); + vprint(f, format_str, make_format_args>(args...)); } FMT_API void vprint(CStringRef format_str, format_args args); @@ -3218,7 +3218,7 @@ FMT_API void vprint(CStringRef format_str, format_args args); */ template inline void print(CStringRef format_str, const Args & ... args) { - vprint(format_str, make_format_args>(args...)); + vprint(format_str, make_format_args>(args...)); } /** @@ -3412,7 +3412,7 @@ void check_sign(const Char *&s, const Arg &arg) { } // namespace internal template -inline internal::Arg BasicFormatter::get_arg( +inline internal::Arg basic_formatter::get_arg( BasicStringRef arg_name, const char *&error) { if (this->check_no_auto_index(error)) { map_.init(this->args()); @@ -3425,10 +3425,11 @@ inline internal::Arg BasicFormatter::get_arg( } template -inline internal::Arg BasicFormatter::parse_arg_index(const Char *&s) { +inline internal::Arg basic_formatter::parse_arg_index( + const Char *&s) { const char *error = 0; internal::Arg arg = *s < '0' || *s > '9' ? - this->next_arg(error) : get_arg(internal::parse_nonnegative_int(s), error); + this->next_arg(error) : get_arg(internal::parse_nonnegative_int(s), error); if (error) { FMT_THROW(format_error( *s != '}' && *s != ':' ? "invalid format string" : error)); @@ -3437,7 +3438,7 @@ inline internal::Arg BasicFormatter::parse_arg_index(const Char *&s) { } template -inline internal::Arg BasicFormatter::parse_arg_name(const Char *&s) { +inline internal::Arg basic_formatter::parse_arg_name(const Char *&s) { assert(internal::is_name_start(*s)); const Char *start = s; Char c; @@ -3452,7 +3453,7 @@ inline internal::Arg BasicFormatter::parse_arg_name(const Char *&s) { } template -const Char *BasicFormatter::format( +const Char *basic_formatter::format( const Char *&format_str, const internal::Arg &arg) { using internal::Arg; const Char *s = format_str; @@ -3622,7 +3623,7 @@ const Char *BasicFormatter::format( } template -void BasicFormatter::format(BasicCStringRef format_str) { +void basic_formatter::format(BasicCStringRef format_str) { const Char *s = format_str.c_str(); const Char *start = s; while (*s) { diff --git a/fmt/ostream.h b/fmt/ostream.h index a941f6c9..ac089749 100644 --- a/fmt/ostream.h +++ b/fmt/ostream.h @@ -83,11 +83,11 @@ BasicStringRef format_value( // Formats a value. template -void format_value(BasicFormatter &f, +void format_value(basic_formatter &f, const Char *&format_str, const T &value) { internal::MemoryBuffer buffer; auto str = internal::format_value(buffer, value); - typedef internal::MakeArg< BasicFormatter > MakeArg; + typedef internal::MakeArg< basic_formatter > MakeArg; format_str = f.format(format_str, MakeArg(str)); } @@ -105,7 +105,7 @@ FMT_API void vprint(std::ostream &os, CStringRef format_str, format_args args); template inline void print(std::ostream &os, CStringRef format_str, const Args & ... args) { - vprint(os, format_str, make_format_args>(args...)); + vprint(os, format_str, make_format_args>(args...)); } } // namespace fmt diff --git a/fmt/posix.h b/fmt/posix.h index 18d14de2..5fd17859 100644 --- a/fmt/posix.h +++ b/fmt/posix.h @@ -172,7 +172,7 @@ public: template inline void print(CStringRef format_str, const Args & ... args) { - vprint(format_str, make_format_args>(args...)); + vprint(format_str, make_format_args>(args...)); } }; diff --git a/fmt/printf.h b/fmt/printf.h index 75ae5598..a0d2b8d3 100644 --- a/fmt/printf.h +++ b/fmt/printf.h @@ -262,7 +262,7 @@ class BasicPrintfArgFormatter : public internal::ArgFormatterBase { /** Formats an argument of a custom (user-defined) type. */ void visit_custom(internal::Arg::CustomValue c) { - BasicFormatter formatter(basic_format_args>(), + basic_formatter formatter(basic_format_args>(), this->writer()); const Char format_str[] = {'}', 0}; const Char *format = format_str; diff --git a/fmt/time.h b/fmt/time.h index e33ee93f..ed2335c0 100644 --- a/fmt/time.h +++ b/fmt/time.h @@ -15,7 +15,7 @@ namespace fmt { template -void format_value(BasicFormatter &f, +void format_value(basic_formatter &f, const char *&format_str, const std::tm &tm) { if (*format_str == ':') ++format_str; diff --git a/test/custom-formatter-test.cc b/test/custom-formatter-test.cc index 85f307dd..53227a3c 100644 --- a/test/custom-formatter-test.cc +++ b/test/custom-formatter-test.cc @@ -17,7 +17,7 @@ using fmt::BasicPrintfArgFormatter; class CustomArgFormatter : public fmt::BasicArgFormatter { public: - CustomArgFormatter(fmt::BasicFormatter &f, + CustomArgFormatter(fmt::basic_formatter &f, fmt::FormatSpec &s, const char *fmt) : fmt::BasicArgFormatter(f, s, fmt) {} @@ -45,12 +45,12 @@ class CustomPrintfArgFormatter : } }; -typedef fmt::BasicFormatter CustomFormatter; +typedef fmt::basic_formatter CustomFormatter; std::string custom_vformat(const char *format_str, fmt::basic_format_args args) { fmt::MemoryWriter writer; - // Pass custom argument formatter as a template arg to BasicFormatter. + // Pass custom argument formatter as a template arg to basic_formatter. CustomFormatter formatter(args, writer); formatter.format(format_str); return writer.str(); diff --git a/test/format-test.cc b/test/format-test.cc index 1be9a821..2c7fc29f 100644 --- a/test/format-test.cc +++ b/test/format-test.cc @@ -1355,7 +1355,7 @@ TEST(FormatterTest, FormatCStringRef) { EXPECT_EQ("test", format("{0}", CStringRef("test"))); } -void format_value(fmt::BasicFormatter &f, const char *, const Date &d) { +void format_value(fmt::basic_formatter &f, const char *, const Date &d) { f.writer() << d.year() << '-' << d.month() << '-' << d.day(); } @@ -1368,7 +1368,7 @@ TEST(FormatterTest, FormatCustom) { class Answer {}; template -void format_value(fmt::BasicFormatter &f, const Char *, Answer) { +void format_value(fmt::basic_formatter &f, const Char *, Answer) { f.writer() << "42"; } @@ -1559,7 +1559,7 @@ std::string vformat_message(int id, const char *format, fmt::format_args args) { template std::string format_message(int id, const char *format, const Args & ... args) { - auto va = fmt::make_format_args>(args...); + auto va = fmt::make_format_args>(args...); return vformat_message(id, format, va); } @@ -1624,7 +1624,7 @@ class MockArgFormatter : public: typedef fmt::internal::ArgFormatterBase Base; - MockArgFormatter(fmt::BasicFormatter &f, + MockArgFormatter(fmt::basic_formatter &f, fmt::FormatSpec &s, const char *) : fmt::internal::ArgFormatterBase(f.writer(), s) { EXPECT_CALL(*this, visit_int(42)); @@ -1633,7 +1633,7 @@ class MockArgFormatter : MOCK_METHOD1(visit_int, void (int value)); }; -typedef fmt::BasicFormatter CustomFormatter; +typedef fmt::basic_formatter CustomFormatter; void custom_vformat(const char *format_str, fmt::basic_format_args args) { diff --git a/test/ostream-test.cc b/test/ostream-test.cc index 2469e041..224540b1 100644 --- a/test/ostream-test.cc +++ b/test/ostream-test.cc @@ -59,14 +59,14 @@ TEST(OStreamTest, Enum) { } struct TestArgFormatter : fmt::BasicArgFormatter { - TestArgFormatter(fmt::BasicFormatter &f, + TestArgFormatter(fmt::basic_formatter &f, fmt::FormatSpec &s, const char *fmt) : fmt::BasicArgFormatter(f, s, fmt) {} }; TEST(OStreamTest, CustomArg) { fmt::MemoryWriter writer; - typedef fmt::BasicFormatter Formatter; + typedef fmt::basic_formatter Formatter; Formatter formatter(fmt::basic_format_args(), writer); fmt::FormatSpec spec; TestArgFormatter af(formatter, spec, "}"); diff --git a/test/util-test.cc b/test/util-test.cc index 5d5ddf32..5e836d49 100644 --- a/test/util-test.cc +++ b/test/util-test.cc @@ -64,13 +64,13 @@ namespace { struct Test {}; template -void format_value(fmt::BasicFormatter &f, const Char *, Test) { +void format_value(fmt::basic_formatter &f, const Char *, Test) { f.writer() << "test"; } template Arg make_arg(const T &value) { - typedef fmt::internal::MakeValue< fmt::BasicFormatter > MakeValue; + typedef fmt::internal::MakeValue< fmt::basic_formatter > MakeValue; Arg arg = MakeValue(value); arg.type = fmt::internal::type(); return arg; @@ -566,7 +566,7 @@ TEST(ArgTest, MakeArg) { EXPECT_EQ(fmt::internal::Arg::CUSTOM, arg.type); EXPECT_EQ(&t, arg.custom.value); fmt::MemoryWriter w; - fmt::BasicFormatter formatter(fmt::format_args(), w); + fmt::basic_formatter formatter(fmt::format_args(), w); const char *s = "}"; arg.custom.format(&formatter, &t, &s); EXPECT_EQ("test", w.str());