From 3771d12992d09e0d3b27c449b3adb891e50ee06b Mon Sep 17 00:00:00 2001 From: gabime Date: Mon, 17 Sep 2018 14:40:52 +0300 Subject: [PATCH] Upgraded to fmt ver 5.2.0 --- include/spdlog/fmt/bundled/color.h | 278 + include/spdlog/fmt/bundled/core.h | 2066 ++++--- include/spdlog/fmt/bundled/format-inl.h | 1180 ++-- include/spdlog/fmt/bundled/format.h | 6548 ++++++++++------------- include/spdlog/fmt/bundled/ostream.h | 218 +- include/spdlog/fmt/bundled/posix.h | 518 +- include/spdlog/fmt/bundled/printf.h | 1169 ++-- include/spdlog/fmt/bundled/ranges.h | 429 +- include/spdlog/fmt/bundled/time.h | 265 +- 9 files changed, 5899 insertions(+), 6772 deletions(-) create mode 100644 include/spdlog/fmt/bundled/color.h diff --git a/include/spdlog/fmt/bundled/color.h b/include/spdlog/fmt/bundled/color.h new file mode 100644 index 00000000..4973976a --- /dev/null +++ b/include/spdlog/fmt/bundled/color.h @@ -0,0 +1,278 @@ +// Formatting library for C++ - color support +// +// Copyright (c) 2018 - present, Victor Zverovich and fmt contributors +// All rights reserved. +// +// For the license information refer to format.h. + +#ifndef FMT_COLOR_H_ +#define FMT_COLOR_H_ + +#include "format.h" + +FMT_BEGIN_NAMESPACE + +#ifdef FMT_DEPRECATED_COLORS + +// color and (v)print_colored are deprecated. +enum color { black, red, green, yellow, blue, magenta, cyan, white }; +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) { + vprint_colored(c, format_str, make_format_args(args...)); +} +template +inline void print_colored(color c, wstring_view format_str, + const Args & ... args) { + vprint_colored(c, format_str, make_format_args(args...)); +} + +inline void vprint_colored(color c, string_view format, format_args args) { + char escape[] = "\x1b[30m"; + escape[3] = static_cast('0' + c); + std::fputs(escape, stdout); + vprint(format, args); + std::fputs(internal::data::RESET_COLOR, stdout); +} + +inline void vprint_colored(color c, wstring_view format, wformat_args args) { + wchar_t escape[] = L"\x1b[30m"; + escape[3] = static_cast('0' + c); + std::fputws(escape, stdout); + vprint(format, args); + std::fputws(internal::data::WRESET_COLOR, stdout); +} + +#else + +// Experimental color support. +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 + +// rgb is a struct for red, green and blue colors. +// We use rgb as name because some editors will show it as color direct in the +// editor. +struct rgb { + FMT_CONSTEXPR_DECL rgb() : r(0), g(0), b(0) {} + FMT_CONSTEXPR_DECL rgb(uint8_t r_, uint8_t g_, uint8_t b_) + : r(r_), g(g_), b(b_) {} + FMT_CONSTEXPR_DECL rgb(uint32_t hex) + : r((hex >> 16) & 0xFF), g((hex >> 8) & 0xFF), b((hex) & 0xFF) {} + FMT_CONSTEXPR_DECL rgb(color hex) + : r((uint32_t(hex) >> 16) & 0xFF), g((uint32_t(hex) >> 8) & 0xFF), + b(uint32_t(hex) & 0xFF) {} + uint8_t r; + uint8_t g; + uint8_t b; +}; + +void vprint_rgb(rgb fd, string_view format, format_args args); +void vprint_rgb(rgb fd, rgb bg, string_view format, format_args args); + +/** + Formats a string and prints it to stdout using ANSI escape sequences to + specify foreground color 'fd'. + Example: + fmt::print(fmt::color::red, "Elapsed time: {0:.2f} seconds", 1.23); + */ +template +inline void print(rgb fd, string_view format_str, const Args & ... args) { + vprint_rgb(fd, format_str, make_format_args(args...)); +} + +/** + Formats a string and prints it to stdout using ANSI escape sequences to + specify foreground color 'fd' and background color 'bg'. + Example: + fmt::print(fmt::color::red, fmt::color::black, + "Elapsed time: {0:.2f} seconds", 1.23); + */ +template +inline void print(rgb fd, rgb bg, string_view format_str, + const Args & ... args) { + vprint_rgb(fd, bg, format_str, make_format_args(args...)); +} +namespace internal { +FMT_CONSTEXPR void to_esc(uint8_t c, char out[], int offset) { + out[offset + 0] = static_cast('0' + c / 100); + out[offset + 1] = static_cast('0' + c / 10 % 10); + out[offset + 2] = static_cast('0' + c % 10); +} +} // namespace internal + +inline void vprint_rgb(rgb fd, string_view format, format_args args) { + char escape_fd[] = "\x1b[38;2;000;000;000m"; + internal::to_esc(fd.r, escape_fd, 7); + internal::to_esc(fd.g, escape_fd, 11); + internal::to_esc(fd.b, escape_fd, 15); + + std::fputs(escape_fd, stdout); + vprint(format, args); + std::fputs(internal::data::RESET_COLOR, stdout); +} + +inline void vprint_rgb(rgb fd, rgb bg, string_view format, format_args args) { + char escape_fd[] = "\x1b[38;2;000;000;000m"; // foreground color + char escape_bg[] = "\x1b[48;2;000;000;000m"; // background color + internal::to_esc(fd.r, escape_fd, 7); + internal::to_esc(fd.g, escape_fd, 11); + internal::to_esc(fd.b, escape_fd, 15); + + internal::to_esc(bg.r, escape_bg, 7); + internal::to_esc(bg.g, escape_bg, 11); + internal::to_esc(bg.b, escape_bg, 15); + + std::fputs(escape_fd, stdout); + std::fputs(escape_bg, stdout); + vprint(format, args); + std::fputs(internal::data::RESET_COLOR, stdout); +} + +#endif + +FMT_END_NAMESPACE + +#endif // FMT_COLOR_H_ diff --git a/include/spdlog/fmt/bundled/core.h b/include/spdlog/fmt/bundled/core.h index 19273a67..583a536d 100644 --- a/include/spdlog/fmt/bundled/core.h +++ b/include/spdlog/fmt/bundled/core.h @@ -9,208 +9,231 @@ #define FMT_CORE_H_ #include -#include +#include // std::FILE #include #include #include #include // The fmt library version in the form major * 10000 + minor * 100 + patch. -#define FMT_VERSION 50100 +#define FMT_VERSION 50200 #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 -#ifdef __has_include -#define FMT_HAS_INCLUDE(x) __has_include(x) +#if defined(__has_include) && !defined(__INTELLISENSE__) && \ + (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1600) +# 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. +// 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 \ + (FMT_MSC_VER >= 1900 || FMT_GCC_VERSION >= 406 || FMT_USE_CONSTEXPR) +#endif +#if FMT_USE_CONSTEXPR11 +# define FMT_CONSTEXPR11 constexpr +#else +# 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_MSC_VER >= 1800 -#define FMT_EXPLICIT explicit +# define FMT_EXPLICIT explicit #else -#define FMT_EXPLICIT +# 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 #if FMT_HAS_CPP_ATTRIBUTE(noreturn) -#define FMT_NORETURN [[noreturn]] +# define FMT_NORETURN [[noreturn]] #else -#define FMT_NORETURN +# define FMT_NORETURN #endif // Check if exceptions are disabled. #if defined(__GNUC__) && !defined(__EXCEPTIONS) -#define FMT_EXCEPTIONS 0 +# define FMT_EXCEPTIONS 0 #elif FMT_MSC_VER && !_HAS_EXCEPTIONS -#define FMT_EXCEPTIONS 0 +# define FMT_EXCEPTIONS 0 #endif #ifndef FMT_EXCEPTIONS -#define FMT_EXCEPTIONS 1 +# define FMT_EXCEPTIONS 1 #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 +#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 #else -#define FMT_DETECTED_NOEXCEPT throw() +# define FMT_DETECTED_NOEXCEPT throw() +# define FMT_HAS_CXX11_NOEXCEPT 0 #endif #ifndef FMT_NOEXCEPT -#if FMT_EXCEPTIONS -#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 // This is needed because GCC still uses throw() in its headers when exceptions // are disabled. #if FMT_GCC_VERSION -#define FMT_DTOR_NOEXCEPT FMT_DETECTED_NOEXCEPT +# define FMT_DTOR_NOEXCEPT FMT_DETECTED_NOEXCEPT #else -#define FMT_DTOR_NOEXCEPT FMT_NOEXCEPT +# define FMT_DTOR_NOEXCEPT FMT_NOEXCEPT #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 -#define FMT_DELETED = delete - -// A macro to disallow the copy construction and assignment. -#define FMT_DISALLOW_COPY_AND_ASSIGN(Type) \ - Type(const Type &) FMT_DELETED; \ - void operator=(const Type &) FMT_DELETED - // 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_USE_STD_STRING_VIEW -#elif (FMT_HAS_INCLUDE() && __cplusplus >= 201402L) -#include -#define FMT_USE_EXPERIMENTAL_STRING_VIEW +# include +# define FMT_USE_STD_STRING_VIEW +#elif (FMT_HAS_INCLUDE() && \ + __cplusplus >= 201402L) +# include +# define FMT_USE_EXPERIMENTAL_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 - namespace internal { // An implementation of declval for pre-C++11 compilers such as gcc 4. -template +template typename std::add_rvalue_reference::type declval() FMT_NOEXCEPT; +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; +}; + // Casts nonnegative integer to unsigned. -template -FMT_CONSTEXPR typename std::make_unsigned::type to_unsigned(Int value) -{ - FMT_ASSERT(value >= 0, "negative value"); - return static_cast::type>(value); +template +FMT_CONSTEXPR typename std::make_unsigned::type to_unsigned(Int value) { + FMT_ASSERT(value >= 0, "negative value"); + return static_cast::type>(value); } -} // namespace internal +// A constexpr std::char_traits::length replacement for pre-C++17. +template +FMT_CONSTEXPR size_t length(const Char *s) { + const Char *start = s; + while (*s) ++s; + return s - start; +} +#if FMT_GCC_VERSION +FMT_CONSTEXPR size_t length(const char *s) { return std::strlen(s); } +#endif +} // namespace internal /** An implementation of ``std::basic_string_view`` for pre-C++17. It provides a @@ -219,480 +242,367 @@ FMT_CONSTEXPR typename std::make_unsigned::type to_unsigned(Int value) compiled with a different ``-std`` option than the client code (which is not recommended). */ -template -class basic_string_view -{ -private: - const Char *data_; - size_t size_; +template +class basic_string_view { + private: + const Char *data_; + size_t size_; -public: - typedef Char char_type; - typedef const Char *iterator; + public: + typedef Char char_type; + typedef const Char *iterator; -// Standard basic_string_view type. + // Standard basic_string_view type. #if defined(FMT_USE_STD_STRING_VIEW) - typedef std::basic_string_view type; + typedef std::basic_string_view type; #elif defined(FMT_USE_EXPERIMENTAL_STRING_VIEW) - typedef std::experimental::basic_string_view type; + typedef std::experimental::basic_string_view type; #else - struct type - { - const char *data() const - { - return FMT_NULL; - } - size_t size() const - { - return 0; - } - }; + struct type { + const char *data() const { return FMT_NULL; } + size_t size() const { return 0; } + }; #endif - FMT_CONSTEXPR basic_string_view() FMT_NOEXCEPT : data_(FMT_NULL), size_(0) {} + 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) {} + /** 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) {} - /** - \rst - Constructs a string reference object from a C string computing - the size with ``std::char_traits::length``. - \endrst - */ - basic_string_view(const Char *s) - : data_(s) - , size_(std::char_traits::length(s)) - { - } + /** + \rst + Constructs a string reference object from a C string computing + the size with ``std::char_traits::length``. + \endrst + */ + FMT_CONSTEXPR basic_string_view(const Char *s) + : data_(s), size_(internal::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.c_str()), size_(s.size()) - { - } + /** 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(type s) FMT_NOEXCEPT : data_(s.data()), size_(s.size()) {} + FMT_CONSTEXPR basic_string_view(type s) FMT_NOEXCEPT + : data_(s.data()), size_(s.size()) {} - /** Returns a pointer to the string data. */ - const Char *data() const - { - return data_; - } + /** Returns a pointer to the string data. */ + FMT_CONSTEXPR const Char *data() const { return data_; } - /** Returns the string size. */ - FMT_CONSTEXPR size_t size() const - { - return size_; - } + /** Returns the string size. */ + FMT_CONSTEXPR size_t size() const { return size_; } - FMT_CONSTEXPR iterator begin() const - { - return data_; - } - FMT_CONSTEXPR iterator end() const - { - return data_ + size_; - } + FMT_CONSTEXPR iterator begin() const { return data_; } + FMT_CONSTEXPR iterator end() const { return data_ + size_; } - FMT_CONSTEXPR void remove_prefix(size_t n) - { - data_ += n; - size_ -= n; - } + FMT_CONSTEXPR void remove_prefix(size_t n) { + data_ += n; + size_ -= n; + } - // Lexicographically compare this string reference to other. - int compare(basic_string_view other) const - { - size_t str_size = size_ < other.size_ ? size_ : other.size_; - int result = std::char_traits::compare(data_, other.data_, str_size); - if (result == 0) - result = size_ == other.size_ ? 0 : (size_ < other.size_ ? -1 : 1); - return result; - } + // Lexicographically compare this string reference to other. + int compare(basic_string_view other) const { + size_t str_size = size_ < other.size_ ? size_ : other.size_; + int result = std::char_traits::compare(data_, other.data_, str_size); + if (result == 0) + result = size_ == other.size_ ? 0 : (size_ < other.size_ ? -1 : 1); + return result; + } - friend bool operator==(basic_string_view lhs, basic_string_view rhs) - { - return lhs.compare(rhs) == 0; - } - friend bool operator!=(basic_string_view lhs, basic_string_view rhs) - { - return lhs.compare(rhs) != 0; - } - friend bool operator<(basic_string_view lhs, basic_string_view rhs) - { - return lhs.compare(rhs) < 0; - } - friend bool operator<=(basic_string_view lhs, basic_string_view rhs) - { - return lhs.compare(rhs) <= 0; - } - friend bool operator>(basic_string_view lhs, basic_string_view rhs) - { - return lhs.compare(rhs) > 0; - } - friend bool operator>=(basic_string_view lhs, basic_string_view rhs) - { - return lhs.compare(rhs) >= 0; - } + friend bool operator==(basic_string_view lhs, basic_string_view rhs) { + return lhs.compare(rhs) == 0; + } + friend bool operator!=(basic_string_view lhs, basic_string_view rhs) { + return lhs.compare(rhs) != 0; + } + friend bool operator<(basic_string_view lhs, basic_string_view rhs) { + return lhs.compare(rhs) < 0; + } + friend bool operator<=(basic_string_view lhs, basic_string_view rhs) { + return lhs.compare(rhs) <= 0; + } + friend bool operator>(basic_string_view lhs, basic_string_view rhs) { + return lhs.compare(rhs) > 0; + } + friend bool operator>=(basic_string_view lhs, basic_string_view rhs) { + return lhs.compare(rhs) >= 0; + } }; typedef basic_string_view string_view; typedef basic_string_view wstring_view; -template +template class basic_format_arg; -template +template class basic_format_args; // A formatter for objects of type T. -template +template struct formatter; +template +struct convert_to_int { + enum { + value = !std::is_arithmetic::value && std::is_convertible::value + }; +}; + namespace internal { /** A contiguous memory buffer with an optional growing ability. */ -template -class basic_buffer -{ -private: - FMT_DISALLOW_COPY_AND_ASSIGN(basic_buffer); +template +class basic_buffer { + private: + basic_buffer(const basic_buffer &) = delete; + void operator=(const basic_buffer &) = delete; - T *ptr_; - std::size_t size_; - std::size_t capacity_; + T *ptr_; + std::size_t size_; + std::size_t capacity_; -protected: - basic_buffer(T *p = FMT_NULL, std::size_t sz = 0, std::size_t cap = 0) FMT_NOEXCEPT : ptr_(p), size_(sz), capacity_(cap) {} + 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) {} - /** Sets the buffer data and capacity. */ - void set(T *buf_data, std::size_t buf_capacity) FMT_NOEXCEPT - { - ptr_ = buf_data; - capacity_ = buf_capacity; - } + basic_buffer(T *p = FMT_NULL, std::size_t sz = 0, std::size_t cap = 0) + FMT_NOEXCEPT: ptr_(p), size_(sz), capacity_(cap) {} - /** Increases the buffer capacity to hold at least *capacity* elements. */ - virtual void grow(std::size_t capacity) = 0; + /** Sets the buffer data and capacity. */ + void set(T *buf_data, std::size_t buf_capacity) FMT_NOEXCEPT { + ptr_ = buf_data; + capacity_ = buf_capacity; + } -public: - typedef T value_type; - typedef const T &const_reference; + /** Increases the buffer capacity to hold at least *capacity* elements. */ + virtual void grow(std::size_t capacity) = 0; - virtual ~basic_buffer() {} + public: + typedef T value_type; + typedef const T &const_reference; - T *begin() FMT_NOEXCEPT - { - return ptr_; - } - T *end() FMT_NOEXCEPT - { - return ptr_ + size_; - } + virtual ~basic_buffer() {} - /** Returns the size of this buffer. */ - std::size_t size() const FMT_NOEXCEPT - { - return size_; - } + T *begin() FMT_NOEXCEPT { return ptr_; } + T *end() FMT_NOEXCEPT { return ptr_ + size_; } - /** Returns the capacity of this buffer. */ - std::size_t capacity() const FMT_NOEXCEPT - { - return capacity_; - } + /** Returns the size of this buffer. */ + std::size_t size() const FMT_NOEXCEPT { return size_; } - /** Returns a pointer to the buffer data. */ - T *data() FMT_NOEXCEPT - { - return ptr_; - } + /** Returns the capacity of this buffer. */ + std::size_t capacity() const FMT_NOEXCEPT { return capacity_; } - /** Returns a pointer to the buffer data. */ - const T *data() const FMT_NOEXCEPT - { - return ptr_; - } + /** Returns a pointer to the buffer data. */ + T *data() FMT_NOEXCEPT { return ptr_; } - /** - Resizes the buffer. If T is a POD type new elements may not be initialized. - */ - void resize(std::size_t new_size) - { - reserve(new_size); - size_ = new_size; - } + /** Returns a pointer to the buffer data. */ + const T *data() const FMT_NOEXCEPT { return ptr_; } - /** Reserves space to store at least *capacity* elements. */ - void reserve(std::size_t new_capacity) - { - if (new_capacity > capacity_) - grow(new_capacity); - } + /** + Resizes the buffer. If T is a POD type new elements may not be initialized. + */ + void resize(std::size_t new_size) { + reserve(new_size); + size_ = new_size; + } - void push_back(const T &value) - { - reserve(size_ + 1); - ptr_[size_++] = value; - } + /** Clears this buffer. */ + void clear() { size_ = 0; } - /** Appends data to the end of the buffer. */ - template - void append(const U *begin, const U *end); + /** Reserves space to store at least *capacity* elements. */ + void reserve(std::size_t new_capacity) { + if (new_capacity > capacity_) + grow(new_capacity); + } - T &operator[](std::size_t index) - { - return ptr_[index]; - } - const T &operator[](std::size_t index) const - { - return ptr_[index]; - } + 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); + + T &operator[](std::size_t index) { return ptr_[index]; } + const T &operator[](std::size_t index) const { return ptr_[index]; } }; typedef basic_buffer buffer; typedef basic_buffer wbuffer; // A container-backed buffer. -template -class container_buffer : public basic_buffer -{ -private: - Container &container_; +template +class container_buffer : public basic_buffer { + private: + Container &container_; -protected: - void grow(std::size_t capacity) FMT_OVERRIDE - { - container_.resize(capacity); - this->set(&container_[0], capacity); - } + protected: + void grow(std::size_t capacity) FMT_OVERRIDE { + container_.resize(capacity); + this->set(&container_[0], capacity); + } -public: - explicit container_buffer(Container &c) - : basic_buffer(&c[0], c.size(), c.size()) - , container_(c) - { - } + public: + explicit container_buffer(Container &c) + : basic_buffer(c.size()), container_(c) {} }; -struct error_handler -{ - FMT_CONSTEXPR error_handler() {} - FMT_CONSTEXPR error_handler(const error_handler &) {} +struct error_handler { + FMT_CONSTEXPR 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); + // This function is intentionally not constexpr to give a compile-time error. + FMT_API void on_error(const char *message); }; // Formatting of wide characters and strings into a narrow output is disallowed: // fmt::format("{}", L"test"); // error // To fix this, use a wide format string: // fmt::format(L"{}", L"test"); -template -inline void require_wchar() -{ - static_assert(std::is_same::value, "formatting of wide characters into a narrow output is disallowed"); +template +inline void require_wchar() { + static_assert( + std::is_same::value, + "formatting of wide characters into a narrow output is disallowed"); } -template +template struct named_arg_base; -template +template struct named_arg; -template -struct is_named_arg : std::false_type -{ +template +struct is_named_arg : std::false_type {}; + +template +struct is_named_arg> : std::true_type {}; + +enum 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, + 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 }; -template -struct is_named_arg> : std::true_type -{ -}; - -enum 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, - 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 -}; - -FMT_CONSTEXPR bool is_integral(type t) -{ - FMT_ASSERT(t != internal::named_arg_type, "invalid argument type"); - return t > internal::none_type && t <= internal::last_integer_type; +FMT_CONSTEXPR bool is_integral(type t) { + FMT_ASSERT(t != internal::named_arg_type, "invalid argument type"); + return t > internal::none_type && t <= internal::last_integer_type; } -FMT_CONSTEXPR bool is_arithmetic(type t) -{ - FMT_ASSERT(t != internal::named_arg_type, "invalid argument type"); - return t > internal::none_type && t <= internal::last_numeric_type; +FMT_CONSTEXPR bool is_arithmetic(type t) { + FMT_ASSERT(t != internal::named_arg_type, "invalid argument type"); + return t > internal::none_type && t <= internal::last_numeric_type; } -template -struct convert_to_int -{ - enum - { - value = !std::is_arithmetic::value && std::is_convertible::value - }; +template +struct string_value { + const Char *value; + std::size_t size; }; -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 -{ -public: - typedef typename Context::char_type char_type; +template +class value { + public: + typedef typename Context::char_type char_type; - union - { - int int_value; - unsigned uint_value; - long long long_long_value; - unsigned long long ulong_long_value; - double double_value; - long double long_double_value; - const void *pointer; - string_value string; - string_value sstring; - string_value ustring; - custom_value custom; - }; + union { + int int_value; + unsigned uint_value; + long long long_long_value; + unsigned long long ulong_long_value; + double double_value; + long double long_double_value; + const void *pointer; + string_value string; + string_value sstring; + string_value ustring; + custom_value custom; + }; - FMT_CONSTEXPR value(int val = 0) - : int_value(val) - { - } - value(unsigned val) - { - uint_value = val; - } - value(long long val) - { - long_long_value = val; - } - 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) - { - static_assert(std::is_same::value, "incompatible string types"); - sstring.value = val; - } - value(const unsigned char *val) - { - static_assert(std::is_same::value, "incompatible string types"); - ustring.value = val; - } - value(basic_string_view val) - { - string.value = val.data(); - string.size = val.size(); - } - value(const void *val) - { - pointer = val; - } + FMT_CONSTEXPR value(int val = 0) : int_value(val) {} + value(unsigned val) { uint_value = val; } + value(long long val) { long_long_value = val; } + 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) { + static_assert(std::is_same::value, + "incompatible string types"); + sstring.value = val; + } + value(const unsigned char *val) { + static_assert(std::is_same::value, + "incompatible string types"); + ustring.value = val; + } + value(basic_string_view val) { + string.value = val.data(); + string.size = val.size(); + } + value(const void *val) { pointer = val; } - template - explicit value(const T &val) - { - custom.value = &val; - custom.format = &format_custom_arg; - } + template + explicit value(const T &val) { + custom.value = &val; + custom.format = &format_custom_arg; + } - const named_arg_base &as_named_arg() - { - return *static_cast *>(pointer); - } + 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) - { - // 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(); - parse_ctx.advance_to(f.parse(parse_ctx)); - ctx.advance_to(f.format(*static_cast(arg), ctx)); - } + 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) { + // 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(); + parse_ctx.advance_to(f.parse(parse_ctx)); + ctx.advance_to(f.format(*static_cast(arg), ctx)); + } }; -template -struct typed_value : value -{ - static const type type_tag = TYPE; +// Value initializer used to delay conversion to value and reduce memory churn. +template +struct init { + T val; + static const type type_tag = TYPE; - template - FMT_CONSTEXPR typed_value(const T &val) - : value(val) - { - } + FMT_CONSTEXPR init(const T &v) : val(v) {} + FMT_CONSTEXPR operator value() const { return value(val); } }; -template +template FMT_CONSTEXPR basic_format_arg make_arg(const T &value); -#define FMT_MAKE_VALUE(TAG, ArgType, ValueType) \ - template \ - FMT_CONSTEXPR typed_value make_value(ArgType val) \ - { \ - return static_cast(val); \ - } +#define FMT_MAKE_VALUE(TAG, ArgType, ValueType) \ + template \ + FMT_CONSTEXPR init make_value(ArgType val) { \ + return static_cast(val); \ + } -#define FMT_MAKE_VALUE_SAME(TAG, Type) \ - template \ - FMT_CONSTEXPR typed_value 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) @@ -702,10 +612,15 @@ 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) +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) FMT_MAKE_VALUE_SAME(long_long_type, long long) FMT_MAKE_VALUE_SAME(ulong_long_type, unsigned long long) @@ -714,11 +629,10 @@ FMT_MAKE_VALUE(uint_type, unsigned char, unsigned) FMT_MAKE_VALUE(char_type, char, int) #if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) -template -inline typed_value make_value(wchar_t val) -{ - require_wchar(); - return static_cast(val); +template +inline init make_value(wchar_t val) { + require_wchar(); + return static_cast(val); } #endif @@ -728,204 +642,167 @@ FMT_MAKE_VALUE_SAME(long_double_type, long double) // Formatting of wide strings into a narrow buffer and multibyte strings // into a wide buffer is disallowed (https://github.com/fmtlib/fmt/pull/606). -FMT_MAKE_VALUE(cstring_type, typename C::char_type *, const typename C::char_type *) -FMT_MAKE_VALUE(cstring_type, const typename C::char_type *, const typename C::char_type *) +FMT_MAKE_VALUE(cstring_type, typename C::char_type*, + const typename C::char_type*) +FMT_MAKE_VALUE(cstring_type, const typename C::char_type*, + const typename C::char_type*) -FMT_MAKE_VALUE(cstring_type, signed char *, const signed char *) -FMT_MAKE_VALUE_SAME(cstring_type, const signed char *) -FMT_MAKE_VALUE(cstring_type, unsigned char *, const unsigned char *) -FMT_MAKE_VALUE_SAME(cstring_type, const unsigned char *) +FMT_MAKE_VALUE(cstring_type, signed char*, const signed char*) +FMT_MAKE_VALUE_SAME(cstring_type, const signed char*) +FMT_MAKE_VALUE(cstring_type, unsigned char*, const unsigned char*) +FMT_MAKE_VALUE_SAME(cstring_type, const unsigned char*) FMT_MAKE_VALUE_SAME(string_type, basic_string_view) -FMT_MAKE_VALUE(string_type, typename basic_string_view::type, basic_string_view) -FMT_MAKE_VALUE(string_type, const std::basic_string &, basic_string_view) -FMT_MAKE_VALUE(pointer_type, void *, const void *) -FMT_MAKE_VALUE_SAME(pointer_type, const void *) +FMT_MAKE_VALUE(string_type, + typename basic_string_view::type, + basic_string_view) +FMT_MAKE_VALUE(string_type, const std::basic_string&, + basic_string_view) +FMT_MAKE_VALUE(pointer_type, void*, const void*) +FMT_MAKE_VALUE_SAME(pointer_type, const void*) #if FMT_USE_NULLPTR -FMT_MAKE_VALUE(pointer_type, std::nullptr_t, const void *) +FMT_MAKE_VALUE(pointer_type, std::nullptr_t, const void*) #endif // Formatting of arbitrary pointers is disallowed. If you want to output a // pointer cast it to "void *" or "const void *". In particular, this forbids // formatting of "[const] volatile char *" which is printed as bool by // iostreams. -template -typename std::enable_if::value>::type make_value(const T *) -{ - static_assert(!sizeof(T), "formatting of non-void pointers is disallowed"); +template +typename std::enable_if::value>::type + make_value(const T *) { + static_assert(!sizeof(T), "formatting of non-void pointers is disallowed"); } -template -inline typename std::enable_if::value && convert_to_int::value, typed_value>::type -make_value(const T &val) -{ - return static_cast(val); -} +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); } -template -inline typename std::enable_if::value && !std::is_convertible>::value, +template +inline typename std::enable_if< + std::is_constructible, T>::value, + init, string_type>>::type + make_value(const T &val) { return basic_string_view(val); } + +template +inline typename std::enable_if< + !convert_to_int::value && + !std::is_convertible>::value && + !std::is_constructible, T>::value, // Implicit conversion to std::string is not handled here because it's // unsafe: https://github.com/fmtlib/fmt/issues/729 - typed_value>::type -make_value(const T &val) -{ - return val; -} + init>::type + make_value(const T &val) { return val; } -template -typed_value 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); +template +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); } // Maximum number of arguments with packed types. -enum -{ - max_packed_args = 15 -}; +enum { max_packed_args = 15 }; -template +template class arg_map; - -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::type(Args...)>::type type; -}; -} // namespace internal +} // namespace internal // A formatting argument. It is a trivially copyable/constructible type to // allow storage in basic_memory_buffer. -template -class basic_format_arg -{ -private: - internal::value value_; - internal::type type_; +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); + template + friend FMT_CONSTEXPR basic_format_arg + internal::make_arg(const T &value); - template - friend FMT_CONSTEXPR typename internal::result_of::type visit(Visitor &&vis, basic_format_arg arg); + template + friend FMT_CONSTEXPR typename internal::result_of::type + visit(Visitor &&vis, const basic_format_arg &arg); - friend class basic_format_args; - friend class internal::arg_map; + friend class basic_format_args; + friend class internal::arg_map; - typedef typename Context::char_type char_type; + typedef typename Context::char_type char_type; -public: - class handle - { - public: - explicit handle(internal::custom_value custom) - : custom_(custom) - { - } + public: + class handle { + public: + 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_; - }; + private: + internal::custom_value custom_; + }; - FMT_CONSTEXPR basic_format_arg() - : type_(internal::none_type) - { - } + FMT_CONSTEXPR basic_format_arg() : type_(internal::none_type) {} - FMT_EXPLICIT operator bool() const FMT_NOEXCEPT - { - return type_ != internal::none_type; - } + FMT_EXPLICIT operator bool() const FMT_NOEXCEPT { + return type_ != internal::none_type; + } - internal::type type() const - { - return type_; - } + internal::type type() const { return type_; } - bool is_integral() const - { - return internal::is_integral(type_); - } - bool is_arithmetic() const - { - return internal::is_arithmetic(type_); - } + bool is_integral() const { return internal::is_integral(type_); } + bool is_arithmetic() const { return internal::is_arithmetic(type_); } }; // Parsing context consisting of a format string range being parsed and an // argument counter for automatic indexing. -template -class basic_parse_context : private ErrorHandler -{ -private: - basic_string_view format_str_; - int next_arg_id_; +template +class basic_parse_context : private ErrorHandler { + private: + basic_string_view format_str_; + int next_arg_id_; -public: - typedef Char char_type; - typedef typename basic_string_view::iterator iterator; + public: + 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. + FMT_CONSTEXPR iterator begin() const FMT_NOEXCEPT { + return format_str_.begin(); + } + + // Returns an iterator past the end of the format string range being parsed. + FMT_CONSTEXPR iterator end() const FMT_NOEXCEPT { return format_str_.end(); } + + // Advances the begin iterator to ``it``. + FMT_CONSTEXPR void advance_to(iterator it) { + format_str_.remove_prefix(internal::to_unsigned(it - begin())); + } + + // Returns the next argument index. + FMT_CONSTEXPR unsigned next_arg_id(); + + FMT_CONSTEXPR bool check_arg_id(unsigned) { + if (next_arg_id_ > 0) { + on_error("cannot switch from automatic to manual argument indexing"); + return false; } + next_arg_id_ = -1; + return true; + } + void check_arg_id(basic_string_view) {} - // Returns an iterator to the beginning of the format string range being - // parsed. - FMT_CONSTEXPR iterator begin() const FMT_NOEXCEPT - { - return format_str_.begin(); - } + FMT_CONSTEXPR void on_error(const char *message) { + ErrorHandler::on_error(message); + } - // Returns an iterator past the end of the format string range being parsed. - FMT_CONSTEXPR iterator end() const FMT_NOEXCEPT - { - return format_str_.end(); - } - - // Advances the begin iterator to ``it``. - FMT_CONSTEXPR void advance_to(iterator it) - { - format_str_.remove_prefix(internal::to_unsigned(it - begin())); - } - - // Returns the next argument index. - FMT_CONSTEXPR unsigned next_arg_id(); - - FMT_CONSTEXPR bool check_arg_id(unsigned) - { - if (next_arg_id_ > 0) - { - on_error("cannot switch from automatic to manual argument indexing"); - return false; - } - next_arg_id_ = -1; - return true; - } - void check_arg_id(basic_string_view) {} - - FMT_CONSTEXPR void on_error(const char *message) - { - ErrorHandler::on_error(message); - } - - FMT_CONSTEXPR ErrorHandler error_handler() const - { - return *this; - } + FMT_CONSTEXPR ErrorHandler error_handler() const { return *this; } }; typedef basic_parse_context parse_context; @@ -933,246 +810,197 @@ typedef basic_parse_context wparse_context; namespace internal { // A map from argument names to their values for named arguments. -template -class arg_map -{ -private: - FMT_DISALLOW_COPY_AND_ASSIGN(arg_map); +template +class arg_map { + private: + arg_map(const arg_map &) = delete; + void operator=(const arg_map &) = delete; - typedef typename Context::char_type char_type; + typedef typename Context::char_type char_type; - struct entry - { - basic_string_view name; - basic_format_arg arg; - }; + struct entry { + basic_string_view name; + basic_format_arg arg; + }; - entry *map_; - unsigned size_; + entry *map_; + unsigned size_; - void push_back(value val) - { - 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_; - } - - 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; - } - return basic_format_arg(); + void push_back(value val) { + 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_; } + + 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; } + return basic_format_arg(); + } }; -template -class context_base -{ -public: - typedef OutputIt iterator; +template +class context_base { + public: + typedef OutputIt iterator; -private: - basic_parse_context parse_context_; - iterator out_; - basic_format_args args_; + private: + basic_parse_context parse_context_; + iterator out_; + basic_format_args args_; -protected: - typedef Char char_type; - typedef basic_format_arg format_arg; + protected: + typedef Char char_type; + typedef basic_format_arg format_arg; - context_base(OutputIt out, basic_string_view format_str, basic_format_args ctx_args) - : parse_context_(format_str) - , out_(out) - , args_(ctx_args) - { - } + context_base(OutputIt out, basic_string_view format_str, + basic_format_args ctx_args) + : parse_context_(format_str), out_(out), args_(ctx_args) {} - // 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"); - return arg; - } + // 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"); + 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(); - } + // 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(); + } -public: - basic_parse_context &parse_context() - { - return parse_context_; - } + public: + basic_parse_context &parse_context() { + return parse_context_; + } - internal::error_handler error_handler() - { - return parse_context_.error_handler(); - } + 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_; - } - iterator begin() - { - return out_; - } // deprecated + // Returns an iterator to the beginning of the output range. + iterator out() { return out_; } + iterator begin() { return out_; } // deprecated - // Advances the begin iterator to ``it``. - void advance_to(iterator it) - { - out_ = it; - } + // Advances the begin iterator to ``it``. + void advance_to(iterator it) { out_ = it; } - basic_format_args args() const - { - return args_; - } + basic_format_args args() const { return args_; } }; // Extracts a reference to the container from back_insert_iterator. -template -inline Container &get_container(std::back_insert_iterator it) -{ - typedef std::back_insert_iterator bi_iterator; - struct accessor : bi_iterator - { - accessor(bi_iterator iter) - : bi_iterator(iter) - { - } - using bi_iterator::container; - }; - return *accessor(it).container; +template +inline Container &get_container(std::back_insert_iterator it) { + typedef std::back_insert_iterator bi_iterator; + struct accessor: bi_iterator { + accessor(bi_iterator iter) : bi_iterator(iter) {} + using bi_iterator::container; + }; + return *accessor(it).container; } -} // namespace internal +} // namespace internal // Formatting context. -template -class basic_format_context : public internal::context_base, Char> -{ -public: - /** The character type for the output. */ - typedef Char char_type; +template +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; - }; + // using formatter_type = formatter; + template + struct formatter_type { typedef formatter type; }; -private: - internal::arg_map map_; + private: + internal::arg_map map_; - FMT_DISALLOW_COPY_AND_ASSIGN(basic_format_context); + 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; - using base::get_arg; + typedef internal::context_base base; + typedef typename base::format_arg format_arg; + using base::get_arg; -public: - using typename base::iterator; + public: + using typename base::iterator; - /** - Constructs a ``basic_format_context`` object. References to the arguments are - stored in the object so make sure they have appropriate lifetimes. - */ - basic_format_context(OutputIt out, basic_string_view format_str, basic_format_args ctx_args) - : base(out, format_str, ctx_args) - { - } + /** + Constructs a ``basic_format_context`` object. References to the arguments are + stored in the object so make sure they have appropriate lifetimes. + */ + basic_format_context(OutputIt out, basic_string_view format_str, + basic_format_args ctx_args) + : base(out, format_str, ctx_args) {} - format_arg next_arg() - { - return this->do_get_arg(this->parse_context().next_arg_id()); - } - format_arg get_arg(unsigned arg_id) - { - return this->do_get_arg(arg_id); - } + format_arg next_arg() { + return this->do_get_arg(this->parse_context().next_arg_id()); + } + format_arg get_arg(unsigned arg_id) { return this->do_get_arg(arg_id); } - // Checks if manual indexing is used and returns the argument with the - // specified name. - format_arg get_arg(basic_string_view name); + // Checks if manual indexing is used and returns the argument with the + // specified name. + format_arg get_arg(basic_string_view name); }; -template -struct buffer_context -{ - typedef basic_format_context>, Char> type; +template +struct buffer_context { + typedef basic_format_context< + std::back_insert_iterator>, Char> type; }; typedef buffer_context::type format_context; typedef buffer_context::type wformat_context; namespace internal { -template -struct get_type -{ - typedef decltype(make_value(declval::type &>())) value_type; - static const type value = value_type::type_tag; +template +struct get_type { + typedef decltype(make_value( + declval::type&>())) value_type; + static const type value = value_type::type_tag; }; -template -FMT_CONSTEXPR 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() { + return get_type::value | (get_types() << 4); } -template -FMT_CONSTEXPR unsigned long long get_types() -{ - return get_type::value | (get_types() << 4); +template +FMT_CONSTEXPR basic_format_arg make_arg(const T &value) { + basic_format_arg arg; + arg.type_ = get_type::value; + arg.value_ = make_value(value); + return arg; } -template -FMT_CONSTEXPR basic_format_arg make_arg(const T &value) -{ - basic_format_arg arg; - arg.type_ = get_type::value; - arg.value_ = make_value(value); - return arg; +template +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) -{ - return make_value(value); +template +inline typename std::enable_if>::type + make_arg(const T &value) { + return make_arg(value); } - -template -inline typename std::enable_if>::type make_arg(const T &value) -{ - return make_arg(value); -} -} // namespace internal +} // namespace internal /** \rst @@ -1181,52 +1009,53 @@ inline typename std::enable_if>::type make such as `~fmt::vformat`. \endrst */ -template -class format_arg_store -{ -private: - static const size_t NUM_ARGS = sizeof...(Args); +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; + // 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); - value_type data_[DATA_SIZE]; + // 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); + value_type data_[DATA_SIZE]; - friend class basic_format_args; + friend class basic_format_args; - static FMT_CONSTEXPR long long get_types() - { - return IS_PACKED ? static_cast(internal::get_types()) : -static_cast(NUM_ARGS); - } + static FMT_CONSTEXPR11 long long get_types() { + return IS_PACKED ? + static_cast(internal::get_types()) : + -static_cast(NUM_ARGS); + } -public: -#if FMT_USE_CONSTEXPR - static constexpr long long TYPES = get_types(); + public: +#if FMT_USE_CONSTEXPR11 + static FMT_CONSTEXPR11 long long TYPES = get_types(); #else - static const long long TYPES; + static const long long TYPES; #endif -#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)...}; - std::memcpy(data_, init, sizeof(init)); - } +#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)...}; + 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_CONSTEXPR -template +#if !FMT_USE_CONSTEXPR11 +template const long long format_arg_store::TYPES = get_types(); #endif @@ -1234,168 +1063,153 @@ const long long format_arg_store::TYPES = get_types(); \rst Constructs an `~fmt::format_arg_store` object that contains references to arguments and can be implicitly converted to `~fmt::format_args`. `Context` - can - be omitted in which case it defaults to `~fmt::context`. + can be omitted in which case it defaults to `~fmt::context`. \endrst */ -template -inline format_arg_store make_format_args(const Args &... args) -{ - return format_arg_store(args...); +template +inline format_arg_store + make_format_args(const Args & ... args) { + return format_arg_store(args...); } -template -inline format_arg_store make_format_args(const Args &... args) -{ - return format_arg_store(args...); +template +inline format_arg_store + make_format_args(const Args & ... args) { + return format_arg_store(args...); } /** Formatting arguments. */ -template -class basic_format_args -{ -public: - typedef unsigned size_type; - typedef basic_format_arg format_arg; +template +class basic_format_args { + public: + typedef unsigned size_type; + typedef basic_format_arg format_arg; -private: - // To reduce compiled code size per formatting function call, types of first - // max_packed_args arguments are passed in the types_ field. - unsigned long long types_; - union - { - // If the number of arguments is less than max_packed_args, the argument - // values are stored in values_, otherwise they are stored in 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_; - }; + private: + // To reduce compiled code size per formatting function call, types of first + // max_packed_args arguments are passed in the types_ field. + unsigned long long types_; + union { + // If the number of arguments is less than max_packed_args, the argument + // values are stored in values_, otherwise they are stored in 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_; + }; - typename internal::type type(unsigned index) const - { - unsigned shift = index * 4; - unsigned long long mask = 0xf; - return static_cast((types_ & (mask << shift)) >> shift); + typename internal::type type(unsigned index) const { + unsigned shift = index * 4; + unsigned long long mask = 0xf; + return static_cast( + (types_ & (mask << 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; } + + format_arg do_get(size_type index) const { + format_arg arg; + long long signed_types = static_cast(types_); + if (signed_types < 0) { + unsigned long long num_args = + static_cast(-signed_types); + if (index < num_args) + arg = args_[index]; + 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_; + val = values_[index]; + return arg; + } - friend class internal::arg_map; + public: + basic_format_args() : types_(0) {} - void set_data(const internal::value *values) - { - values_ = values; - } - void set_data(const format_arg *args) - { - args_ = args; - } + /** + \rst + Constructs a `basic_format_args` object from `~fmt::format_arg_store`. + \endrst + */ + template + basic_format_args(const format_arg_store &store) + : types_(static_cast(store.TYPES)) { + set_data(store.data_); + } - format_arg do_get(size_type index) const - { - long long signed_types = static_cast(types_); - if (signed_types < 0) - { - unsigned long long num_args = static_cast(-signed_types); - return index < num_args ? args_[index] : format_arg(); - } - format_arg 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_; - val = values_[index]; - return arg; - } + /** + \rst + Constructs a `basic_format_args` object from a dynamic set of arguments. + \endrst + */ + basic_format_args(const format_arg *args, size_type count) + : types_(-static_cast(count)) { + set_data(args); + } -public: - basic_format_args() - : types_(0) - { - } + /** Returns the argument at specified index. */ + format_arg get(size_type index) const { + format_arg arg = do_get(index); + if (arg.type_ == internal::named_arg_type) + arg = arg.value_.as_named_arg().template deserialize(); + return arg; + } - /** - \rst - Constructs a `basic_format_args` object from `~fmt::format_arg_store`. - \endrst - */ - template - basic_format_args(const format_arg_store &store) - : types_(static_cast(store.TYPES)) - { - set_data(store.data_); - } - - /** Returns the argument at specified index. */ - format_arg get(size_type index) const - { - format_arg arg = do_get(index); - return arg.type_ == internal::named_arg_type ? arg.value_.as_named_arg().template deserialize() : arg; - } - - unsigned max_size() const - { - long long signed_types = static_cast(types_); - return static_cast(signed_types < 0 ? -signed_types : static_cast(internal::max_packed_args)); - } + unsigned max_size() const { + long long signed_types = static_cast(types_); + return static_cast( + signed_types < 0 ? + -signed_types : static_cast(internal::max_packed_args)); + } }; /** 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)...) - { - } +struct format_args: basic_format_args { + 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)...) - { - } +struct wformat_args : basic_format_args { + template + wformat_args(Args && ... arg) + : basic_format_args(std::forward(arg)...) {} }; namespace internal { -template -struct named_arg_base -{ - basic_string_view name; +template +struct named_arg_base { + basic_string_view name; - // Serialized value. - mutable char data[sizeof(basic_format_arg)]; + // Serialized value. + mutable char data[sizeof(basic_format_arg)]; - named_arg_base(basic_string_view nm) - : name(nm) - { - } + named_arg_base(basic_string_view nm) : name(nm) {} - template - basic_format_arg deserialize() const - { - basic_format_arg arg; - std::memcpy(&arg, data, sizeof(basic_format_arg)); - return arg; - } + 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) {} }; -} // namespace internal +} /** \rst @@ -1406,91 +1220,145 @@ struct named_arg : named_arg_base fmt::print("Elapsed time: {s:.2f} seconds", fmt::arg("s", 1.23)); \endrst */ -template -inline internal::named_arg arg(string_view name, const T &arg) -{ - return internal::named_arg(name, arg); +template +inline internal::named_arg arg(string_view name, const T &arg) { + return internal::named_arg(name, arg); } -template -inline internal::named_arg arg(wstring_view name, const T &arg) -{ - return internal::named_arg(name, arg); +template +inline internal::named_arg arg(wstring_view name, const T &arg) { + return internal::named_arg(name, arg); } // This function template is deleted intentionally to disable nested named // arguments as in ``format("{}", arg("a", arg("b", 42)))``. -template -void arg(S, internal::named_arg) FMT_DELETED; +template +void arg(S, internal::named_arg) = delete; -#ifndef FMT_EXTENDED_COLORS -// color and (v)print_colored are deprecated. -enum color -{ - black, - red, - green, - yellow, - blue, - magenta, - cyan, - white -}; -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) -{ - vprint_colored(c, format_str, make_format_args(args...)); -} -template -inline void print_colored(color c, wstring_view format_str, const Args &... args) -{ - vprint_colored(c, format_str, make_format_args(args...)); -} -#endif +// A base class for compile-time strings. It is defined in the fmt namespace to +// make formatting functions visible via ADL, e.g. format(fmt("{}"), 42). +struct compile_string {}; -format_context::iterator vformat_to(internal::buffer &buf, string_view format_str, format_args args); -wformat_context::iterator vformat_to(internal::wbuffer &buf, wstring_view format_str, wformat_args args); - -template -struct is_contiguous : std::false_type -{ +namespace internal { +// If S is a format string type, format_string_traints::char_type gives its +// character type. +template +struct format_string_traits { + private: + // Use constructability as a way to detect if format_string_traits is + // specialized because other methods are broken on MSVC2013. + format_string_traits(); }; -template -struct is_contiguous> : std::true_type -{ -}; +template +struct format_string_traits_base { typedef Char char_type; }; -template -struct is_contiguous> : std::true_type -{ -}; +template +struct format_string_traits : format_string_traits_base {}; + +template +struct format_string_traits : format_string_traits_base {}; + +template +struct format_string_traits : format_string_traits_base {}; + +template +struct format_string_traits : format_string_traits_base {}; + +template +struct format_string_traits> : + format_string_traits_base {}; + +template +struct format_string_traits< + S, typename std::enable_if, S>::value>::type> : + format_string_traits_base {}; + +template +struct is_format_string : + std::integral_constant< + bool, std::is_constructible>::value> {}; + +template +struct is_compile_string : + std::integral_constant::value> {}; + +template +inline typename std::enable_if::value>::type + check_format_string(const S &) {} +template +typename std::enable_if::value>::type + check_format_string(S); + +template +std::basic_string vformat( + basic_string_view format_str, + basic_format_args::type> args); +} // namespace internal + +format_context::iterator vformat_to( + internal::buffer &buf, string_view format_str, format_args args); +wformat_context::iterator vformat_to( + internal::wbuffer &buf, wstring_view format_str, wformat_args args); + +template +struct is_contiguous : std::false_type {}; + +template +struct is_contiguous> : std::true_type {}; + +template +struct is_contiguous> : std::true_type {}; /** Formats a string and writes the output to ``out``. */ -template -typename std::enable_if::value, std::back_insert_iterator>::type vformat_to( - std::back_insert_iterator out, string_view format_str, format_args args) -{ - auto &container = internal::get_container(out); - internal::container_buffer buf(container); - vformat_to(buf, format_str, args); - return std::back_inserter(container); +template +typename std::enable_if< + is_contiguous::value, std::back_insert_iterator>::type + vformat_to(std::back_insert_iterator out, + string_view format_str, format_args args) { + internal::container_buffer buf(internal::get_container(out)); + vformat_to(buf, format_str, args); + return out; } -template -typename std::enable_if::value, std::back_insert_iterator>::type vformat_to( - std::back_insert_iterator out, wstring_view format_str, wformat_args args) -{ - auto &container = internal::get_container(out); - internal::container_buffer buf(container); - vformat_to(buf, format_str, args); - return std::back_inserter(container); +template +typename std::enable_if< + is_contiguous::value, std::back_insert_iterator>::type + vformat_to(std::back_insert_iterator out, + wstring_view format_str, wformat_args args) { + internal::container_buffer buf(internal::get_container(out)); + vformat_to(buf, format_str, args); + return out; } -std::string vformat(string_view format_str, format_args args); -std::wstring vformat(wstring_view format_str, wformat_args args); +template +inline typename std::enable_if< + is_contiguous::value, std::back_insert_iterator>::type + format_to(std::back_insert_iterator out, + string_view format_str, const Args & ... args) { + format_arg_store as{args...}; + return vformat_to(out, format_str, as); +} + +template +inline typename std::enable_if< + is_contiguous::value, std::back_insert_iterator>::type + format_to(std::back_insert_iterator out, + wstring_view format_str, const Args & ... args) { + return vformat_to(out, format_str, + make_format_args(args...)); +} + +template < + typename String, + typename Char = typename internal::format_string_traits::char_type> +inline std::basic_string vformat( + const String &format_str, + basic_format_args::type> args) { + // Convert format string to string_view to reduce the number of overloads. + return internal::vformat(basic_string_view(format_str), args); +} /** \rst @@ -1502,20 +1370,20 @@ std::wstring vformat(wstring_view format_str, wformat_args args); std::string message = fmt::format("The answer is {}", 42); \endrst */ -template -inline std::string format(string_view format_str, const Args &... args) -{ - // This should be just - // return vformat(format_str, make_format_args(args...)); - // but gcc has trouble optimizing the latter, so break it down. - format_arg_store as{args...}; - return vformat(format_str, as); -} -template -inline std::wstring format(wstring_view format_str, const Args &... args) -{ - format_arg_store as{args...}; - return vformat(format_str, as); +template +inline std::basic_string< + typename internal::format_string_traits::char_type> + format(const String &format_str, const Args & ... args) { + internal::check_format_string(format_str); + // This should be just + // return vformat(format_str, make_format_args(args...)); + // but gcc has trouble optimizing the latter, so break it down. + typedef typename internal::format_string_traits::char_type char_t; + typedef typename buffer_context::type context_t; + format_arg_store as{args...}; + return internal::vformat( + basic_string_view(format_str), + basic_format_args(as)); } FMT_API void vprint(std::FILE *f, string_view format_str, format_args args); @@ -1530,22 +1398,20 @@ FMT_API void vprint(std::FILE *f, wstring_view format_str, wformat_args args); fmt::print(stderr, "Don't {}!", "panic"); \endrst */ -template -inline void print(std::FILE *f, string_view format_str, const Args &... args) -{ - format_arg_store as(args...); - vprint(f, format_str, as); +template +inline void print(std::FILE *f, string_view format_str, const Args & ... args) { + format_arg_store as(args...); + vprint(f, format_str, as); } /** Prints formatted data to the file *f* which should be in wide-oriented mode - set - via ``fwide(f, 1)`` or ``_setmode(_fileno(f), _O_U8TEXT)`` on Windows. + set via ``fwide(f, 1)`` or ``_setmode(_fileno(f), _O_U8TEXT)`` on Windows. */ -template -inline void print(std::FILE *f, wstring_view format_str, const Args &... args) -{ - format_arg_store as(args...); - vprint(f, format_str, as); +template +inline void print(std::FILE *f, wstring_view format_str, + const Args & ... args) { + format_arg_store as(args...); + vprint(f, format_str, as); } FMT_API void vprint(string_view format_str, format_args args); @@ -1560,19 +1426,17 @@ FMT_API void vprint(wstring_view format_str, wformat_args args); fmt::print("Elapsed time: {0:.2f} seconds", 1.23); \endrst */ -template -inline void print(string_view format_str, const Args &... args) -{ - format_arg_store as{args...}; - vprint(format_str, as); +template +inline void print(string_view format_str, const Args & ... args) { + format_arg_store as{args...}; + vprint(format_str, as); } -template -inline void print(wstring_view format_str, const Args &... args) -{ - format_arg_store as(args...); - vprint(format_str, as); +template +inline void print(wstring_view format_str, const Args & ... args) { + format_arg_store as(args...); + vprint(format_str, as); } FMT_END_NAMESPACE -#endif // FMT_CORE_H_ +#endif // FMT_CORE_H_ diff --git a/include/spdlog/fmt/bundled/format-inl.h b/include/spdlog/fmt/bundled/format-inl.h index 1aba8c6e..56c4d581 100644 --- a/include/spdlog/fmt/bundled/format-inl.h +++ b/include/spdlog/fmt/bundled/format-inl.h @@ -17,52 +17,49 @@ #include #include #include -#include // for std::ptrdiff_t -#include - -#if defined(_WIN32) && defined(__MINGW32__) -#include +#include // for std::ptrdiff_t +#include // for std::memmove +#if !defined(FMT_STATIC_THOUSANDS_SEPARATOR) +# 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 *, ...) -{ - return fmt::internal::null<>(); +inline fmt::internal::null<> strerror_r(int, char *, ...) { + return fmt::internal::null<>(); } -inline fmt::internal::null<> strerror_s(char *, std::size_t, ...) -{ - return fmt::internal::null<>(); +inline fmt::internal::null<> strerror_s(char *, std::size_t, ...) { + return fmt::internal::null<>(); } FMT_BEGIN_NAMESPACE @@ -70,23 +67,22 @@ FMT_BEGIN_NAMESPACE namespace { #ifndef _MSC_VER -#define FMT_SNPRINTF snprintf -#else // _MSC_VER -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 snprintf +#else // _MSC_VER +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 -#endif // _MSC_VER +# 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 +# define FMT_SWPRINTF swprintf #endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT) typedef void (*FormatFunc)(internal::buffer &, int, string_view); @@ -100,479 +96,771 @@ 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 -{ - FMT_ASSERT(buffer != FMT_NULL && buffer_size != 0, "invalid buffer"); +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_; - std::size_t buffer_size_; + class dispatcher { + private: + int error_code_; + char *&buffer_; + std::size_t buffer_size_; - // A noop assignment operator to avoid bogus warnings. - void operator=(const dispatcher &) {} + // A noop assignment operator to avoid bogus warnings. + void operator=(const dispatcher &) {} - // Handle the result of XSI-compliant version of strerror_r. - int handle(int result) - { - // glibc versions before 2.13 return result in errno. - return result == -1 ? errno : result; - } + // Handle the result of XSI-compliant version of strerror_r. + int handle(int result) { + // glibc versions before 2.13 return result in errno. + return result == -1 ? errno : result; + } - // Handle the result of GNU-specific version of strerror_r. - 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; - buffer_ = message; - return 0; - } + // Handle the result of GNU-specific version of strerror_r. + 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; + buffer_ = message; + return 0; + } - // Handle the case when strerror_r is not available. - int handle(internal::null<>) - { - return fallback(strerror_s(buffer_, buffer_size_, error_code_)); - } + // Handle the case when strerror_r is not available. + int handle(internal::null<>) { + return fallback(strerror_s(buffer_, buffer_size_, error_code_)); + } - // 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; - } + // 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; + } - // Fallback to strerror if strerror_r and strerror_s are not available. - int fallback(internal::null<>) - { - errno = 0; - buffer_ = strerror(error_code_); - return errno; - } + // Fallback to strerror if strerror_r and strerror_s are not available. + int fallback(internal::null<>) { + errno = 0; + buffer_ = strerror(error_code_); + return errno; + } - public: - dispatcher(int err_code, char *&buf, std::size_t buf_size) - : error_code_(err_code) - , buffer_(buf) - , buffer_size_(buf_size) - { - } + public: + 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_)); - } - }; - return dispatcher(error_code, buffer, buffer_size).run(); + 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, 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 - // bad_alloc. - out.resize(0); - static const char SEP[] = ": "; - static const char ERROR_STR[] = "error "; - // Subtract 2 to account for terminating null characters in SEP and ERROR_STR. - std::size_t error_code_size = sizeof(SEP) + sizeof(ERROR_STR) - 2; - typedef internal::int_traits::main_type main_type; - main_type abs_value = static_cast(error_code); - if (internal::is_negative(error_code)) - { - abs_value = 0 - abs_value; - ++error_code_size; - } - error_code_size += internal::count_digits(abs_value); - writer w(out); - if (message.size() <= inline_buffer_size - error_code_size) - { - w.write(message); - w.write(SEP); - } - w.write(ERROR_STR); - w.write(error_code); - assert(out.size() <= inline_buffer_size); +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 + // bad_alloc. + out.resize(0); + static const char SEP[] = ": "; + static const char ERROR_STR[] = "error "; + // Subtract 2 to account for terminating null characters in SEP and ERROR_STR. + std::size_t error_code_size = sizeof(SEP) + sizeof(ERROR_STR) - 2; + typedef internal::int_traits::main_type main_type; + main_type abs_value = static_cast(error_code); + if (internal::is_negative(error_code)) { + abs_value = 0 - abs_value; + ++error_code_size; + } + error_code_size += internal::count_digits(abs_value); + writer w(out); + if (message.size() <= inline_buffer_size - error_code_size) { + w.write(message); + w.write(SEP); + } + w.write(ERROR_STR); + w.write(error_code); + assert(out.size() <= inline_buffer_size); } -void report_error(FormatFunc func, int error_code, string_view message) FMT_NOEXCEPT -{ - memory_buffer full_message; - func(full_message, error_code, message); - // Use Writer::data instead of Writer::c_str to avoid potential memory - // allocation. - std::fwrite(full_message.data(), full_message.size(), 1, stderr); - std::fputc('\n', stderr); +void report_error(FormatFunc func, int error_code, + string_view message) FMT_NOEXCEPT { + memory_buffer full_message; + func(full_message, error_code, message); + // Use Writer::data instead of Writer::c_str to avoid potential memory + // allocation. + std::fwrite(full_message.data(), full_message.size(), 1, stderr); + std::fputc('\n', stderr); } -} // namespace +} // namespace -class locale -{ -private: - std::locale locale_; +#if !defined(FMT_STATIC_THOUSANDS_SEPARATOR) +class locale { + private: + std::locale locale_; -public: - explicit locale(std::locale loc = std::locale()) - : locale_(loc) - { - } - std::locale get() - { - return locale_; - } + public: + explicit locale(std::locale loc = std::locale()) : locale_(loc) {} + std::locale get() { return locale_; } }; -template -FMT_FUNC Char internal::thousands_sep(locale_provider *lp) -{ - std::locale loc = lp ? lp->locale().get() : std::locale(); - return std::use_facet>(loc).thousands_sep(); +FMT_FUNC size_t internal::count_code_points(u8string_view s) { + const char8_t *data = s.data(); + int num_code_points = 0; + for (size_t i = 0, size = s.size(); i != size; ++i) { + if ((data[i].value & 0xc0) != 0x80) + ++num_code_points; + } + return num_code_points; } -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; - base = std::runtime_error(to_string(buffer)); +template +FMT_FUNC Char internal::thousands_sep(locale_provider *lp) { + std::locale loc = lp ? lp->locale().get() : std::locale(); + return std::use_facet>(loc).thousands_sep(); +} +#else +template +FMT_FUNC Char internal::thousands_sep(locale_provider *lp) { + return FMT_STATIC_THOUSANDS_SEPARATOR; +} +#endif + +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; + base = std::runtime_error(to_string(buffer)); } namespace internal { -template -int char_traits::format_float(char *buffer, std::size_t size, const char *format, int precision, T value) -{ - return precision < 0 ? FMT_SNPRINTF(buffer, size, format, value) : FMT_SNPRINTF(buffer, size, format, precision, value); +template +int char_traits::format_float( + char *buffer, std::size_t size, const char *format, int precision, T value) { + return precision < 0 ? + FMT_SNPRINTF(buffer, size, format, value) : + FMT_SNPRINTF(buffer, size, format, precision, value); } -template -int char_traits::format_float(wchar_t *buffer, std::size_t size, const wchar_t *format, int precision, T value) -{ - return precision < 0 ? FMT_SWPRINTF(buffer, size, format, value) : FMT_SWPRINTF(buffer, size, format, precision, value); +template +int char_traits::format_float( + wchar_t *buffer, std::size_t size, const wchar_t *format, int precision, + T value) { + return precision < 0 ? + FMT_SWPRINTF(buffer, size, format, value) : + FMT_SWPRINTF(buffer, size, format, precision, value); } -template -const char basic_data::DIGITS[] = "0001020304050607080910111213141516171819" - "2021222324252627282930313233343536373839" - "4041424344454647484950515253545556575859" - "6061626364656667686970717273747576777879" - "8081828384858687888990919293949596979899"; +template +const char basic_data::DIGITS[] = + "0001020304050607080910111213141516171819" + "2021222324252627282930313233343536373839" + "4041424344454647484950515253545556575859" + "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[] = {0, FMT_POWERS_OF_10(1)}; +template +const uint32_t basic_data::POWERS_OF_10_32[] = { + 1, FMT_POWERS_OF_10(1) +}; -template -const uint64_t basic_data::POWERS_OF_10_64[] = {0, FMT_POWERS_OF_10(1), FMT_POWERS_OF_10(1000000000ull), 10000000000000000000ull}; +template +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 +}; // 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}; +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, +}; // 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}; +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 +}; -template -const char basic_data::RESET_COLOR[] = "\x1b[0m"; -template -const wchar_t basic_data::WRESET_COLOR[] = L"\x1b[0m"; +template const char basic_data::RESET_COLOR[] = "\x1b[0m"; +template const wchar_t basic_data::WRESET_COLOR[] = L"\x1b[0m"; -FMT_FUNC fp operator*(fp x, fp y) -{ - // Multiply 32-bit parts of significands. - uint64_t mask = (1ULL << 32) - 1; - uint64_t a = x.f >> 32, b = x.f & mask; - uint64_t c = y.f >> 32, d = y.f & mask; - uint64_t ac = a * c, bc = b * c, ad = a * d, bd = b * d; - // Compute mid 64-bit of result and round. - uint64_t mid = (bd >> 32) + (ad & mask) + (bc & mask) + (1U << 31); - return fp(ac + (ad >> 32) + (bc >> 32) + (mid >> 32), x.e + y.e + 64); -} +// A handmade floating-point number f * pow(2, e). +class fp { + private: + typedef uint64_t significand_type; -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)); - // Decimal exponent of the first (smallest) cached power of 10. - const int first_dec_exp = -348; - // Difference between two consecutive decimal exponents in cached powers of - // 10. - const int dec_exp_step = 8; - index = (index - first_dec_exp - 1) / dec_exp_step + 1; - pow10_exponent = first_dec_exp + index * dec_exp_step; - return fp(data::POW10_SIGNIFICANDS[index], data::POW10_EXPONENTS[index]); -} -} // namespace internal + // All sizes are in bits. + static FMT_CONSTEXPR_DECL const int char_size = + 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; + static FMT_CONSTEXPR_DECL const uint64_t implicit_bit = + 1ull << double_significand_size; -#if FMT_USE_WINDOWS_H + public: + significand_type f; + int e; -FMT_FUNC internal::utf8_to_utf16::utf8_to_utf16(string_view s) -{ - static const char ERROR_MSG[] = "cannot convert string from UTF-8 to UTF-16"; - if (s.size() > INT_MAX) - FMT_THROW(windows_error(ERROR_INVALID_PARAMETER, ERROR_MSG)); - int s_size = static_cast(s.size()); - if (s_size == 0) - { - // MultiByteToWideChar does not support zero length, handle separately. - buffer_.resize(1); - buffer_[0] = 0; - return; + static FMT_CONSTEXPR_DECL const int significand_size = + sizeof(significand_type) * char_size; + + fp(): f(0), e(0) {} + fp(uint64_t f, int e): f(f), e(e) {} + + // 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) { + // 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 + 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; + auto u = bit_cast(d); + auto biased_e = (u & exponent_mask) >> double_significand_size; + f = u & significand_mask; + if (biased_e != 0) + f += implicit_bit; + else + biased_e = 1; // Subnormals use biased exponent 1 (min exponent). + e = static_cast(biased_e - exponent_bias - double_significand_size); + } + + // Normalizes the value converted from double and multiplied by (1 << SHIFT). + template + void normalize() { + // Handle subnormals. + auto shifted_implicit_bit = implicit_bit << SHIFT; + while ((f & shifted_implicit_bit) == 0) { + f <<= 1; + --e; } + // Subtract 1 to account for hidden bit. + auto offset = significand_size - double_significand_size - SHIFT - 1; + f <<= offset; + e -= offset; + } - 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)); - buffer_[length] = 0; + // Compute lower and upper boundaries (m^- and m^+ in the Grisu paper), where + // 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); + 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; + lower.e = upper.e; + } +}; + +// Returns an fp number representing x - y. Result may not be normalized. +inline fp operator-(fp x, fp y) { + FMT_ASSERT(x.f >= y.f && x.e == y.e, "invalid operands"); + return fp(x.f - y.f, x.e); } -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")); +// 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. +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_FUNC fp operator*(fp x, fp y) { + // Multiply 32-bit parts of significands. + uint64_t mask = (1ULL << 32) - 1; + uint64_t a = x.f >> 32, b = x.f & mask; + uint64_t c = y.f >> 32, d = y.f & mask; + uint64_t ac = a * c, bc = b * c, ad = a * d, bd = b * d; + // Compute mid 64-bit of result and round. + uint64_t mid = (bd >> 32) + (ad & mask) + (bc & mask) + (1U << 31); + 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) { + 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)); + // 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. + const int dec_exp_step = 8; + index = (index - first_dec_exp - 1) / dec_exp_step + 1; + pow10_exponent = first_dec_exp + index * dec_exp_step; + return fp(data::POW10_SIGNIFICANDS[index], data::POW10_EXPONENTS[index]); +} + +// Generates output using Grisu2 digit-gen algorithm. +FMT_FUNC void grisu2_gen_digits( + const fp &scaled_value, const fp &scaled_upper, uint64_t delta, + char *buffer, size_t &size, int &dec_exp) { + internal::fp one(1ull << -scaled_upper.e, scaled_upper.e); + // hi (p1 in Grisu) contains the most significant digits of scaled_upper. + // hi = floor(scaled_upper / one). + uint32_t hi = static_cast(scaled_upper.f >> -one.e); + // lo (p2 in Grisu) contains the least significants digits of scaled_upper. + // lo = scaled_upper mod 1. + uint64_t lo = scaled_upper.f & (one.f - 1); + size = 0; + auto exp = count_digits(hi); // kappa in Grisu. + 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; + default: + FMT_ASSERT(false, "invalid number of digits"); } -} - -FMT_FUNC int internal::utf16_to_utf8::convert(wstring_view s) -{ - 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. - buffer_.resize(1); - buffer_[0] = 0; - return 0; + if (digit != 0 || size != 0) + buffer[size++] = static_cast('0' + digit); + --exp; + uint64_t remainder = (static_cast(hi) << -one.e) + lo; + if (remainder <= delta) { + dec_exp += exp; + // TODO: use scaled_value + (void)scaled_value; + return; } - - 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(); - buffer_[length] = 0; - return 0; -} - -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; - 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_TRY - { - wmemory_buffer buf; - buf.resize(inline_buffer_size); - for (;;) - { - 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); - if (result != 0) - { - utf16_to_utf8 utf8_message; - if (utf8_message.convert(system_message) == ERROR_SUCCESS) - { - writer w(out); - w.write(message); - w.write(": "); - w.write(utf8_message); - return; - } - break; - } - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - break; // Can't get error message, report error code instead. - buf.resize(buf.size() * 2); - } + } + for (;;) { + lo *= 10; + delta *= 10; + char digit = static_cast(lo >> -one.e); + if (digit != 0 || size != 0) + buffer[size++] = static_cast('0' + digit); + lo &= one.f - 1; + --exp; + if (lo < delta) { + dec_exp += exp; + return; } - FMT_CATCH(...) {} - format_error_code(out, error_code, message); + } } -#endif // FMT_USE_WINDOWS_H +FMT_FUNC void grisu2_format_positive(double value, char *buffer, size_t &size, + int &dec_exp) { + FMT_ASSERT(value > 0, "value is nonpositive"); + fp fp_value(value); + fp lower, upper; // w^- and w^+ in the Grisu paper. + fp_value.compute_boundaries(lower, upper); + // Find a cached power of 10 close to 1 / upper. + const int min_exp = -60; // alpha in Grisu. + auto dec_pow = get_cached_power( // \tilde{c}_{-k} in Grisu. + min_exp - (upper.e + fp::significand_size), dec_exp); + dec_exp = -dec_exp; + fp_value.normalize(); + fp scaled_value = fp_value * dec_pow; + fp scaled_lower = lower * dec_pow; // \tilde{M}^- in Grisu. + fp scaled_upper = upper * dec_pow; // \tilde{M}^+ in Grisu. + ++scaled_lower.f; // \tilde{M}^- + 1 ulp -> M^-_{\uparrow}. + --scaled_upper.f; // \tilde{M}^+ - 1 ulp -> M^+_{\downarrow}. + uint64_t delta = scaled_upper.f - scaled_lower.f; + grisu2_gen_digits(scaled_value, scaled_upper, delta, buffer, size, dec_exp); +} -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]; - int result = safe_strerror(error_code, system_message, buf.size()); - if (result == 0) - { - writer w(out); - w.write(message); - w.write(": "); - w.write(system_message); - return; - } - if (result != ERANGE) - break; // Can't get error message, report error code instead. - buf.resize(buf.size() * 2); - } +FMT_FUNC void round(char *buffer, size_t &size, int &exp, + int digits_to_remove) { + size -= to_unsigned(digits_to_remove); + exp += digits_to_remove; + int digit = buffer[size] - '0'; + // TODO: proper rounding and carry + if (digit > 5 || (digit == 5 && (digits_to_remove > 1 || + (buffer[size - 1] - '0') % 2) != 0)) { + ++buffer[size - 1]; + } +} + +// Writes the exponent exp in the form "[+-]d{1,3}" to buffer. +FMT_FUNC char *write_exponent(char *buffer, int exp) { + FMT_ASSERT(-1000 < exp && exp < 1000, "exponent out of range"); + if (exp < 0) { + *buffer++ = '-'; + exp = -exp; + } else { + *buffer++ = '+'; + } + if (exp >= 100) { + *buffer++ = static_cast('0' + exp / 100); + exp %= 100; + const char *d = data::DIGITS + exp * 2; + *buffer++ = d[0]; + *buffer++ = d[1]; + } else { + const char *d = data::DIGITS + exp * 2; + *buffer++ = d[0]; + *buffer++ = d[1]; + } + return buffer; +} + +FMT_FUNC void format_exp_notation( + char *buffer, size_t &size, int exp, int precision, bool upper) { + // Insert a decimal point after the first digit and add an exponent. + std::memmove(buffer + 2, buffer + 1, size - 1); + buffer[1] = '.'; + exp += static_cast(size) - 1; + int num_digits = precision - static_cast(size) + 1; + if (num_digits > 0) { + std::uninitialized_fill_n(buffer + size + 1, num_digits, '0'); + size += to_unsigned(num_digits); + } else if (num_digits < 0) { + round(buffer, size, exp, -num_digits); + } + char *p = buffer + size + 1; + *p++ = upper ? 'E' : 'e'; + size = to_unsigned(write_exponent(p, exp) - buffer); +} + +// Prettifies the output of the Grisu2 algorithm. +// The number is given as v = buffer * 10^exp. +FMT_FUNC void grisu2_prettify(char *buffer, size_t &size, int exp, + int precision, bool upper) { + // pow(10, full_exp - 1) <= v <= pow(10, full_exp). + int int_size = static_cast(size); + int full_exp = int_size + exp; + const int exp_threshold = 21; + if (int_size <= full_exp && full_exp <= exp_threshold) { + // 1234e7 -> 12340000000[.0+] + std::uninitialized_fill_n(buffer + int_size, full_exp - int_size, '0'); + char *p = buffer + full_exp; + if (precision > 0) { + *p++ = '.'; + std::uninitialized_fill_n(p, precision, '0'); + p += precision; } - FMT_CATCH(...) {} - format_error_code(out, error_code, message); + size = to_unsigned(p - buffer); + } else if (0 < full_exp && full_exp <= exp_threshold) { + // 1234e-2 -> 12.34[0+] + int fractional_size = -exp; + std::memmove(buffer + full_exp + 1, buffer + full_exp, + to_unsigned(fractional_size)); + buffer[full_exp] = '.'; + int num_zeros = precision - fractional_size; + if (num_zeros > 0) { + std::uninitialized_fill_n(buffer + size + 1, num_zeros, '0'); + size += to_unsigned(num_zeros); + } + ++size; + } else if (-6 < full_exp && full_exp <= 0) { + // 1234e-6 -> 0.001234 + int offset = 2 - full_exp; + std::memmove(buffer + offset, buffer, size); + buffer[0] = '0'; + buffer[1] = '.'; + std::uninitialized_fill_n(buffer + 2, -full_exp, '0'); + size = to_unsigned(int_size + offset); + } else { + format_exp_notation(buffer, size, exp, precision, upper); + } } -template -void basic_fixed_buffer::grow(std::size_t) -{ - FMT_THROW(std::runtime_error("buffer overflow")); -} - -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 -{ - 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 -{ - report_error(internal::format_windows_error, error_code, message); -} -#endif - -FMT_FUNC void vprint(std::FILE *f, string_view format_str, format_args args) -{ - memory_buffer buffer; - vformat_to(buffer, format_str, args); - std::fwrite(buffer.data(), 1, buffer.size(), f); -} - -FMT_FUNC void vprint(std::FILE *f, wstring_view format_str, wformat_args args) -{ - wmemory_buffer buffer; - vformat_to(buffer, format_str, args); - std::fwrite(buffer.data(), sizeof(wchar_t), buffer.size(), f); -} - -FMT_FUNC void vprint(string_view format_str, format_args args) -{ - vprint(stdout, format_str, args); -} - -FMT_FUNC void vprint(wstring_view format_str, wformat_args args) -{ - vprint(stdout, format_str, args); -} - -#ifndef FMT_EXTENDED_COLORS -FMT_FUNC void vprint_colored(color c, string_view format, format_args args) -{ - char escape[] = "\x1b[30m"; - escape[3] = static_cast('0' + c); - std::fputs(escape, stdout); - vprint(format, args); - std::fputs(internal::data::RESET_COLOR, stdout); -} - -FMT_FUNC void vprint_colored(color c, wstring_view format, wformat_args args) -{ - wchar_t escape[] = L"\x1b[30m"; - escape[3] = static_cast('0' + c); - std::fputws(escape, stdout); - vprint(format, args); - std::fputws(internal::data::WRESET_COLOR, stdout); -} +#if FMT_CLANG_VERSION +# define FMT_FALLTHROUGH [[clang::fallthrough]]; +#elif FMT_GCC_VERSION >= 700 +# define FMT_FALLTHROUGH [[gnu::fallthrough]]; #else -namespace internal { -FMT_CONSTEXPR void to_esc(uint8_t c, char out[], int offset) -{ - out[offset + 0] = static_cast('0' + c / 100); - out[offset + 1] = static_cast('0' + c / 10 % 10); - out[offset + 2] = static_cast('0' + c % 10); +# define FMT_FALLTHROUGH +#endif + +// Formats a nonnegative value using Grisu2 algorithm. Grisu2 doesn't give any +// guarantees on the shortness of the result. +FMT_FUNC void grisu2_format(double value, char *buffer, size_t &size, char type, + int precision, bool write_decimal_point) { + FMT_ASSERT(value >= 0, "value is negative"); + int dec_exp = 0; // K in Grisu. + if (value > 0) { + grisu2_format_positive(value, buffer, size, dec_exp); + } else { + *buffer = '0'; + size = 1; + } + const int default_precision = 6; + if (precision < 0) + precision = default_precision; + bool upper = false; + switch (type) { + case 'G': + upper = true; + FMT_FALLTHROUGH + case '\0': case 'g': { + int digits_to_remove = static_cast(size) - precision; + if (digits_to_remove > 0) { + round(buffer, size, dec_exp, digits_to_remove); + // Remove trailing zeros. + while (size > 0 && buffer[size - 1] == '0') { + --size; + ++dec_exp; + } + } + precision = 0; + break; + } + case 'F': + upper = true; + FMT_FALLTHROUGH + case 'f': { + int digits_to_remove = -dec_exp - precision; + if (digits_to_remove > 0) { + if (digits_to_remove >= static_cast(size)) + digits_to_remove = static_cast(size) - 1; + round(buffer, size, dec_exp, digits_to_remove); + } + break; + } + case 'e': case 'E': + format_exp_notation(buffer, size, dec_exp, precision, type == 'E'); + return; + } + if (write_decimal_point && precision < 1) + precision = 1; + grisu2_prettify(buffer, size, dec_exp, precision, upper); } -} // namespace internal +} // namespace internal -FMT_FUNC void vprint_rgb(rgb fd, string_view format, format_args args) -{ - char escape_fd[] = "\x1b[38;2;000;000;000m"; - internal::to_esc(fd.r, escape_fd, 7); - internal::to_esc(fd.g, escape_fd, 11); - internal::to_esc(fd.b, escape_fd, 15); +#if FMT_USE_WINDOWS_H - std::fputs(escape_fd, stdout); - vprint(format, args); - std::fputs(internal::data::RESET_COLOR, stdout); +FMT_FUNC internal::utf8_to_utf16::utf8_to_utf16(string_view s) { + static const char ERROR_MSG[] = "cannot convert string from UTF-8 to UTF-16"; + if (s.size() > INT_MAX) + FMT_THROW(windows_error(ERROR_INVALID_PARAMETER, ERROR_MSG)); + int s_size = static_cast(s.size()); + if (s_size == 0) { + // MultiByteToWideChar does not support zero length, handle separately. + buffer_.resize(1); + buffer_[0] = 0; + 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)); + 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)); + buffer_[length] = 0; } -FMT_FUNC void vprint_rgb(rgb fd, rgb bg, string_view format, format_args args) -{ - char escape_fd[] = "\x1b[38;2;000;000;000m"; // foreground color - char escape_bg[] = "\x1b[48;2;000;000;000m"; // background color - internal::to_esc(fd.r, escape_fd, 7); - internal::to_esc(fd.g, escape_fd, 11); - internal::to_esc(fd.b, escape_fd, 15); +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")); + } +} - internal::to_esc(bg.r, escape_bg, 7); - internal::to_esc(bg.g, escape_bg, 11); - internal::to_esc(bg.b, escape_bg, 15); +FMT_FUNC int internal::utf16_to_utf8::convert(wstring_view s) { + 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. + buffer_.resize(1); + buffer_[0] = 0; + return 0; + } - std::fputs(escape_fd, stdout); - std::fputs(escape_bg, stdout); - vprint(format, args); - std::fputs(internal::data::RESET_COLOR, stdout); + 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(); + buffer_[length] = 0; + return 0; +} + +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; + 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_TRY { + wmemory_buffer buf; + buf.resize(inline_buffer_size); + for (;;) { + 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); + if (result != 0) { + utf16_to_utf8 utf8_message; + if (utf8_message.convert(system_message) == ERROR_SUCCESS) { + writer w(out); + w.write(message); + w.write(": "); + w.write(utf8_message); + return; + } + break; + } + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + break; // Can't get error message, report error code instead. + buf.resize(buf.size() * 2); + } + } 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_TRY { + memory_buffer buf; + buf.resize(inline_buffer_size); + for (;;) { + char *system_message = &buf[0]; + int result = safe_strerror(error_code, system_message, buf.size()); + if (result == 0) { + writer w(out); + w.write(message); + w.write(": "); + w.write(system_message); + return; + } + if (result != ERANGE) + break; // Can't get error message, report error code instead. + buf.resize(buf.size() * 2); + } + } FMT_CATCH(...) {} + format_error_code(out, error_code, message); +} + +template +void basic_fixed_buffer::grow(std::size_t) { + FMT_THROW(std::runtime_error("buffer overflow")); +} + +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 { + 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 { + report_error(internal::format_windows_error, error_code, message); } #endif -FMT_FUNC locale locale_provider::locale() -{ - return fmt::locale(); +FMT_FUNC void vprint(std::FILE *f, string_view format_str, format_args args) { + memory_buffer buffer; + vformat_to(buffer, format_str, args); + std::fwrite(buffer.data(), 1, buffer.size(), f); } +FMT_FUNC void vprint(std::FILE *f, wstring_view format_str, wformat_args args) { + wmemory_buffer buffer; + vformat_to(buffer, format_str, args); + std::fwrite(buffer.data(), sizeof(wchar_t), buffer.size(), f); +} + +FMT_FUNC void vprint(string_view format_str, format_args args) { + vprint(stdout, format_str, args); +} + +FMT_FUNC void vprint(wstring_view format_str, wformat_args args) { + vprint(stdout, format_str, args); +} + +#if !defined(FMT_STATIC_THOUSANDS_SEPARATOR) +FMT_FUNC locale locale_provider::locale() { return fmt::locale(); } +#endif + FMT_END_NAMESPACE #ifdef _MSC_VER -#pragma warning(pop) +# pragma warning(pop) #endif -#endif // FMT_FORMAT_INL_H_ +#endif // FMT_FORMAT_INL_H_ diff --git a/include/spdlog/fmt/bundled/format.h b/include/spdlog/fmt/bundled/format.h index 60001f36..06ea33f2 100644 --- a/include/spdlog/fmt/bundled/format.h +++ b/include/spdlog/fmt/bundled/format.h @@ -38,195 +38,192 @@ #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 #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 implicit conversions that may change the sign of // an integer; silencing it otherwise would require many explicit casts. -#pragma GCC diagnostic ignored "-Wsign-conversion" +# pragma GCC diagnostic ignored "-Wsign-conversion" #endif +# if FMT_CLANG_VERSION +# pragma GCC diagnostic ignored "-Wgnu-string-literal-operator-template" +# 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 #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) -{ - // 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; +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; +} } -} // namespace internal FMT_END_NAMESPACE -#define FMT_THROW(x) fmt::internal::do_throw(x) -#else -#define FMT_THROW(x) throw x -#endif -#else -#define FMT_THROW(x) \ - do \ - { \ - static_cast(sizeof(x)); \ - assert(false); \ - } while (false); -#endif +# define FMT_THROW(x) fmt::internal::do_throw(x) +# else +# define FMT_THROW(x) throw x +# 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 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_ICC_VERSION >= 1500) -#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_ICC_VERSION >= 1500) +# define FMT_USE_USER_DEFINED_LITERALS 1 +# else +# define FMT_USE_USER_DEFINED_LITERALS 0 +# endif #endif -#if FMT_USE_USER_DEFINED_LITERALS && !defined(FMT_ICC_VERSION) && \ - ((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_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 +#if FMT_HAS_GXX_CXX11 || FMT_HAS_FEATURE(cxx_trailing_return) || \ + FMT_MSC_VER >= 1600 +# define FMT_USE_TRAILING_RETURN 1 #else -#define FMT_USE_TRAILING_RETURN 0 -#endif - -#if FMT_HAS_GXX_CXX11 || FMT_HAS_FEATURE(cxx_rvalue_references) || FMT_MSC_VER >= 1600 -#define FMT_USE_RVALUE_REFERENCES 1 -#else -#define FMT_USE_RVALUE_REFERENCES 0 +# define FMT_USE_TRAILING_RETURN 0 #endif #ifndef FMT_USE_GRISU -#define FMT_USE_GRISU 0 +# define FMT_USE_GRISU 0 #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 // A workaround for gcc 4.4 that doesn't support union members with ctors. -#if (FMT_GCC_VERSION && FMT_GCC_VERSION <= 404) || (FMT_MSC_VER && FMT_MSC_VER <= 1800) -#define FMT_UNION struct +#if (FMT_GCC_VERSION && FMT_GCC_VERSION <= 404) || \ + (FMT_MSC_VER && FMT_MSC_VER <= 1800) +# define FMT_UNION struct #else -#define FMT_UNION union +# define FMT_UNION union #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 -inline uint32_t clz(uint32_t x) -{ - unsigned long r = 0; - _BitScanReverse(&r, x); +# ifndef __clang__ +# pragma intrinsic(_BitScanReverse) +# endif +inline uint32_t clz(uint32_t x) { + unsigned long r = 0; + _BitScanReverse(&r, x); - 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) - return 31 - r; + 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) + 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 - _BitScanReverse64(&r, x); -#else - // Scan the high 32 bits. - if (_BitScanReverse(&r, static_cast(x >> 32))) - return 63 - (r + 32); +inline uint32_t clzll(uint64_t x) { + unsigned long r = 0; +# ifdef _WIN64 + _BitScanReverse64(&r, x); +# else + // Scan the high 32 bits. + if (_BitScanReverse(&r, static_cast(x >> 32))) + return 63 - (r + 32); - // Scan the low 32 bits. - _BitScanReverse(&r, static_cast(x)); -#endif + // Scan the low 32 bits. + _BitScanReverse(&r, static_cast(x)); +# 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) - return 63 - r; + 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) + 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 @@ -236,184 +233,71 @@ namespace internal { // An equivalent of `*reinterpret_cast(&source)` that doesn't produce // undefined behavior (e.g. due to type aliasing). // Example: uint64_t d = bit_cast(2.718); -template -inline Dest bit_cast(const Source &source) -{ - static_assert(sizeof(Dest) == sizeof(Source), "size mismatch"); - Dest dest; - std::memcpy(&dest, &source, sizeof(dest)); - return dest; +template +inline Dest bit_cast(const Source& source) { + static_assert(sizeof(Dest) == sizeof(Source), "size mismatch"); + Dest dest; + std::memcpy(&dest, &source, sizeof(dest)); + return dest; } // 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()) -{ - 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(); -} -template -FMT_CONSTEXPR T *end(T (&array)[N]) FMT_NOEXCEPT -{ - return array + N; +template +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(); } +template +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 -{ - int data[2]; - operator int() const - { - return 0; - } +struct dummy_int { + int data[2]; + operator int() const { return 0; } }; typedef std::numeric_limits fputil; // Dummy implementations of system functions such as signbit and ecvt called // if the latter are not available. -inline dummy_int signbit(...) -{ - return dummy_int(); -} -inline dummy_int _ecvt_s(...) -{ - return dummy_int(); -} -inline dummy_int isinf(...) -{ - return dummy_int(); -} -inline dummy_int _finite(...) -{ - return dummy_int(); -} -inline dummy_int isnan(...) -{ - return dummy_int(); -} -inline dummy_int _isnan(...) -{ - return dummy_int(); +inline dummy_int signbit(...) { return dummy_int(); } +inline dummy_int _ecvt_s(...) { return dummy_int(); } +inline dummy_int isinf(...) { return dummy_int(); } +inline dummy_int _finite(...) { return dummy_int(); } +inline dummy_int isnan(...) { return dummy_int(); } +inline dummy_int _isnan(...) { return dummy_int(); } + +inline bool use_grisu() { + return FMT_USE_GRISU && std::numeric_limits::is_iec559; } -// A handmade floating-point number f * pow(2, e). -class fp -{ -private: - typedef uint64_t significand_type; +// Formats value using Grisu2 algorithm: +// https://www.cs.tufts.edu/~nr/cs257/archive/florian-loitsch/printf.pdf +FMT_API void grisu2_format(double value, char *buffer, size_t &size, char type, + int precision, bool write_decimal_point); - // All sizes are in bits. - static FMT_CONSTEXPR_DECL const int char_size = 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; - static FMT_CONSTEXPR_DECL const uint64_t implicit_bit = 1ull << double_significand_size; - -public: - significand_type f; - int e; - - static FMT_CONSTEXPR_DECL const int significand_size = sizeof(significand_type) * char_size; - - fp(uint64_t f, int e) - : f(f) - , e(e) - { - } - - // 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) - { - // Assume double is in the format [sign][exponent][significand]. - typedef std::numeric_limits limits; - const int double_size = sizeof(Double) * char_size; - const int exponent_size = 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; - auto u = bit_cast(d); - auto biased_e = (u & exponent_mask) >> double_significand_size; - f = u & significand_mask; - if (biased_e != 0) - f += implicit_bit; - else - biased_e = 1; // Subnormals use biased exponent 1 (min exponent). - e = static_cast(biased_e - exponent_bias - double_significand_size); - } - - // Normalizes the value converted from double and multiplied by (1 << SHIFT). - template - void normalize() - { - // Handle subnormals. - auto shifted_implicit_bit = implicit_bit << SHIFT; - while ((f & shifted_implicit_bit) == 0) - { - f <<= 1; - --e; - } - // Subtract 1 to account for hidden bit. - auto offset = significand_size - double_significand_size - SHIFT - 1; - f <<= offset; - e -= offset; - } -}; - -// Returns an fp number representing x - y. Result may not be normalized. -inline fp operator-(fp x, fp y) -{ - FMT_ASSERT(x.f >= y.f && x.e == y.e, "invalid operands"); - return fp(x.f - y.f, x.e); -} - -// 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. -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. -fp get_cached_power(int min_exponent, int &pow10_exponent); - -template -typename Allocator::value_type *allocate(Allocator &alloc, std::size_t n) -{ +template +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); + return std::allocator_traits::allocate(alloc, n); #else - return alloc.allocate(n); + return alloc.allocate(n); #endif } // A helper function to suppress bogus "conditional expression is constant" // warnings. -template -inline T const_check(T value) -{ - return value; -} -} // namespace internal +template +inline T const_check(T value) { return value; } +} // namespace internal FMT_END_NAMESPACE namespace std { @@ -421,171 +305,165 @@ namespace std { // is used to resolve ambiguity between isinf and std::isinf in glibc: // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48891 // and the same for isnan and signbit. -template<> -class numeric_limits : public std::numeric_limits -{ -public: - // Portable version of isinf. - template - static bool isinfinity(T x) - { - using namespace fmt::internal; - // The resolution "priority" is: - // isinf macro > std::isinf > ::isinf > fmt::internal::isinf - if (const_check(sizeof(isinf(x)) != sizeof(dummy_int))) - return isinf(x) != 0; - return !_finite(static_cast(x)); - } +template <> +class numeric_limits : + public std::numeric_limits { + public: + // Portable version of isinf. + template + static bool isinfinity(T x) { + using namespace fmt::internal; + // The resolution "priority" is: + // isinf macro > std::isinf > ::isinf > fmt::internal::isinf + if (const_check(sizeof(isinf(x)) != sizeof(dummy_int))) + return isinf(x) != 0; + return !_finite(static_cast(x)); + } - // Portable version of isnan. - 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; - return _isnan(static_cast(x)) != 0; - } + // Portable version of isnan. + 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; + return _isnan(static_cast(x)) != 0; + } - // Portable version of signbit. - static bool isnegative(double x) - { - using namespace fmt::internal; - if (const_check(sizeof(signbit(x)) != sizeof(fmt::internal::dummy_int))) - return signbit(x) != 0; - if (x < 0) - return true; - if (!isnotanumber(x)) - return false; - int dec = 0, sign = 0; - char buffer[2]; // The buffer size must be >= 2 or _ecvt_s will fail. - _ecvt_s(buffer, sizeof(buffer), x, 0, &dec, &sign); - return sign != 0; - } + // Portable version of signbit. + static bool isnegative(double x) { + using namespace fmt::internal; + if (const_check(sizeof(signbit(x)) != sizeof(fmt::internal::dummy_int))) + return signbit(x) != 0; + if (x < 0) return true; + if (!isnotanumber(x)) return false; + int dec = 0, sign = 0; + char buffer[2]; // The buffer size must be >= 2 or _ecvt_s will fail. + _ecvt_s(buffer, sizeof(buffer), x, 0, &dec, &sign); + return sign != 0; + } }; -} // namespace std +} // namespace std FMT_BEGIN_NAMESPACE -template +template class basic_writer; -template -class output_range -{ -private: - OutputIt it_; +template +class output_range { + private: + OutputIt it_; - // Unused yet. - typedef void sentinel; - sentinel end() const; + // Unused yet. + typedef void sentinel; + sentinel end() const; -public: - typedef OutputIt iterator; - typedef T value_type; + public: + typedef OutputIt iterator; + typedef T value_type; - explicit output_range(OutputIt it) - : it_(it) - { - } - OutputIt begin() const - { - return 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> -{ - typedef output_range> base; +template +class back_insert_range: + public output_range> { + typedef output_range> base; + public: + typedef typename Container::value_type value_type; -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; 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) - { - } +class format_error : public std::runtime_error { + public: + 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) -{ - return {p, size}; +template +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) -{ - std::size_t new_size = size_ + internal::to_unsigned(end - begin); - reserve(new_size); - std::uninitialized_copy(begin, end, internal::make_checked(ptr_, capacity_) + size_); - size_ = new_size; +template +template +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, + internal::make_checked(ptr_, capacity_) + size_); + size_ = new_size; } -} // namespace internal +} // namespace internal + +// A UTF-8 code unit type. +struct char8_t { + char value; + FMT_CONSTEXPR explicit operator bool() const FMT_NOEXCEPT { + return value != 0; + } +}; + +// A UTF-8 string view. +class u8string_view : public basic_string_view { + private: + typedef basic_string_view base; + + public: + using basic_string_view::basic_string_view; + using basic_string_view::char_type; + + u8string_view(const char *s) + : base(reinterpret_cast(s)) {} + + u8string_view(const char *s, size_t count) FMT_NOEXCEPT + : base(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) { + return u8string_view(s, n); +} +} +#endif // A wrapper around std::locale used to reduce compile times since // is very heavy. class locale; -class locale_provider -{ -public: - virtual ~locale_provider() {} - virtual fmt::locale locale(); +class locale_provider { + public: + virtual ~locale_provider() {} + virtual fmt::locale locale(); }; // The number of characters to store in the basic_memory_buffer object itself // to avoid dynamic memory allocation. -enum -{ - inline_buffer_size = 500 -}; +enum { inline_buffer_size = 500 }; /** \rst @@ -616,106 +494,92 @@ enum The output can be converted to an ``std::string`` with ``to_string(out)``. \endrst */ -template> -class basic_memory_buffer : private Allocator, public internal::basic_buffer -{ -private: - T store_[SIZE]; +template > +class basic_memory_buffer: private Allocator, public internal::basic_buffer { + private: + T store_[SIZE]; - // Deallocate memory allocated by the buffer. - void deallocate() - { - T *data = this->data(); - if (data != store_) - Allocator::deallocate(data, this->capacity()); - } + // Deallocate memory allocated by the buffer. + void deallocate() { + T* data = this->data(); + if (data != store_) Allocator::deallocate(data, this->capacity()); + } -protected: - void grow(std::size_t size) FMT_OVERRIDE; + protected: + void grow(std::size_t size) FMT_OVERRIDE; -public: - explicit basic_memory_buffer(const Allocator &alloc = Allocator()) - : Allocator(alloc) - { - this->set(store_, SIZE); - } - ~basic_memory_buffer() - { - deallocate(); - } + public: + explicit basic_memory_buffer(const Allocator &alloc = Allocator()) + : Allocator(alloc) { + this->set(store_, SIZE); + } + ~basic_memory_buffer() { deallocate(); } -private: - // Move data from other to this buffer. - void move(basic_memory_buffer &other) - { - Allocator &this_alloc = *this, &other_alloc = other; - this_alloc = std::move(other_alloc); - T *data = other.data(); - std::size_t size = other.size(), capacity = other.capacity(); - if (data == other.store_) - { - this->set(store_, capacity); - std::uninitialized_copy(other.store_, other.store_ + size, internal::make_checked(store_, capacity)); - } - else - { - this->set(data, capacity); - // Set pointer to the inline array so that delete is not called - // when deallocating. - other.set(other.store_, 0); - } - this->resize(size); + private: + // Move data from other to this buffer. + void move(basic_memory_buffer &other) { + Allocator &this_alloc = *this, &other_alloc = other; + this_alloc = std::move(other_alloc); + T* data = other.data(); + std::size_t size = other.size(), capacity = other.capacity(); + if (data == other.store_) { + this->set(store_, capacity); + std::uninitialized_copy(other.store_, other.store_ + size, + internal::make_checked(store_, capacity)); + } else { + this->set(data, capacity); + // Set pointer to the inline array so that delete is not called + // when deallocating. + other.set(other.store_, 0); } + this->resize(size); + } -public: - /** - \rst - Constructs a :class:`fmt::basic_memory_buffer` object moving the content - of the other object to it. - \endrst - */ - basic_memory_buffer(basic_memory_buffer &&other) - { - move(other); - } + public: + /** + \rst + Constructs a :class:`fmt::basic_memory_buffer` object moving the content + of the other object to it. + \endrst + */ + 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) - { - assert(this != &other); - deallocate(); - move(other); - return *this; - } + /** + \rst + Moves the content of the other ``basic_memory_buffer`` object to this one. + \endrst + */ + basic_memory_buffer &operator=(basic_memory_buffer &&other) { + assert(this != &other); + deallocate(); + move(other); + return *this; + } - // Returns a copy of the allocator associated with this buffer. - Allocator get_allocator() const - { - return *this; - } + // Returns a copy of the allocator associated with this buffer. + Allocator get_allocator() const { return *this; } }; -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); - // 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)); - this->set(new_data, new_capacity); - // 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); +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); + // 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)); + this->set(new_data, new_capacity); + // 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); } typedef basic_memory_buffer memory_buffer; @@ -730,343 +594,290 @@ typedef basic_memory_buffer wmemory_buffer; ``std::runtime_error``. \endrst */ -template -class basic_fixed_buffer : public internal::basic_buffer -{ -public: - /** - \rst - Constructs a :class:`fmt::basic_fixed_buffer` object for *array* of the - given size. - \endrst - */ - basic_fixed_buffer(Char *array, std::size_t size) - { - this->set(array, size); - } +template +class basic_fixed_buffer : public internal::basic_buffer { + public: + /** + \rst + Constructs a :class:`fmt::basic_fixed_buffer` object for *array* of the + given size. + \endrst + */ + basic_fixed_buffer(Char *array, std::size_t size) { + this->set(array, size); + } - /** - \rst - Constructs a :class:`fmt::basic_fixed_buffer` object for *array* of the - size known at compile time. - \endrst - */ - template - explicit basic_fixed_buffer(Char (&array)[SIZE]) - { - this->set(array, SIZE); - } + /** + \rst + Constructs a :class:`fmt::basic_fixed_buffer` object for *array* of the + size known at compile time. + \endrst + */ + template + explicit basic_fixed_buffer(Char (&array)[SIZE]) { + this->set(array, SIZE); + } -protected: - FMT_API void grow(std::size_t size) FMT_OVERRIDE; + protected: + FMT_API void grow(std::size_t size) FMT_OVERRIDE; }; namespace internal { -template +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); +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); }; -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); +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); }; #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); + 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, long double value); + 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, double value); + 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, long double value); + wchar_t *buffer, std::size_t size, const wchar_t* format, int precision, + long double value); #endif -template -inline typename std::enable_if::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 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); + 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; -} +template +inline Iterator &reserve(Iterator &it, std::size_t) { return it; } -template +template class null_terminating_iterator; -template +template FMT_CONSTEXPR_DECL const Char *pointer_from(null_terminating_iterator it); // An iterator that produces a null terminator on *end. This simplifies parsing // and allows comparing the performance of processing a null-terminated string // vs string_view. -template -class null_terminating_iterator -{ -public: - typedef std::ptrdiff_t difference_type; - typedef Char value_type; - typedef const Char *pointer; - typedef const Char &reference; - typedef std::random_access_iterator_tag iterator_category; +template +class null_terminating_iterator { + public: + typedef std::ptrdiff_t difference_type; + typedef Char value_type; + typedef const Char* pointer; + typedef const Char& reference; + typedef std::random_access_iterator_tag iterator_category; - null_terminating_iterator() - : ptr_(0) - , end_(0) - { - } + null_terminating_iterator() : ptr_(0), end_(0) {} - FMT_CONSTEXPR null_terminating_iterator(const Char *ptr, const Char *end) - : ptr_(ptr) - , end_(end) - { - } + FMT_CONSTEXPR null_terminating_iterator(const Char *ptr, const Char *end) + : ptr_(ptr), end_(end) {} - template - FMT_CONSTEXPR explicit null_terminating_iterator(const Range &r) - : ptr_(r.begin()) - , end_(r.end()) - { - } + template + FMT_CONSTEXPR explicit null_terminating_iterator(const Range &r) + : ptr_(r.begin()), end_(r.end()) {} - null_terminating_iterator &operator=(const Char *ptr) - { - assert(ptr <= end_); - ptr_ = ptr; - return *this; - } + FMT_CONSTEXPR null_terminating_iterator &operator=(const Char *ptr) { + assert(ptr <= end_); + ptr_ = ptr; + return *this; + } - FMT_CONSTEXPR Char operator*() const - { - return ptr_ != end_ ? *ptr_ : 0; - } + FMT_CONSTEXPR Char operator*() const { + return ptr_ != end_ ? *ptr_ : 0; + } - FMT_CONSTEXPR null_terminating_iterator operator++() - { - ++ptr_; - return *this; - } + FMT_CONSTEXPR null_terminating_iterator operator++() { + ++ptr_; + return *this; + } - FMT_CONSTEXPR null_terminating_iterator operator++(int) - { - null_terminating_iterator result(*this); - ++ptr_; - return result; - } + FMT_CONSTEXPR null_terminating_iterator operator++(int) { + null_terminating_iterator result(*this); + ++ptr_; + return result; + } - FMT_CONSTEXPR null_terminating_iterator operator--() - { - --ptr_; - return *this; - } + FMT_CONSTEXPR null_terminating_iterator operator--() { + --ptr_; + return *this; + } - FMT_CONSTEXPR null_terminating_iterator operator+(difference_type n) - { - return null_terminating_iterator(ptr_ + n, end_); - } + FMT_CONSTEXPR null_terminating_iterator operator+(difference_type n) { + return null_terminating_iterator(ptr_ + n, end_); + } - FMT_CONSTEXPR null_terminating_iterator operator-(difference_type n) - { - return null_terminating_iterator(ptr_ - n, end_); - } + FMT_CONSTEXPR null_terminating_iterator operator-(difference_type n) { + return null_terminating_iterator(ptr_ - n, end_); + } - FMT_CONSTEXPR null_terminating_iterator operator+=(difference_type n) - { - ptr_ += n; - return *this; - } + FMT_CONSTEXPR null_terminating_iterator operator+=(difference_type n) { + ptr_ += n; + return *this; + } - FMT_CONSTEXPR difference_type operator-(null_terminating_iterator other) const - { - return ptr_ - other.ptr_; - } + FMT_CONSTEXPR difference_type operator-( + null_terminating_iterator other) const { + return ptr_ - other.ptr_; + } - FMT_CONSTEXPR bool operator!=(null_terminating_iterator other) const - { - return ptr_ != other.ptr_; - } + FMT_CONSTEXPR bool operator!=(null_terminating_iterator other) const { + return ptr_ != other.ptr_; + } - bool operator>=(null_terminating_iterator other) const - { - return ptr_ >= other.ptr_; - } + bool operator>=(null_terminating_iterator other) const { + return ptr_ >= other.ptr_; + } - // This should be a friend specialization pointer_from but the latter - // doesn't compile by gcc 5.1 due to a compiler bug. - template - friend FMT_CONSTEXPR_DECL const CharT *pointer_from(null_terminating_iterator it); + // This should be a friend specialization pointer_from but the latter + // doesn't compile by gcc 5.1 due to a compiler bug. + template + friend FMT_CONSTEXPR_DECL const CharT *pointer_from( + null_terminating_iterator it); -private: - const Char *ptr_; - const Char *end_; + private: + const Char *ptr_; + const Char *end_; }; -template -FMT_CONSTEXPR const T *pointer_from(const T *p) -{ - return p; -} +template +FMT_CONSTEXPR const T *pointer_from(const T *p) { return p; } -template -FMT_CONSTEXPR const Char *pointer_from(null_terminating_iterator it) -{ - return it.ptr_; +template +FMT_CONSTEXPR const Char *pointer_from(null_terminating_iterator it) { + return it.ptr_; } // An output iterator that counts the number of objects written to it and // discards them. -template -class counting_iterator -{ -private: - std::size_t count_; - mutable T blackhole_; +template +class counting_iterator { + private: + std::size_t count_; + mutable T blackhole_; -public: - typedef std::output_iterator_tag iterator_category; - typedef T value_type; - typedef std::ptrdiff_t difference_type; - typedef T *pointer; - typedef T &reference; - typedef counting_iterator _Unchecked_type; // Mark iterator as checked. + public: + typedef std::output_iterator_tag iterator_category; + typedef T value_type; + typedef std::ptrdiff_t difference_type; + typedef T* pointer; + 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_; - } + std::size_t count() const { return count_; } - counting_iterator &operator++() - { - ++count_; - return *this; - } + counting_iterator& operator++() { + ++count_; + return *this; + } - counting_iterator operator++(int) - { - auto it = *this; - ++*this; - return it; - } + counting_iterator operator++(int) { + auto it = *this; + ++*this; + return it; + } - T &operator*() const - { - return blackhole_; - } + T &operator*() const { return blackhole_; } }; // An output iterator that truncates the output and counts the number of objects // written to it. -template -class truncating_iterator -{ -private: - typedef std::iterator_traits traits; +template +class truncating_iterator { + private: + typedef std::iterator_traits traits; - OutputIt out_; - std::size_t limit_; - std::size_t count_; - mutable typename traits::value_type blackhole_; + OutputIt out_; + std::size_t limit_; + std::size_t count_; + mutable typename traits::value_type blackhole_; -public: - typedef std::output_iterator_tag iterator_category; - typedef typename traits::value_type value_type; - typedef typename traits::difference_type difference_type; - typedef typename traits::pointer pointer; - typedef typename traits::reference reference; - typedef truncating_iterator _Unchecked_type; // Mark iterator as checked. + public: + typedef std::output_iterator_tag iterator_category; + typedef typename traits::value_type value_type; + typedef typename traits::difference_type difference_type; + typedef typename traits::pointer pointer; + typedef typename traits::reference reference; + typedef truncating_iterator _Unchecked_type; // Mark iterator as checked. - truncating_iterator(OutputIt out, std::size_t limit) - : out_(out) - , limit_(limit) - , count_(0) - { - } + truncating_iterator(OutputIt out, std::size_t limit) + : out_(out), limit_(limit), count_(0) {} - OutputIt base() const - { - return out_; - } - std::size_t count() const - { - return count_; - } + OutputIt base() const { return out_; } + std::size_t count() const { return count_; } - truncating_iterator &operator++() - { - if (count_++ < limit_) - ++out_; - return *this; - } + truncating_iterator& operator++() { + if (count_++ < limit_) + ++out_; + return *this; + } - truncating_iterator operator++(int) - { - auto it = *this; - ++*this; - return it; - } + truncating_iterator operator++(int) { + auto it = *this; + ++*this; + return it; + } - reference operator*() const - { - return count_ < limit_ ? *out_ : blackhole_; - } + reference operator*() const { return count_ < limit_ ? *out_ : blackhole_; } }; // 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::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 value) { + return value < 0; } -template -FMT_CONSTEXPR typename std::enable_if::is_signed, bool>::type is_negative(T) -{ - return false; +template +FMT_CONSTEXPR typename std::enable_if< + !std::numeric_limits::is_signed, bool>::type is_negative(T) { + return false; } -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::digits <= 32, uint32_t, uint64_t>::type main_type; +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; }; // Static data is placed in this class template to allow header-only // configuration. -template -struct FMT_API basic_data -{ - static const uint32_t POWERS_OF_10_32[]; - static const uint64_t POWERS_OF_10_64[]; - static const uint64_t POW10_SIGNIFICANDS[]; - static const int16_t POW10_EXPONENTS[]; - static const char DIGITS[]; - static const char RESET_COLOR[]; - static const wchar_t WRESET_COLOR[]; +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[]; + static const uint64_t POW10_SIGNIFICANDS[]; + static const int16_t POW10_EXPONENTS[]; + static const char DIGITS[]; + static const char RESET_COLOR[]; + static const wchar_t WRESET_COLOR[]; }; #if FMT_USE_EXTERN_TEMPLATES @@ -1078,254 +889,224 @@ typedef basic_data<> data; #ifdef FMT_BUILTIN_CLZLL // Returns the number of decimal digits in n. Leading zeros are not counted // except for n == 0 in which case count_digits returns 1. -inline unsigned count_digits(uint64_t n) -{ - // Based on http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog10 - // and the benchmark https://github.com/localvoid/cxx-benchmark-count-digits. - int t = (64 - FMT_BUILTIN_CLZLL(n | 1)) * 1233 >> 12; - return to_unsigned(t) - (n < data::POWERS_OF_10_64[t]) + 1; +inline unsigned count_digits(uint64_t n) { + // Based on http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog10 + // and the benchmark https://github.com/localvoid/cxx-benchmark-count-digits. + int t = (64 - FMT_BUILTIN_CLZLL(n | 1)) * 1233 >> 12; + return to_unsigned(t) - (n < data::ZERO_OR_POWERS_OF_10_64[t]) + 1; } #else // Fallback version of count_digits used when __builtin_clz is not available. -inline unsigned count_digits(uint64_t n) -{ - unsigned count = 1; - for (;;) - { - // Integer division is slow so do it for a group of four digits instead - // of for every digit. The idea comes from the talk by Alexandrescu - // "Three Optimization Tips for C++". See speed-test for a comparison. - if (n < 10) - return count; - if (n < 100) - return count + 1; - if (n < 1000) - return count + 2; - if (n < 10000) - return count + 3; - n /= 10000u; - count += 4; - } +inline unsigned count_digits(uint64_t n) { + unsigned count = 1; + for (;;) { + // Integer division is slow so do it for a group of four digits instead + // of for every digit. The idea comes from the talk by Alexandrescu + // "Three Optimization Tips for C++". See speed-test for a comparison. + if (n < 10) return count; + if (n < 100) return count + 1; + if (n < 1000) return count + 2; + if (n < 10000) return count + 3; + n /= 10000u; + count += 4; + } } #endif +// Counts the number of code points in a UTF-8 string. +FMT_API size_t count_code_points(u8string_view s); + #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 +template 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) -{ - 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) : h.template on<3>(n) - : n < 100000 ? h.template on<4>(n) : h.template on<5>(n) - : n < 100000000 ? n < 10000000 ? h.template on<6>(n) : h.template on<7>(n) - : n < 1000000000 ? h.template on<8>(n) : h.template on<9>(n); +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) + : h.template on<3>(n) + : n < 100000 ? h.template on<4>(n) + : h.template on<5>(n) + : n < 100000000 ? n < 10000000 ? h.template on<6>(n) + : h.template on<7>(n) + : n < 1000000000 ? h.template on<8>(n) + : h.template on<9>(n); } // An lg handler that formats a decimal number. // Usage: lg(n, decimal_formatter(buffer)); -class decimal_formatter -{ -private: - char *buffer_; +class decimal_formatter { + private: + char *buffer_; - void write_pair(unsigned N, uint32_t index) - { - std::memcpy(buffer_ + N, data::DIGITS + index * 2, 2); - } + 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) - { - } + public: + explicit decimal_formatter(char *buf) : buffer_(buf) {} - template - char *on(uint32_t u) - { - if (N == 0) - { - *buffer_ = static_cast(u) + '0'; - } - else if (N == 1) - { - write_pair(0, u); - } - else - { - // The idea of using 4.32 fixed-point numbers is based on - // https://github.com/jeaiii/itoa - unsigned n = N - 1; - unsigned a = n / 5 * n * 53 / 16; - uint64_t t = ((1ULL << (32 + a)) / data::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) - { - t = 100ULL * static_cast(t); - write_pair(i, t >> 32); - } - if (N % 2 == 0) - { - buffer_[N] = static_cast((10ULL * static_cast(t)) >> 32) + '0'; - } - } - return buffer_ += N + 1; + template char *on(uint32_t u) { + if (N == 0) { + *buffer_ = static_cast(u) + '0'; + } else if (N == 1) { + write_pair(0, u); + } else { + // The idea of using 4.32 fixed-point numbers is based on + // 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); + t = ((t * u) >> a) + n / 5 * 4; + write_pair(0, t >> 32); + for (unsigned i = 2; i < N; i += 2) { + t = 100ULL * static_cast(t); + write_pair(i, t >> 32); + } + if (N % 2 == 0) { + buffer_[N] = static_cast( + (10ULL * static_cast(t)) >> 32) + '0'; + } } + return buffer_ += N + 1; + } }; // 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) - { - } +class decimal_formatter_null : public decimal_formatter { + public: + explicit decimal_formatter_null(char *buf) : decimal_formatter(buf) {} - template - char *on(uint32_t u) - { - char *buf = decimal_formatter::on(u); - *buf = '\0'; - return buf; - } + template char *on(uint32_t u) { + char *buf = decimal_formatter::on(u); + *buf = '\0'; + return buf; + } }; #ifdef FMT_BUILTIN_CLZ // Optional version of count_digits for better performance on 32-bit platforms. -inline unsigned count_digits(uint32_t n) -{ - int t = (32 - FMT_BUILTIN_CLZ(n | 1)) * 1233 >> 12; - return to_unsigned(t) - (n < data::POWERS_OF_10_32[t]) + 1; +inline unsigned count_digits(uint32_t n) { + int t = (32 - FMT_BUILTIN_CLZ(n | 1)) * 1233 >> 12; + return to_unsigned(t) - (n < data::ZERO_OR_POWERS_OF_10_32[t]) + 1; } #endif // A functor that doesn't add a thousands separator. -struct no_thousands_sep -{ - typedef char char_type; +struct no_thousands_sep { + typedef char char_type; - template - void operator()(Char *) - { - } + template + void operator()(Char *) {} }; // A functor that adds a thousands separator. -template -class add_thousands_sep -{ -private: - basic_string_view sep_; +template +class add_thousands_sep { + private: + basic_string_view sep_; - // Index of a decimal digit with the least significant digit having index 0. - unsigned digit_index_; + // Index of a decimal digit with the least significant digit having index 0. + unsigned digit_index_; -public: - typedef Char char_type; + public: + typedef Char char_type; - explicit add_thousands_sep(basic_string_view sep) - : sep_(sep) - , digit_index_(0) - { - } + explicit add_thousands_sep(basic_string_view sep) + : sep_(sep), digit_index_(0) {} - 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())); - } + 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())); + } }; -template +template FMT_API Char thousands_sep(locale_provider *lp); // Formats a decimal unsigned integer value writing into buffer. // 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, unsigned num_digits, ThousandsSep thousands_sep) -{ - buffer += num_digits; - 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 - // "Three Optimization Tips for C++". See speed-test for a comparison. - unsigned index = static_cast((value % 100) * 2); - value /= 100; - *--buffer = data::DIGITS[index + 1]; - thousands_sep(buffer); - *--buffer = data::DIGITS[index]; - thousands_sep(buffer); - } - if (value < 10) - { - *--buffer = static_cast('0' + value); - return end; - } - unsigned index = static_cast(value * 2); +template +inline Char *format_decimal(Char *buffer, UInt value, unsigned num_digits, + ThousandsSep thousands_sep) { + buffer += num_digits; + 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 + // "Three Optimization Tips for C++". See speed-test for a comparison. + unsigned index = static_cast((value % 100) * 2); + value /= 100; *--buffer = data::DIGITS[index + 1]; thousands_sep(buffer); *--buffer = data::DIGITS[index]; + thousands_sep(buffer); + } + if (value < 10) { + *--buffer = static_cast('0' + value); return end; + } + unsigned index = static_cast(value * 2); + *--buffer = data::DIGITS[index + 1]; + thousands_sep(buffer); + *--buffer = data::DIGITS[index]; + return end; } -template -inline Iterator format_decimal(Iterator out, UInt value, unsigned num_digits, ThousandsSep sep) -{ - typedef typename ThousandsSep::char_type char_type; - // Buffer should be large enough to hold all digits (digits10 + 1) and null. - char_type buffer[std::numeric_limits::digits10 + 2]; - format_decimal(buffer, value, num_digits, sep); - return std::copy_n(buffer, num_digits, out); +template +inline Iterator format_decimal( + Iterator out, UInt value, unsigned num_digits, ThousandsSep sep) { + typedef typename ThousandsSep::char_type char_type; + // Buffer should be large enough to hold all digits (digits10 + 1) and null. + char_type buffer[std::numeric_limits::digits10 + 2]; + format_decimal(buffer, value, num_digits, sep); + return std::copy_n(buffer, num_digits, out); } -template -inline It format_decimal(It out, UInt value, unsigned num_digits) -{ - return format_decimal(out, value, num_digits, no_thousands_sep()); +template +inline It format_decimal(It out, UInt value, unsigned num_digits) { + return format_decimal(out, value, num_digits, no_thousands_sep()); } -template -inline Char *format_uint(Char *buffer, UInt value, unsigned num_digits, bool upper = false) -{ - buffer += num_digits; - Char *end = buffer; - do - { - const char *digits = upper ? "0123456789ABCDEF" : "0123456789abcdef"; - unsigned digit = (value & ((1 << BASE_BITS) - 1)); - *--buffer = BASE_BITS < 4 ? static_cast('0' + digit) : digits[digit]; - } while ((value >>= BASE_BITS) != 0); - return end; +template +inline Char *format_uint(Char *buffer, UInt value, unsigned num_digits, + bool upper = false) { + buffer += num_digits; + Char *end = buffer; + do { + const char *digits = upper ? "0123456789ABCDEF" : "0123456789abcdef"; + unsigned digit = (value & ((1 << BASE_BITS) - 1)); + *--buffer = BASE_BITS < 4 ? static_cast('0' + digit) : digits[digit]; + } while ((value >>= BASE_BITS) != 0); + return end; } -template -inline It format_uint(It out, UInt value, unsigned 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]; - format_uint(buffer, value, num_digits, upper); - return std::copy_n(buffer, num_digits, out); +template +inline It format_uint(It out, UInt value, unsigned 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]; + format_uint(buffer, value, num_digits, upper); + return std::copy_n(buffer, num_digits, out); } #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. @@ -1333,76 +1114,47 @@ inline It format_uint(It out, UInt value, unsigned num_digits, bool upper = fals #if FMT_USE_WINDOWS_H // A converter from UTF-8 to UTF-16. // It is only provided for Windows since other systems support UTF-8 natively. -class utf8_to_utf16 -{ -private: - wmemory_buffer buffer_; +class utf8_to_utf16 { + private: + wmemory_buffer buffer_; -public: - 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]; - } - std::wstring str() const - { - return std::wstring(&buffer_[0], size()); - } + public: + 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]; } + std::wstring str() const { return std::wstring(&buffer_[0], size()); } }; // A converter from UTF-16 to UTF-8. // It is only provided for Windows since other systems support UTF-8 natively. -class utf16_to_utf8 -{ -private: - memory_buffer buffer_; +class utf16_to_utf8 { + private: + memory_buffer buffer_; -public: - 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]; - } - std::string str() const - { - return std::string(&buffer_[0], size()); - } + public: + 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]; } + std::string str() const { return std::string(&buffer_[0], size()); } - // Performs conversion returning a system error code instead of - // throwing exception on conversion error. This method may still throw - // in case of memory allocation error. - FMT_API int convert(wstring_view s); + // Performs conversion returning a system error code instead of + // throwing exception on conversion error. This method may still throw + // in case of memory allocation error. + FMT_API int convert(wstring_view s); }; -FMT_API void format_windows_error(fmt::internal::buffer &out, int error_code, fmt::string_view message) FMT_NOEXCEPT; +FMT_API void format_windows_error(fmt::internal::buffer &out, int error_code, + fmt::string_view message) FMT_NOEXCEPT; #endif -template -struct null -{ -}; -} // namespace internal +template +struct null {}; +} // namespace internal -struct monostate -{ -}; +struct monostate {}; /** \rst @@ -1411,1112 +1163,882 @@ struct monostate ``vis(value)`` will be called with the value of type ``double``. \endrst */ -template -FMT_CONSTEXPR typename internal::result_of::type visit(Visitor &&vis, basic_format_arg arg) -{ - typedef typename Context::char_type char_type; - switch (arg.type_) - { - case internal::none_type: - break; - case internal::named_arg_type: - FMT_ASSERT(false, "invalid argument type"); - break; - case internal::int_type: - return vis(arg.value_.int_value); - case internal::uint_type: - return vis(arg.value_.uint_value); - case internal::long_long_type: - return vis(arg.value_.long_long_value); - case internal::ulong_long_type: - return vis(arg.value_.ulong_long_value); - case internal::bool_type: - return vis(arg.value_.int_value != 0); - case internal::char_type: - return vis(static_cast(arg.value_.int_value)); - case internal::double_type: - return vis(arg.value_.double_value); - case internal::long_double_type: - return vis(arg.value_.long_double_value); - 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)); - case internal::pointer_type: - return vis(arg.value_.pointer); - case internal::custom_type: - return vis(typename basic_format_arg::handle(arg.value_.custom)); - } - return vis(monostate()); +template +FMT_CONSTEXPR typename internal::result_of::type + visit(Visitor &&vis, const basic_format_arg &arg) { + typedef typename Context::char_type char_type; + switch (arg.type_) { + case internal::none_type: + break; + case internal::named_arg_type: + FMT_ASSERT(false, "invalid argument type"); + break; + case internal::int_type: + return vis(arg.value_.int_value); + case internal::uint_type: + return vis(arg.value_.uint_value); + case internal::long_long_type: + return vis(arg.value_.long_long_value); + case internal::ulong_long_type: + return vis(arg.value_.ulong_long_value); + case internal::bool_type: + return vis(arg.value_.int_value != 0); + case internal::char_type: + return vis(static_cast(arg.value_.int_value)); + case internal::double_type: + return vis(arg.value_.double_value); + case internal::long_double_type: + return vis(arg.value_.long_double_value); + 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)); + case internal::pointer_type: + return vis(arg.value_.pointer); + case internal::custom_type: + return vis(typename basic_format_arg::handle(arg.value_.custom)); + } + return vis(monostate()); } -enum alignment -{ - ALIGN_DEFAULT, - ALIGN_LEFT, - ALIGN_RIGHT, - ALIGN_CENTER, - ALIGN_NUMERIC +enum alignment { + ALIGN_DEFAULT, ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER, ALIGN_NUMERIC }; // Flags. -enum -{ - SIGN_FLAG = 1, - PLUS_FLAG = 2, - MINUS_FLAG = 4, - HASH_FLAG = 8 -}; +enum {SIGN_FLAG = 1, PLUS_FLAG = 2, MINUS_FLAG = 4, HASH_FLAG = 8}; -enum format_spec_tag -{ - fill_tag, - align_tag, - width_tag, - type_tag -}; +enum format_spec_tag {fill_tag, align_tag, width_tag, type_tag}; // Format specifier. -template -class format_spec -{ -private: - T value_; +template +class format_spec { + private: + T value_; -public: - typedef T value_type; + public: + typedef T value_type; - explicit format_spec(T value) - : value_(value) - { - } + explicit format_spec(T value) : value_(value) {} - T value() const - { - return value_; - } + T value() const { return value_; } }; // template // typedef format_spec fill_spec; -template -class fill_spec : public format_spec -{ -public: - explicit fill_spec(Char value) - : format_spec(value) - { - } +template +class fill_spec : public format_spec { + public: + explicit fill_spec(Char value) : format_spec(value) {} }; typedef format_spec width_spec; typedef format_spec type_spec; // An empty format specifier. -struct empty_spec -{ -}; +struct empty_spec {}; // An alignment specifier. -struct align_spec : empty_spec -{ - unsigned width_; - // Fill is always wchar_t and cast to char if necessary to avoid having - // two specialization of AlignSpec and its subclasses. - wchar_t fill_; - alignment align_; +struct align_spec : empty_spec { + unsigned width_; + // Fill is always wchar_t and cast to char if necessary to avoid having + // two specialization of AlignSpec and its subclasses. + wchar_t fill_; + alignment align_; - FMT_CONSTEXPR align_spec(unsigned width, wchar_t fill, alignment align = ALIGN_DEFAULT) - : width_(width) - , fill_(fill) - , align_(align) - { - } + FMT_CONSTEXPR align_spec( + unsigned width, wchar_t fill, alignment align = ALIGN_DEFAULT) + : width_(width), fill_(fill), align_(align) {} - FMT_CONSTEXPR unsigned width() const - { - return width_; - } - FMT_CONSTEXPR wchar_t fill() const - { - return fill_; - } - FMT_CONSTEXPR alignment align() const - { - return align_; - } + FMT_CONSTEXPR unsigned width() const { return width_; } + FMT_CONSTEXPR wchar_t fill() const { return fill_; } + FMT_CONSTEXPR alignment align() const { return align_; } - int precision() const - { - return -1; - } + int precision() const { return -1; } }; // Format specifiers. -template -class basic_format_specs : public align_spec -{ -public: - unsigned flags_; - int precision_; - Char type_; +template +class basic_format_specs : public align_spec { + public: + unsigned flags_; + int precision_; + Char type_; - FMT_CONSTEXPR basic_format_specs(unsigned width = 0, char type = 0, wchar_t fill = ' ') - : align_spec(width, fill) - , flags_(0) - , precision_(-1) - , type_(type) - { - } + FMT_CONSTEXPR basic_format_specs( + unsigned width = 0, char type = 0, wchar_t fill = ' ') + : align_spec(width, fill), flags_(0), precision_(-1), type_(type) {} - FMT_CONSTEXPR bool flag(unsigned f) const - { - return (flags_ & f) != 0; - } - FMT_CONSTEXPR int precision() const - { - return precision_; - } - FMT_CONSTEXPR Char type() const - { - return type_; - } + FMT_CONSTEXPR bool flag(unsigned f) const { return (flags_ & f) != 0; } + FMT_CONSTEXPR int precision() const { return precision_; } + FMT_CONSTEXPR Char type() const { return type_; } }; 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_++); - on_error("cannot switch from manual to automatic argument indexing"); - return 0; +template +FMT_CONSTEXPR unsigned basic_parse_context::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; } -struct format_string -{ -}; - namespace internal { -template -FMT_CONSTEXPR void handle_int_type_spec(Char spec, Handler &&handler) -{ - switch (spec) - { - case 0: - case 'd': - handler.on_dec(); - break; - case 'x': - case 'X': - handler.on_hex(); - break; - case 'b': - case 'B': - handler.on_bin(); - break; - case 'o': - handler.on_oct(); - break; - case 'n': - handler.on_num(); - break; - default: - handler.on_error(); - } +template +struct format_string_traits< + S, typename std::enable_if::value>::type>: + format_string_traits_base {}; + +template +FMT_CONSTEXPR void handle_int_type_spec(Char spec, Handler &&handler) { + switch (spec) { + case 0: case 'd': + handler.on_dec(); + break; + case 'x': case 'X': + handler.on_hex(); + break; + case 'b': case 'B': + handler.on_bin(); + break; + case 'o': + handler.on_oct(); + break; + case 'n': + handler.on_num(); + break; + default: + handler.on_error(); + } } -template -FMT_CONSTEXPR void handle_float_type_spec(Char spec, Handler &&handler) -{ - switch (spec) - { - case 0: - case 'g': - case 'G': - handler.on_general(); - break; - case 'e': - case 'E': - handler.on_exp(); - break; - case 'f': - case 'F': - handler.on_fixed(); - break; - case 'a': - case 'A': - handler.on_hex(); - break; - default: - handler.on_error(); - break; - } +template +FMT_CONSTEXPR void handle_float_type_spec(Char spec, Handler &&handler) { + switch (spec) { + case 0: case 'g': case 'G': + handler.on_general(); + break; + case 'e': case 'E': + handler.on_exp(); + break; + case 'f': case 'F': + handler.on_fixed(); + break; + case 'a': case 'A': + handler.on_hex(); + break; + default: + handler.on_error(); + break; + } } -template -FMT_CONSTEXPR void handle_char_specs(const basic_format_specs &specs, Handler &&handler) -{ - if (specs.type() && specs.type() != 'c') - { - handler.on_int(); - return; - } - if (specs.align() == ALIGN_NUMERIC || specs.flag(~0u) != 0) - handler.on_error("invalid format specifier for char"); - handler.on_char(); +template +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->flag(~0u) != 0) + handler.on_error("invalid format specifier for char"); + handler.on_char(); } -template -FMT_CONSTEXPR void handle_cstring_type_spec(Char spec, Handler &&handler) -{ - if (spec == 0 || spec == 's') - handler.on_string(); - else if (spec == 'p') - handler.on_pointer(); - else - handler.on_error("invalid type specifier"); +template +FMT_CONSTEXPR void handle_cstring_type_spec(Char spec, Handler &&handler) { + if (spec == 0 || spec == 's') + handler.on_string(); + else if (spec == 'p') + handler.on_pointer(); + else + handler.on_error("invalid type specifier"); } -template -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_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"); +template +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 -{ -public: - FMT_CONSTEXPR explicit int_type_checker(ErrorHandler eh) - : ErrorHandler(eh) - { - } +template +class int_type_checker : private ErrorHandler { + public: + FMT_CONSTEXPR explicit int_type_checker(ErrorHandler eh) : ErrorHandler(eh) {} - FMT_CONSTEXPR void on_dec() {} - FMT_CONSTEXPR void on_hex() {} - FMT_CONSTEXPR void on_bin() {} - FMT_CONSTEXPR void on_oct() {} - FMT_CONSTEXPR void on_num() {} + FMT_CONSTEXPR void on_dec() {} + FMT_CONSTEXPR void on_hex() {} + FMT_CONSTEXPR void on_bin() {} + FMT_CONSTEXPR void on_oct() {} + FMT_CONSTEXPR void on_num() {} - FMT_CONSTEXPR void on_error() - { - ErrorHandler::on_error("invalid type specifier"); - } + FMT_CONSTEXPR void on_error() { + ErrorHandler::on_error("invalid type specifier"); + } }; -template -class float_type_checker : private ErrorHandler -{ -public: - FMT_CONSTEXPR explicit float_type_checker(ErrorHandler eh) - : ErrorHandler(eh) - { - } +template +class float_type_checker : private ErrorHandler { + public: + FMT_CONSTEXPR explicit float_type_checker(ErrorHandler eh) + : ErrorHandler(eh) {} - FMT_CONSTEXPR void on_general() {} - FMT_CONSTEXPR void on_exp() {} - FMT_CONSTEXPR void on_fixed() {} - FMT_CONSTEXPR void on_hex() {} + FMT_CONSTEXPR void on_general() {} + FMT_CONSTEXPR void on_exp() {} + FMT_CONSTEXPR void on_fixed() {} + FMT_CONSTEXPR void on_hex() {} - FMT_CONSTEXPR void on_error() - { - ErrorHandler::on_error("invalid type specifier"); - } + FMT_CONSTEXPR void on_error() { + ErrorHandler::on_error("invalid type specifier"); + } }; -template -class char_specs_checker : public ErrorHandler -{ -private: - CharType type_; +template +class char_specs_checker : public ErrorHandler { + private: + CharType type_; -public: - FMT_CONSTEXPR char_specs_checker(CharType type, ErrorHandler eh) - : ErrorHandler(eh) - , type_(type) - { - } + public: + FMT_CONSTEXPR char_specs_checker(CharType type, ErrorHandler eh) + : ErrorHandler(eh), type_(type) {} - FMT_CONSTEXPR void on_int() - { - handle_int_type_spec(type_, int_type_checker(*this)); - } - FMT_CONSTEXPR void on_char() {} + FMT_CONSTEXPR void on_int() { + handle_int_type_spec(type_, int_type_checker(*this)); + } + FMT_CONSTEXPR void on_char() {} }; -template -class cstring_type_checker : public ErrorHandler -{ -public: - FMT_CONSTEXPR explicit cstring_type_checker(ErrorHandler eh) - : ErrorHandler(eh) - { - } +template +class cstring_type_checker : public ErrorHandler { + public: + FMT_CONSTEXPR explicit cstring_type_checker(ErrorHandler eh) + : ErrorHandler(eh) {} - FMT_CONSTEXPR void on_string() {} - FMT_CONSTEXPR void on_pointer() {} + FMT_CONSTEXPR void on_string() {} + FMT_CONSTEXPR void on_pointer() {} }; -template -void arg_map::init(const basic_format_args &args) -{ - if (map_) - return; - map_ = new entry[args.max_size()]; - bool use_values = args.type(max_packed_args - 1) == internal::none_type; - if (use_values) - { - 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. - } - } - return; - } - for (unsigned i = 0;; ++i) - { - switch (args.args_[i].type_) - { +template +void arg_map::init(const basic_format_args &args) { + if (map_) + return; + map_ = new entry[args.max_size()]; + bool use_values = args.type(max_packed_args - 1) == internal::none_type; + if (use_values) { + for (unsigned i = 0;/*nothing*/; ++i) { + internal::type arg_type = args.type(i); + switch (arg_type) { case internal::none_type: - return; + return; case internal::named_arg_type: - push_back(args.args_[i].value_); - break; + 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 -{ -public: - typedef typename Range::value_type char_type; - typedef decltype(internal::declval().begin()) iterator; - typedef basic_format_specs format_specs; +template +class arg_formatter_base { + public: + typedef typename Range::value_type char_type; + typedef decltype(internal::declval().begin()) iterator; + typedef basic_format_specs format_specs; -private: - typedef basic_writer writer_type; - writer_type writer_; - format_specs &specs_; + private: + typedef basic_writer writer_type; + writer_type writer_; + format_specs *specs_; - FMT_DISALLOW_COPY_AND_ASSIGN(arg_formatter_base); + struct char_writer { + char_type value; + template + void operator()(It &&it) const { *it++ = value; } + }; - struct char_writer - { - char_type value; - template - void operator()(It &&it) const - { - *it++ = value; - } - }; + void write_char(char_type value) { + if (specs_) + writer_.write_padded(1, *specs_, char_writer{value}); + else + writer_.write(value); + } - void write_char(char_type value) - { - writer_.write_padded(1, specs_, char_writer{value}); + void write_pointer(const void *p) { + format_specs specs = specs_ ? *specs_ : format_specs(); + specs.flags_ = HASH_FLAG; + specs.type_ = 'x'; + writer_.write_int(reinterpret_cast(p), specs); + } + + protected: + writer_type &writer() { return writer_; } + format_specs *spec() { return specs_; } + iterator out() { return writer_.out(); } + + void write(bool value) { + string_view sv(value ? "true" : "false"); + specs_ ? writer_.write_str(sv, *specs_) : writer_.write(sv); + } + + 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_str(sv, *specs_) : writer_.write(sv); + } + + public: + arg_formatter_base(Range r, format_specs *s): writer_(r), specs_(s) {} + + iterator operator()(monostate) { + FMT_ASSERT(false, "invalid argument type"); + return out(); + } + + template + typename std::enable_if::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); + write(value != 0); + } else if (std::is_same::value) { + internal::handle_char_specs( + specs_, char_spec_handler(*this, static_cast(value))); + } else { + specs_ ? writer_.write_int(value, *specs_) : writer_.write(value); } + return out(); + } - void write_pointer(const void *p) - { - format_specs specs = specs_; - specs.flags_ = HASH_FLAG; - specs.type_ = 'x'; - writer_.write_int(reinterpret_cast(p), specs); + template + typename std::enable_if::value, iterator>::type + operator()(T value) { + writer_.write_double(value, specs_ ? *specs_ : format_specs()); + return out(); + } + + struct char_spec_handler : internal::error_handler { + arg_formatter_base &formatter; + char_type value; + + char_spec_handler(arg_formatter_base& f, char_type val) + : formatter(f), value(val) {} + + void on_int() { + if (formatter.specs_) + formatter.writer_.write_int(value, *formatter.specs_); + else + formatter.writer_.write(value); } + void on_char() { formatter.write_char(value); } + }; -protected: - writer_type &writer() - { - return writer_; - } - format_specs &spec() - { - return specs_; - } - iterator out() - { - return writer_.out(); + struct cstring_spec_handler : internal::error_handler { + arg_formatter_base &formatter; + const char_type *value; + + cstring_spec_handler(arg_formatter_base &f, const char_type *val) + : formatter(f), value(val) {} + + void on_string() { formatter.write(value); } + void on_pointer() { formatter.write_pointer(value); } + }; + + iterator operator()(const char_type *value) { + if (!specs_) return write(value), out(); + 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()); + writer_.write_str(value, *specs_); + } else { + writer_.write(value); } + return out(); + } - void write(bool value) - { - writer_.write_str(string_view(value ? "true" : "false"), specs_); - } - - void write(const char_type *value) - { - if (!value) - FMT_THROW(format_error("string pointer is null")); - auto length = std::char_traits::length(value); - writer_.write_str(basic_string_view(value, length), specs_); - } - -public: - arg_formatter_base(Range r, format_specs &s) - : writer_(r) - , specs_(s) - { - } - - iterator operator()(monostate) - { - FMT_ASSERT(false, "invalid argument type"); - return out(); - } - - template - typename std::enable_if::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_.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))); - } - else - { - writer_.write_int(value, specs_); - } - return out(); - } - - template - typename std::enable_if::value, iterator>::type operator()(T value) - { - writer_.write_double(value, specs_); - return out(); - } - - struct char_spec_handler : internal::error_handler - { - arg_formatter_base &formatter; - char_type value; - - char_spec_handler(arg_formatter_base &f, char_type val) - : formatter(f) - , value(val) - { - } - - void on_int() - { - formatter.writer_.write_int(value, formatter.specs_); - } - void on_char() - { - formatter.write_char(value); - } - }; - - struct cstring_spec_handler : internal::error_handler - { - arg_formatter_base &formatter; - const char_type *value; - - cstring_spec_handler(arg_formatter_base &f, const char_type *val) - : formatter(f) - , value(val) - { - } - - void on_string() - { - formatter.write(value); - } - void on_pointer() - { - formatter.write_pointer(value); - } - }; - - iterator operator()(const char_type *value) - { - internal::handle_cstring_type_spec(specs_.type_, cstring_spec_handler(*this, value)); - return out(); - } - - iterator operator()(basic_string_view value) - { - internal::check_string_type_spec(specs_.type_, internal::error_handler()); - writer_.write_str(value, specs_); - return out(); - } - - iterator operator()(const void *value) - { - check_pointer_type_spec(specs_.type_, internal::error_handler()); - write_pointer(value); - return out(); - } + iterator operator()(const void *value) { + if (specs_) + check_pointer_type_spec(specs_->type_, internal::error_handler()); + write_pointer(value); + return out(); + } }; -template -struct is_format_string : std::integral_constant::value> -{ -}; - -template -FMT_CONSTEXPR bool is_name_start(Char c) -{ - return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || '_' == c; +template +FMT_CONSTEXPR bool is_name_start(Char c) { + return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || '_' == c; } -// Parses the input as an unsigned integer. This function assumes that the -// first character is a digit and presence of a non-digit character at the end. +// DEPRECATED: Parses the input as an unsigned integer. This function assumes +// that the first character is a digit and presence of a non-digit character at +// the end. // it: an iterator pointing to the beginning of the input range. -template -FMT_CONSTEXPR unsigned parse_nonnegative_int(Iterator &it, ErrorHandler &&eh) -{ - assert('0' <= *it && *it <= '9'); - unsigned value = 0; - // Convert to unsigned to prevent a warning. - unsigned max_int = (std::numeric_limits::max)(); - unsigned big = max_int / 10; - do - { - // Check for overflow. - if (value > big) - { - value = max_int + 1; - break; - } - value = value * 10 + unsigned(*it - '0'); - // Workaround for MSVC "setup_exception stack overflow" error: - auto next = it; - ++next; - it = next; - } while ('0' <= *it && *it <= '9'); - if (value > max_int) - eh.on_error("number is too big"); - return value; +template +FMT_CONSTEXPR unsigned parse_nonnegative_int(Iterator &it, ErrorHandler &&eh) { + assert('0' <= *it && *it <= '9'); + unsigned value = 0; + // Convert to unsigned to prevent a warning. + unsigned max_int = (std::numeric_limits::max)(); + unsigned big = max_int / 10; + do { + // Check for overflow. + if (value > big) { + value = max_int + 1; + break; + } + value = value * 10 + unsigned(*it - '0'); + // Workaround for MSVC "setup_exception stack overflow" error: + auto next = it; + ++next; + it = next; + } while ('0' <= *it && *it <= '9'); + if (value > max_int) + eh.on_error("number is too big"); + return value; } -template -class custom_formatter : public function -{ -private: - Context &ctx_; - -public: - explicit custom_formatter(Context &ctx) - : ctx_(ctx) - { +// 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) { + assert(begin != end && '0' <= *begin && *begin <= '9'); + unsigned value = 0; + // Convert to unsigned to prevent a warning. + unsigned max_int = (std::numeric_limits::max)(); + unsigned big = max_int / 10; + do { + // Check for overflow. + if (value > big) { + value = max_int + 1; + break; } + value = value * 10 + unsigned(*begin++ - '0'); + } while (begin != end && '0' <= *begin && *begin <= '9'); + if (value > max_int) + eh.on_error("number is too big"); + return value; +} - bool operator()(typename basic_format_arg::handle h) const - { - h.format(ctx_); - return true; - } +template +class custom_formatter: public function { + private: + Context &ctx_; - template - bool operator()(T) const - { - return false; - } + public: + 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 -struct is_integer -{ - enum - { - value = - std::is_integral::value && !std::is_same::value && !std::is_same::value && !std::is_same::value - }; +template +struct is_integer { + enum { + value = std::is_integral::value && !std::is_same::value && + !std::is_same::value && !std::is_same::value + }; }; -template -class width_checker : public function -{ -public: - explicit FMT_CONSTEXPR width_checker(ErrorHandler &eh) - : handler_(eh) - { - } +template +class width_checker: public function { + public: + explicit FMT_CONSTEXPR width_checker(ErrorHandler &eh) : handler_(eh) {} - template - FMT_CONSTEXPR 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 value) { + if (is_negative(value)) + handler_.on_error("negative width"); + return static_cast(value); + } - template - FMT_CONSTEXPR typename std::enable_if::value, unsigned long long>::type operator()(T) - { - handler_.on_error("width is not integer"); - return 0; - } + template + FMT_CONSTEXPR typename std::enable_if< + !is_integer::value, unsigned long long>::type operator()(T) { + handler_.on_error("width is not integer"); + return 0; + } -private: - ErrorHandler &handler_; + private: + ErrorHandler &handler_; }; -template -class precision_checker : public function -{ -public: - explicit FMT_CONSTEXPR precision_checker(ErrorHandler &eh) - : handler_(eh) - { - } +template +class precision_checker: public function { + public: + explicit FMT_CONSTEXPR precision_checker(ErrorHandler &eh) : handler_(eh) {} - template - 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 value) { + if (is_negative(value)) + handler_.on_error("negative precision"); + return static_cast(value); + } - template - FMT_CONSTEXPR typename std::enable_if::value, unsigned long long>::type operator()(T) - { - handler_.on_error("precision is not integer"); - return 0; - } + template + FMT_CONSTEXPR typename std::enable_if< + !is_integer::value, unsigned long long>::type operator()(T) { + handler_.on_error("precision is not integer"); + return 0; + } -private: - ErrorHandler &handler_; + private: + ErrorHandler &handler_; }; // A format specifier handler that sets fields in basic_format_specs. -template -class specs_setter -{ -public: - explicit FMT_CONSTEXPR specs_setter(basic_format_specs &specs) - : specs_(specs) - { - } +template +class specs_setter { + public: + 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; - } - FMT_CONSTEXPR void on_plus() - { - specs_.flags_ |= SIGN_FLAG | PLUS_FLAG; - } - FMT_CONSTEXPR void on_minus() - { - specs_.flags_ |= MINUS_FLAG; - } - FMT_CONSTEXPR void on_space() - { - specs_.flags_ |= SIGN_FLAG; - } - FMT_CONSTEXPR void on_hash() - { - specs_.flags_ |= HASH_FLAG; - } + FMT_CONSTEXPR void on_align(alignment align) { specs_.align_ = align; } + FMT_CONSTEXPR void on_fill(Char fill) { specs_.fill_ = fill; } + FMT_CONSTEXPR void on_plus() { specs_.flags_ |= SIGN_FLAG | PLUS_FLAG; } + FMT_CONSTEXPR void on_minus() { specs_.flags_ |= MINUS_FLAG; } + FMT_CONSTEXPR void on_space() { specs_.flags_ |= SIGN_FLAG; } + FMT_CONSTEXPR void on_hash() { specs_.flags_ |= HASH_FLAG; } - FMT_CONSTEXPR void on_zero() - { - specs_.align_ = ALIGN_NUMERIC; - specs_.fill_ = '0'; - } + FMT_CONSTEXPR void on_zero() { + specs_.align_ = ALIGN_NUMERIC; + specs_.fill_ = '0'; + } - FMT_CONSTEXPR void on_width(unsigned width) - { - specs_.width_ = width; - } - FMT_CONSTEXPR void on_precision(unsigned precision) - { - specs_.precision_ = static_cast(precision); - } - FMT_CONSTEXPR void end_precision() {} + FMT_CONSTEXPR void on_width(unsigned width) { specs_.width_ = width; } + FMT_CONSTEXPR void on_precision(unsigned precision) { + specs_.precision_ = static_cast(precision); + } + FMT_CONSTEXPR void end_precision() {} - FMT_CONSTEXPR void on_type(Char type) - { - specs_.type_ = type; - } + FMT_CONSTEXPR void on_type(Char type) { specs_.type_ = type; } -protected: - basic_format_specs &specs_; + protected: + basic_format_specs &specs_; }; // A format specifier handler that checks if specifiers are consistent with the // argument type. -template -class specs_checker : public Handler -{ -public: - FMT_CONSTEXPR specs_checker(const Handler &handler, internal::type arg_type) - : Handler(handler) - , arg_type_(arg_type) - { - } +template +class specs_checker : public Handler { + public: + FMT_CONSTEXPR specs_checker(const Handler& handler, internal::type arg_type) + : Handler(handler), arg_type_(arg_type) {} - FMT_CONSTEXPR specs_checker(const specs_checker &other) - : Handler(other) - , arg_type_(other.arg_type_) - { - } + FMT_CONSTEXPR specs_checker(const specs_checker &other) + : Handler(other), arg_type_(other.arg_type_) {} - FMT_CONSTEXPR void on_align(alignment align) - { - if (align == ALIGN_NUMERIC) - require_numeric_argument(); - Handler::on_align(align); - } + FMT_CONSTEXPR void on_align(alignment align) { + if (align == ALIGN_NUMERIC) + require_numeric_argument(); + Handler::on_align(align); + } - FMT_CONSTEXPR void on_plus() - { - check_sign(); - Handler::on_plus(); - } + FMT_CONSTEXPR void on_plus() { + check_sign(); + Handler::on_plus(); + } - FMT_CONSTEXPR void on_minus() - { - check_sign(); - Handler::on_minus(); - } + FMT_CONSTEXPR void on_minus() { + check_sign(); + Handler::on_minus(); + } - FMT_CONSTEXPR void on_space() - { - check_sign(); - Handler::on_space(); - } + FMT_CONSTEXPR void on_space() { + check_sign(); + Handler::on_space(); + } - FMT_CONSTEXPR void on_hash() - { - require_numeric_argument(); - Handler::on_hash(); - } + FMT_CONSTEXPR void on_hash() { + require_numeric_argument(); + Handler::on_hash(); + } - FMT_CONSTEXPR void on_zero() - { - require_numeric_argument(); - Handler::on_zero(); - } + FMT_CONSTEXPR void on_zero() { + require_numeric_argument(); + Handler::on_zero(); + } - FMT_CONSTEXPR void end_precision() - { - if (is_integral(arg_type_) || arg_type_ == pointer_type) - this->on_error("precision not allowed for this argument type"); - } + FMT_CONSTEXPR void end_precision() { + if (is_integral(arg_type_) || arg_type_ == pointer_type) + this->on_error("precision not allowed for this argument type"); + } -private: - FMT_CONSTEXPR void require_numeric_argument() - { - if (!is_arithmetic(arg_type_)) - this->on_error("format specifier requires numeric argument"); - } + private: + FMT_CONSTEXPR void require_numeric_argument() { + if (!is_arithmetic(arg_type_)) + this->on_error("format specifier requires numeric argument"); + } - FMT_CONSTEXPR void check_sign() - { - require_numeric_argument(); - if (is_integral(arg_type_) && arg_type_ != int_type && arg_type_ != long_long_type && arg_type_ != internal::char_type) - { - this->on_error("format specifier requires signed argument"); - } + FMT_CONSTEXPR void check_sign() { + require_numeric_argument(); + if (is_integral(arg_type_) && arg_type_ != int_type && + arg_type_ != long_long_type && arg_type_ != internal::char_type) { + this->on_error("format specifier requires signed argument"); } + } - internal::type arg_type_; + internal::type arg_type_; }; -template class Handler, typename T, typename Context, typename ErrorHandler> -FMT_CONSTEXPR void set_dynamic_spec(T &value, basic_format_arg arg, ErrorHandler eh) -{ - unsigned long long big_value = visit(Handler(eh), arg); - if (big_value > (std::numeric_limits::max)()) - eh.on_error("number is too big"); - value = static_cast(big_value); +template