From 58b6f8db48792a6f8b43a0b6caef1de5fac96f03 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Sat, 12 Jan 2019 18:27:38 -0800 Subject: [PATCH] Format the code using clang-format --- .clang-format | 8 + include/fmt/chrono.h | 125 +- include/fmt/color.h | 455 +++--- include/fmt/core.h | 805 ++++----- include/fmt/format-inl.h | 508 +++--- include/fmt/format.h | 1542 +++++++++-------- include/fmt/locale.h | 42 +- include/fmt/ostream.h | 67 +- include/fmt/posix.h | 121 +- include/fmt/prepare.h | 118 +- include/fmt/printf.h | 347 ++-- include/fmt/ranges.h | 154 +- include/fmt/time.h | 47 +- src/format.cc | 39 +- src/posix.cc | 99 +- test/assert-test.cc | 8 +- test/chrono-test.cc | 31 +- test/core-test.cc | 209 ++- test/custom-formatter-test.cc | 15 +- test/format-impl-test.cc | 44 +- test/format-test.cc | 1015 ++++++------ test/gmock-gtest-all.cc | 2910 +++++++++++++++------------------ test/gtest-extra-test.cc | 179 +- test/gtest-extra.cc | 21 +- test/gtest-extra.h | 150 +- test/locale-test.cc | 3 +- test/mock-allocator.h | 30 +- test/ostream-test.cc | 63 +- test/posix-mock-test.cc | 206 +-- test/posix-mock.h | 28 +- test/posix-test.cc | 87 +- test/prepare-test.cc | 80 +- test/printf-test.cc | 178 +- test/ranges-test.cc | 23 +- test/test-assert.h | 2 +- test/test-main.cc | 12 +- test/time-test.cc | 29 +- test/util.cc | 9 +- test/util.h | 33 +- 39 files changed, 4734 insertions(+), 5108 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..df55d340 --- /dev/null +++ b/.clang-format @@ -0,0 +1,8 @@ +# Run manually to reformat a file: +# clang-format -i --style=file +Language: Cpp +BasedOnStyle: Google +IndentPPDirectives: AfterHash +IndentCaseLabels: false +AlwaysBreakTemplateDeclarations: false +DerivePointerAlignment: false diff --git a/include/fmt/chrono.h b/include/fmt/chrono.h index 1926701f..0d0e3486 100644 --- a/include/fmt/chrono.h +++ b/include/fmt/chrono.h @@ -28,8 +28,9 @@ enum class numeric_system { // Parses a put_time-like format string and invokes handler actions. template -FMT_CONSTEXPR const Char *parse_chrono_format( - const Char *begin, const Char *end, Handler &&handler) { +FMT_CONSTEXPR const Char* parse_chrono_format(const Char* begin, + const Char* end, + Handler&& handler) { auto ptr = begin; while (ptr != end) { auto c = *ptr; @@ -38,11 +39,9 @@ FMT_CONSTEXPR const Char *parse_chrono_format( ++ptr; continue; } - if (begin != ptr) - handler.on_text(begin, ptr); - ++ptr; // consume '%' - if (ptr == end) - throw format_error("invalid format"); + if (begin != ptr) handler.on_text(begin, ptr); + ++ptr; // consume '%' + if (ptr == end) throw format_error("invalid format"); c = *ptr++; switch (c) { case '%': @@ -127,8 +126,7 @@ FMT_CONSTEXPR const Char *parse_chrono_format( break; // Alternative representation: case 'E': { - if (ptr == end) - throw format_error("invalid format"); + if (ptr == end) throw format_error("invalid format"); c = *ptr++; switch (c) { case 'c': @@ -146,8 +144,7 @@ FMT_CONSTEXPR const Char *parse_chrono_format( break; } case 'O': - if (ptr == end) - throw format_error("invalid format"); + if (ptr == end) throw format_error("invalid format"); c = *ptr++; switch (c) { case 'w': @@ -177,16 +174,14 @@ FMT_CONSTEXPR const Char *parse_chrono_format( } begin = ptr; } - if (begin != ptr) - handler.on_text(begin, ptr); + if (begin != ptr) handler.on_text(begin, ptr); return ptr; } struct chrono_format_checker { void report_no_date() { throw format_error("no date"); } - template - void on_text(const Char *, const Char *) {} + template void on_text(const Char*, const Char*) {} void on_abbr_weekday() { report_no_date(); } void on_full_weekday() { report_no_date(); } void on_dec0_weekday(numeric_system) { report_no_date(); } @@ -210,24 +205,23 @@ struct chrono_format_checker { void on_tz_name() { report_no_date(); } }; -template -inline int to_int(Int value) { +template inline int to_int(Int value) { FMT_ASSERT(value >= (std::numeric_limits::min)() && - value <= (std::numeric_limits::max)(), "invalid value"); + value <= (std::numeric_limits::max)(), + "invalid value"); return static_cast(value); } -template -struct chrono_formatter { - FormatContext &context; +template struct chrono_formatter { + FormatContext& context; OutputIt out; std::chrono::seconds s; std::chrono::milliseconds ms; typedef typename FormatContext::char_type char_type; - explicit chrono_formatter(FormatContext &ctx, OutputIt o) - : context(ctx), out(o) {} + explicit chrono_formatter(FormatContext& ctx, OutputIt o) + : context(ctx), out(o) {} int hour() const { return to_int((s.count() / 3600) % 24); } @@ -251,14 +245,13 @@ struct chrono_formatter { typedef typename int_traits::main_type main_type; main_type n = to_unsigned(value); int num_digits = internal::count_digits(n); - if (width > num_digits) - out = std::fill_n(out, width - num_digits, '0'); + if (width > num_digits) out = std::fill_n(out, width - num_digits, '0'); out = format_decimal(out, n, num_digits); } - void format_localized(const tm &time, const char *format) { + void format_localized(const tm& time, const char* format) { auto locale = context.locale().template get(); - auto &facet = std::use_facet>(locale); + auto& facet = std::use_facet>(locale); std::basic_ostringstream os; os.imbue(locale); facet.put(os, os, ' ', &time, format, format + std::strlen(format)); @@ -266,7 +259,7 @@ struct chrono_formatter { std::copy(str.begin(), str.end(), out); } - void on_text(const char_type *begin, const char_type *end) { + void on_text(const char_type* begin, const char_type* end) { std::copy(begin, end, out); } @@ -286,24 +279,21 @@ struct chrono_formatter { void on_tz_name() {} void on_24_hour(numeric_system ns) { - if (ns == numeric_system::standard) - return write(hour(), 2); + if (ns == numeric_system::standard) return write(hour(), 2); auto time = tm(); time.tm_hour = hour(); format_localized(time, "%OH"); } void on_12_hour(numeric_system ns) { - if (ns == numeric_system::standard) - return write(hour12(), 2); + if (ns == numeric_system::standard) return write(hour12(), 2); auto time = tm(); time.tm_hour = hour(); format_localized(time, "%OI"); } void on_minute(numeric_system ns) { - if (ns == numeric_system::standard) - return write(minute(), 2); + if (ns == numeric_system::standard) return write(minute(), 2); auto time = tm(); time.tm_min = minute(); format_localized(time, "%OM"); @@ -341,30 +331,30 @@ struct chrono_formatter { }; } // namespace internal -template FMT_CONSTEXPR const char *get_units() { +template FMT_CONSTEXPR const char* get_units() { return FMT_NULL; } -template <> FMT_CONSTEXPR const char *get_units() { return "as"; } -template <> FMT_CONSTEXPR const char *get_units() { return "fs"; } -template <> FMT_CONSTEXPR const char *get_units() { return "ps"; } -template <> FMT_CONSTEXPR const char *get_units() { return "ns"; } -template <> FMT_CONSTEXPR const char *get_units() { return "µs"; } -template <> FMT_CONSTEXPR const char *get_units() { return "ms"; } -template <> FMT_CONSTEXPR const char *get_units() { return "cs"; } -template <> FMT_CONSTEXPR const char *get_units() { return "ds"; } -template <> FMT_CONSTEXPR const char *get_units>() { return "s"; } -template <> FMT_CONSTEXPR const char *get_units() { return "das"; } -template <> FMT_CONSTEXPR const char *get_units() { return "hs"; } -template <> FMT_CONSTEXPR const char *get_units() { return "ks"; } -template <> FMT_CONSTEXPR const char *get_units() { return "Ms"; } -template <> FMT_CONSTEXPR const char *get_units() { return "Gs"; } -template <> FMT_CONSTEXPR const char *get_units() { return "Ts"; } -template <> FMT_CONSTEXPR const char *get_units() { return "Ps"; } -template <> FMT_CONSTEXPR const char *get_units() { return "Es"; } -template <> FMT_CONSTEXPR const char *get_units>() { +template <> FMT_CONSTEXPR const char* get_units() { return "as"; } +template <> FMT_CONSTEXPR const char* get_units() { return "fs"; } +template <> FMT_CONSTEXPR const char* get_units() { return "ps"; } +template <> FMT_CONSTEXPR const char* get_units() { return "ns"; } +template <> FMT_CONSTEXPR const char* get_units() { return "µs"; } +template <> FMT_CONSTEXPR const char* get_units() { return "ms"; } +template <> FMT_CONSTEXPR const char* get_units() { return "cs"; } +template <> FMT_CONSTEXPR const char* get_units() { return "ds"; } +template <> FMT_CONSTEXPR const char* get_units>() { return "s"; } +template <> FMT_CONSTEXPR const char* get_units() { return "das"; } +template <> FMT_CONSTEXPR const char* get_units() { return "hs"; } +template <> FMT_CONSTEXPR const char* get_units() { return "ks"; } +template <> FMT_CONSTEXPR const char* get_units() { return "Ms"; } +template <> FMT_CONSTEXPR const char* get_units() { return "Gs"; } +template <> FMT_CONSTEXPR const char* get_units() { return "Ts"; } +template <> FMT_CONSTEXPR const char* get_units() { return "Ps"; } +template <> FMT_CONSTEXPR const char* get_units() { return "Es"; } +template <> FMT_CONSTEXPR const char* get_units>() { return "m"; } -template <> FMT_CONSTEXPR const char *get_units>() { +template <> FMT_CONSTEXPR const char* get_units>() { return "h"; } @@ -378,12 +368,11 @@ struct formatter, Char> { typedef std::chrono::duration duration; struct spec_handler { - formatter &f; - basic_parse_context &context; + formatter& f; + basic_parse_context& context; basic_string_view format_str; - template - FMT_CONSTEXPR arg_ref_type make_arg_ref(Id arg_id) { + template FMT_CONSTEXPR arg_ref_type make_arg_ref(Id arg_id) { context.check_arg_id(arg_id); return arg_ref_type(arg_id); } @@ -398,13 +387,12 @@ struct formatter, Char> { return arg_ref_type(context.next_arg_id()); } - void on_error(const char *msg) { throw format_error(msg); } + void on_error(const char* msg) { throw format_error(msg); } void on_fill(Char fill) { f.spec.fill_ = fill; } void on_align(alignment align) { f.spec.align_ = align; } void on_width(unsigned width) { f.spec.width_ = width; } - template - void on_dynamic_width(Id arg_id) { + template void on_dynamic_width(Id arg_id) { f.width_ref = make_arg_ref(arg_id); } }; @@ -412,7 +400,7 @@ struct formatter, Char> { public: formatter() : spec() {} - FMT_CONSTEXPR auto parse(basic_parse_context &ctx) + FMT_CONSTEXPR auto parse(basic_parse_context& ctx) -> decltype(ctx.begin()) { auto begin = ctx.begin(), end = ctx.end(); if (begin == end) return begin; @@ -421,14 +409,13 @@ struct formatter, Char> { if (begin == end) return begin; begin = internal::parse_width(begin, end, handler); end = parse_chrono_format(begin, end, internal::chrono_format_checker()); - format_str = basic_string_view( - &*begin, internal::to_unsigned(end - begin)); + format_str = + basic_string_view(&*begin, internal::to_unsigned(end - begin)); return end; } template - auto format(const duration &d, FormatContext &ctx) - -> decltype(ctx.out()) { + auto format(const duration& d, FormatContext& ctx) -> decltype(ctx.out()) { auto begin = format_str.begin(), end = format_str.end(); // As a possible future optimization, we could avoid extra copying if width // is not specified. @@ -436,7 +423,7 @@ struct formatter, Char> { typedef output_range range; basic_writer w(range(ctx.out())); if (begin == end || *begin == '}') { - if (const char *unit = get_units()) + if (const char* unit = get_units()) format_to(buf, "{}{}", d.count(), unit); else if (Period::den == 1) format_to(buf, "{}[{}]s", d.count(), Period::num); @@ -449,8 +436,8 @@ struct formatter, Char> { f.ms = std::chrono::duration_cast(d - f.s); parse_chrono_format(begin, end, f); } - internal::handle_dynamic_spec( - spec.width_, width_ref, ctx); + internal::handle_dynamic_spec(spec.width_, + width_ref, ctx); w.write(buf.data(), buf.size(), spec); return w.out(); } diff --git a/include/fmt/color.h b/include/fmt/color.h index 857d5d13..3044aaab 100644 --- a/include/fmt/color.h +++ b/include/fmt/color.h @@ -20,12 +20,12 @@ FMT_API void vprint_colored(color c, string_view format, format_args args); FMT_API void vprint_colored(color c, wstring_view format, wformat_args args); template inline void print_colored(color c, string_view format_str, - const Args & ... args) { + const Args&... args) { vprint_colored(c, format_str, make_format_args(args...)); } template inline void print_colored(color c, wstring_view format_str, - const Args & ... args) { + const Args&... args) { vprint_colored(c, format_str, make_format_args(args...)); } @@ -48,148 +48,148 @@ inline void vprint_colored(color c, wstring_view format, wformat_args args) { #else enum class color : uint32_t { - alice_blue = 0xF0F8FF, // rgb(240,248,255) - antique_white = 0xFAEBD7, // rgb(250,235,215) - aqua = 0x00FFFF, // rgb(0,255,255) - aquamarine = 0x7FFFD4, // rgb(127,255,212) - azure = 0xF0FFFF, // rgb(240,255,255) - beige = 0xF5F5DC, // rgb(245,245,220) - bisque = 0xFFE4C4, // rgb(255,228,196) - black = 0x000000, // rgb(0,0,0) - blanched_almond = 0xFFEBCD, // rgb(255,235,205) - blue = 0x0000FF, // rgb(0,0,255) - blue_violet = 0x8A2BE2, // rgb(138,43,226) - brown = 0xA52A2A, // rgb(165,42,42) - burly_wood = 0xDEB887, // rgb(222,184,135) - cadet_blue = 0x5F9EA0, // rgb(95,158,160) - chartreuse = 0x7FFF00, // rgb(127,255,0) - chocolate = 0xD2691E, // rgb(210,105,30) - coral = 0xFF7F50, // rgb(255,127,80) - cornflower_blue = 0x6495ED, // rgb(100,149,237) - cornsilk = 0xFFF8DC, // rgb(255,248,220) - crimson = 0xDC143C, // rgb(220,20,60) - cyan = 0x00FFFF, // rgb(0,255,255) - dark_blue = 0x00008B, // rgb(0,0,139) - dark_cyan = 0x008B8B, // rgb(0,139,139) - dark_golden_rod = 0xB8860B, // rgb(184,134,11) - dark_gray = 0xA9A9A9, // rgb(169,169,169) - dark_green = 0x006400, // rgb(0,100,0) - dark_khaki = 0xBDB76B, // rgb(189,183,107) - dark_magenta = 0x8B008B, // rgb(139,0,139) - dark_olive_green = 0x556B2F, // rgb(85,107,47) - dark_orange = 0xFF8C00, // rgb(255,140,0) - dark_orchid = 0x9932CC, // rgb(153,50,204) - dark_red = 0x8B0000, // rgb(139,0,0) - dark_salmon = 0xE9967A, // rgb(233,150,122) - dark_sea_green = 0x8FBC8F, // rgb(143,188,143) - dark_slate_blue = 0x483D8B, // rgb(72,61,139) - dark_slate_gray = 0x2F4F4F, // rgb(47,79,79) - dark_turquoise = 0x00CED1, // rgb(0,206,209) - dark_violet = 0x9400D3, // rgb(148,0,211) - deep_pink = 0xFF1493, // rgb(255,20,147) - deep_sky_blue = 0x00BFFF, // rgb(0,191,255) - dim_gray = 0x696969, // rgb(105,105,105) - dodger_blue = 0x1E90FF, // rgb(30,144,255) - fire_brick = 0xB22222, // rgb(178,34,34) - floral_white = 0xFFFAF0, // rgb(255,250,240) - forest_green = 0x228B22, // rgb(34,139,34) - fuchsia = 0xFF00FF, // rgb(255,0,255) - gainsboro = 0xDCDCDC, // rgb(220,220,220) - ghost_white = 0xF8F8FF, // rgb(248,248,255) - gold = 0xFFD700, // rgb(255,215,0) - golden_rod = 0xDAA520, // rgb(218,165,32) - gray = 0x808080, // rgb(128,128,128) - green = 0x008000, // rgb(0,128,0) - green_yellow = 0xADFF2F, // rgb(173,255,47) - honey_dew = 0xF0FFF0, // rgb(240,255,240) - hot_pink = 0xFF69B4, // rgb(255,105,180) - indian_red = 0xCD5C5C, // rgb(205,92,92) - indigo = 0x4B0082, // rgb(75,0,130) - ivory = 0xFFFFF0, // rgb(255,255,240) - khaki = 0xF0E68C, // rgb(240,230,140) - lavender = 0xE6E6FA, // rgb(230,230,250) - lavender_blush = 0xFFF0F5, // rgb(255,240,245) - lawn_green = 0x7CFC00, // rgb(124,252,0) - lemon_chiffon = 0xFFFACD, // rgb(255,250,205) - light_blue = 0xADD8E6, // rgb(173,216,230) - light_coral = 0xF08080, // rgb(240,128,128) - light_cyan = 0xE0FFFF, // rgb(224,255,255) - light_golden_rod_yellow = 0xFAFAD2, // rgb(250,250,210) - light_gray = 0xD3D3D3, // rgb(211,211,211) - light_green = 0x90EE90, // rgb(144,238,144) - light_pink = 0xFFB6C1, // rgb(255,182,193) - light_salmon = 0xFFA07A, // rgb(255,160,122) - light_sea_green = 0x20B2AA, // rgb(32,178,170) - light_sky_blue = 0x87CEFA, // rgb(135,206,250) - light_slate_gray = 0x778899, // rgb(119,136,153) - light_steel_blue = 0xB0C4DE, // rgb(176,196,222) - light_yellow = 0xFFFFE0, // rgb(255,255,224) - lime = 0x00FF00, // rgb(0,255,0) - lime_green = 0x32CD32, // rgb(50,205,50) - linen = 0xFAF0E6, // rgb(250,240,230) - magenta = 0xFF00FF, // rgb(255,0,255) - maroon = 0x800000, // rgb(128,0,0) - medium_aquamarine = 0x66CDAA, // rgb(102,205,170) - medium_blue = 0x0000CD, // rgb(0,0,205) - medium_orchid = 0xBA55D3, // rgb(186,85,211) - medium_purple = 0x9370DB, // rgb(147,112,219) - medium_sea_green = 0x3CB371, // rgb(60,179,113) - medium_slate_blue = 0x7B68EE, // rgb(123,104,238) - medium_spring_green = 0x00FA9A, // rgb(0,250,154) - medium_turquoise = 0x48D1CC, // rgb(72,209,204) - medium_violet_red = 0xC71585, // rgb(199,21,133) - midnight_blue = 0x191970, // rgb(25,25,112) - mint_cream = 0xF5FFFA, // rgb(245,255,250) - misty_rose = 0xFFE4E1, // rgb(255,228,225) - moccasin = 0xFFE4B5, // rgb(255,228,181) - navajo_white = 0xFFDEAD, // rgb(255,222,173) - navy = 0x000080, // rgb(0,0,128) - old_lace = 0xFDF5E6, // rgb(253,245,230) - olive = 0x808000, // rgb(128,128,0) - olive_drab = 0x6B8E23, // rgb(107,142,35) - orange = 0xFFA500, // rgb(255,165,0) - orange_red = 0xFF4500, // rgb(255,69,0) - orchid = 0xDA70D6, // rgb(218,112,214) - pale_golden_rod = 0xEEE8AA, // rgb(238,232,170) - pale_green = 0x98FB98, // rgb(152,251,152) - pale_turquoise = 0xAFEEEE, // rgb(175,238,238) - pale_violet_red = 0xDB7093, // rgb(219,112,147) - papaya_whip = 0xFFEFD5, // rgb(255,239,213) - peach_puff = 0xFFDAB9, // rgb(255,218,185) - peru = 0xCD853F, // rgb(205,133,63) - pink = 0xFFC0CB, // rgb(255,192,203) - plum = 0xDDA0DD, // rgb(221,160,221) - powder_blue = 0xB0E0E6, // rgb(176,224,230) - purple = 0x800080, // rgb(128,0,128) - rebecca_purple = 0x663399, // rgb(102,51,153) - red = 0xFF0000, // rgb(255,0,0) - rosy_brown = 0xBC8F8F, // rgb(188,143,143) - royal_blue = 0x4169E1, // rgb(65,105,225) - saddle_brown = 0x8B4513, // rgb(139,69,19) - salmon = 0xFA8072, // rgb(250,128,114) - sandy_brown = 0xF4A460, // rgb(244,164,96) - sea_green = 0x2E8B57, // rgb(46,139,87) - sea_shell = 0xFFF5EE, // rgb(255,245,238) - sienna = 0xA0522D, // rgb(160,82,45) - silver = 0xC0C0C0, // rgb(192,192,192) - sky_blue = 0x87CEEB, // rgb(135,206,235) - slate_blue = 0x6A5ACD, // rgb(106,90,205) - slate_gray = 0x708090, // rgb(112,128,144) - snow = 0xFFFAFA, // rgb(255,250,250) - spring_green = 0x00FF7F, // rgb(0,255,127) - steel_blue = 0x4682B4, // rgb(70,130,180) - tan = 0xD2B48C, // rgb(210,180,140) - teal = 0x008080, // rgb(0,128,128) - thistle = 0xD8BFD8, // rgb(216,191,216) - tomato = 0xFF6347, // rgb(255,99,71) - turquoise = 0x40E0D0, // rgb(64,224,208) - violet = 0xEE82EE, // rgb(238,130,238) - wheat = 0xF5DEB3, // rgb(245,222,179) - white = 0xFFFFFF, // rgb(255,255,255) - white_smoke = 0xF5F5F5, // rgb(245,245,245) - yellow = 0xFFFF00, // rgb(255,255,0) - yellow_green = 0x9ACD32 // rgb(154,205,50) -}; // enum class color + alice_blue = 0xF0F8FF, // rgb(240,248,255) + antique_white = 0xFAEBD7, // rgb(250,235,215) + aqua = 0x00FFFF, // rgb(0,255,255) + aquamarine = 0x7FFFD4, // rgb(127,255,212) + azure = 0xF0FFFF, // rgb(240,255,255) + beige = 0xF5F5DC, // rgb(245,245,220) + bisque = 0xFFE4C4, // rgb(255,228,196) + black = 0x000000, // rgb(0,0,0) + blanched_almond = 0xFFEBCD, // rgb(255,235,205) + blue = 0x0000FF, // rgb(0,0,255) + blue_violet = 0x8A2BE2, // rgb(138,43,226) + brown = 0xA52A2A, // rgb(165,42,42) + burly_wood = 0xDEB887, // rgb(222,184,135) + cadet_blue = 0x5F9EA0, // rgb(95,158,160) + chartreuse = 0x7FFF00, // rgb(127,255,0) + chocolate = 0xD2691E, // rgb(210,105,30) + coral = 0xFF7F50, // rgb(255,127,80) + cornflower_blue = 0x6495ED, // rgb(100,149,237) + cornsilk = 0xFFF8DC, // rgb(255,248,220) + crimson = 0xDC143C, // rgb(220,20,60) + cyan = 0x00FFFF, // rgb(0,255,255) + dark_blue = 0x00008B, // rgb(0,0,139) + dark_cyan = 0x008B8B, // rgb(0,139,139) + dark_golden_rod = 0xB8860B, // rgb(184,134,11) + dark_gray = 0xA9A9A9, // rgb(169,169,169) + dark_green = 0x006400, // rgb(0,100,0) + dark_khaki = 0xBDB76B, // rgb(189,183,107) + dark_magenta = 0x8B008B, // rgb(139,0,139) + dark_olive_green = 0x556B2F, // rgb(85,107,47) + dark_orange = 0xFF8C00, // rgb(255,140,0) + dark_orchid = 0x9932CC, // rgb(153,50,204) + dark_red = 0x8B0000, // rgb(139,0,0) + dark_salmon = 0xE9967A, // rgb(233,150,122) + dark_sea_green = 0x8FBC8F, // rgb(143,188,143) + dark_slate_blue = 0x483D8B, // rgb(72,61,139) + dark_slate_gray = 0x2F4F4F, // rgb(47,79,79) + dark_turquoise = 0x00CED1, // rgb(0,206,209) + dark_violet = 0x9400D3, // rgb(148,0,211) + deep_pink = 0xFF1493, // rgb(255,20,147) + deep_sky_blue = 0x00BFFF, // rgb(0,191,255) + dim_gray = 0x696969, // rgb(105,105,105) + dodger_blue = 0x1E90FF, // rgb(30,144,255) + fire_brick = 0xB22222, // rgb(178,34,34) + floral_white = 0xFFFAF0, // rgb(255,250,240) + forest_green = 0x228B22, // rgb(34,139,34) + fuchsia = 0xFF00FF, // rgb(255,0,255) + gainsboro = 0xDCDCDC, // rgb(220,220,220) + ghost_white = 0xF8F8FF, // rgb(248,248,255) + gold = 0xFFD700, // rgb(255,215,0) + golden_rod = 0xDAA520, // rgb(218,165,32) + gray = 0x808080, // rgb(128,128,128) + green = 0x008000, // rgb(0,128,0) + green_yellow = 0xADFF2F, // rgb(173,255,47) + honey_dew = 0xF0FFF0, // rgb(240,255,240) + hot_pink = 0xFF69B4, // rgb(255,105,180) + indian_red = 0xCD5C5C, // rgb(205,92,92) + indigo = 0x4B0082, // rgb(75,0,130) + ivory = 0xFFFFF0, // rgb(255,255,240) + khaki = 0xF0E68C, // rgb(240,230,140) + lavender = 0xE6E6FA, // rgb(230,230,250) + lavender_blush = 0xFFF0F5, // rgb(255,240,245) + lawn_green = 0x7CFC00, // rgb(124,252,0) + lemon_chiffon = 0xFFFACD, // rgb(255,250,205) + light_blue = 0xADD8E6, // rgb(173,216,230) + light_coral = 0xF08080, // rgb(240,128,128) + light_cyan = 0xE0FFFF, // rgb(224,255,255) + light_golden_rod_yellow = 0xFAFAD2, // rgb(250,250,210) + light_gray = 0xD3D3D3, // rgb(211,211,211) + light_green = 0x90EE90, // rgb(144,238,144) + light_pink = 0xFFB6C1, // rgb(255,182,193) + light_salmon = 0xFFA07A, // rgb(255,160,122) + light_sea_green = 0x20B2AA, // rgb(32,178,170) + light_sky_blue = 0x87CEFA, // rgb(135,206,250) + light_slate_gray = 0x778899, // rgb(119,136,153) + light_steel_blue = 0xB0C4DE, // rgb(176,196,222) + light_yellow = 0xFFFFE0, // rgb(255,255,224) + lime = 0x00FF00, // rgb(0,255,0) + lime_green = 0x32CD32, // rgb(50,205,50) + linen = 0xFAF0E6, // rgb(250,240,230) + magenta = 0xFF00FF, // rgb(255,0,255) + maroon = 0x800000, // rgb(128,0,0) + medium_aquamarine = 0x66CDAA, // rgb(102,205,170) + medium_blue = 0x0000CD, // rgb(0,0,205) + medium_orchid = 0xBA55D3, // rgb(186,85,211) + medium_purple = 0x9370DB, // rgb(147,112,219) + medium_sea_green = 0x3CB371, // rgb(60,179,113) + medium_slate_blue = 0x7B68EE, // rgb(123,104,238) + medium_spring_green = 0x00FA9A, // rgb(0,250,154) + medium_turquoise = 0x48D1CC, // rgb(72,209,204) + medium_violet_red = 0xC71585, // rgb(199,21,133) + midnight_blue = 0x191970, // rgb(25,25,112) + mint_cream = 0xF5FFFA, // rgb(245,255,250) + misty_rose = 0xFFE4E1, // rgb(255,228,225) + moccasin = 0xFFE4B5, // rgb(255,228,181) + navajo_white = 0xFFDEAD, // rgb(255,222,173) + navy = 0x000080, // rgb(0,0,128) + old_lace = 0xFDF5E6, // rgb(253,245,230) + olive = 0x808000, // rgb(128,128,0) + olive_drab = 0x6B8E23, // rgb(107,142,35) + orange = 0xFFA500, // rgb(255,165,0) + orange_red = 0xFF4500, // rgb(255,69,0) + orchid = 0xDA70D6, // rgb(218,112,214) + pale_golden_rod = 0xEEE8AA, // rgb(238,232,170) + pale_green = 0x98FB98, // rgb(152,251,152) + pale_turquoise = 0xAFEEEE, // rgb(175,238,238) + pale_violet_red = 0xDB7093, // rgb(219,112,147) + papaya_whip = 0xFFEFD5, // rgb(255,239,213) + peach_puff = 0xFFDAB9, // rgb(255,218,185) + peru = 0xCD853F, // rgb(205,133,63) + pink = 0xFFC0CB, // rgb(255,192,203) + plum = 0xDDA0DD, // rgb(221,160,221) + powder_blue = 0xB0E0E6, // rgb(176,224,230) + purple = 0x800080, // rgb(128,0,128) + rebecca_purple = 0x663399, // rgb(102,51,153) + red = 0xFF0000, // rgb(255,0,0) + rosy_brown = 0xBC8F8F, // rgb(188,143,143) + royal_blue = 0x4169E1, // rgb(65,105,225) + saddle_brown = 0x8B4513, // rgb(139,69,19) + salmon = 0xFA8072, // rgb(250,128,114) + sandy_brown = 0xF4A460, // rgb(244,164,96) + sea_green = 0x2E8B57, // rgb(46,139,87) + sea_shell = 0xFFF5EE, // rgb(255,245,238) + sienna = 0xA0522D, // rgb(160,82,45) + silver = 0xC0C0C0, // rgb(192,192,192) + sky_blue = 0x87CEEB, // rgb(135,206,235) + slate_blue = 0x6A5ACD, // rgb(106,90,205) + slate_gray = 0x708090, // rgb(112,128,144) + snow = 0xFFFAFA, // rgb(255,250,250) + spring_green = 0x00FF7F, // rgb(0,255,127) + steel_blue = 0x4682B4, // rgb(70,130,180) + tan = 0xD2B48C, // rgb(210,180,140) + teal = 0x008080, // rgb(0,128,128) + thistle = 0xD8BFD8, // rgb(216,191,216) + tomato = 0xFF6347, // rgb(255,99,71) + turquoise = 0x40E0D0, // rgb(64,224,208) + violet = 0xEE82EE, // rgb(238,130,238) + wheat = 0xF5DEB3, // rgb(245,222,179) + white = 0xFFFFFF, // rgb(255,255,255) + white_smoke = 0xF5F5F5, // rgb(245,245,245) + yellow = 0xFFFF00, // rgb(255,255,0) + yellow_green = 0x9ACD32 // rgb(154,205,50) +}; // enum class color enum class terminal_color : uint8_t { black = 30, @@ -226,7 +226,8 @@ struct rgb { FMT_CONSTEXPR rgb(uint32_t hex) : r((hex >> 16) & 0xFF), g((hex >> 8) & 0xFF), b(hex & 0xFF) {} FMT_CONSTEXPR rgb(color hex) - : r((uint32_t(hex) >> 16) & 0xFF), g((uint32_t(hex) >> 8) & 0xFF), + : r((uint32_t(hex) >> 16) & 0xFF), + g((uint32_t(hex) >> 8) & 0xFF), b(uint32_t(hex) & 0xFF) {} uint8_t r; uint8_t g; @@ -237,19 +238,17 @@ namespace internal { // color is a struct of either a rgb color or a terminal color. struct color_type { - FMT_CONSTEXPR color_type() FMT_NOEXCEPT - : is_rgb(), value{} {} - FMT_CONSTEXPR color_type(color rgb_color) FMT_NOEXCEPT - : is_rgb(true), value{} { + FMT_CONSTEXPR color_type() FMT_NOEXCEPT : is_rgb(), value{} {} + FMT_CONSTEXPR color_type(color rgb_color) FMT_NOEXCEPT : is_rgb(true), + value{} { value.rgb_color = static_cast(rgb_color); } - FMT_CONSTEXPR color_type(rgb rgb_color) FMT_NOEXCEPT - : is_rgb(true), value{} { - value.rgb_color = (static_cast(rgb_color.r) << 16) - | (static_cast(rgb_color.g) << 8) | rgb_color.b; + FMT_CONSTEXPR color_type(rgb rgb_color) FMT_NOEXCEPT : is_rgb(true), value{} { + value.rgb_color = (static_cast(rgb_color.r) << 16) | + (static_cast(rgb_color.g) << 8) | rgb_color.b; } - FMT_CONSTEXPR color_type(terminal_color term_color) FMT_NOEXCEPT - : is_rgb(), value{} { + FMT_CONSTEXPR color_type(terminal_color term_color) FMT_NOEXCEPT : is_rgb(), + value{} { value.term_color = static_cast(term_color); } bool is_rgb; @@ -258,15 +257,17 @@ struct color_type { uint32_t rgb_color; } value; }; -} // namespace internal +} // namespace internal // Experimental text formatting support. class text_style { public: FMT_CONSTEXPR text_style(emphasis em = emphasis()) FMT_NOEXCEPT - : set_foreground_color(), set_background_color(), ems(em) {} + : set_foreground_color(), + set_background_color(), + ems(em) {} - FMT_CONSTEXPR text_style &operator|=(const text_style &rhs) { + FMT_CONSTEXPR text_style& operator|=(const text_style& rhs) { if (!set_foreground_color) { set_foreground_color = rhs.set_foreground_color; foreground_color = rhs.foreground_color; @@ -290,12 +291,12 @@ class text_style { return *this; } - friend FMT_CONSTEXPR - text_style operator|(text_style lhs, const text_style &rhs) { + friend FMT_CONSTEXPR text_style operator|(text_style lhs, + const text_style& rhs) { return lhs |= rhs; } - FMT_CONSTEXPR text_style &operator&=(const text_style &rhs) { + FMT_CONSTEXPR text_style& operator&=(const text_style& rhs) { if (!set_foreground_color) { set_foreground_color = rhs.set_foreground_color; foreground_color = rhs.foreground_color; @@ -319,8 +320,8 @@ class text_style { return *this; } - friend FMT_CONSTEXPR - text_style operator&(text_style lhs, const text_style &rhs) { + friend FMT_CONSTEXPR text_style operator&(text_style lhs, + const text_style& rhs) { return lhs &= rhs; } @@ -346,20 +347,20 @@ class text_style { return ems; } -private: - FMT_CONSTEXPR text_style(bool is_foreground, - internal::color_type text_color) FMT_NOEXCEPT - : set_foreground_color(), - set_background_color(), - ems() { - if (is_foreground) { - foreground_color = text_color; - set_foreground_color = true; - } else { - background_color = text_color; - set_background_color = true; - } - } + private: + FMT_CONSTEXPR text_style(bool is_foreground, + internal::color_type text_color) FMT_NOEXCEPT + : set_foreground_color(), + set_background_color(), + ems() { + if (is_foreground) { + foreground_color = text_color; + set_foreground_color = true; + } else { + background_color = text_color; + set_background_color = true; + } + } friend FMT_CONSTEXPR_DECL text_style fg(internal::color_type foreground) FMT_NOEXCEPT; @@ -387,10 +388,9 @@ FMT_CONSTEXPR text_style operator|(emphasis lhs, emphasis rhs) FMT_NOEXCEPT { namespace internal { -template -struct ansi_color_escape { +template struct ansi_color_escape { FMT_CONSTEXPR ansi_color_escape(internal::color_type text_color, - const char * esc) FMT_NOEXCEPT { + const char* esc) FMT_NOEXCEPT { // If we have a terminal color, we need to output another escape code // sequence. if (!text_color.is_rgb) { @@ -398,8 +398,7 @@ struct ansi_color_escape { uint32_t value = text_color.value.term_color; // Background ASCII codes are the same as the foreground ones but with // 10 more. - if (is_background) - value += 10u; + if (is_background) value += 10u; std::size_t index = 0; buffer[index++] = static_cast('\x1b'); @@ -421,7 +420,7 @@ struct ansi_color_escape { buffer[i] = static_cast(esc[i]); } rgb color(text_color.value.rgb_color); - to_esc(color.r, buffer + 7, ';'); + to_esc(color.r, buffer + 7, ';'); to_esc(color.g, buffer + 11, ';'); to_esc(color.b, buffer + 15, 'm'); buffer[19] = static_cast(0); @@ -429,19 +428,15 @@ struct ansi_color_escape { FMT_CONSTEXPR ansi_color_escape(emphasis em) FMT_NOEXCEPT { uint8_t em_codes[4] = {}; uint8_t em_bits = static_cast(em); - if (em_bits & static_cast(emphasis::bold)) - em_codes[0] = 1; - if (em_bits & static_cast(emphasis::italic)) - em_codes[1] = 3; - if (em_bits & static_cast(emphasis::underline)) - em_codes[2] = 4; + if (em_bits & static_cast(emphasis::bold)) em_codes[0] = 1; + if (em_bits & static_cast(emphasis::italic)) em_codes[1] = 3; + if (em_bits & static_cast(emphasis::underline)) em_codes[2] = 4; if (em_bits & static_cast(emphasis::strikethrough)) em_codes[3] = 9; std::size_t index = 0; for (int i = 0; i < 4; ++i) { - if (!em_codes[i]) - continue; + if (!em_codes[i]) continue; buffer[index++] = static_cast('\x1b'); buffer[index++] = static_cast('['); buffer[index++] = static_cast('0' + em_codes[i]); @@ -449,19 +444,17 @@ struct ansi_color_escape { } buffer[index++] = static_cast(0); } - FMT_CONSTEXPR operator const Char *() const FMT_NOEXCEPT { return buffer; } + FMT_CONSTEXPR operator const Char*() const FMT_NOEXCEPT { return buffer; } - FMT_CONSTEXPR const Char * begin() const FMT_NOEXCEPT { - return buffer; - } - FMT_CONSTEXPR const Char * end() const FMT_NOEXCEPT { + FMT_CONSTEXPR const Char* begin() const FMT_NOEXCEPT { return buffer; } + FMT_CONSTEXPR const Char* end() const FMT_NOEXCEPT { return buffer + std::strlen(buffer); } -private: + private: Char buffer[7u + 3u * 4u + 1u]; - static FMT_CONSTEXPR void to_esc(uint8_t c, Char *out, + static FMT_CONSTEXPR void to_esc(uint8_t c, Char* out, char delimiter) FMT_NOEXCEPT { out[0] = static_cast('0' + c / 100); out[1] = static_cast('0' + c / 10 % 10); @@ -471,40 +464,37 @@ private: }; template -FMT_CONSTEXPR ansi_color_escape -make_foreground_color(internal::color_type foreground) FMT_NOEXCEPT { +FMT_CONSTEXPR ansi_color_escape make_foreground_color( + internal::color_type foreground) FMT_NOEXCEPT { return ansi_color_escape(foreground, internal::data::FOREGROUND_COLOR); } template -FMT_CONSTEXPR ansi_color_escape -make_background_color(internal::color_type background) FMT_NOEXCEPT { +FMT_CONSTEXPR ansi_color_escape make_background_color( + internal::color_type background) FMT_NOEXCEPT { return ansi_color_escape(background, internal::data::BACKGROUND_COLOR); } template -FMT_CONSTEXPR ansi_color_escape -make_emphasis(emphasis em) FMT_NOEXCEPT { +FMT_CONSTEXPR ansi_color_escape make_emphasis(emphasis em) FMT_NOEXCEPT { return ansi_color_escape(em); } template -inline void fputs(const Char *chars, FILE *stream) FMT_NOEXCEPT { +inline void fputs(const Char* chars, FILE* stream) FMT_NOEXCEPT { std::fputs(chars, stream); } template <> -inline void fputs(const wchar_t *chars, FILE *stream) FMT_NOEXCEPT { +inline void fputs(const wchar_t* chars, FILE* stream) FMT_NOEXCEPT { std::fputws(chars, stream); } -template -inline void reset_color(FILE *stream) FMT_NOEXCEPT { +template inline void reset_color(FILE* stream) FMT_NOEXCEPT { fputs(internal::data::RESET_COLOR, stream); } -template <> -inline void reset_color(FILE *stream) FMT_NOEXCEPT { +template <> inline void reset_color(FILE* stream) FMT_NOEXCEPT { fputs(internal::data::WRESET_COLOR, stream); } @@ -519,27 +509,24 @@ inline void reset_color(basic_memory_buffer& buffer) FMT_NOEXCEPT { // which is needed because or else // fmt::print(stderr, fmt::emphasis::bold, ""); // would take stderr (a std::FILE *) as the format string. -template <> -struct is_string : std::false_type {}; -template <> -struct is_string : std::false_type {}; +template <> struct is_string : std::false_type {}; +template <> struct is_string : std::false_type {}; template std::basic_string vformat( - const text_style &ts, basic_string_view format_str, + const text_style& ts, basic_string_view format_str, basic_format_args::type> args) { basic_memory_buffer buffer; bool has_style = false; if (ts.has_emphasis()) { has_style = true; - ansi_color_escape escape = - make_emphasis(ts.get_emphasis()); + ansi_color_escape escape = make_emphasis(ts.get_emphasis()); buffer.append(escape.begin(), escape.end()); } if (ts.has_foreground()) { has_style = true; ansi_color_escape escape = - make_foreground_color(ts.get_foreground()); + make_foreground_color(ts.get_foreground()); buffer.append(escape.begin(), escape.end()); } if (ts.has_background()) { @@ -554,22 +541,20 @@ std::basic_string vformat( } return fmt::to_string(buffer); } -} // namespace internal +} // namespace internal -template < - typename S, typename Char = typename internal::char_t::type> -void vprint(std::FILE *f, const text_style &ts, const S &format, +template ::type> +void vprint(std::FILE* f, const text_style& ts, const S& format, basic_format_args::type> args) { bool has_style = false; if (ts.has_emphasis()) { has_style = true; - internal::fputs( - internal::make_emphasis(ts.get_emphasis()), f); + internal::fputs(internal::make_emphasis(ts.get_emphasis()), f); } if (ts.has_foreground()) { has_style = true; internal::fputs( - internal::make_foreground_color(ts.get_foreground()), f); + internal::make_foreground_color(ts.get_foreground()), f); } if (ts.has_background()) { has_style = true; @@ -591,8 +576,8 @@ void vprint(std::FILE *f, const text_style &ts, const S &format, */ template typename std::enable_if::value>::type print( - std::FILE *f, const text_style &ts, const String &format_str, - const Args &... args) { + std::FILE* f, const text_style& ts, const String& format_str, + const Args&... args) { internal::check_format_string(format_str); typedef typename internal::char_t::type char_t; typedef typename buffer_context::type context_t; @@ -609,16 +594,13 @@ typename std::enable_if::value>::type print( */ template typename std::enable_if::value>::type print( - const text_style &ts, const String &format_str, - const Args &... args) { + const text_style& ts, const String& format_str, const Args&... args) { return print(stdout, ts, format_str, args...); } - template inline std::basic_string vformat( - const text_style &ts, - const S &format_str, + const text_style& ts, const S& format_str, basic_format_args::type> args) { return internal::vformat(ts, to_string_view(format_str), args); } @@ -636,11 +618,12 @@ inline std::basic_string vformat( \endrst */ template -inline std::basic_string format( - const text_style &ts, const S &format_str, const Args &... args) { +inline std::basic_string format(const text_style& ts, + const S& format_str, + const Args&... args) { return internal::vformat( - ts, to_string_view(format_str), - *internal::checked_args(format_str, args...)); + ts, to_string_view(format_str), + *internal::checked_args(format_str, args...)); } #endif diff --git a/include/fmt/core.h b/include/fmt/core.h index d95e98a3..4014b8de 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -19,171 +19,178 @@ #define FMT_VERSION 50301 #ifdef __has_feature -# define FMT_HAS_FEATURE(x) __has_feature(x) +# define FMT_HAS_FEATURE(x) __has_feature(x) #else -# define FMT_HAS_FEATURE(x) 0 +# define FMT_HAS_FEATURE(x) 0 #endif #if defined(__has_include) && !defined(__INTELLISENSE__) && \ !(defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1600) -# define FMT_HAS_INCLUDE(x) __has_include(x) +# define FMT_HAS_INCLUDE(x) __has_include(x) #else -# define FMT_HAS_INCLUDE(x) 0 +# define FMT_HAS_INCLUDE(x) 0 #endif #ifdef __has_cpp_attribute -# define FMT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x) +# define FMT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x) #else -# define FMT_HAS_CPP_ATTRIBUTE(x) 0 +# define FMT_HAS_CPP_ATTRIBUTE(x) 0 #endif #if defined(__GNUC__) && !defined(__clang__) -# define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +# define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) #else -# define FMT_GCC_VERSION 0 +# define FMT_GCC_VERSION 0 #endif #if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) -# define FMT_HAS_GXX_CXX11 FMT_GCC_VERSION +# define FMT_HAS_GXX_CXX11 FMT_GCC_VERSION #else -# define FMT_HAS_GXX_CXX11 0 +# define FMT_HAS_GXX_CXX11 0 #endif #ifdef _MSC_VER -# define FMT_MSC_VER _MSC_VER +# define FMT_MSC_VER _MSC_VER #else -# define FMT_MSC_VER 0 +# define FMT_MSC_VER 0 #endif // Check if relaxed C++14 constexpr is supported. // GCC doesn't allow throw in constexpr until version 6 (bug 67371). #ifndef FMT_USE_CONSTEXPR -# define FMT_USE_CONSTEXPR \ - (FMT_HAS_FEATURE(cxx_relaxed_constexpr) || FMT_MSC_VER >= 1910 || \ - (FMT_GCC_VERSION >= 600 && __cplusplus >= 201402L)) +# define FMT_USE_CONSTEXPR \ + (FMT_HAS_FEATURE(cxx_relaxed_constexpr) || FMT_MSC_VER >= 1910 || \ + (FMT_GCC_VERSION >= 600 && __cplusplus >= 201402L)) #endif #if FMT_USE_CONSTEXPR -# define FMT_CONSTEXPR constexpr -# define FMT_CONSTEXPR_DECL constexpr +# define FMT_CONSTEXPR constexpr +# define FMT_CONSTEXPR_DECL constexpr #else -# define FMT_CONSTEXPR inline -# define FMT_CONSTEXPR_DECL +# define FMT_CONSTEXPR inline +# define FMT_CONSTEXPR_DECL #endif #ifndef FMT_USE_CONSTEXPR11 -# define FMT_USE_CONSTEXPR11 \ +# define FMT_USE_CONSTEXPR11 \ (FMT_USE_CONSTEXPR || FMT_GCC_VERSION >= 406 || FMT_MSC_VER >= 1900) #endif #if FMT_USE_CONSTEXPR11 -# define FMT_CONSTEXPR11 constexpr +# define FMT_CONSTEXPR11 constexpr #else -# define FMT_CONSTEXPR11 +# define FMT_CONSTEXPR11 #endif #ifndef FMT_OVERRIDE -# if FMT_HAS_FEATURE(cxx_override) || \ - (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900 -# define FMT_OVERRIDE override -# else -# define FMT_OVERRIDE -# endif +# if FMT_HAS_FEATURE(cxx_override) || \ + (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900 +# define FMT_OVERRIDE override +# else +# define FMT_OVERRIDE +# endif #endif -#if FMT_HAS_FEATURE(cxx_explicit_conversions) || \ - FMT_GCC_VERSION >= 405 || FMT_MSC_VER >= 1800 -# define FMT_USE_EXPLICIT 1 -# define FMT_EXPLICIT explicit +#if FMT_HAS_FEATURE(cxx_explicit_conversions) || FMT_GCC_VERSION >= 405 || \ + FMT_MSC_VER >= 1800 +# define FMT_USE_EXPLICIT 1 +# define FMT_EXPLICIT explicit #else -# define FMT_USE_EXPLICIT 0 -# define FMT_EXPLICIT +# define FMT_USE_EXPLICIT 0 +# define FMT_EXPLICIT #endif #ifndef FMT_NULL -# if FMT_HAS_FEATURE(cxx_nullptr) || \ - (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1600 -# define FMT_NULL nullptr -# define FMT_USE_NULLPTR 1 -# else -# define FMT_NULL NULL -# endif +# if FMT_HAS_FEATURE(cxx_nullptr) || \ + (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1600 +# define FMT_NULL nullptr +# define FMT_USE_NULLPTR 1 +# else +# define FMT_NULL NULL +# endif #endif #ifndef FMT_USE_NULLPTR -# define FMT_USE_NULLPTR 0 +# define FMT_USE_NULLPTR 0 #endif // Check if exceptions are disabled. #ifndef FMT_EXCEPTIONS -# if (defined(__GNUC__) && !defined(__EXCEPTIONS)) || \ - FMT_MSC_VER && !_HAS_EXCEPTIONS -# define FMT_EXCEPTIONS 0 -# else -# define FMT_EXCEPTIONS 1 -# endif +# if (defined(__GNUC__) && !defined(__EXCEPTIONS)) || \ + FMT_MSC_VER && !_HAS_EXCEPTIONS +# define FMT_EXCEPTIONS 0 +# else +# define FMT_EXCEPTIONS 1 +# endif #endif // Define FMT_USE_NOEXCEPT to make fmt use noexcept (C++11 feature). #ifndef FMT_USE_NOEXCEPT -# define FMT_USE_NOEXCEPT 0 +# define FMT_USE_NOEXCEPT 0 #endif #if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \ (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900 -# define FMT_DETECTED_NOEXCEPT noexcept -# define FMT_HAS_CXX11_NOEXCEPT 1 +# define FMT_DETECTED_NOEXCEPT noexcept +# define FMT_HAS_CXX11_NOEXCEPT 1 #else -# define FMT_DETECTED_NOEXCEPT throw() -# define FMT_HAS_CXX11_NOEXCEPT 0 +# define FMT_DETECTED_NOEXCEPT throw() +# define FMT_HAS_CXX11_NOEXCEPT 0 #endif #ifndef FMT_NOEXCEPT -# if FMT_EXCEPTIONS || FMT_HAS_CXX11_NOEXCEPT -# define FMT_NOEXCEPT FMT_DETECTED_NOEXCEPT -# else -# define FMT_NOEXCEPT -# endif +# if FMT_EXCEPTIONS || FMT_HAS_CXX11_NOEXCEPT +# define FMT_NOEXCEPT FMT_DETECTED_NOEXCEPT +# else +# define FMT_NOEXCEPT +# endif #endif #ifndef FMT_BEGIN_NAMESPACE -# if FMT_HAS_FEATURE(cxx_inline_namespaces) || FMT_GCC_VERSION >= 404 || \ - FMT_MSC_VER >= 1900 -# define FMT_INLINE_NAMESPACE inline namespace -# define FMT_END_NAMESPACE }} -# else -# define FMT_INLINE_NAMESPACE namespace -# define FMT_END_NAMESPACE } using namespace v5; } -# endif -# define FMT_BEGIN_NAMESPACE namespace fmt { FMT_INLINE_NAMESPACE v5 { +# if FMT_HAS_FEATURE(cxx_inline_namespaces) || FMT_GCC_VERSION >= 404 || \ + FMT_MSC_VER >= 1900 +# define FMT_INLINE_NAMESPACE inline namespace +# define FMT_END_NAMESPACE \ + } \ + } +# else +# define FMT_INLINE_NAMESPACE namespace +# define FMT_END_NAMESPACE \ + } \ + using namespace v5; \ + } +# endif +# define FMT_BEGIN_NAMESPACE \ + namespace fmt { \ + FMT_INLINE_NAMESPACE v5 { #endif #if !defined(FMT_HEADER_ONLY) && defined(_WIN32) -# ifdef FMT_EXPORT -# define FMT_API __declspec(dllexport) -# elif defined(FMT_SHARED) -# define FMT_API __declspec(dllimport) -# endif +# ifdef FMT_EXPORT +# define FMT_API __declspec(dllexport) +# elif defined(FMT_SHARED) +# define FMT_API __declspec(dllimport) +# endif #endif #ifndef FMT_API -# define FMT_API +# define FMT_API #endif #ifndef FMT_ASSERT -# define FMT_ASSERT(condition, message) assert((condition) && message) +# define FMT_ASSERT(condition, message) assert((condition) && message) #endif // libc++ supports string_view in pre-c++17. -#if (FMT_HAS_INCLUDE() && \ - (__cplusplus > 201402L || defined(_LIBCPP_VERSION))) || \ +#if (FMT_HAS_INCLUDE() && \ + (__cplusplus > 201402L || defined(_LIBCPP_VERSION))) || \ (defined(_MSVC_LANG) && _MSVC_LANG > 201402L && _MSC_VER >= 1910) -# include -# define FMT_STRING_VIEW std::basic_string_view -#elif FMT_HAS_INCLUDE() && __cplusplus >= 201402L -# include -# define FMT_STRING_VIEW std::experimental::basic_string_view +# include +# define FMT_STRING_VIEW std::basic_string_view +#elif FMT_HAS_INCLUDE() && __cplusplus >= 201402L +# include +# define FMT_STRING_VIEW std::experimental::basic_string_view #endif // std::result_of is defined in in gcc 4.4. #if FMT_GCC_VERSION && FMT_GCC_VERSION <= 404 -# include +# include #endif FMT_BEGIN_NAMESPACE @@ -193,14 +200,12 @@ namespace internal { template typename std::add_rvalue_reference::type declval() FMT_NOEXCEPT; -template -struct result_of; +template struct result_of; -template -struct result_of { +template struct result_of { // A workaround for gcc 4.4 that doesn't allow F to be a reference. - typedef typename std::result_of< - typename std::remove_reference::type(Args...)>::type type; + typedef typename std::result_of::type( + Args...)>::type type; }; // Casts nonnegative integer to unsigned. @@ -211,25 +216,26 @@ FMT_CONSTEXPR typename std::make_unsigned::type to_unsigned(Int value) { } /** A contiguous memory buffer with an optional growing ability. */ -template -class basic_buffer { +template class basic_buffer { private: - basic_buffer(const basic_buffer &) = delete; - void operator=(const basic_buffer &) = delete; + basic_buffer(const basic_buffer&) = delete; + void operator=(const basic_buffer&) = delete; - T *ptr_; + T* ptr_; std::size_t size_; std::size_t capacity_; protected: // Don't initialize ptr_ since it is not accessed to save a few cycles. - basic_buffer(std::size_t sz) FMT_NOEXCEPT: size_(sz), capacity_(sz) {} + basic_buffer(std::size_t sz) FMT_NOEXCEPT : size_(sz), capacity_(sz) {} - basic_buffer(T *p = FMT_NULL, std::size_t sz = 0, std::size_t cap = 0) - FMT_NOEXCEPT: ptr_(p), size_(sz), capacity_(cap) {} + basic_buffer(T* p = FMT_NULL, std::size_t sz = 0, + std::size_t cap = 0) FMT_NOEXCEPT : ptr_(p), + size_(sz), + capacity_(cap) {} /** Sets the buffer data and capacity. */ - void set(T *buf_data, std::size_t buf_capacity) FMT_NOEXCEPT { + void set(T* buf_data, std::size_t buf_capacity) FMT_NOEXCEPT { ptr_ = buf_data; capacity_ = buf_capacity; } @@ -239,12 +245,12 @@ class basic_buffer { public: typedef T value_type; - typedef const T &const_reference; + typedef const T& const_reference; virtual ~basic_buffer() {} - T *begin() FMT_NOEXCEPT { return ptr_; } - T *end() FMT_NOEXCEPT { return ptr_ + size_; } + T* begin() FMT_NOEXCEPT { return ptr_; } + T* end() FMT_NOEXCEPT { return ptr_ + size_; } /** Returns the size of this buffer. */ std::size_t size() const FMT_NOEXCEPT { return size_; } @@ -253,10 +259,10 @@ class basic_buffer { std::size_t capacity() const FMT_NOEXCEPT { return capacity_; } /** Returns a pointer to the buffer data. */ - T *data() FMT_NOEXCEPT { return ptr_; } + T* data() FMT_NOEXCEPT { return ptr_; } /** Returns a pointer to the buffer data. */ - const T *data() const FMT_NOEXCEPT { return ptr_; } + const T* data() const FMT_NOEXCEPT { return ptr_; } /** Resizes the buffer. If T is a POD type new elements may not be initialized. @@ -271,21 +277,19 @@ class basic_buffer { /** Reserves space to store at least *capacity* elements. */ void reserve(std::size_t new_capacity) { - if (new_capacity > capacity_) - grow(new_capacity); + if (new_capacity > capacity_) grow(new_capacity); } - void push_back(const T &value) { + void push_back(const T& value) { reserve(size_ + 1); ptr_[size_++] = value; } /** Appends data to the end of the buffer. */ - template - void append(const U *begin, const U *end); + template void append(const U* begin, const U* end); - T &operator[](std::size_t index) { return ptr_[index]; } - const T &operator[](std::size_t index) const { return ptr_[index]; } + T& operator[](std::size_t index) { return ptr_[index]; } + const T& operator[](std::size_t index) const { return ptr_[index]; } }; typedef basic_buffer buffer; @@ -295,7 +299,7 @@ typedef basic_buffer wbuffer; template class container_buffer : public basic_buffer { private: - Container &container_; + Container& container_; protected: void grow(std::size_t capacity) FMT_OVERRIDE { @@ -304,15 +308,15 @@ class container_buffer : public basic_buffer { } public: - explicit container_buffer(Container &c) - : basic_buffer(c.size()), container_(c) {} + explicit container_buffer(Container& c) + : basic_buffer(c.size()), container_(c) {} }; // Extracts a reference to the container from back_insert_iterator. template -inline Container &get_container(std::back_insert_iterator it) { +inline Container& get_container(std::back_insert_iterator it) { typedef std::back_insert_iterator bi_iterator; - struct accessor: bi_iterator { + struct accessor : bi_iterator { accessor(bi_iterator iter) : bi_iterator(iter) {} using bi_iterator::container; }; @@ -321,19 +325,17 @@ inline Container &get_container(std::back_insert_iterator it) { struct error_handler { FMT_CONSTEXPR error_handler() {} - FMT_CONSTEXPR error_handler(const error_handler &) {} + FMT_CONSTEXPR error_handler(const error_handler&) {} // This function is intentionally not constexpr to give a compile-time error. - FMT_API void on_error(const char *message); + FMT_API void on_error(const char* message); }; -template -struct no_formatter_error : std::false_type {}; +template struct no_formatter_error : std::false_type {}; } // namespace internal #if FMT_GCC_VERSION && FMT_GCC_VERSION < 405 -template -struct is_constructible: std::false_type {}; +template struct is_constructible : std::false_type {}; #else template struct is_constructible : std::is_constructible {}; @@ -346,21 +348,21 @@ struct is_constructible : std::is_constructible {}; compiled with a different ``-std`` option than the client code (which is not recommended). */ -template -class basic_string_view { +template class basic_string_view { private: - const Char *data_; + const Char* data_; size_t size_; public: typedef Char char_type; - typedef const Char *iterator; + typedef const Char* iterator; FMT_CONSTEXPR basic_string_view() FMT_NOEXCEPT : data_(FMT_NULL), size_(0) {} /** Constructs a string reference object from a C string and a size. */ - FMT_CONSTEXPR basic_string_view(const Char *s, size_t count) FMT_NOEXCEPT - : data_(s), size_(count) {} + FMT_CONSTEXPR basic_string_view(const Char* s, size_t count) FMT_NOEXCEPT + : data_(s), + size_(count) {} /** \rst @@ -368,22 +370,23 @@ class basic_string_view { the size with ``std::char_traits::length``. \endrst */ - basic_string_view(const Char *s) - : data_(s), size_(std::char_traits::length(s)) {} + basic_string_view(const Char* s) + : data_(s), size_(std::char_traits::length(s)) {} /** Constructs a string reference from a ``std::basic_string`` object. */ template - FMT_CONSTEXPR basic_string_view( - const std::basic_string &s) FMT_NOEXCEPT - : data_(s.data()), size_(s.size()) {} + FMT_CONSTEXPR basic_string_view(const std::basic_string& s) + FMT_NOEXCEPT : data_(s.data()), + size_(s.size()) {} #ifdef FMT_STRING_VIEW FMT_CONSTEXPR basic_string_view(FMT_STRING_VIEW s) FMT_NOEXCEPT - : data_(s.data()), size_(s.size()) {} + : data_(s.data()), + size_(s.size()) {} #endif /** Returns a pointer to the string data. */ - FMT_CONSTEXPR const Char *data() const { return data_; } + FMT_CONSTEXPR const Char* data() const { return data_; } /** Returns the string size. */ FMT_CONSTEXPR size_t size() const { return size_; } @@ -451,22 +454,26 @@ typedef basic_string_view wstring_view; \endrst */ template -inline basic_string_view - to_string_view(basic_string_view s) { return s; } +inline basic_string_view to_string_view(basic_string_view s) { + return s; +} template -inline basic_string_view -to_string_view(const std::basic_string &s) { +inline basic_string_view to_string_view( + const std::basic_string& s) { return {s.data(), s.size()}; } template -inline basic_string_view to_string_view(const Char *s) { return s; } +inline basic_string_view to_string_view(const Char* s) { + return s; +} #ifdef FMT_STRING_VIEW template -inline basic_string_view - to_string_view(FMT_STRING_VIEW s) { return s; } +inline basic_string_view to_string_view(FMT_STRING_VIEW s) { + return s; +} #endif // A base class for compile-time strings. It is defined in the fmt namespace to @@ -476,67 +483,81 @@ struct compile_string {}; template struct is_compile_string : std::is_base_of {}; -template < - typename S, - typename Enable = typename std::enable_if::value>::type> -FMT_CONSTEXPR basic_string_view - to_string_view(const S &s) { return s; } +template ::value>::type> +FMT_CONSTEXPR basic_string_view to_string_view( + const S& s) { + return s; +} -template -class basic_format_arg; +template class basic_format_arg; -template -class basic_format_args; +template class basic_format_args; // A formatter for objects of type T. template struct formatter { - static_assert(internal::no_formatter_error::value, - "don't know how to format the type, include fmt/ostream.h if it provides " - "an operator<< that should be used"); + static_assert( + internal::no_formatter_error::value, + "don't know how to format the type, include fmt/ostream.h if it provides " + "an operator<< that should be used"); // The following functions are not defined intentionally. template - typename ParseContext::iterator parse(ParseContext &); + typename ParseContext::iterator parse(ParseContext&); template - auto format(const T &val, FormatContext &ctx) -> decltype(ctx.out()); + auto format(const T& val, FormatContext& ctx) -> decltype(ctx.out()); }; template -struct convert_to_int: std::integral_constant< - bool, !std::is_arithmetic::value && std::is_convertible::value> {}; +struct convert_to_int + : std::integral_constant::value && + std::is_convertible::value> {}; namespace internal { -struct dummy_string_view { typedef void char_type; }; +struct dummy_string_view { + typedef void char_type; +}; dummy_string_view to_string_view(...); using fmt::v5::to_string_view; // Specifies whether S is a string type convertible to fmt::basic_string_view. template -struct is_string : std::integral_constant()))>::value> {}; +struct is_string + : std::integral_constant< + bool, !std::is_same()))>::value> { +}; -template -struct char_t { +template struct char_t { typedef decltype(to_string_view(declval())) result; typedef typename result::char_type type; }; -template -struct named_arg_base; +template struct named_arg_base; -template -struct named_arg; +template struct named_arg; enum type { - none_type, named_arg_type, + none_type, + named_arg_type, // Integer types should go first, - int_type, uint_type, long_long_type, ulong_long_type, bool_type, char_type, + int_type, + uint_type, + long_long_type, + ulong_long_type, + bool_type, + char_type, last_integer_type = char_type, // followed by floating-point types. - double_type, long_double_type, last_numeric_type = long_double_type, - cstring_type, string_type, pointer_type, custom_type + double_type, + long_double_type, + last_numeric_type = long_double_type, + cstring_type, + string_type, + pointer_type, + custom_type }; FMT_CONSTEXPR bool is_integral(type t) { @@ -549,21 +570,18 @@ FMT_CONSTEXPR bool is_arithmetic(type t) { return t > internal::none_type && t <= internal::last_numeric_type; } -template -struct string_value { - const Char *value; +template struct string_value { + const Char* value; std::size_t size; }; -template -struct custom_value { - const void *value; - void (*format)(const void *arg, Context &ctx); +template struct custom_value { + const void* value; + void (*format)(const void* arg, Context& ctx); }; // A formatting argument value. -template -class value { +template class value { public: typedef typename Context::char_type char_type; @@ -574,7 +592,7 @@ class value { unsigned long long ulong_long_value; double double_value; long double long_double_value; - const void *pointer; + const void* pointer; string_value string; string_value sstring; string_value ustring; @@ -587,13 +605,13 @@ class value { value(unsigned long long val) { ulong_long_value = val; } value(double val) { double_value = val; } value(long double val) { long_double_value = val; } - value(const char_type *val) { string.value = val; } - value(const signed char *val) { + value(const char_type* val) { string.value = val; } + value(const signed char* val) { static_assert(std::is_same::value, "incompatible string types"); sstring.value = val; } - value(const unsigned char *val) { + value(const unsigned char* val) { static_assert(std::is_same::value, "incompatible string types"); ustring.value = val; @@ -602,54 +620,54 @@ class value { string.value = val.data(); string.size = val.size(); } - value(const void *val) { pointer = val; } + value(const void* val) { pointer = val; } - template - explicit value(const T &val) { + template explicit value(const T& val) { custom.value = &val; custom.format = &format_custom_arg; } - const named_arg_base &as_named_arg() { + const named_arg_base& as_named_arg() { return *static_cast*>(pointer); } private: // Formats an argument of a custom type, such as a user-defined class. template - static void format_custom_arg(const void *arg, Context &ctx) { + static void format_custom_arg(const void* arg, Context& ctx) { // Get the formatter type through the context to allow different contexts // have different extension points, e.g. `formatter` for `format` and // `printf_formatter` for `printf`. typename Context::template formatter_type::type f; - auto &&parse_ctx = ctx.parse_context(); + auto&& parse_ctx = ctx.parse_context(); parse_ctx.advance_to(f.parse(parse_ctx)); ctx.advance_to(f.format(*static_cast(arg), ctx)); } }; // Value initializer used to delay conversion to value and reduce memory churn. -template -struct init { +template struct init { T val; static const type type_tag = TYPE; - FMT_CONSTEXPR init(const T &v) : val(v) {} + FMT_CONSTEXPR init(const T& v) : val(v) {} FMT_CONSTEXPR operator value() const { return value(val); } }; template -FMT_CONSTEXPR basic_format_arg make_arg(const T &value); +FMT_CONSTEXPR basic_format_arg make_arg(const T& value); -#define FMT_MAKE_VALUE(TAG, ArgType, ValueType) \ - template \ +#define FMT_MAKE_VALUE(TAG, ArgType, ValueType) \ + template \ FMT_CONSTEXPR init make_value(ArgType val) { \ - return static_cast(val); \ + return static_cast(val); \ } -#define FMT_MAKE_VALUE_SAME(TAG, Type) \ - template \ - FMT_CONSTEXPR init make_value(Type val) { return val; } +#define FMT_MAKE_VALUE_SAME(TAG, Type) \ + template \ + FMT_CONSTEXPR init make_value(Type val) { \ + return val; \ + } FMT_MAKE_VALUE(bool_type, bool, int) FMT_MAKE_VALUE(int_type, short, int) @@ -660,14 +678,14 @@ FMT_MAKE_VALUE_SAME(uint_type, unsigned) // To minimize the number of types we need to deal with, long is translated // either to int or to long long depending on its size. typedef std::conditional::type - long_type; -FMT_MAKE_VALUE( - (sizeof(long) == sizeof(int) ? int_type : long_long_type), long, long_type) -typedef std::conditional::type ulong_type; -FMT_MAKE_VALUE( - (sizeof(unsigned long) == sizeof(unsigned) ? uint_type : ulong_long_type), - unsigned long, ulong_type) + long_type; +FMT_MAKE_VALUE((sizeof(long) == sizeof(int) ? int_type : long_long_type), long, + long_type) +typedef std::conditional::type ulong_type; +FMT_MAKE_VALUE((sizeof(unsigned long) == sizeof(unsigned) ? uint_type + : ulong_long_type), + unsigned long, ulong_type) FMT_MAKE_VALUE_SAME(long_long_type, long long) FMT_MAKE_VALUE_SAME(ulong_long_type, unsigned long long) @@ -676,14 +694,20 @@ FMT_MAKE_VALUE(uint_type, unsigned char, unsigned) // This doesn't use FMT_MAKE_VALUE because of ambiguity in gcc 4.4. template -FMT_CONSTEXPR typename std::enable_if< - std::is_same::value, - init>::type make_value(Char val) { return val; } +FMT_CONSTEXPR + typename std::enable_if::value, + init>::type + make_value(Char val) { + return val; +} template -FMT_CONSTEXPR typename std::enable_if< - !std::is_same::value, - init>::type make_value(char val) { return val; } +FMT_CONSTEXPR + typename std::enable_if::value, + init>::type + make_value(char val) { + return val; +} FMT_MAKE_VALUE(double_type, float, double) FMT_MAKE_VALUE_SAME(double_type, double) @@ -719,37 +743,44 @@ FMT_MAKE_VALUE(pointer_type, std::nullptr_t, const void*) // iostreams. template typename std::enable_if::value>::type - make_value(const T *) { +make_value(const T*) { static_assert(!sizeof(T), "formatting of non-void pointers is disallowed"); } template -inline typename std::enable_if< - std::is_enum::value && convert_to_int::value, - init>::type - make_value(const T &val) { return static_cast(val); } +inline + typename std::enable_if::value && + convert_to_int::value, + init>::type + make_value(const T& val) { + return static_cast(val); +} template inline typename std::enable_if< is_constructible, T>::value && - !internal::is_string::value, + !internal::is_string::value, init, string_type>>::type - make_value(const T &val) { return basic_string_view(val); } +make_value(const T& val) { + return basic_string_view(val); +} template inline typename std::enable_if< !convert_to_int::value && !std::is_same::value && - !std::is_convertible>::value && - !is_constructible, T>::value && - !internal::is_string::value, + !std::is_convertible>::value && + !is_constructible, T>::value && + !internal::is_string::value, // Implicit conversion to std::string is not handled here because it's // unsafe: https://github.com/fmtlib/fmt/issues/729 - init>::type - make_value(const T &val) { return val; } + init>::type +make_value(const T& val) { + return val; +} template -init - make_value(const named_arg &val) { +init make_value( + const named_arg& val) { basic_format_arg arg = make_arg(val.value); std::memcpy(val.data, &arg, sizeof(arg)); return static_cast(&val); @@ -757,13 +788,13 @@ init template FMT_CONSTEXPR11 typename std::enable_if< - internal::is_string::value, - init, string_type>>::type - make_value(const S &val) { + internal::is_string::value, + init, string_type>>::type +make_value(const S& val) { // Handle adapted strings. - static_assert(std::is_same< - typename C::char_type, typename internal::char_t::type>::value, - "mismatch between char-types of context and argument"); + static_assert(std::is_same::type>::value, + "mismatch between char-types of context and argument"); return to_string_view(val); } @@ -771,25 +802,23 @@ FMT_CONSTEXPR11 typename std::enable_if< enum { max_packed_args = 15 }; enum : unsigned long long { is_unpacked_bit = 1ull << 63 }; -template -class arg_map; +template class arg_map; } // namespace internal // A formatting argument. It is a trivially copyable/constructible type to // allow storage in basic_memory_buffer. -template -class basic_format_arg { +template class basic_format_arg { private: internal::value value_; internal::type type_; template - friend FMT_CONSTEXPR basic_format_arg - internal::make_arg(const T &value); + friend FMT_CONSTEXPR basic_format_arg internal::make_arg( + const T& value); template friend FMT_CONSTEXPR typename internal::result_of::type - visit_format_arg(Visitor &&vis, const basic_format_arg &arg); + visit_format_arg(Visitor&& vis, const basic_format_arg& arg); friend class basic_format_args; friend class internal::arg_map; @@ -799,9 +828,9 @@ class basic_format_arg { public: class handle { public: - explicit handle(internal::custom_value custom): custom_(custom) {} + explicit handle(internal::custom_value custom) : custom_(custom) {} - void format(Context &ctx) const { custom_.format(custom_.value, ctx); } + void format(Context& ctx) const { custom_.format(custom_.value, ctx); } private: internal::custom_value custom_; @@ -829,8 +858,8 @@ struct monostate {}; \endrst */ template -FMT_CONSTEXPR typename internal::result_of::type - visit_format_arg(Visitor &&vis, const basic_format_arg &arg) { +FMT_CONSTEXPR typename internal::result_of::type visit_format_arg( + Visitor&& vis, const basic_format_arg& arg) { typedef typename Context::char_type char_type; switch (arg.type_) { case internal::none_type: @@ -857,8 +886,8 @@ FMT_CONSTEXPR typename internal::result_of::type case internal::cstring_type: return vis(arg.value_.string.value); case internal::string_type: - return vis(basic_string_view( - arg.value_.string.value, arg.value_.string.size)); + return vis(basic_string_view(arg.value_.string.value, + arg.value_.string.size)); case internal::pointer_type: return vis(arg.value_.pointer); case internal::custom_type: @@ -869,8 +898,8 @@ FMT_CONSTEXPR typename internal::result_of::type // DEPRECATED! template -FMT_CONSTEXPR typename internal::result_of::type - visit(Visitor &&vis, const basic_format_arg &arg) { +FMT_CONSTEXPR typename internal::result_of::type visit( + Visitor&& vis, const basic_format_arg& arg) { return visit_format_arg(std::forward(vis), arg); } @@ -886,9 +915,9 @@ class basic_parse_context : private ErrorHandler { typedef Char char_type; typedef typename basic_string_view::iterator iterator; - explicit FMT_CONSTEXPR basic_parse_context( - basic_string_view format_str, ErrorHandler eh = ErrorHandler()) - : ErrorHandler(eh), format_str_(format_str), next_arg_id_(0) {} + explicit FMT_CONSTEXPR basic_parse_context(basic_string_view format_str, + ErrorHandler eh = ErrorHandler()) + : ErrorHandler(eh), format_str_(format_str), next_arg_id_(0) {} // Returns an iterator to the beginning of the format string range being // parsed. @@ -918,7 +947,7 @@ class basic_parse_context : private ErrorHandler { FMT_CONSTEXPR void check_arg_id(basic_string_view) {} - FMT_CONSTEXPR void on_error(const char *message) { + FMT_CONSTEXPR void on_error(const char* message) { ErrorHandler::on_error(message); } @@ -934,11 +963,10 @@ typedef basic_parse_context wparse_context; namespace internal { // A map from argument names to their values for named arguments. -template -class arg_map { +template class arg_map { private: - arg_map(const arg_map &) = delete; - void operator=(const arg_map &) = delete; + arg_map(const arg_map&) = delete; + void operator=(const arg_map&) = delete; typedef typename Context::char_type char_type; @@ -947,25 +975,24 @@ class arg_map { basic_format_arg arg; }; - entry *map_; + entry* map_; unsigned size_; void push_back(value val) { - const internal::named_arg_base &named = val.as_named_arg(); + const internal::named_arg_base& named = val.as_named_arg(); map_[size_] = entry{named.name, named.template deserialize()}; ++size_; } public: arg_map() : map_(FMT_NULL), size_(0) {} - void init(const basic_format_args &args); - ~arg_map() { delete [] map_; } + void init(const basic_format_args& args); + ~arg_map() { delete[] map_; } basic_format_arg find(basic_string_view name) const { // The list is unsorted, so just return the first matching name. for (entry *it = map_, *end = map_ + size_; it != end; ++it) { - if (it->name == name) - return it->arg; + if (it->name == name) return it->arg; } return {}; } @@ -974,17 +1001,15 @@ class arg_map { // A type-erased reference to an std::locale to avoid heavy include. class locale_ref { private: - const void *locale_; // A type-erased pointer to std::locale. + const void* locale_; // A type-erased pointer to std::locale. friend class locale; public: locale_ref() : locale_(FMT_NULL) {} - template - explicit locale_ref(const Locale &loc); + template explicit locale_ref(const Locale& loc); - template - Locale get() const; + template Locale get() const; }; template @@ -1005,33 +1030,32 @@ class context_base { context_base(OutputIt out, basic_string_view format_str, basic_format_args ctx_args, locale_ref loc = locale_ref()) - : parse_context_(format_str), out_(out), args_(ctx_args), loc_(loc) {} + : parse_context_(format_str), out_(out), args_(ctx_args), loc_(loc) {} // Returns the argument with specified index. format_arg do_get_arg(unsigned arg_id) { format_arg arg = args_.get(arg_id); - if (!arg) - parse_context_.on_error("argument index out of range"); + if (!arg) parse_context_.on_error("argument index out of range"); return arg; } // Checks if manual indexing is used and returns the argument with // specified index. format_arg get_arg(unsigned arg_id) { - return this->parse_context().check_arg_id(arg_id) ? - this->do_get_arg(arg_id) : format_arg(); + return this->parse_context().check_arg_id(arg_id) ? this->do_get_arg(arg_id) + : format_arg(); } public: - basic_parse_context &parse_context() { return parse_context_; } - basic_format_args args() const { return args_; } // DEPRECATED! + basic_parse_context& parse_context() { return parse_context_; } + basic_format_args args() const { return args_; } // DEPRECATED! basic_format_arg arg(unsigned id) const { return args_.get(id); } internal::error_handler error_handler() { return parse_context_.error_handler(); } - void on_error(const char *message) { parse_context_.on_error(message); } + void on_error(const char* message) { parse_context_.on_error(message); } // Returns an iterator to the beginning of the output range. iterator out() { return out_; } @@ -1043,15 +1067,15 @@ class context_base { locale_ref locale() { return loc_; } }; -template -struct get_type { - typedef decltype(make_value( - declval::type&>())) value_type; +template struct get_type { + typedef decltype( + make_value(declval::type&>())) value_type; static const type value = value_type::type_tag; }; -template -FMT_CONSTEXPR11 unsigned long long get_types() { return 0; } +template FMT_CONSTEXPR11 unsigned long long get_types() { + return 0; +} template FMT_CONSTEXPR11 unsigned long long get_types() { @@ -1059,7 +1083,7 @@ FMT_CONSTEXPR11 unsigned long long get_types() { } template -FMT_CONSTEXPR basic_format_arg make_arg(const T &value) { +FMT_CONSTEXPR basic_format_arg make_arg(const T& value) { basic_format_arg arg; arg.type_ = get_type::value; arg.value_ = make_value(value); @@ -1067,36 +1091,37 @@ FMT_CONSTEXPR basic_format_arg make_arg(const T &value) { } template -inline typename std::enable_if>::type - make_arg(const T &value) { +inline typename std::enable_if>::type make_arg( + const T& value) { return make_value(value); } template inline typename std::enable_if>::type - make_arg(const T &value) { +make_arg(const T& value) { return make_arg(value); } } // namespace internal // Formatting context. template -class basic_format_context : - public internal::context_base< - OutputIt, basic_format_context, Char> { +class basic_format_context + : public internal::context_base< + OutputIt, basic_format_context, Char> { public: /** The character type for the output. */ typedef Char char_type; // using formatter_type = formatter; - template - struct formatter_type { typedef formatter type; }; + template struct formatter_type { + typedef formatter type; + }; private: internal::arg_map map_; - basic_format_context(const basic_format_context &) = delete; - void operator=(const basic_format_context &) = delete; + basic_format_context(const basic_format_context&) = delete; + void operator=(const basic_format_context&) = delete; typedef internal::context_base base; typedef typename base::format_arg format_arg; @@ -1112,7 +1137,7 @@ class basic_format_context : basic_format_context(OutputIt out, basic_string_view format_str, basic_format_args ctx_args, internal::locale_ref loc = internal::locale_ref()) - : base(out, format_str, ctx_args, loc) {} + : base(out, format_str, ctx_args, loc) {} format_arg next_arg() { return this->do_get_arg(this->parse_context().next_arg_id()); @@ -1124,10 +1149,10 @@ class basic_format_context : format_arg get_arg(basic_string_view name); }; -template -struct buffer_context { +template struct buffer_context { typedef basic_format_context< - std::back_insert_iterator>, Char> type; + std::back_insert_iterator>, Char> + type; }; typedef buffer_context::type format_context; typedef buffer_context::type wformat_context; @@ -1139,28 +1164,26 @@ typedef buffer_context::type wformat_context; such as `~fmt::vformat`. \endrst */ -template -class format_arg_store { +template class format_arg_store { private: static const size_t NUM_ARGS = sizeof...(Args); // Packed is a macro on MinGW so use IS_PACKED instead. static const bool IS_PACKED = NUM_ARGS < internal::max_packed_args; - typedef typename std::conditional, basic_format_arg>::type value_type; + typedef typename std::conditional, + basic_format_arg>::type value_type; // If the arguments are not packed, add one more element to mark the end. static const size_t DATA_SIZE = - NUM_ARGS + (IS_PACKED && NUM_ARGS != 0 ? 0 : 1); + NUM_ARGS + (IS_PACKED && NUM_ARGS != 0 ? 0 : 1); value_type data_[DATA_SIZE]; friend class basic_format_args; static FMT_CONSTEXPR11 unsigned long long get_types() { - return IS_PACKED ? - internal::get_types() : - internal::is_unpacked_bit | NUM_ARGS; + return IS_PACKED ? internal::get_types() + : internal::is_unpacked_bit | NUM_ARGS; } public: @@ -1173,19 +1196,19 @@ class format_arg_store { #if (FMT_GCC_VERSION && FMT_GCC_VERSION <= 405) || \ (FMT_MSC_VER && FMT_MSC_VER <= 1800) // Workaround array initialization issues in gcc <= 4.5 and MSVC <= 2013. - format_arg_store(const Args &... args) { - value_type init[DATA_SIZE] = - {internal::make_arg(args)...}; + format_arg_store(const Args&... args) { + value_type init[DATA_SIZE] = { + internal::make_arg(args)...}; std::memcpy(data_, init, sizeof(init)); } #else - format_arg_store(const Args &... args) - : data_{internal::make_arg(args)...} {} + format_arg_store(const Args&... args) + : data_{internal::make_arg(args)...} {} #endif }; #if !FMT_USE_CONSTEXPR11 -template +template const unsigned long long format_arg_store::TYPES = get_types(); #endif @@ -1197,16 +1220,17 @@ const unsigned long long format_arg_store::TYPES = can be omitted in which case it defaults to `~fmt::context`. \endrst */ -template -inline format_arg_store - make_format_args(const Args &... args) { return {args...}; } +template +inline format_arg_store make_format_args( + const Args&... args) { + return {args...}; +} /** Formatting arguments. */ -template -class basic_format_args { +template class basic_format_args { public: typedef unsigned size_type; - typedef basic_format_arg format_arg; + typedef basic_format_arg format_arg; private: // To reduce compiled code size per formatting function call, types of first @@ -1218,37 +1242,34 @@ class basic_format_args { // This is done to reduce compiled code size as storing larger objects // may require more code (at least on x86-64) even if the same amount of // data is actually copied to stack. It saves ~10% on the bloat test. - const internal::value *values_; - const format_arg *args_; + const internal::value* values_; + const format_arg* args_; }; bool is_packed() const { return (types_ & internal::is_unpacked_bit) == 0; } typename internal::type type(unsigned index) const { unsigned shift = index * 4; - return static_cast( - (types_ & (0xfull << shift)) >> shift); + return static_cast((types_ & (0xfull << shift)) >> + shift); } friend class internal::arg_map; - void set_data(const internal::value *values) { values_ = values; } - void set_data(const format_arg *args) { args_ = args; } + void set_data(const internal::value* values) { values_ = values; } + void set_data(const format_arg* args) { args_ = args; } format_arg do_get(size_type index) const { format_arg arg; if (!is_packed()) { auto num_args = max_size(); - if (index < num_args) - arg = args_[index]; + if (index < num_args) arg = args_[index]; return arg; } - if (index > internal::max_packed_args) - return arg; + if (index > internal::max_packed_args) return arg; arg.type_ = type(index); - if (arg.type_ == internal::none_type) - return arg; - internal::value &val = arg.value_; + if (arg.type_ == internal::none_type) return arg; + internal::value& val = arg.value_; val = values_[index]; return arg; } @@ -1262,8 +1283,8 @@ class basic_format_args { \endrst */ template - basic_format_args(const format_arg_store &store) - : types_(static_cast(store.TYPES)) { + basic_format_args(const format_arg_store& store) + : types_(static_cast(store.TYPES)) { set_data(store.data_); } @@ -1272,8 +1293,8 @@ class basic_format_args { Constructs a `basic_format_args` object from a dynamic set of arguments. \endrst */ - basic_format_args(const format_arg *args, size_type count) - : types_(internal::is_unpacked_bit | count) { + basic_format_args(const format_arg* args, size_type count) + : types_(internal::is_unpacked_bit | count) { set_data(args); } @@ -1288,82 +1309,79 @@ class basic_format_args { size_type max_size() const { unsigned long long max_packed = internal::max_packed_args; return static_cast( - is_packed() ? max_packed : types_ & ~internal::is_unpacked_bit); + is_packed() ? max_packed : types_ & ~internal::is_unpacked_bit); } }; /** An alias to ``basic_format_args``. */ // It is a separate type rather than a typedef to make symbols readable. struct format_args : basic_format_args { - template - format_args(Args &&... arg) - : basic_format_args(std::forward(arg)...) {} + template + format_args(Args&&... arg) + : basic_format_args(std::forward(arg)...) {} }; struct wformat_args : basic_format_args { - template - wformat_args(Args &&... arg) - : basic_format_args(std::forward(arg)...) {} + template + wformat_args(Args&&... arg) + : basic_format_args(std::forward(arg)...) {} }; #define FMT_ENABLE_IF_T(B, T) typename std::enable_if::type #ifndef FMT_USE_ALIAS_TEMPLATES -# define FMT_USE_ALIAS_TEMPLATES FMT_HAS_FEATURE(cxx_alias_templates) +# define FMT_USE_ALIAS_TEMPLATES FMT_HAS_FEATURE(cxx_alias_templates) #endif #if FMT_USE_ALIAS_TEMPLATES /** String's character type. */ template -using char_t = FMT_ENABLE_IF_T( - internal::is_string::value, typename internal::char_t::type); -#define FMT_CHAR(S) fmt::char_t +using char_t = FMT_ENABLE_IF_T(internal::is_string::value, + typename internal::char_t::type); +# define FMT_CHAR(S) fmt::char_t #else template -struct char_t : std::enable_if< - internal::is_string::value, typename internal::char_t::type> {}; -#define FMT_CHAR(S) typename char_t::type +struct char_t : std::enable_if::value, + typename internal::char_t::type> {}; +# define FMT_CHAR(S) typename char_t::type #endif namespace internal { -template -struct named_arg_base { +template struct named_arg_base { basic_string_view name; // Serialized value. - mutable char data[ - sizeof(basic_format_arg::type>)]; + mutable char + data[sizeof(basic_format_arg::type>)]; named_arg_base(basic_string_view nm) : name(nm) {} - template - basic_format_arg deserialize() const { + template basic_format_arg deserialize() const { basic_format_arg arg; std::memcpy(&arg, data, sizeof(basic_format_arg)); return arg; } }; -template -struct named_arg : named_arg_base { - const T &value; +template struct named_arg : named_arg_base { + const T& value; - named_arg(basic_string_view name, const T &val) - : named_arg_base(name), value(val) {} + named_arg(basic_string_view name, const T& val) + : named_arg_base(name), value(val) {} }; template inline typename std::enable_if::value>::type - check_format_string(const S &) {} +check_format_string(const S&) {} template -typename std::enable_if::value>::type - check_format_string(S); +typename std::enable_if::value>::type check_format_string( + S); template -struct checked_args : format_arg_store< - typename buffer_context::type, Args...> { +struct checked_args + : format_arg_store::type, Args...> { typedef typename buffer_context::type context; - checked_args(const S &format_str, const Args &... args): - format_arg_store(args...) { + checked_args(const S& format_str, const Args&... args) + : format_arg_store(args...) { internal::check_format_string(format_str); } @@ -1372,14 +1390,14 @@ struct checked_args : format_arg_store< template std::basic_string vformat( - basic_string_view format_str, - basic_format_args::type> args); + basic_string_view format_str, + basic_format_args::type> args); template typename buffer_context::type::iterator vformat_to( - internal::basic_buffer &buf, basic_string_view format_str, - basic_format_args::type> args); -} + internal::basic_buffer& buf, basic_string_view format_str, + basic_format_args::type> args); +} // namespace internal /** \rst @@ -1391,12 +1409,12 @@ typename buffer_context::type::iterator vformat_to( \endrst */ template -inline internal::named_arg arg(string_view name, const T &arg) { +inline internal::named_arg arg(string_view name, const T& arg) { return {name, arg}; } template -inline internal::named_arg arg(wstring_view name, const T &arg) { +inline internal::named_arg arg(wstring_view name, const T& arg) { return {name, arg}; } @@ -1404,41 +1422,38 @@ inline internal::named_arg arg(wstring_view name, const T &arg) { template void arg(S, internal::named_arg) = delete; -template -struct is_contiguous: std::false_type {}; +template struct is_contiguous : std::false_type {}; template -struct is_contiguous >: std::true_type {}; +struct is_contiguous> : std::true_type {}; template -struct is_contiguous >: std::true_type {}; +struct is_contiguous> : std::true_type {}; /** Formats a string and writes the output to ``out``. */ template -typename std::enable_if< - is_contiguous::value, std::back_insert_iterator>::type - vformat_to( - std::back_insert_iterator out, - const S &format_str, - basic_format_args::type> args) { +typename std::enable_if::value, + std::back_insert_iterator>::type +vformat_to(std::back_insert_iterator out, const S& format_str, + basic_format_args::type> args) { internal::container_buffer buf(internal::get_container(out)); internal::vformat_to(buf, to_string_view(format_str), args); return out; } template -inline typename std::enable_if< - is_contiguous::value && internal::is_string::value, - std::back_insert_iterator>::type - format_to(std::back_insert_iterator out, const S &format_str, - const Args &... args) { +inline typename std::enable_if::value && + internal::is_string::value, + std::back_insert_iterator>::type +format_to(std::back_insert_iterator out, const S& format_str, + const Args&... args) { internal::checked_args ca(format_str, args...); return vformat_to(out, to_string_view(format_str), *ca); } template inline std::basic_string vformat( - const S &format_str, + const S& format_str, basic_format_args::type> args) { return internal::vformat(to_string_view(format_str), args); } @@ -1454,15 +1469,15 @@ inline std::basic_string vformat( \endrst */ template -inline std::basic_string format( - const S &format_str, const Args &... args) { +inline std::basic_string format(const S& format_str, + const Args&... args) { return internal::vformat( - to_string_view(format_str), - *internal::checked_args(format_str, args...)); + to_string_view(format_str), + *internal::checked_args(format_str, args...)); } -FMT_API void vprint(std::FILE *f, string_view format_str, format_args args); -FMT_API void vprint(std::FILE *f, wstring_view format_str, wformat_args args); +FMT_API void vprint(std::FILE* f, string_view format_str, format_args args); +FMT_API void vprint(std::FILE* f, wstring_view format_str, wformat_args args); /** \rst @@ -1477,7 +1492,7 @@ FMT_API void vprint(std::FILE *f, wstring_view format_str, wformat_args args); */ template inline FMT_ENABLE_IF_T(internal::is_string::value, void) - print(std::FILE *f, const S &format_str, const Args &... args) { + print(std::FILE* f, const S& format_str, const Args&... args) { vprint(f, to_string_view(format_str), internal::checked_args(format_str, args...)); } @@ -1496,7 +1511,7 @@ FMT_API void vprint(wstring_view format_str, wformat_args args); */ template inline FMT_ENABLE_IF_T(internal::is_string::value, void) - print(const S &format_str, const Args &... args) { + print(const S& format_str, const Args&... args) { vprint(to_string_view(format_str), internal::checked_args(format_str, args...)); } diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h index 552c9430..2debe52a 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h @@ -20,45 +20,45 @@ #include // for std::ptrdiff_t #include // for std::memmove #if !defined(FMT_STATIC_THOUSANDS_SEPARATOR) -# include +# include #endif #if FMT_USE_WINDOWS_H -# if !defined(FMT_HEADER_ONLY) && !defined(WIN32_LEAN_AND_MEAN) -# define WIN32_LEAN_AND_MEAN -# endif -# if defined(NOMINMAX) || defined(FMT_WIN_MINMAX) -# include -# else -# define NOMINMAX -# include -# undef NOMINMAX -# endif +# if !defined(FMT_HEADER_ONLY) && !defined(WIN32_LEAN_AND_MEAN) +# define WIN32_LEAN_AND_MEAN +# endif +# if defined(NOMINMAX) || defined(FMT_WIN_MINMAX) +# include +# else +# define NOMINMAX +# include +# undef NOMINMAX +# endif #endif #if FMT_EXCEPTIONS -# define FMT_TRY try -# define FMT_CATCH(x) catch (x) +# define FMT_TRY try +# define FMT_CATCH(x) catch (x) #else -# define FMT_TRY if (true) -# define FMT_CATCH(x) if (false) +# define FMT_TRY if (true) +# define FMT_CATCH(x) if (false) #endif #ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable: 4127) // conditional expression is constant -# pragma warning(disable: 4702) // unreachable code +# pragma warning(push) +# pragma warning(disable : 4127) // conditional expression is constant +# pragma warning(disable : 4702) // unreachable code // Disable deprecation warning for strerror. The latter is not called but // MSVC fails to detect it. -# pragma warning(disable: 4996) +# pragma warning(disable : 4996) #endif // Dummy implementations of strerror_r and strerror_s called if corresponding // system functions are not available. -inline fmt::internal::null<> strerror_r(int, char *, ...) { +inline fmt::internal::null<> strerror_r(int, char*, ...) { return fmt::internal::null<>(); } -inline fmt::internal::null<> strerror_s(char *, std::size_t, ...) { +inline fmt::internal::null<> strerror_s(char*, std::size_t, ...) { return fmt::internal::null<>(); } @@ -67,25 +67,25 @@ FMT_BEGIN_NAMESPACE namespace { #ifndef _MSC_VER -# define FMT_SNPRINTF snprintf +# define FMT_SNPRINTF snprintf #else // _MSC_VER -inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) { +inline int fmt_snprintf(char* buffer, size_t size, const char* format, ...) { va_list args; va_start(args, format); int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args); va_end(args); return result; } -# define FMT_SNPRINTF fmt_snprintf +# define FMT_SNPRINTF fmt_snprintf #endif // _MSC_VER #if defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT) -# define FMT_SWPRINTF snwprintf +# define FMT_SWPRINTF snwprintf #else -# define FMT_SWPRINTF swprintf -#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT) +# define FMT_SWPRINTF swprintf +#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT) -typedef void (*FormatFunc)(internal::buffer &, int, string_view); +typedef void (*FormatFunc)(internal::buffer&, int, string_view); // Portable thread-safe version of strerror. // Sets buffer to point to a string describing the error code. @@ -96,18 +96,18 @@ typedef void (*FormatFunc)(internal::buffer &, int, string_view); // ERANGE - buffer is not large enough to store the error message // other - failure // Buffer should be at least of size 1. -int safe_strerror( - int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT { +int safe_strerror(int error_code, char*& buffer, + std::size_t buffer_size) FMT_NOEXCEPT { FMT_ASSERT(buffer != FMT_NULL && buffer_size != 0, "invalid buffer"); class dispatcher { private: int error_code_; - char *&buffer_; + char*& buffer_; std::size_t buffer_size_; // A noop assignment operator to avoid bogus warnings. - void operator=(const dispatcher &) {} + void operator=(const dispatcher&) {} // Handle the result of XSI-compliant version of strerror_r. int handle(int result) { @@ -116,7 +116,7 @@ int safe_strerror( } // Handle the result of GNU-specific version of strerror_r. - int handle(char *message) { + int handle(char* message) { // If the buffer is full then the message is probably truncated. if (message == buffer_ && strlen(buffer_) == buffer_size_ - 1) return ERANGE; @@ -132,8 +132,8 @@ int safe_strerror( // Fallback to strerror_s when strerror_r is not available. int fallback(int result) { // If the buffer is full then the message is probably truncated. - return result == 0 && strlen(buffer_) == buffer_size_ - 1 ? - ERANGE : result; + return result == 0 && strlen(buffer_) == buffer_size_ - 1 ? ERANGE + : result; } #if !FMT_MSC_VER @@ -146,17 +146,15 @@ int safe_strerror( #endif public: - dispatcher(int err_code, char *&buf, std::size_t buf_size) - : error_code_(err_code), buffer_(buf), buffer_size_(buf_size) {} + dispatcher(int err_code, char*& buf, std::size_t buf_size) + : error_code_(err_code), buffer_(buf), buffer_size_(buf_size) {} - int run() { - return handle(strerror_r(error_code_, buffer_, buffer_size_)); - } + int run() { return handle(strerror_r(error_code_, buffer_, buffer_size_)); } }; return dispatcher(error_code, buffer, buffer_size).run(); } -void format_error_code(internal::buffer &out, int error_code, +void format_error_code(internal::buffer& out, int error_code, string_view message) FMT_NOEXCEPT { // Report error code making sure that the output fits into // inline_buffer_size to avoid dynamic memory allocation and potential @@ -195,11 +193,10 @@ void report_error(FormatFunc func, int error_code, } // namespace FMT_FUNC size_t internal::count_code_points(basic_string_view s) { - const char8_t *data = s.data(); + const char8_t* data = s.data(); size_t num_code_points = 0; for (size_t i = 0, size = s.size(); i != size; ++i) { - if ((data[i] & 0xc0) != 0x80) - ++num_code_points; + if ((data[i] & 0xc0) != 0x80) ++num_code_points; } return num_code_points; } @@ -208,22 +205,20 @@ FMT_FUNC size_t internal::count_code_points(basic_string_view s) { namespace internal { template -locale_ref::locale_ref(const Locale &loc) : locale_(&loc) { +locale_ref::locale_ref(const Locale& loc) : locale_(&loc) { static_assert(std::is_same::value, ""); } -template -Locale locale_ref::get() const { +template Locale locale_ref::get() const { static_assert(std::is_same::value, ""); return locale_ ? *static_cast(locale_) : std::locale(); } -template -FMT_FUNC Char thousands_sep_impl(locale_ref loc) { - return std::use_facet >( - loc.get()).thousands_sep(); -} +template FMT_FUNC Char thousands_sep_impl(locale_ref loc) { + return std::use_facet >(loc.get()) + .thousands_sep(); } +} // namespace internal #else template FMT_FUNC Char internal::thousands_sep_impl(locale_ref) { @@ -231,31 +226,30 @@ FMT_FUNC Char internal::thousands_sep_impl(locale_ref) { } #endif -FMT_FUNC void system_error::init( - int err_code, string_view format_str, format_args args) { +FMT_FUNC void system_error::init(int err_code, string_view format_str, + format_args args) { error_code_ = err_code; memory_buffer buffer; format_system_error(buffer, err_code, vformat(format_str, args)); - std::runtime_error &base = *this; + std::runtime_error& base = *this; base = std::runtime_error(to_string(buffer)); } namespace internal { template -int char_traits::format_float( - char *buf, std::size_t size, const char *format, int precision, T value) { - return precision < 0 ? - FMT_SNPRINTF(buf, size, format, value) : - FMT_SNPRINTF(buf, size, format, precision, value); +int char_traits::format_float(char* buf, std::size_t size, + const char* format, int precision, + T value) { + return precision < 0 ? FMT_SNPRINTF(buf, size, format, value) + : FMT_SNPRINTF(buf, size, format, precision, value); } template -int char_traits::format_float( - wchar_t *buf, std::size_t size, const wchar_t *format, int precision, - T value) { - return precision < 0 ? - FMT_SWPRINTF(buf, size, format, value) : - FMT_SWPRINTF(buf, size, format, precision, value); +int char_traits::format_float(wchar_t* buf, std::size_t size, + const wchar_t* format, int precision, + T value) { + return precision < 0 ? FMT_SWPRINTF(buf, size, format, value) + : FMT_SWPRINTF(buf, size, format, precision, value); } template @@ -266,86 +260,75 @@ const char basic_data::DIGITS[] = "6061626364656667686970717273747576777879" "8081828384858687888990919293949596979899"; -#define FMT_POWERS_OF_10(factor) \ - factor * 10, \ - factor * 100, \ - factor * 1000, \ - factor * 10000, \ - factor * 100000, \ - factor * 1000000, \ - factor * 10000000, \ - factor * 100000000, \ - factor * 1000000000 +#define FMT_POWERS_OF_10(factor) \ + factor * 10, factor * 100, factor * 1000, factor * 10000, factor * 100000, \ + factor * 1000000, factor * 10000000, factor * 100000000, \ + factor * 1000000000 template -const uint32_t basic_data::POWERS_OF_10_32[] = { - 1, FMT_POWERS_OF_10(1) -}; +const uint32_t basic_data::POWERS_OF_10_32[] = {1, FMT_POWERS_OF_10(1)}; template -const uint32_t basic_data::ZERO_OR_POWERS_OF_10_32[] = { - 0, FMT_POWERS_OF_10(1) -}; +const uint32_t basic_data::ZERO_OR_POWERS_OF_10_32[] = {0, + FMT_POWERS_OF_10(1)}; template const uint64_t basic_data::ZERO_OR_POWERS_OF_10_64[] = { - 0, - FMT_POWERS_OF_10(1), - FMT_POWERS_OF_10(1000000000ull), - 10000000000000000000ull -}; + 0, FMT_POWERS_OF_10(1), FMT_POWERS_OF_10(1000000000ull), + 10000000000000000000ull}; // Normalized 64-bit significands of pow(10, k), for k = -348, -340, ..., 340. // These are generated by support/compute-powers.py. template const uint64_t basic_data::POW10_SIGNIFICANDS[] = { - 0xfa8fd5a0081c0288, 0xbaaee17fa23ebf76, 0x8b16fb203055ac76, - 0xcf42894a5dce35ea, 0x9a6bb0aa55653b2d, 0xe61acf033d1a45df, - 0xab70fe17c79ac6ca, 0xff77b1fcbebcdc4f, 0xbe5691ef416bd60c, - 0x8dd01fad907ffc3c, 0xd3515c2831559a83, 0x9d71ac8fada6c9b5, - 0xea9c227723ee8bcb, 0xaecc49914078536d, 0x823c12795db6ce57, - 0xc21094364dfb5637, 0x9096ea6f3848984f, 0xd77485cb25823ac7, - 0xa086cfcd97bf97f4, 0xef340a98172aace5, 0xb23867fb2a35b28e, - 0x84c8d4dfd2c63f3b, 0xc5dd44271ad3cdba, 0x936b9fcebb25c996, - 0xdbac6c247d62a584, 0xa3ab66580d5fdaf6, 0xf3e2f893dec3f126, - 0xb5b5ada8aaff80b8, 0x87625f056c7c4a8b, 0xc9bcff6034c13053, - 0x964e858c91ba2655, 0xdff9772470297ebd, 0xa6dfbd9fb8e5b88f, - 0xf8a95fcf88747d94, 0xb94470938fa89bcf, 0x8a08f0f8bf0f156b, - 0xcdb02555653131b6, 0x993fe2c6d07b7fac, 0xe45c10c42a2b3b06, - 0xaa242499697392d3, 0xfd87b5f28300ca0e, 0xbce5086492111aeb, - 0x8cbccc096f5088cc, 0xd1b71758e219652c, 0x9c40000000000000, - 0xe8d4a51000000000, 0xad78ebc5ac620000, 0x813f3978f8940984, - 0xc097ce7bc90715b3, 0x8f7e32ce7bea5c70, 0xd5d238a4abe98068, - 0x9f4f2726179a2245, 0xed63a231d4c4fb27, 0xb0de65388cc8ada8, - 0x83c7088e1aab65db, 0xc45d1df942711d9a, 0x924d692ca61be758, - 0xda01ee641a708dea, 0xa26da3999aef774a, 0xf209787bb47d6b85, - 0xb454e4a179dd1877, 0x865b86925b9bc5c2, 0xc83553c5c8965d3d, - 0x952ab45cfa97a0b3, 0xde469fbd99a05fe3, 0xa59bc234db398c25, - 0xf6c69a72a3989f5c, 0xb7dcbf5354e9bece, 0x88fcf317f22241e2, - 0xcc20ce9bd35c78a5, 0x98165af37b2153df, 0xe2a0b5dc971f303a, - 0xa8d9d1535ce3b396, 0xfb9b7cd9a4a7443c, 0xbb764c4ca7a44410, - 0x8bab8eefb6409c1a, 0xd01fef10a657842c, 0x9b10a4e5e9913129, - 0xe7109bfba19c0c9d, 0xac2820d9623bf429, 0x80444b5e7aa7cf85, - 0xbf21e44003acdd2d, 0x8e679c2f5e44ff8f, 0xd433179d9c8cb841, - 0x9e19db92b4e31ba9, 0xeb96bf6ebadf77d9, 0xaf87023b9bf0ee6b, + 0xfa8fd5a0081c0288, 0xbaaee17fa23ebf76, 0x8b16fb203055ac76, + 0xcf42894a5dce35ea, 0x9a6bb0aa55653b2d, 0xe61acf033d1a45df, + 0xab70fe17c79ac6ca, 0xff77b1fcbebcdc4f, 0xbe5691ef416bd60c, + 0x8dd01fad907ffc3c, 0xd3515c2831559a83, 0x9d71ac8fada6c9b5, + 0xea9c227723ee8bcb, 0xaecc49914078536d, 0x823c12795db6ce57, + 0xc21094364dfb5637, 0x9096ea6f3848984f, 0xd77485cb25823ac7, + 0xa086cfcd97bf97f4, 0xef340a98172aace5, 0xb23867fb2a35b28e, + 0x84c8d4dfd2c63f3b, 0xc5dd44271ad3cdba, 0x936b9fcebb25c996, + 0xdbac6c247d62a584, 0xa3ab66580d5fdaf6, 0xf3e2f893dec3f126, + 0xb5b5ada8aaff80b8, 0x87625f056c7c4a8b, 0xc9bcff6034c13053, + 0x964e858c91ba2655, 0xdff9772470297ebd, 0xa6dfbd9fb8e5b88f, + 0xf8a95fcf88747d94, 0xb94470938fa89bcf, 0x8a08f0f8bf0f156b, + 0xcdb02555653131b6, 0x993fe2c6d07b7fac, 0xe45c10c42a2b3b06, + 0xaa242499697392d3, 0xfd87b5f28300ca0e, 0xbce5086492111aeb, + 0x8cbccc096f5088cc, 0xd1b71758e219652c, 0x9c40000000000000, + 0xe8d4a51000000000, 0xad78ebc5ac620000, 0x813f3978f8940984, + 0xc097ce7bc90715b3, 0x8f7e32ce7bea5c70, 0xd5d238a4abe98068, + 0x9f4f2726179a2245, 0xed63a231d4c4fb27, 0xb0de65388cc8ada8, + 0x83c7088e1aab65db, 0xc45d1df942711d9a, 0x924d692ca61be758, + 0xda01ee641a708dea, 0xa26da3999aef774a, 0xf209787bb47d6b85, + 0xb454e4a179dd1877, 0x865b86925b9bc5c2, 0xc83553c5c8965d3d, + 0x952ab45cfa97a0b3, 0xde469fbd99a05fe3, 0xa59bc234db398c25, + 0xf6c69a72a3989f5c, 0xb7dcbf5354e9bece, 0x88fcf317f22241e2, + 0xcc20ce9bd35c78a5, 0x98165af37b2153df, 0xe2a0b5dc971f303a, + 0xa8d9d1535ce3b396, 0xfb9b7cd9a4a7443c, 0xbb764c4ca7a44410, + 0x8bab8eefb6409c1a, 0xd01fef10a657842c, 0x9b10a4e5e9913129, + 0xe7109bfba19c0c9d, 0xac2820d9623bf429, 0x80444b5e7aa7cf85, + 0xbf21e44003acdd2d, 0x8e679c2f5e44ff8f, 0xd433179d9c8cb841, + 0x9e19db92b4e31ba9, 0xeb96bf6ebadf77d9, 0xaf87023b9bf0ee6b, }; // Binary exponents of pow(10, k), for k = -348, -340, ..., 340, corresponding // to significands above. template const int16_t basic_data::POW10_EXPONENTS[] = { - -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007, -980, -954, - -927, -901, -874, -847, -821, -794, -768, -741, -715, -688, -661, - -635, -608, -582, -555, -529, -502, -475, -449, -422, -396, -369, - -343, -316, -289, -263, -236, -210, -183, -157, -130, -103, -77, - -50, -24, 3, 30, 56, 83, 109, 136, 162, 189, 216, - 242, 269, 295, 322, 348, 375, 402, 428, 455, 481, 508, - 534, 561, 588, 614, 641, 667, 694, 720, 747, 774, 800, - 827, 853, 880, 907, 933, 960, 986, 1013, 1039, 1066 -}; + -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007, -980, -954, + -927, -901, -874, -847, -821, -794, -768, -741, -715, -688, -661, + -635, -608, -582, -555, -529, -502, -475, -449, -422, -396, -369, + -343, -316, -289, -263, -236, -210, -183, -157, -130, -103, -77, + -50, -24, 3, 30, 56, 83, 109, 136, 162, 189, 216, + 242, 269, 295, 322, 348, 375, 402, 428, 455, 481, 508, + 534, 561, 588, 614, 641, 667, 694, 720, 747, 774, 800, + 827, 853, 880, 907, 933, 960, 986, 1013, 1039, 1066}; -template const char basic_data::FOREGROUND_COLOR[] = "\x1b[38;2;"; -template const char basic_data::BACKGROUND_COLOR[] = "\x1b[48;2;"; +template +const char basic_data::FOREGROUND_COLOR[] = "\x1b[38;2;"; +template +const char basic_data::BACKGROUND_COLOR[] = "\x1b[48;2;"; template const char basic_data::RESET_COLOR[] = "\x1b[0m"; template const wchar_t basic_data::WRESET_COLOR[] = L"\x1b[0m"; @@ -356,33 +339,32 @@ class fp { // All sizes are in bits. static FMT_CONSTEXPR_DECL const int char_size = - std::numeric_limits::digits; + std::numeric_limits::digits; // Subtract 1 to account for an implicit most significant bit in the // normalized form. static FMT_CONSTEXPR_DECL const int double_significand_size = - std::numeric_limits::digits - 1; + std::numeric_limits::digits - 1; static FMT_CONSTEXPR_DECL const uint64_t implicit_bit = - 1ull << double_significand_size; + 1ull << double_significand_size; public: significand_type f; int e; static FMT_CONSTEXPR_DECL const int significand_size = - sizeof(significand_type) * char_size; + sizeof(significand_type) * char_size; - fp(): f(0), e(0) {} - fp(uint64_t f_val, int e_val): f(f_val), e(e_val) {} + fp() : f(0), e(0) {} + fp(uint64_t f_val, int e_val) : f(f_val), e(e_val) {} // Constructs fp from an IEEE754 double. It is a template to prevent compile // errors on platforms where double is not IEEE754. - template - explicit fp(Double d) { + template explicit fp(Double d) { // Assume double is in the format [sign][exponent][significand]. typedef std::numeric_limits limits; const int double_size = static_cast(sizeof(Double) * char_size); const int exponent_size = - double_size - double_significand_size - 1; // -1 for sign + double_size - double_significand_size - 1; // -1 for sign const uint64_t significand_mask = implicit_bit - 1; const uint64_t exponent_mask = (~0ull >> 1) & ~significand_mask; const int exponent_bias = (1 << exponent_size) - limits::max_exponent - 1; @@ -397,8 +379,7 @@ class fp { } // Normalizes the value converted from double and multiplied by (1 << SHIFT). - template - void normalize() { + template void normalize() { // Handle subnormals. auto shifted_implicit_bit = implicit_bit << SHIFT; while ((f & shifted_implicit_bit) == 0) { @@ -415,9 +396,9 @@ class fp { // a boundary is a value half way between the number and its predecessor // (lower) or successor (upper). The upper boundary is normalized and lower // has the same exponent but may be not normalized. - void compute_boundaries(fp &lower, fp &upper) const { - lower = f == implicit_bit ? - fp((f << 2) - 1, e - 2) : fp((f << 1) - 1, e - 1); + void compute_boundaries(fp& lower, fp& upper) const { + lower = + f == implicit_bit ? fp((f << 2) - 1, e - 2) : fp((f << 1) - 1, e - 1); upper = fp((f << 1) + 1, e - 1); upper.normalize<1>(); // 1 is to account for the exponent shift above. lower.f <<= lower.e - upper.e; @@ -432,12 +413,13 @@ inline fp operator-(fp x, fp y) { } // Computes an fp number r with r.f = x.f * y.f / pow(2, 64) rounded to nearest -// with half-up tie breaking, r.e = x.e + y.e + 64. Result may not be normalized. +// with half-up tie breaking, r.e = x.e + y.e + 64. Result may not be +// normalized. FMT_API fp operator*(fp x, fp y); // Returns cached power (of 10) c_k = c_k.f * pow(2, c_k.e) such that its // (binary) exponent satisfies min_exponent <= c_k.e <= min_exponent + 3. -FMT_API fp get_cached_power(int min_exponent, int &pow10_exponent); +FMT_API fp get_cached_power(int min_exponent, int& pow10_exponent); FMT_FUNC fp operator*(fp x, fp y) { // Multiply 32-bit parts of significands. @@ -450,10 +432,10 @@ FMT_FUNC fp operator*(fp x, fp y) { return fp(ac + (ad >> 32) + (bc >> 32) + (mid >> 32), x.e + y.e + 64); } -FMT_FUNC fp get_cached_power(int min_exponent, int &pow10_exponent) { +FMT_FUNC fp get_cached_power(int min_exponent, int& pow10_exponent) { const double one_over_log2_10 = 0.30102999566398114; // 1 / log2(10) - int index = static_cast(std::ceil( - (min_exponent + fp::significand_size - 1) * one_over_log2_10)); + int index = static_cast( + std::ceil((min_exponent + fp::significand_size - 1) * one_over_log2_10)); // Decimal exponent of the first (smallest) cached power of 10. const int first_dec_exp = -348; // Difference between 2 consecutive decimal exponents in cached powers of 10. @@ -463,55 +445,84 @@ FMT_FUNC fp get_cached_power(int min_exponent, int &pow10_exponent) { return fp(data::POW10_SIGNIFICANDS[index], data::POW10_EXPONENTS[index]); } -FMT_FUNC bool grisu2_round( - char *buf, int &size, int max_digits, uint64_t delta, - uint64_t remainder, uint64_t exp, uint64_t diff, int &exp10) { - while (remainder < diff && delta - remainder >= exp && - (remainder + exp < diff || diff - remainder > remainder + exp - diff)) { +FMT_FUNC bool grisu2_round(char* buf, int& size, int max_digits, uint64_t delta, + uint64_t remainder, uint64_t exp, uint64_t diff, + int& exp10) { + while ( + remainder < diff && delta - remainder >= exp && + (remainder + exp < diff || diff - remainder > remainder + exp - diff)) { --buf[size - 1]; remainder += exp; } if (size > max_digits) { --size; ++exp10; - if (buf[size] >= '5') - return false; + if (buf[size] >= '5') return false; } return true; } // Generates output using Grisu2 digit-gen algorithm. -FMT_FUNC bool grisu2_gen_digits( - char *buf, int &size, uint32_t hi, uint64_t lo, int &exp, - uint64_t delta, const fp &one, const fp &diff, int max_digits) { +FMT_FUNC bool grisu2_gen_digits(char* buf, int& size, uint32_t hi, uint64_t lo, + int& exp, uint64_t delta, const fp& one, + const fp& diff, int max_digits) { // Generate digits for the most significant part (hi). while (exp > 0) { uint32_t digit = 0; // This optimization by miloyip reduces the number of integer divisions by // one per iteration. switch (exp) { - case 10: digit = hi / 1000000000; hi %= 1000000000; break; - case 9: digit = hi / 100000000; hi %= 100000000; break; - case 8: digit = hi / 10000000; hi %= 10000000; break; - case 7: digit = hi / 1000000; hi %= 1000000; break; - case 6: digit = hi / 100000; hi %= 100000; break; - case 5: digit = hi / 10000; hi %= 10000; break; - case 4: digit = hi / 1000; hi %= 1000; break; - case 3: digit = hi / 100; hi %= 100; break; - case 2: digit = hi / 10; hi %= 10; break; - case 1: digit = hi; hi = 0; break; + case 10: + digit = hi / 1000000000; + hi %= 1000000000; + break; + case 9: + digit = hi / 100000000; + hi %= 100000000; + break; + case 8: + digit = hi / 10000000; + hi %= 10000000; + break; + case 7: + digit = hi / 1000000; + hi %= 1000000; + break; + case 6: + digit = hi / 100000; + hi %= 100000; + break; + case 5: + digit = hi / 10000; + hi %= 10000; + break; + case 4: + digit = hi / 1000; + hi %= 1000; + break; + case 3: + digit = hi / 100; + hi %= 100; + break; + case 2: + digit = hi / 10; + hi %= 10; + break; + case 1: + digit = hi; + hi = 0; + break; default: FMT_ASSERT(false, "invalid number of digits"); } - if (digit != 0 || size != 0) - buf[size++] = static_cast('0' + digit); + if (digit != 0 || size != 0) buf[size++] = static_cast('0' + digit); --exp; uint64_t remainder = (static_cast(hi) << -one.e) + lo; if (remainder <= delta || size > max_digits) { return grisu2_round( - buf, size, max_digits, delta, remainder, - static_cast(data::POWERS_OF_10_32[exp]) << -one.e, - diff.f, exp); + buf, size, max_digits, delta, remainder, + static_cast(data::POWERS_OF_10_32[exp]) << -one.e, diff.f, + exp); } } // Generate digits for the least significant part (lo). @@ -519,8 +530,7 @@ FMT_FUNC bool grisu2_gen_digits( lo *= 10; delta *= 10; char digit = static_cast(lo >> -one.e); - if (digit != 0 || size != 0) - buf[size++] = static_cast('0' + digit); + if (digit != 0 || size != 0) buf[size++] = static_cast('0' + digit); lo &= one.f - 1; --exp; if (lo < delta || size > max_digits) { @@ -531,11 +541,11 @@ FMT_FUNC bool grisu2_gen_digits( } #if FMT_CLANG_VERSION -# define FMT_FALLTHROUGH [[clang::fallthrough]]; +# define FMT_FALLTHROUGH [[clang::fallthrough]]; #elif FMT_GCC_VERSION >= 700 -# define FMT_FALLTHROUGH [[gnu::fallthrough]]; +# define FMT_FALLTHROUGH [[gnu::fallthrough]]; #else -# define FMT_FALLTHROUGH +# define FMT_FALLTHROUGH #endif struct gen_digits_params { @@ -546,19 +556,18 @@ struct gen_digits_params { }; struct prettify_handler { - char *data; + char* data; ptrdiff_t size; - buffer &buf; + buffer& buf; - explicit prettify_handler(buffer &b, ptrdiff_t n) - : data(b.data()), size(n), buf(b) {} + explicit prettify_handler(buffer& b, ptrdiff_t n) + : data(b.data()), size(n), buf(b) {} ~prettify_handler() { assert(buf.size() >= to_unsigned(size)); buf.resize(to_unsigned(size)); } - template - void insert(ptrdiff_t pos, ptrdiff_t n, F f) { + template void insert(ptrdiff_t pos, ptrdiff_t n, F f) { std::memmove(data + pos + n, data + pos, to_unsigned(size - pos)); f(data + pos); size += n; @@ -583,8 +592,7 @@ struct prettify_handler { }; // Writes the exponent exp in the form "[+-]d{2,3}" to buffer. -template -FMT_FUNC void write_exponent(int exp, Handler &&h) { +template FMT_FUNC void write_exponent(int exp, Handler&& h) { FMT_ASSERT(-1000 < exp && exp < 1000, "exponent out of range"); if (exp < 0) { h.append('-'); @@ -595,11 +603,11 @@ FMT_FUNC void write_exponent(int exp, Handler &&h) { if (exp >= 100) { h.append(static_cast('0' + exp / 100)); exp %= 100; - const char *d = data::DIGITS + exp * 2; + const char* d = data::DIGITS + exp * 2; h.append(d[0]); h.append(d[1]); } else { - const char *d = data::DIGITS + exp * 2; + const char* d = data::DIGITS + exp * 2; h.append(d[0]); h.append(d[1]); } @@ -607,7 +615,7 @@ FMT_FUNC void write_exponent(int exp, Handler &&h) { struct fill { size_t n; - void operator()(char *buf) const { + void operator()(char* buf) const { buf[0] = '0'; buf[1] = '.'; std::uninitialized_fill_n(buf + 2, n, '0'); @@ -616,14 +624,13 @@ struct fill { // The number is given as v = f * pow(10, exp), where f has size digits. template -FMT_FUNC void grisu2_prettify(const gen_digits_params ¶ms, - int size, int exp, Handler &&handler) { +FMT_FUNC void grisu2_prettify(const gen_digits_params& params, int size, + int exp, Handler&& handler) { if (!params.fixed) { // Insert a decimal point after the first digit and add an exponent. handler.insert(1, '.'); exp += size - 1; - if (size < params.num_digits) - handler.append(params.num_digits - size, '0'); + if (size < params.num_digits) handler.append(params.num_digits - size, '0'); handler.append(params.upper ? 'E' : 'e'); write_exponent(exp, handler); return; @@ -659,8 +666,7 @@ FMT_FUNC void grisu2_prettify(const gen_digits_params ¶ms, struct char_counter { ptrdiff_t size; - template - void insert(ptrdiff_t, ptrdiff_t n, F) { size += n; } + template void insert(ptrdiff_t, ptrdiff_t n, F) { size += n; } void insert(ptrdiff_t, char) { ++size; } void append(ptrdiff_t n, char) { size += n; } void append(char) { ++size; } @@ -670,15 +676,16 @@ struct char_counter { // Converts format specifiers into parameters for digit generation and computes // output buffer size for a number in the range [pow(10, exp - 1), pow(10, exp) // or 0 if exp == 1. -FMT_FUNC gen_digits_params process_specs(const core_format_specs &specs, - int exp, buffer &buf) { +FMT_FUNC gen_digits_params process_specs(const core_format_specs& specs, + int exp, buffer& buf) { auto params = gen_digits_params(); int num_digits = specs.precision >= 0 ? specs.precision : 6; switch (specs.type) { case 'G': params.upper = true; FMT_FALLTHROUGH - case '\0': case 'g': + case '\0': + case 'g': params.trailing_zeros = (specs.flags & HASH_FLAG) != 0; if (-4 <= exp && exp < num_digits + 1) { params.fixed = true; @@ -693,8 +700,7 @@ FMT_FUNC gen_digits_params process_specs(const core_format_specs &specs, params.fixed = true; params.trailing_zeros = true; int adjusted_min_digits = num_digits + exp; - if (adjusted_min_digits > 0) - num_digits = adjusted_min_digits; + if (adjusted_min_digits > 0) num_digits = adjusted_min_digits; break; } case 'E': @@ -713,7 +719,7 @@ FMT_FUNC gen_digits_params process_specs(const core_format_specs &specs, template FMT_FUNC typename std::enable_if::type - grisu2_format(Double value, buffer &buf, core_format_specs specs) { +grisu2_format(Double value, buffer& buf, core_format_specs specs) { FMT_ASSERT(value >= 0, "value is negative"); if (value == 0) { gen_digits_params params = process_specs(specs, 1, buf); @@ -728,13 +734,13 @@ FMT_FUNC typename std::enable_if::type fp_value.compute_boundaries(lower, upper); // Find a cached power of 10 close to 1 / upper and use it to scale upper. - const int min_exp = -60; // alpha in Grisu. - int cached_exp = 0; // K in Grisu. + const int min_exp = -60; // alpha in Grisu. + int cached_exp = 0; // K in Grisu. auto cached_pow = get_cached_power( // \tilde{c}_{-k} in Grisu. min_exp - (upper.e + fp::significand_size), cached_exp); cached_exp = -cached_exp; upper = upper * cached_pow; // \tilde{M}^+ in Grisu. - --upper.f; // \tilde{M}^+ - 1 ulp -> M^+_{\downarrow}. + --upper.f; // \tilde{M}^+ - 1 ulp -> M^+_{\downarrow}. fp one(1ull << -upper.e, upper.e); // hi (p1 in Grisu) contains the most significant digits of scaled_upper. // hi = floor(upper / one). @@ -744,9 +750,9 @@ FMT_FUNC typename std::enable_if::type fp_value.normalize(); fp scaled_value = fp_value * cached_pow; lower = lower * cached_pow; // \tilde{M}^- in Grisu. - ++lower.f; // \tilde{M}^- + 1 ulp -> M^-_{\uparrow}. + ++lower.f; // \tilde{M}^- + 1 ulp -> M^-_{\uparrow}. uint64_t delta = upper.f - lower.f; - fp diff = upper - scaled_value; // wp_w in Grisu. + fp diff = upper - scaled_value; // wp_w in Grisu. // lo (p2 in Grisu) contains the least significants digits of scaled_upper. // lo = supper % one. uint64_t lo = upper.f & (one.f - 1); @@ -761,29 +767,27 @@ FMT_FUNC typename std::enable_if::type } template -void sprintf_format(Double value, internal::buffer &buf, +void sprintf_format(Double value, internal::buffer& buf, core_format_specs spec) { // Buffer capacity must be non-zero, otherwise MSVC's vsnprintf_s will fail. FMT_ASSERT(buf.capacity() != 0, "empty buffer"); // Build format string. - enum { MAX_FORMAT_SIZE = 10}; // longest format: %#-*.*Lg + enum { MAX_FORMAT_SIZE = 10 }; // longest format: %#-*.*Lg char format[MAX_FORMAT_SIZE]; - char *format_ptr = format; + char* format_ptr = format; *format_ptr++ = '%'; - if (spec.has(HASH_FLAG)) - *format_ptr++ = '#'; + if (spec.has(HASH_FLAG)) *format_ptr++ = '#'; if (spec.precision >= 0) { *format_ptr++ = '.'; *format_ptr++ = '*'; } - if (std::is_same::value) - *format_ptr++ = 'L'; + if (std::is_same::value) *format_ptr++ = 'L'; *format_ptr++ = spec.type; *format_ptr = '\0'; // Format using snprintf. - char *start = FMT_NULL; + char* start = FMT_NULL; for (;;) { std::size_t buffer_size = buf.capacity(); start = &buf[0]; @@ -819,28 +823,25 @@ FMT_FUNC internal::utf8_to_utf16::utf8_to_utf16(string_view s) { return; } - int length = MultiByteToWideChar( - CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, FMT_NULL, 0); - if (length == 0) - FMT_THROW(windows_error(GetLastError(), ERROR_MSG)); + int length = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), + s_size, FMT_NULL, 0); + if (length == 0) FMT_THROW(windows_error(GetLastError(), ERROR_MSG)); buffer_.resize(length + 1); - length = MultiByteToWideChar( - CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, &buffer_[0], length); - if (length == 0) - FMT_THROW(windows_error(GetLastError(), ERROR_MSG)); + length = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, + &buffer_[0], length); + if (length == 0) FMT_THROW(windows_error(GetLastError(), ERROR_MSG)); buffer_[length] = 0; } FMT_FUNC internal::utf16_to_utf8::utf16_to_utf8(wstring_view s) { if (int error_code = convert(s)) { FMT_THROW(windows_error(error_code, - "cannot convert string from UTF-16 to UTF-8")); + "cannot convert string from UTF-16 to UTF-8")); } } FMT_FUNC int internal::utf16_to_utf8::convert(wstring_view s) { - if (s.size() > INT_MAX) - return ERROR_INVALID_PARAMETER; + if (s.size() > INT_MAX) return ERROR_INVALID_PARAMETER; int s_size = static_cast(s.size()); if (s_size == 0) { // WideCharToMultiByte does not support zero length, handle separately. @@ -849,39 +850,38 @@ FMT_FUNC int internal::utf16_to_utf8::convert(wstring_view s) { return 0; } - int length = WideCharToMultiByte( - CP_UTF8, 0, s.data(), s_size, FMT_NULL, 0, FMT_NULL, FMT_NULL); - if (length == 0) - return GetLastError(); + int length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, FMT_NULL, 0, + FMT_NULL, FMT_NULL); + if (length == 0) return GetLastError(); buffer_.resize(length + 1); - length = WideCharToMultiByte( - CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, FMT_NULL, FMT_NULL); - if (length == 0) - return GetLastError(); + length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, &buffer_[0], + length, FMT_NULL, FMT_NULL); + if (length == 0) return GetLastError(); buffer_[length] = 0; return 0; } -FMT_FUNC void windows_error::init( - int err_code, string_view format_str, format_args args) { +FMT_FUNC void windows_error::init(int err_code, string_view format_str, + format_args args) { error_code_ = err_code; memory_buffer buffer; internal::format_windows_error(buffer, err_code, vformat(format_str, args)); - std::runtime_error &base = *this; + std::runtime_error& base = *this; base = std::runtime_error(to_string(buffer)); } -FMT_FUNC void internal::format_windows_error( - internal::buffer &out, int error_code, string_view message) FMT_NOEXCEPT { +FMT_FUNC void internal::format_windows_error(internal::buffer& out, + int error_code, + string_view message) FMT_NOEXCEPT { FMT_TRY { wmemory_buffer buf; buf.resize(inline_buffer_size); for (;;) { - wchar_t *system_message = &buf[0]; + wchar_t* system_message = &buf[0]; int result = FormatMessageW( - FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - FMT_NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - system_message, static_cast(buf.size()), FMT_NULL); + FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, FMT_NULL, + error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), system_message, + static_cast(buf.size()), FMT_NULL); if (result != 0) { utf16_to_utf8 utf8_message; if (utf8_message.convert(system_message) == ERROR_SUCCESS) { @@ -897,19 +897,20 @@ FMT_FUNC void internal::format_windows_error( break; // Can't get error message, report error code instead. buf.resize(buf.size() * 2); } - } FMT_CATCH(...) {} + } + FMT_CATCH(...) {} format_error_code(out, error_code, message); } #endif // FMT_USE_WINDOWS_H -FMT_FUNC void format_system_error( - internal::buffer &out, int error_code, string_view message) FMT_NOEXCEPT { +FMT_FUNC void format_system_error(internal::buffer& out, int error_code, + string_view message) FMT_NOEXCEPT { FMT_TRY { memory_buffer buf; buf.resize(inline_buffer_size); for (;;) { - char *system_message = &buf[0]; + char* system_message = &buf[0]; int result = safe_strerror(error_code, system_message, buf.size()); if (result == 0) { writer w(out); @@ -922,34 +923,35 @@ FMT_FUNC void format_system_error( break; // Can't get error message, report error code instead. buf.resize(buf.size() * 2); } - } FMT_CATCH(...) {} + } + FMT_CATCH(...) {} format_error_code(out, error_code, message); } -FMT_FUNC void internal::error_handler::on_error(const char *message) { +FMT_FUNC void internal::error_handler::on_error(const char* message) { FMT_THROW(format_error(message)); } -FMT_FUNC void report_system_error( - int error_code, fmt::string_view message) FMT_NOEXCEPT { +FMT_FUNC void report_system_error(int error_code, + fmt::string_view message) FMT_NOEXCEPT { report_error(format_system_error, error_code, message); } #if FMT_USE_WINDOWS_H -FMT_FUNC void report_windows_error( - int error_code, fmt::string_view message) FMT_NOEXCEPT { +FMT_FUNC void report_windows_error(int error_code, + fmt::string_view message) FMT_NOEXCEPT { report_error(internal::format_windows_error, error_code, message); } #endif -FMT_FUNC void vprint(std::FILE *f, string_view format_str, format_args args) { +FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) { memory_buffer buffer; internal::vformat_to(buffer, format_str, basic_format_args::type>(args)); std::fwrite(buffer.data(), 1, buffer.size(), f); } -FMT_FUNC void vprint(std::FILE *f, wstring_view format_str, wformat_args args) { +FMT_FUNC void vprint(std::FILE* f, wstring_view format_str, wformat_args args) { wmemory_buffer buffer; internal::vformat_to(buffer, format_str, args); std::fwrite(buffer.data(), sizeof(wchar_t), buffer.size(), f); @@ -966,7 +968,7 @@ FMT_FUNC void vprint(wstring_view format_str, wformat_args args) { FMT_END_NAMESPACE #ifdef _MSC_VER -# pragma warning(pop) +# pragma warning(pop) #endif #endif // FMT_FORMAT_INL_H_ diff --git a/include/fmt/format.h b/include/fmt/format.h index 3485f5f1..aa5fe3de 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -28,6 +28,7 @@ #ifndef FMT_FORMAT_H_ #define FMT_FORMAT_H_ +#include #include #include #include @@ -35,170 +36,171 @@ #include #include #include -#include #ifdef __clang__ -# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__) +# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__) #else -# define FMT_CLANG_VERSION 0 +# define FMT_CLANG_VERSION 0 #endif #ifdef __INTEL_COMPILER -# define FMT_ICC_VERSION __INTEL_COMPILER +# define FMT_ICC_VERSION __INTEL_COMPILER #elif defined(__ICL) -# define FMT_ICC_VERSION __ICL +# define FMT_ICC_VERSION __ICL #else -# define FMT_ICC_VERSION 0 +# define FMT_ICC_VERSION 0 #endif #ifdef __NVCC__ -# define FMT_CUDA_VERSION (__CUDACC_VER_MAJOR__ * 100 + __CUDACC_VER_MINOR__) +# define FMT_CUDA_VERSION (__CUDACC_VER_MAJOR__ * 100 + __CUDACC_VER_MINOR__) #else -# define FMT_CUDA_VERSION 0 +# define FMT_CUDA_VERSION 0 #endif #include "core.h" #if FMT_GCC_VERSION >= 406 || FMT_CLANG_VERSION -# pragma GCC diagnostic push +# pragma GCC diagnostic push // Disable the warning about declaration shadowing because it affects too // many valid cases. -# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wshadow" // Disable the warning about nonliteral format strings because we construct // them dynamically when falling back to snprintf for FP formatting. -# pragma GCC diagnostic ignored "-Wformat-nonliteral" +# pragma GCC diagnostic ignored "-Wformat-nonliteral" #endif -# if FMT_CLANG_VERSION +#if FMT_CLANG_VERSION # pragma GCC diagnostic ignored "-Wgnu-string-literal-operator-template" -# endif +#endif #ifdef _SECURE_SCL -# define FMT_SECURE_SCL _SECURE_SCL +# define FMT_SECURE_SCL _SECURE_SCL #else -# define FMT_SECURE_SCL 0 +# define FMT_SECURE_SCL 0 #endif // Check whether we can use unrestricted unions and use struct if not. #ifndef FMT_UNRESTRICTED_UNION -# if FMT_MSC_VER >= 1900 || FMT_GCC_VERSION >= 406 || FMT_CLANG_VERSION >= 303 -# define FMT_UNRESTRICTED_UNION union -# else -# define FMT_UNRESTRICTED_UNION struct -# endif +# if FMT_MSC_VER >= 1900 || FMT_GCC_VERSION >= 406 || FMT_CLANG_VERSION >= 303 +# define FMT_UNRESTRICTED_UNION union +# else +# define FMT_UNRESTRICTED_UNION struct +# endif #endif #if FMT_SECURE_SCL -# include +# include #endif #ifdef __has_builtin -# define FMT_HAS_BUILTIN(x) __has_builtin(x) +# define FMT_HAS_BUILTIN(x) __has_builtin(x) #else -# define FMT_HAS_BUILTIN(x) 0 +# define FMT_HAS_BUILTIN(x) 0 #endif #ifdef __GNUC_LIBSTD__ -# define FMT_GNUC_LIBSTD_VERSION (__GNUC_LIBSTD__ * 100 + __GNUC_LIBSTD_MINOR__) +# define FMT_GNUC_LIBSTD_VERSION \ + (__GNUC_LIBSTD__ * 100 + __GNUC_LIBSTD_MINOR__) #endif #ifndef FMT_THROW -# if FMT_EXCEPTIONS -# if FMT_MSC_VER +# if FMT_EXCEPTIONS +# if FMT_MSC_VER FMT_BEGIN_NAMESPACE namespace internal { -template -inline void do_throw(const Exception &x) { +template inline void do_throw(const Exception& x) { // Silence unreachable code warnings in MSVC because these are nearly // impossible to fix in a generic code. volatile bool b = true; - if (b) - throw x; -} + if (b) throw x; } +} // namespace internal FMT_END_NAMESPACE -# define FMT_THROW(x) fmt::internal::do_throw(x) +# define FMT_THROW(x) fmt::internal::do_throw(x) +# else +# define FMT_THROW(x) throw x +# endif # else -# define FMT_THROW(x) throw x +# define FMT_THROW(x) \ + do { \ + static_cast(sizeof(x)); \ + assert(false); \ + } while (false); # endif -# else -# define FMT_THROW(x) do { static_cast(sizeof(x)); assert(false); } while(false); -# endif #endif #ifndef FMT_USE_USER_DEFINED_LITERALS // For Intel's compiler and NVIDIA's compiler both it and the system gcc/msc // must support UDLs. -# if (FMT_HAS_FEATURE(cxx_user_literals) || \ - FMT_GCC_VERSION >= 407 || FMT_MSC_VER >= 1900) && \ - (!(FMT_ICC_VERSION || FMT_CUDA_VERSION) || \ - FMT_ICC_VERSION >= 1500 || FMT_CUDA_VERSION >= 700) -# define FMT_USE_USER_DEFINED_LITERALS 1 -# else -# define FMT_USE_USER_DEFINED_LITERALS 0 -# endif +# if (FMT_HAS_FEATURE(cxx_user_literals) || FMT_GCC_VERSION >= 407 || \ + FMT_MSC_VER >= 1900) && \ + (!(FMT_ICC_VERSION || FMT_CUDA_VERSION) || FMT_ICC_VERSION >= 1500 || \ + FMT_CUDA_VERSION >= 700) +# define FMT_USE_USER_DEFINED_LITERALS 1 +# else +# define FMT_USE_USER_DEFINED_LITERALS 0 +# endif #endif // EDG C++ Front End based compilers (icc, nvcc) do not currently support UDL // templates. -#if FMT_USE_USER_DEFINED_LITERALS && \ - FMT_ICC_VERSION == 0 && \ - FMT_CUDA_VERSION == 0 && \ - ((FMT_GCC_VERSION >= 600 && __cplusplus >= 201402L) || \ - (defined(FMT_CLANG_VERSION) && FMT_CLANG_VERSION >= 304)) -# define FMT_UDL_TEMPLATE 1 +#if FMT_USE_USER_DEFINED_LITERALS && FMT_ICC_VERSION == 0 && \ + FMT_CUDA_VERSION == 0 && \ + ((FMT_GCC_VERSION >= 600 && __cplusplus >= 201402L) || \ + (defined(FMT_CLANG_VERSION) && FMT_CLANG_VERSION >= 304)) +# define FMT_UDL_TEMPLATE 1 #else -# define FMT_UDL_TEMPLATE 0 +# define FMT_UDL_TEMPLATE 0 #endif #ifndef FMT_USE_EXTERN_TEMPLATES -# ifndef FMT_HEADER_ONLY -# define FMT_USE_EXTERN_TEMPLATES \ - ((FMT_CLANG_VERSION >= 209 && __cplusplus >= 201103L) || \ - (FMT_GCC_VERSION >= 303 && FMT_HAS_GXX_CXX11)) -# else -# define FMT_USE_EXTERN_TEMPLATES 0 -# endif +# ifndef FMT_HEADER_ONLY +# define FMT_USE_EXTERN_TEMPLATES \ + ((FMT_CLANG_VERSION >= 209 && __cplusplus >= 201103L) || \ + (FMT_GCC_VERSION >= 303 && FMT_HAS_GXX_CXX11)) +# else +# define FMT_USE_EXTERN_TEMPLATES 0 +# endif #endif #if FMT_HAS_GXX_CXX11 || FMT_HAS_FEATURE(cxx_trailing_return) || \ FMT_MSC_VER >= 1600 -# define FMT_USE_TRAILING_RETURN 1 +# define FMT_USE_TRAILING_RETURN 1 #else -# define FMT_USE_TRAILING_RETURN 0 +# define FMT_USE_TRAILING_RETURN 0 #endif #ifndef FMT_USE_GRISU -# define FMT_USE_GRISU 0 +# define FMT_USE_GRISU 0 //# define FMT_USE_GRISU std::numeric_limits::is_iec559 #endif // __builtin_clz is broken in clang with Microsoft CodeGen: // https://github.com/fmtlib/fmt/issues/519 #ifndef _MSC_VER -# if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clz) -# define FMT_BUILTIN_CLZ(n) __builtin_clz(n) -# endif +# if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clz) +# define FMT_BUILTIN_CLZ(n) __builtin_clz(n) +# endif -# if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clzll) -# define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n) -# endif +# if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clzll) +# define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n) +# endif #endif // Some compilers masquerade as both MSVC and GCC-likes or otherwise support // __builtin_clz and __builtin_clzll, so only define FMT_BUILTIN_CLZ using the // MSVC intrinsics if the clz and clzll builtins are not available. #if FMT_MSC_VER && !defined(FMT_BUILTIN_CLZLL) && !defined(_MANAGED) -# include // _BitScanReverse, _BitScanReverse64 +# include // _BitScanReverse, _BitScanReverse64 FMT_BEGIN_NAMESPACE namespace internal { // Avoid Clang with Microsoft CodeGen's -Wunknown-pragmas warning. -# ifndef __clang__ -# pragma intrinsic(_BitScanReverse) -# endif +# ifndef __clang__ +# pragma intrinsic(_BitScanReverse) +# endif inline uint32_t clz(uint32_t x) { unsigned long r = 0; _BitScanReverse(&r, x); @@ -207,37 +209,36 @@ inline uint32_t clz(uint32_t x) { // Static analysis complains about using uninitialized data // "r", but the only way that can happen is if "x" is 0, // which the callers guarantee to not happen. -# pragma warning(suppress: 6102) +# pragma warning(suppress : 6102) return 31 - r; } -# define FMT_BUILTIN_CLZ(n) fmt::internal::clz(n) +# define FMT_BUILTIN_CLZ(n) fmt::internal::clz(n) -# if defined(_WIN64) && !defined(__clang__) -# pragma intrinsic(_BitScanReverse64) -# endif +# if defined(_WIN64) && !defined(__clang__) +# pragma intrinsic(_BitScanReverse64) +# endif inline uint32_t clzll(uint64_t x) { unsigned long r = 0; -# ifdef _WIN64 +# ifdef _WIN64 _BitScanReverse64(&r, x); -# else +# else // Scan the high 32 bits. - if (_BitScanReverse(&r, static_cast(x >> 32))) - return 63 - (r + 32); + if (_BitScanReverse(&r, static_cast(x >> 32))) return 63 - (r + 32); // Scan the low 32 bits. _BitScanReverse(&r, static_cast(x)); -# endif +# endif assert(x != 0); // Static analysis complains about using uninitialized data // "r", but the only way that can happen is if "x" is 0, // which the callers guarantee to not happen. -# pragma warning(suppress: 6102) +# pragma warning(suppress : 6102) return 63 - r; } -# define FMT_BUILTIN_CLZLL(n) fmt::internal::clzll(n) -} +# define FMT_BUILTIN_CLZLL(n) fmt::internal::clzll(n) +} // namespace internal FMT_END_NAMESPACE #endif @@ -257,21 +258,24 @@ inline Dest bit_cast(const Source& source) { // An implementation of begin and end for pre-C++11 compilers such as gcc 4. template -FMT_CONSTEXPR auto begin(const C &c) -> decltype(c.begin()) { +FMT_CONSTEXPR auto begin(const C& c) -> decltype(c.begin()) { return c.begin(); } template -FMT_CONSTEXPR T *begin(T (&array)[N]) FMT_NOEXCEPT { return array; } -template -FMT_CONSTEXPR auto end(const C &c) -> decltype(c.end()) { return c.end(); } +FMT_CONSTEXPR T* begin(T (&array)[N]) FMT_NOEXCEPT { + return array; +} +template FMT_CONSTEXPR auto end(const C& c) -> decltype(c.end()) { + return c.end(); +} template -FMT_CONSTEXPR T *end(T (&array)[N]) FMT_NOEXCEPT { return array + N; } +FMT_CONSTEXPR T* end(T (&array)[N]) FMT_NOEXCEPT { + return array + N; +} // For std::result_of in gcc 4.4. -template -struct function { - template - struct result { typedef Result type; }; +template struct function { + template struct result { typedef Result type; }; }; struct dummy_int { @@ -288,7 +292,7 @@ inline dummy_int isnan(...) { return dummy_int(); } inline dummy_int _isnan(...) { return dummy_int(); } template -typename Allocator::value_type *allocate(Allocator& alloc, std::size_t n) { +typename Allocator::value_type* allocate(Allocator& alloc, std::size_t n) { #if __cplusplus >= 201103L || FMT_MSC_VER >= 1700 return std::allocator_traits::allocate(alloc, n); #else @@ -298,8 +302,7 @@ typename Allocator::value_type *allocate(Allocator& alloc, std::size_t n) { // A helper function to suppress bogus "conditional expression is constant" // warnings. -template -inline T const_check(T value) { return value; } +template inline T const_check(T value) { return value; } } // namespace internal FMT_END_NAMESPACE @@ -309,12 +312,11 @@ namespace std { // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48891 // and the same for isnan. template <> -class numeric_limits : - public std::numeric_limits { +class numeric_limits + : public std::numeric_limits { public: // Portable version of isinf. - template - static bool isinfinity(T x) { + template static bool isinfinity(T x) { using namespace fmt::internal; // The resolution "priority" is: // isinf macro > std::isinf > ::isinf > fmt::internal::isinf @@ -324,8 +326,7 @@ class numeric_limits : } // Portable version of isnan. - template - static bool isnotanumber(T x) { + template static bool isnotanumber(T x) { using namespace fmt::internal; if (const_check(sizeof(isnan(x)) != sizeof(fmt::internal::dummy_int))) return isnan(x) != 0; @@ -335,8 +336,7 @@ class numeric_limits : } // namespace std FMT_BEGIN_NAMESPACE -template -class basic_writer; +template class basic_writer; template class output_range { @@ -351,20 +351,21 @@ class output_range { typedef OutputIt iterator; typedef T value_type; - explicit output_range(OutputIt it): it_(it) {} + explicit output_range(OutputIt it) : it_(it) {} OutputIt begin() const { return it_; } }; // A range where begin() returns back_insert_iterator. template -class back_insert_range: - public output_range> { +class back_insert_range + : public output_range> { typedef output_range> base; + public: typedef typename Container::value_type value_type; - back_insert_range(Container &c): base(std::back_inserter(c)) {} - back_insert_range(typename base::iterator it): base(it) {} + back_insert_range(Container& c) : base(std::back_inserter(c)) {} + back_insert_range(typename base::iterator it) : base(it) {} }; typedef basic_writer> writer; @@ -373,34 +374,32 @@ typedef basic_writer> wwriter; /** A formatting error such as invalid format string. */ class format_error : public std::runtime_error { public: - explicit format_error(const char *message) - : std::runtime_error(message) {} + explicit format_error(const char* message) : std::runtime_error(message) {} - explicit format_error(const std::string &message) - : std::runtime_error(message) {} + explicit format_error(const std::string& message) + : std::runtime_error(message) {} }; namespace internal { #if FMT_SECURE_SCL -template -struct checked { typedef stdext::checked_array_iterator type; }; +template struct checked { + typedef stdext::checked_array_iterator type; +}; // Make a checked iterator to avoid warnings on MSVC. template -inline stdext::checked_array_iterator make_checked(T *p, std::size_t size) { +inline stdext::checked_array_iterator make_checked(T* p, std::size_t size) { return {p, size}; } #else -template -struct checked { typedef T *type; }; -template -inline T *make_checked(T *p, std::size_t) { return p; } +template struct checked { typedef T* type; }; +template inline T* make_checked(T* p, std::size_t) { return p; } #endif template template -void basic_buffer::append(const U *begin, const U *end) { +void basic_buffer::append(const U* begin, const U* end) { std::size_t new_size = size_ + internal::to_unsigned(end - begin); reserve(new_size); std::uninitialized_copy(begin, end, @@ -413,7 +412,7 @@ void basic_buffer::append(const U *begin, const U *end) { // type in this mode. If this is the case __cpp_char8_t will be defined. #if !defined(__cpp_char8_t) // A UTF-8 code unit type. -enum char8_t: unsigned char {}; +enum char8_t : unsigned char {}; #endif // A UTF-8 string view. @@ -421,18 +420,19 @@ class u8string_view : public basic_string_view { public: typedef char8_t char_type; - u8string_view(const char *s): - basic_string_view(reinterpret_cast(s)) {} - u8string_view(const char *s, size_t count) FMT_NOEXCEPT: - basic_string_view(reinterpret_cast(s), count) {} + u8string_view(const char* s) + : basic_string_view(reinterpret_cast(s)) {} + u8string_view(const char* s, size_t count) FMT_NOEXCEPT + : basic_string_view(reinterpret_cast(s), count) { + } }; #if FMT_USE_USER_DEFINED_LITERALS inline namespace literals { -inline u8string_view operator"" _u(const char *s, std::size_t n) { +inline u8string_view operator"" _u(const char* s, std::size_t n) { return {s, n}; } -} +} // namespace literals #endif // The number of characters to store in the basic_memory_buffer object itself @@ -469,8 +469,9 @@ enum { inline_buffer_size = 500 }; \endrst */ template > -class basic_memory_buffer: private Allocator, public internal::basic_buffer { + typename Allocator = std::allocator> +class basic_memory_buffer : private Allocator, + public internal::basic_buffer { private: T store_[SIZE]; @@ -485,9 +486,9 @@ class basic_memory_buffer: private Allocator, public internal::basic_buffer { public: typedef T value_type; - typedef const T &const_reference; + typedef const T& const_reference; - explicit basic_memory_buffer(const Allocator &alloc = Allocator()) + explicit basic_memory_buffer(const Allocator& alloc = Allocator()) : Allocator(alloc) { this->set(store_, SIZE); } @@ -495,7 +496,7 @@ class basic_memory_buffer: private Allocator, public internal::basic_buffer { private: // Move data from other to this buffer. - void move(basic_memory_buffer &other) { + void move(basic_memory_buffer& other) { Allocator &this_alloc = *this, &other_alloc = other; this_alloc = std::move(other_alloc); T* data = other.data(); @@ -520,16 +521,14 @@ class basic_memory_buffer: private Allocator, public internal::basic_buffer { of the other object to it. \endrst */ - basic_memory_buffer(basic_memory_buffer &&other) { - move(other); - } + basic_memory_buffer(basic_memory_buffer&& other) { move(other); } /** \rst Moves the content of the other ``basic_memory_buffer`` object to this one. \endrst */ - basic_memory_buffer &operator=(basic_memory_buffer &&other) { + basic_memory_buffer& operator=(basic_memory_buffer&& other) { assert(this != &other); deallocate(); move(other); @@ -544,10 +543,9 @@ template void basic_memory_buffer::grow(std::size_t size) { std::size_t old_capacity = this->capacity(); std::size_t new_capacity = old_capacity + old_capacity / 2; - if (size > new_capacity) - new_capacity = size; - T *old_data = this->data(); - T *new_data = internal::allocate(*this, new_capacity); + if (size > new_capacity) new_capacity = size; + T* old_data = this->data(); + T* new_data = internal::allocate(*this, new_capacity); // The following code doesn't throw, so the raw pointer above doesn't leak. std::uninitialized_copy(old_data, old_data + this->size(), internal::make_checked(new_data, new_capacity)); @@ -555,8 +553,7 @@ void basic_memory_buffer::grow(std::size_t size) { // deallocate must not throw according to the standard, but even if it does, // the buffer already uses the new storage and will deallocate it in // destructor. - if (old_data != store_) - Allocator::deallocate(old_data, old_capacity); + if (old_data != store_) Allocator::deallocate(old_data, old_capacity); } typedef basic_memory_buffer memory_buffer; @@ -564,64 +561,64 @@ typedef basic_memory_buffer wmemory_buffer; namespace internal { -template -struct char_traits; +template struct char_traits; -template <> -struct char_traits { +template <> struct char_traits { // Formats a floating-point number. template - FMT_API static int format_float(char *buffer, std::size_t size, - const char *format, int precision, T value); + FMT_API static int format_float(char* buffer, std::size_t size, + const char* format, int precision, T value); }; -template <> -struct char_traits { +template <> struct char_traits { template - FMT_API static int format_float(wchar_t *buffer, std::size_t size, - const wchar_t *format, int precision, T value); + FMT_API static int format_float(wchar_t* buffer, std::size_t size, + const wchar_t* format, int precision, + T value); }; #if FMT_USE_EXTERN_TEMPLATES -extern template int char_traits::format_float( - char *buffer, std::size_t size, const char* format, int precision, - double value); +extern template int char_traits::format_float(char* buffer, + std::size_t size, + const char* format, + int precision, + double value); extern template int char_traits::format_float( - char *buffer, std::size_t size, const char* format, int precision, + char* buffer, std::size_t size, const char* format, int precision, long double value); extern template int char_traits::format_float( - wchar_t *buffer, std::size_t size, const wchar_t* format, int precision, + wchar_t* buffer, std::size_t size, const wchar_t* format, int precision, double value); extern template int char_traits::format_float( - wchar_t *buffer, std::size_t size, const wchar_t* format, int precision, + wchar_t* buffer, std::size_t size, const wchar_t* format, int precision, long double value); #endif template inline typename std::enable_if< - is_contiguous::value, - typename checked::type>::type - reserve(std::back_insert_iterator &it, std::size_t n) { - Container &c = internal::get_container(it); + is_contiguous::value, + typename checked::type>::type +reserve(std::back_insert_iterator& it, std::size_t n) { + Container& c = internal::get_container(it); std::size_t size = c.size(); c.resize(size + n); return make_checked(&c[size], n); } template -inline Iterator &reserve(Iterator &it, std::size_t) { return it; } +inline Iterator& reserve(Iterator& it, std::size_t) { + return it; +} + +template class null_terminating_iterator; template -class null_terminating_iterator; - -template -FMT_CONSTEXPR_DECL const Char *pointer_from(null_terminating_iterator it); +FMT_CONSTEXPR_DECL const Char* pointer_from(null_terminating_iterator it); // An output iterator that counts the number of objects written to it and // discards them. -template -class counting_iterator { +template class counting_iterator { private: std::size_t count_; mutable T blackhole_; @@ -634,7 +631,7 @@ class counting_iterator { typedef T& reference; typedef counting_iterator _Unchecked_type; // Mark iterator as checked. - counting_iterator(): count_(0) {} + counting_iterator() : count_(0) {} std::size_t count() const { return count_; } @@ -649,25 +646,25 @@ class counting_iterator { return it; } - T &operator*() const { return blackhole_; } + T& operator*() const { return blackhole_; } }; -template -class truncating_iterator_base { +template class truncating_iterator_base { protected: OutputIt out_; std::size_t limit_; std::size_t count_; truncating_iterator_base(OutputIt out, std::size_t limit) - : out_(out), limit_(limit), count_(0) {} + : out_(out), limit_(limit), count_(0) {} public: typedef std::output_iterator_tag iterator_category; typedef void difference_type; typedef void pointer; typedef void reference; - typedef truncating_iterator_base _Unchecked_type; // Mark iterator as checked. + typedef truncating_iterator_base + _Unchecked_type; // Mark iterator as checked. OutputIt base() const { return out_; } std::size_t count() const { return count_; } @@ -675,13 +672,14 @@ class truncating_iterator_base { // An output iterator that truncates the output and counts the number of objects // written to it. -template ::value_type>::type> +template ::value_type>::type> class truncating_iterator; template -class truncating_iterator: - public truncating_iterator_base { +class truncating_iterator + : public truncating_iterator_base { typedef std::iterator_traits traits; mutable typename traits::value_type blackhole_; @@ -690,11 +688,10 @@ class truncating_iterator: typedef typename traits::value_type value_type; truncating_iterator(OutputIt out, std::size_t limit) - : truncating_iterator_base(out, limit) {} + : truncating_iterator_base(out, limit) {} truncating_iterator& operator++() { - if (this->count_++ < this->limit_) - ++this->out_; + if (this->count_++ < this->limit_) ++this->out_; return *this; } @@ -710,17 +707,16 @@ class truncating_iterator: }; template -class truncating_iterator: - public truncating_iterator_base { +class truncating_iterator + : public truncating_iterator_base { public: typedef typename OutputIt::container_type::value_type value_type; truncating_iterator(OutputIt out, std::size_t limit) - : truncating_iterator_base(out, limit) {} + : truncating_iterator_base(out, limit) {} truncating_iterator& operator=(value_type val) { - if (this->count_++ < this->limit_) - this->out_ = val; + if (this->count_++ < this->limit_) this->out_ = val; return *this; } @@ -732,28 +728,28 @@ class truncating_iterator: // Returns true if value is negative, false otherwise. // Same as (value < 0) but doesn't produce warnings if T is an unsigned type. template -FMT_CONSTEXPR typename std::enable_if< - std::numeric_limits::is_signed, bool>::type is_negative(T value) { +FMT_CONSTEXPR + typename std::enable_if::is_signed, bool>::type + is_negative(T value) { return value < 0; } template -FMT_CONSTEXPR typename std::enable_if< - !std::numeric_limits::is_signed, bool>::type is_negative(T) { +FMT_CONSTEXPR + typename std::enable_if::is_signed, bool>::type + is_negative(T) { return false; } -template -struct int_traits { +template struct int_traits { // Smallest of uint32_t and uint64_t that is large enough to represent // all values of T. - typedef typename std::conditional< - std::numeric_limits::digits <= 32, uint32_t, uint64_t>::type main_type; + typedef typename std::conditional::digits <= 32, + uint32_t, uint64_t>::type main_type; }; // Static data is placed in this class template to allow header-only // configuration. -template -struct FMT_API basic_data { +template struct FMT_API basic_data { static const uint32_t POWERS_OF_10_32[]; static const uint32_t ZERO_OR_POWERS_OF_10_32[]; static const uint64_t ZERO_OR_POWERS_OF_10_64[]; @@ -800,7 +796,9 @@ inline int count_digits(uint64_t n) { #endif template -inline size_t count_code_points(basic_string_view s) { return s.size(); } +inline size_t count_code_points(basic_string_view s) { + return s.size(); +} // Counts the number of code points in a UTF-8 string. FMT_API size_t count_code_points(basic_string_view s); @@ -808,37 +806,37 @@ FMT_API size_t count_code_points(basic_string_view s); inline char8_t to_char8_t(char c) { return static_cast(c); } template -struct needs_conversion: std::integral_constant::value_type, char>::value && - std::is_same::value> {}; +struct needs_conversion + : std::integral_constant< + bool, std::is_same::value_type, + char>::value && + std::is_same::value> {}; template -typename std::enable_if< - !needs_conversion::value, OutputIt>::type - copy_str(InputIt begin, InputIt end, OutputIt it) { +typename std::enable_if::value, + OutputIt>::type +copy_str(InputIt begin, InputIt end, OutputIt it) { return std::copy(begin, end, it); } template -typename std::enable_if< - needs_conversion::value, OutputIt>::type - copy_str(InputIt begin, InputIt end, OutputIt it) { +typename std::enable_if::value, + OutputIt>::type +copy_str(InputIt begin, InputIt end, OutputIt it) { return std::transform(begin, end, it, to_char8_t); } #if FMT_HAS_CPP_ATTRIBUTE(always_inline) -# define FMT_ALWAYS_INLINE __attribute__((always_inline)) +# define FMT_ALWAYS_INLINE __attribute__((always_inline)) #else -# define FMT_ALWAYS_INLINE +# define FMT_ALWAYS_INLINE #endif template -inline char *lg(uint32_t n, Handler h) FMT_ALWAYS_INLINE; +inline char* lg(uint32_t n, Handler h) FMT_ALWAYS_INLINE; // Computes g = floor(log10(n)) and calls h.on(n); -template -inline char *lg(uint32_t n, Handler h) { +template inline char* lg(uint32_t n, Handler h) { return n < 100 ? n < 10 ? h.template on<0>(n) : h.template on<1>(n) : n < 1000000 ? n < 10000 ? n < 1000 ? h.template on<2>(n) @@ -855,16 +853,16 @@ inline char *lg(uint32_t n, Handler h) { // Usage: lg(n, decimal_formatter(buffer)); class decimal_formatter { private: - char *buffer_; + char* buffer_; void write_pair(unsigned N, uint32_t index) { std::memcpy(buffer_ + N, data::DIGITS + index * 2, 2); } public: - explicit decimal_formatter(char *buf) : buffer_(buf) {} + explicit decimal_formatter(char* buf) : buffer_(buf) {} - template char *on(uint32_t u) { + template char* on(uint32_t u) { if (N == 0) { *buffer_ = static_cast(u) + '0'; } else if (N == 1) { @@ -874,8 +872,8 @@ class decimal_formatter { // https://github.com/jeaiii/itoa unsigned n = N - 1; unsigned a = n / 5 * n * 53 / 16; - uint64_t t = ((1ULL << (32 + a)) / - data::ZERO_OR_POWERS_OF_10_32[n] + 1 - n / 9); + uint64_t t = + ((1ULL << (32 + a)) / data::ZERO_OR_POWERS_OF_10_32[n] + 1 - n / 9); t = ((t * u) >> a) + n / 5 * 4; write_pair(0, t >> 32); for (unsigned i = 2; i < N; i += 2) { @@ -883,8 +881,8 @@ class decimal_formatter { write_pair(i, t >> 32); } if (N % 2 == 0) { - buffer_[N] = static_cast( - (10ULL * static_cast(t)) >> 32) + '0'; + buffer_[N] = + static_cast((10ULL * static_cast(t)) >> 32) + '0'; } } return buffer_ += N + 1; @@ -894,10 +892,10 @@ class decimal_formatter { // An lg handler that formats a decimal number with a terminating null. class decimal_formatter_null : public decimal_formatter { public: - explicit decimal_formatter_null(char *buf) : decimal_formatter(buf) {} + explicit decimal_formatter_null(char* buf) : decimal_formatter(buf) {} - template char *on(uint32_t u) { - char *buf = decimal_formatter::on(u); + template char* on(uint32_t u) { + char* buf = decimal_formatter::on(u); *buf = '\0'; return buf; } @@ -915,15 +913,13 @@ inline int count_digits(uint32_t n) { struct no_thousands_sep { typedef char char_type; - template - void operator()(Char *) {} + template void operator()(Char*) {} enum { size = 0 }; }; // A functor that adds a thousands separator. -template -class add_thousands_sep { +template class add_thousands_sep { private: basic_string_view sep_; @@ -934,11 +930,10 @@ class add_thousands_sep { typedef Char char_type; explicit add_thousands_sep(basic_string_view sep) - : sep_(sep), digit_index_(0) {} + : sep_(sep), digit_index_(0) {} - void operator()(Char *&buffer) { - if (++digit_index_ % 3 != 0) - return; + void operator()(Char*& buffer) { + if (++digit_index_ % 3 != 0) return; buffer -= sep_.size(); std::uninitialized_copy(sep_.data(), sep_.data() + sep_.size(), internal::make_checked(buffer, sep_.size())); @@ -947,16 +942,13 @@ class add_thousands_sep { enum { size = 1 }; }; -template -FMT_API Char thousands_sep_impl(locale_ref loc); +template FMT_API Char thousands_sep_impl(locale_ref loc); -template -inline Char thousands_sep(locale_ref loc) { +template inline Char thousands_sep(locale_ref loc) { return Char(thousands_sep_impl(loc)); } -template <> -inline wchar_t thousands_sep(locale_ref loc) { +template <> inline wchar_t thousands_sep(locale_ref loc) { return thousands_sep_impl(loc); } @@ -964,11 +956,11 @@ inline wchar_t thousands_sep(locale_ref loc) { // thousands_sep is a functor that is called after writing each char to // add a thousands separator if necessary. template -inline Char *format_decimal(Char *buffer, UInt value, int num_digits, +inline Char* format_decimal(Char* buffer, UInt value, int num_digits, ThousandsSep thousands_sep) { FMT_ASSERT(num_digits >= 0, "invalid digit count"); buffer += num_digits; - Char *end = buffer; + Char* end = buffer; while (value >= 100) { // Integer division is slow so do it for a group of two digits instead // of for every digit. The idea comes from the talk by Alexandrescu @@ -993,8 +985,8 @@ inline Char *format_decimal(Char *buffer, UInt value, int num_digits, template -inline Iterator format_decimal( - Iterator out, UInt value, int num_digits, ThousandsSep sep) { +inline Iterator format_decimal(Iterator out, UInt value, int num_digits, + ThousandsSep sep) { FMT_ASSERT(num_digits >= 0, "invalid digit count"); typedef typename ThousandsSep::char_type char_type; // Buffer should be large enough to hold all digits (<= digits10 + 1). @@ -1011,12 +1003,12 @@ inline It format_decimal(It out, UInt value, int num_digits) { } template -inline Char *format_uint(Char *buffer, UInt value, int num_digits, +inline Char* format_uint(Char* buffer, UInt value, int num_digits, bool upper = false) { buffer += num_digits; - Char *end = buffer; + Char* end = buffer; do { - const char *digits = upper ? "0123456789ABCDEF" : "0123456789abcdef"; + const char* digits = upper ? "0123456789ABCDEF" : "0123456789abcdef"; unsigned digit = (value & ((1 << BASE_BITS) - 1)); *--buffer = static_cast(BASE_BITS < 4 ? static_cast('0' + digit) : digits[digit]); @@ -1025,8 +1017,7 @@ inline Char *format_uint(Char *buffer, UInt value, int num_digits, } template -inline It format_uint(It out, UInt value, int num_digits, - bool upper = false) { +inline It format_uint(It out, UInt value, int num_digits, bool upper = false) { // Buffer should be large enough to hold all digits (digits / BASE_BITS + 1) // and null. char buffer[std::numeric_limits::digits / BASE_BITS + 2]; @@ -1035,9 +1026,9 @@ inline It format_uint(It out, UInt value, int num_digits, } #ifndef _WIN32 -# define FMT_USE_WINDOWS_H 0 +# define FMT_USE_WINDOWS_H 0 #elif !defined(FMT_USE_WINDOWS_H) -# define FMT_USE_WINDOWS_H 1 +# define FMT_USE_WINDOWS_H 1 #endif // Define FMT_USE_WINDOWS_H to 0 to disable use of windows.h. @@ -1053,7 +1044,7 @@ class utf8_to_utf16 { FMT_API explicit utf8_to_utf16(string_view s); operator wstring_view() const { return wstring_view(&buffer_[0], size()); } size_t size() const { return buffer_.size() - 1; } - const wchar_t *c_str() const { return &buffer_[0]; } + const wchar_t* c_str() const { return &buffer_[0]; } std::wstring str() const { return std::wstring(&buffer_[0], size()); } }; @@ -1068,7 +1059,7 @@ class utf16_to_utf8 { FMT_API explicit utf16_to_utf8(wstring_view s); operator string_view() const { return string_view(&buffer_[0], size()); } size_t size() const { return buffer_.size() - 1; } - const char *c_str() const { return &buffer_[0]; } + const char* c_str() const { return &buffer_[0]; } std::string str() const { return std::string(&buffer_[0], size()); } // Performs conversion returning a system error code instead of @@ -1077,16 +1068,19 @@ class utf16_to_utf8 { FMT_API int convert(wstring_view s); }; -FMT_API void format_windows_error(fmt::internal::buffer &out, int error_code, +FMT_API void format_windows_error(fmt::internal::buffer& out, int error_code, fmt::string_view message) FMT_NOEXCEPT; #endif -template -struct null {}; +template struct null {}; } // namespace internal enum alignment { - ALIGN_DEFAULT, ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER, ALIGN_NUMERIC + ALIGN_DEFAULT, + ALIGN_LEFT, + ALIGN_RIGHT, + ALIGN_CENTER, + ALIGN_NUMERIC }; // Flags. @@ -1126,8 +1120,7 @@ typedef basic_format_specs format_specs; template FMT_CONSTEXPR unsigned basic_parse_context::next_arg_id() { - if (next_arg_id_ >= 0) - return internal::to_unsigned(next_arg_id_++); + if (next_arg_id_ >= 0) return internal::to_unsigned(next_arg_id_++); on_error("cannot switch from manual to automatic argument indexing"); return 0; } @@ -1138,24 +1131,29 @@ namespace internal { // https://www.cs.tufts.edu/~nr/cs257/archive/florian-loitsch/printf.pdf template FMT_API typename std::enable_if::type - grisu2_format(Double value, buffer &buf, core_format_specs); +grisu2_format(Double value, buffer& buf, core_format_specs); template inline typename std::enable_if::type - grisu2_format(Double, buffer &, core_format_specs) { return false; } +grisu2_format(Double, buffer&, core_format_specs) { + return false; +} template -void sprintf_format(Double, internal::buffer &, core_format_specs); +void sprintf_format(Double, internal::buffer&, core_format_specs); template -FMT_CONSTEXPR void handle_int_type_spec(char spec, Handler &&handler) { +FMT_CONSTEXPR void handle_int_type_spec(char spec, Handler&& handler) { switch (spec) { - case 0: case 'd': + case 0: + case 'd': handler.on_dec(); break; - case 'x': case 'X': + case 'x': + case 'X': handler.on_hex(); break; - case 'b': case 'B': + case 'b': + case 'B': handler.on_bin(); break; case 'o': @@ -1170,18 +1168,23 @@ FMT_CONSTEXPR void handle_int_type_spec(char spec, Handler &&handler) { } template -FMT_CONSTEXPR void handle_float_type_spec(char spec, Handler &&handler) { +FMT_CONSTEXPR void handle_float_type_spec(char spec, Handler&& handler) { switch (spec) { - case 0: case 'g': case 'G': + case 0: + case 'g': + case 'G': handler.on_general(); break; - case 'e': case 'E': + case 'e': + case 'E': handler.on_exp(); break; - case 'f': case 'F': + case 'f': + case 'F': handler.on_fixed(); break; - case 'a': case 'A': + case 'a': + case 'A': handler.on_hex(); break; default: @@ -1191,8 +1194,8 @@ FMT_CONSTEXPR void handle_float_type_spec(char spec, Handler &&handler) { } template -FMT_CONSTEXPR void handle_char_specs( - const basic_format_specs *specs, Handler &&handler) { +FMT_CONSTEXPR void handle_char_specs(const basic_format_specs* specs, + Handler&& handler) { if (!specs) return handler.on_char(); if (specs->type && specs->type != 'c') return handler.on_int(); if (specs->align() == ALIGN_NUMERIC || specs->flags != 0) @@ -1201,7 +1204,7 @@ FMT_CONSTEXPR void handle_char_specs( } template -FMT_CONSTEXPR void handle_cstring_type_spec(Char spec, Handler &&handler) { +FMT_CONSTEXPR void handle_cstring_type_spec(Char spec, Handler&& handler) { if (spec == 0 || spec == 's') handler.on_string(); else if (spec == 'p') @@ -1211,19 +1214,16 @@ FMT_CONSTEXPR void handle_cstring_type_spec(Char spec, Handler &&handler) { } template -FMT_CONSTEXPR void check_string_type_spec(Char spec, ErrorHandler &&eh) { - if (spec != 0 && spec != 's') - eh.on_error("invalid type specifier"); +FMT_CONSTEXPR void check_string_type_spec(Char spec, ErrorHandler&& eh) { + if (spec != 0 && spec != 's') eh.on_error("invalid type specifier"); } template -FMT_CONSTEXPR void check_pointer_type_spec(Char spec, ErrorHandler &&eh) { - if (spec != 0 && spec != 'p') - eh.on_error("invalid type specifier"); +FMT_CONSTEXPR void check_pointer_type_spec(Char spec, ErrorHandler&& eh) { + if (spec != 0 && spec != 'p') eh.on_error("invalid type specifier"); } -template -class int_type_checker : private ErrorHandler { +template class int_type_checker : private ErrorHandler { public: FMT_CONSTEXPR explicit int_type_checker(ErrorHandler eh) : ErrorHandler(eh) {} @@ -1242,7 +1242,7 @@ template class float_type_checker : private ErrorHandler { public: FMT_CONSTEXPR explicit float_type_checker(ErrorHandler eh) - : ErrorHandler(eh) {} + : ErrorHandler(eh) {} FMT_CONSTEXPR void on_general() {} FMT_CONSTEXPR void on_exp() {} @@ -1261,7 +1261,7 @@ class char_specs_checker : public ErrorHandler { public: FMT_CONSTEXPR char_specs_checker(char type, ErrorHandler eh) - : ErrorHandler(eh), type_(type) {} + : ErrorHandler(eh), type_(type) {} FMT_CONSTEXPR void on_int() { handle_int_type_spec(type_, int_type_checker(*this)); @@ -1273,46 +1273,44 @@ template class cstring_type_checker : public ErrorHandler { public: FMT_CONSTEXPR explicit cstring_type_checker(ErrorHandler eh) - : ErrorHandler(eh) {} + : ErrorHandler(eh) {} FMT_CONSTEXPR void on_string() {} FMT_CONSTEXPR void on_pointer() {} }; template -void arg_map::init(const basic_format_args &args) { - if (map_) - return; +void arg_map::init(const basic_format_args& args) { + if (map_) return; map_ = new entry[args.max_size()]; if (args.is_packed()) { - for (unsigned i = 0;/*nothing*/; ++i) { + for (unsigned i = 0; /*nothing*/; ++i) { internal::type arg_type = args.type(i); switch (arg_type) { - case internal::none_type: - return; - case internal::named_arg_type: - push_back(args.values_[i]); - break; - default: - break; // Do nothing. - } - } - } - for (unsigned i = 0; ; ++i) { - switch (args.args_[i].type_) { case internal::none_type: return; case internal::named_arg_type: - push_back(args.args_[i].value_); + push_back(args.values_[i]); break; default: - break; // Do nothing. + break; // Do nothing. + } + } + } + for (unsigned i = 0;; ++i) { + switch (args.args_[i].type_) { + case internal::none_type: + return; + case internal::named_arg_type: + push_back(args.args_[i].value_); + break; + default: + break; // Do nothing. } } } -template -class arg_formatter_base { +template class arg_formatter_base { public: typedef typename Range::value_type char_type; typedef decltype(internal::declval().begin()) iterator; @@ -1321,7 +1319,7 @@ class arg_formatter_base { private: typedef basic_writer writer_type; writer_type writer_; - format_specs *specs_; + format_specs* specs_; struct char_writer { char_type value; @@ -1329,8 +1327,7 @@ class arg_formatter_base { size_t size() const { return 1; } size_t width() const { return 1; } - template - void operator()(It &&it) const { *it++ = value; } + template void operator()(It&& it) const { *it++ = value; } }; void write_char(char_type value) { @@ -1340,7 +1337,7 @@ class arg_formatter_base { writer_.write(value); } - void write_pointer(const void *p) { + void write_pointer(const void* p) { format_specs specs = specs_ ? *specs_ : format_specs(); specs.flags = HASH_FLAG; specs.type = 'x'; @@ -1348,8 +1345,8 @@ class arg_formatter_base { } protected: - writer_type &writer() { return writer_; } - format_specs *spec() { return specs_; } + writer_type& writer() { return writer_; } + format_specs* spec() { return specs_; } iterator out() { return writer_.out(); } void write(bool value) { @@ -1357,17 +1354,16 @@ class arg_formatter_base { specs_ ? writer_.write(sv, *specs_) : writer_.write(sv); } - void write(const char_type *value) { - if (!value) - FMT_THROW(format_error("string pointer is null")); + void write(const char_type* value) { + if (!value) FMT_THROW(format_error("string pointer is null")); auto length = std::char_traits::length(value); basic_string_view sv(value, length); specs_ ? writer_.write(sv, *specs_) : writer_.write(sv); } public: - arg_formatter_base(Range r, format_specs *s, locale_ref loc) - : writer_(r, loc), specs_(s) {} + arg_formatter_base(Range r, format_specs* s, locale_ref loc) + : writer_(r, loc), specs_(s) {} iterator operator()(monostate) { FMT_ASSERT(false, "invalid argument type"); @@ -1375,18 +1371,18 @@ class arg_formatter_base { } template - typename std::enable_if< - std::is_integral::value || std::is_same::value, - iterator>::type operator()(T value) { + typename std::enable_if::value || + std::is_same::value, + iterator>::type + operator()(T value) { // MSVC2013 fails to compile separate overloads for bool and char_type so // use std::is_same instead. if (std::is_same::value) { - if (specs_ && specs_->type) - return (*this)(value ? 1 : 0); + if (specs_ && specs_->type) return (*this)(value ? 1 : 0); write(value != 0); } else if (std::is_same::value) { internal::handle_char_specs( - specs_, char_spec_handler(*this, static_cast(value))); + specs_, char_spec_handler(*this, static_cast(value))); } else { specs_ ? writer_.write_int(value, *specs_) : writer_.write(value); } @@ -1395,17 +1391,17 @@ class arg_formatter_base { template typename std::enable_if::value, iterator>::type - operator()(T value) { + operator()(T value) { writer_.write_double(value, specs_ ? *specs_ : format_specs()); return out(); } struct char_spec_handler : internal::error_handler { - arg_formatter_base &formatter; + arg_formatter_base& formatter; char_type value; char_spec_handler(arg_formatter_base& f, char_type val) - : formatter(f), value(val) {} + : formatter(f), value(val) {} void on_int() { if (formatter.specs_) @@ -1417,27 +1413,26 @@ class arg_formatter_base { }; struct cstring_spec_handler : internal::error_handler { - arg_formatter_base &formatter; - const char_type *value; + arg_formatter_base& formatter; + const char_type* value; - cstring_spec_handler(arg_formatter_base &f, const char_type *val) - : formatter(f), value(val) {} + 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(); - internal::handle_cstring_type_spec( - specs_->type, cstring_spec_handler(*this, value)); + internal::handle_cstring_type_spec(specs_->type, + cstring_spec_handler(*this, value)); return out(); } iterator operator()(basic_string_view value) { 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_); } else { writer_.write(value); @@ -1445,7 +1440,7 @@ class arg_formatter_base { return out(); } - iterator operator()(const void *value) { + iterator operator()(const void* value) { if (specs_) check_pointer_type_spec(specs_->type, internal::error_handler()); write_pointer(value); @@ -1453,16 +1448,16 @@ class arg_formatter_base { } }; -template -FMT_CONSTEXPR bool is_name_start(Char c) { +template FMT_CONSTEXPR bool is_name_start(Char c) { return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || '_' == c; } // Parses the range [begin, end) as an unsigned integer. This function assumes // that the range is non-empty and the first character is a digit. template -FMT_CONSTEXPR unsigned parse_nonnegative_int( - const Char *&begin, const Char *end, ErrorHandler &&eh) { +FMT_CONSTEXPR unsigned parse_nonnegative_int(const Char*& begin, + const Char* end, + ErrorHandler&& eh) { assert(begin != end && '0' <= *begin && *begin <= '9'); if (*begin == '0') { ++begin; @@ -1481,30 +1476,27 @@ FMT_CONSTEXPR unsigned parse_nonnegative_int( value = value * 10 + unsigned(*begin - '0'); ++begin; } while (begin != end && '0' <= *begin && *begin <= '9'); - if (value > max_int) - eh.on_error("number is too big"); + if (value > max_int) eh.on_error("number is too big"); return value; } template -class custom_formatter: public function { +class custom_formatter : public function { private: - Context &ctx_; + Context& ctx_; public: - explicit custom_formatter(Context &ctx): ctx_(ctx) {} + explicit custom_formatter(Context& ctx) : ctx_(ctx) {} bool operator()(typename basic_format_arg::handle h) const { h.format(ctx_); return true; } - template - bool operator()(T) const { return false; } + template bool operator()(T) const { return false; } }; -template -struct is_integer { +template struct is_integer { enum { value = std::is_integral::value && !std::is_same::value && !std::is_same::value && !std::is_same::value @@ -1512,62 +1504,63 @@ struct is_integer { }; template -class width_checker: public function { +class width_checker : public function { public: - explicit FMT_CONSTEXPR width_checker(ErrorHandler &eh) : handler_(eh) {} + explicit FMT_CONSTEXPR width_checker(ErrorHandler& eh) : handler_(eh) {} template FMT_CONSTEXPR - typename std::enable_if< - is_integer::value, unsigned long long>::type operator()(T value) { - if (is_negative(value)) - handler_.on_error("negative width"); + typename std::enable_if::value, unsigned long long>::type + operator()(T value) { + if (is_negative(value)) handler_.on_error("negative width"); return static_cast(value); } template - FMT_CONSTEXPR typename std::enable_if< - !is_integer::value, unsigned long long>::type operator()(T) { + FMT_CONSTEXPR + typename std::enable_if::value, unsigned long long>::type + operator()(T) { handler_.on_error("width is not integer"); return 0; } private: - ErrorHandler &handler_; + ErrorHandler& handler_; }; template -class precision_checker: public function { +class precision_checker : public function { public: - explicit FMT_CONSTEXPR precision_checker(ErrorHandler &eh) : handler_(eh) {} + explicit FMT_CONSTEXPR precision_checker(ErrorHandler& eh) : handler_(eh) {} template - FMT_CONSTEXPR typename std::enable_if< - is_integer::value, unsigned long long>::type operator()(T value) { - if (is_negative(value)) - handler_.on_error("negative precision"); + FMT_CONSTEXPR + typename std::enable_if::value, unsigned long long>::type + operator()(T value) { + if (is_negative(value)) handler_.on_error("negative precision"); return static_cast(value); } template - FMT_CONSTEXPR typename std::enable_if< - !is_integer::value, unsigned long long>::type operator()(T) { + FMT_CONSTEXPR + typename std::enable_if::value, unsigned long long>::type + operator()(T) { handler_.on_error("precision is not integer"); return 0; } private: - ErrorHandler &handler_; + ErrorHandler& handler_; }; // A format specifier handler that sets fields in basic_format_specs. -template -class specs_setter { +template class specs_setter { public: - explicit FMT_CONSTEXPR specs_setter(basic_format_specs &specs): - specs_(specs) {} + explicit FMT_CONSTEXPR specs_setter(basic_format_specs& specs) + : specs_(specs) {} - FMT_CONSTEXPR specs_setter(const specs_setter &other): specs_(other.specs_) {} + FMT_CONSTEXPR specs_setter(const specs_setter& other) + : specs_(other.specs_) {} FMT_CONSTEXPR void on_align(alignment align) { specs_.align_ = align; } FMT_CONSTEXPR void on_fill(Char fill) { specs_.fill_ = fill; } @@ -1592,13 +1585,12 @@ class specs_setter { } protected: - basic_format_specs &specs_; + basic_format_specs& specs_; }; -template -class numeric_specs_checker { +template class numeric_specs_checker { public: - FMT_CONSTEXPR numeric_specs_checker(ErrorHandler &eh, internal::type arg_type) + FMT_CONSTEXPR numeric_specs_checker(ErrorHandler& eh, internal::type arg_type) : error_handler_(eh), arg_type_(arg_type) {} FMT_CONSTEXPR void require_numeric_argument() { @@ -1620,24 +1612,22 @@ class numeric_specs_checker { } private: - ErrorHandler &error_handler_; + ErrorHandler& error_handler_; internal::type arg_type_; }; // A format specifier handler that checks if specifiers are consistent with the // argument type. -template -class specs_checker : public Handler { +template class specs_checker : public Handler { public: - FMT_CONSTEXPR specs_checker(const Handler &handler, internal::type arg_type) + FMT_CONSTEXPR specs_checker(const Handler& handler, internal::type arg_type) : Handler(handler), checker_(*this, arg_type) {} - FMT_CONSTEXPR specs_checker(const specs_checker &other) + FMT_CONSTEXPR specs_checker(const specs_checker& other) : Handler(other), checker_(*this, other.arg_type_) {} FMT_CONSTEXPR void on_align(alignment align) { - if (align == ALIGN_NUMERIC) - checker_.require_numeric_argument(); + if (align == ALIGN_NUMERIC) checker_.require_numeric_argument(); Handler::on_align(align); } @@ -1672,10 +1662,10 @@ class specs_checker : public Handler { numeric_specs_checker checker_; }; -template