From 5d9b18de0d89f711bff85f7242115a4509e1984d Mon Sep 17 00:00:00 2001 From: halx99 Date: Sun, 20 Oct 2024 23:48:51 +0800 Subject: [PATCH] Rollback fmt to 11.0.2 & emsdk to 3.1.67 - genbindings llvm-15.0.7 can't works on fmt latest: unknown template argument - fmt 11.0.2 can't compile on emsdk 3.1.68+ --- 1k/manifest.ps1 | 2 +- 3rdparty/README.md | 2 +- 3rdparty/fmt/CMakeLists.txt | 16 +- 3rdparty/fmt/ChangeLog.md | 4 - 3rdparty/fmt/README.md | 1 - 3rdparty/fmt/include/fmt/args.h | 45 +- 3rdparty/fmt/include/fmt/base.h | 3595 +++++++++++++------------ 3rdparty/fmt/include/fmt/chrono.h | 846 +++--- 3rdparty/fmt/include/fmt/color.h | 42 +- 3rdparty/fmt/include/fmt/compile.h | 62 +- 3rdparty/fmt/include/fmt/format-inl.h | 111 +- 3rdparty/fmt/include/fmt/format.h | 2123 ++++++++------- 3rdparty/fmt/include/fmt/os.h | 98 +- 3rdparty/fmt/include/fmt/ostream.h | 121 +- 3rdparty/fmt/include/fmt/printf.h | 237 +- 3rdparty/fmt/include/fmt/ranges.h | 104 +- 3rdparty/fmt/include/fmt/std.h | 115 +- 3rdparty/fmt/include/fmt/xchar.h | 152 +- 3rdparty/fmt/src/fmt.cc | 18 +- 3rdparty/fmt/src/format.cc | 5 +- 3rdparty/fmt/src/os.cc | 17 +- CHANGELOG.md | 2 +- core/base/json.h | 4 + 23 files changed, 4059 insertions(+), 3663 deletions(-) create mode 100644 core/base/json.h diff --git a/1k/manifest.ps1 b/1k/manifest.ps1 index bc78267cbebc..76e45a659300 100644 --- a/1k/manifest.ps1 +++ b/1k/manifest.ps1 @@ -12,7 +12,7 @@ if ($Global:is_axmol_app -or $Global:is_axmol_engine) { $manifest['nuget'] = '5.5.1' # since 5.6.0, requires .net 4.0 $manifest['glslcc'] = '1.9.5+' $manifest['cmake'] = '3.29.3~3.30.5+' - $manifest['emsdk'] = '3.1.66~3.1.69+' + $manifest['emsdk'] = '3.1.66~3.1.67+' $manifest['jdk'] = '17.0.10~17.0.12+' $manifest['vs'] = '16.0+' } diff --git a/3rdparty/README.md b/3rdparty/README.md index 9d30bfb00ac6..67c89ff99acf 100644 --- a/3rdparty/README.md +++ b/3rdparty/README.md @@ -67,7 +67,7 @@ ## {fmt} - [![Upstream](https://img.shields.io/github/v/release/fmtlib/fmt?label=Upstream)](https://github.com/fmtlib/fmt) -- Version: 11.0.2-601be1c +- Version: 11.0.2 - License: MIT diff --git a/3rdparty/fmt/CMakeLists.txt b/3rdparty/fmt/CMakeLists.txt index 1606e88612c4..e3b35110f8dc 100644 --- a/3rdparty/fmt/CMakeLists.txt +++ b/3rdparty/fmt/CMakeLists.txt @@ -240,13 +240,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") endif () if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0) set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wshift-overflow=2 - -Wduplicated-cond) - # Workaround for GCC regression - # [12/13/14/15 regression] New (since gcc 12) false positive null-dereference in vector.resize - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108860 - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0) - set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wnull-dereference) - endif () + -Wnull-dereference -Wduplicated-cond) endif () set(WERROR_FLAG -Werror) endif () @@ -325,7 +319,7 @@ else () message(WARNING "Feature cxx_std_11 is unknown for the CXX compiler") endif () -target_include_directories(fmt ${FMT_SYSTEM_HEADERS_ATTRIBUTE} BEFORE PUBLIC +target_include_directories(fmt ${FMT_SYSTEM_HEADERS_ATTRIBUTE} PUBLIC $ $) @@ -365,8 +359,8 @@ if (NOT MSVC) # Unicode is always supported on compilers other than MSVC. elseif (FMT_UNICODE) # Unicode support requires compiling with /utf-8. - target_compile_options(fmt PUBLIC $<$,$>:/utf-8>) - target_compile_options(fmt-header-only INTERFACE $<$,$>:/utf-8>) + target_compile_options(fmt PUBLIC $<$:/utf-8>) + target_compile_options(fmt-header-only INTERFACE $<$:/utf-8>) else () target_compile_definitions(fmt PUBLIC FMT_UNICODE=0) endif () @@ -375,7 +369,7 @@ target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1) target_compile_features(fmt-header-only INTERFACE cxx_std_11) target_include_directories(fmt-header-only - ${FMT_SYSTEM_HEADERS_ATTRIBUTE} BEFORE INTERFACE + ${FMT_SYSTEM_HEADERS_ATTRIBUTE} INTERFACE $ $) diff --git a/3rdparty/fmt/ChangeLog.md b/3rdparty/fmt/ChangeLog.md index 0eb9ba8ed631..6ba567d1d4b1 100644 --- a/3rdparty/fmt/ChangeLog.md +++ b/3rdparty/fmt/ChangeLog.md @@ -1,7 +1,3 @@ -# 11.1.0 - TBD - -- Improved debug codegen. - # 11.0.2 - 2024-07-20 - Fixed compatibility with non-POSIX systems diff --git a/3rdparty/fmt/README.md b/3rdparty/fmt/README.md index fd845db20c2c..5f9249d4bb19 100644 --- a/3rdparty/fmt/README.md +++ b/3rdparty/fmt/README.md @@ -291,7 +291,6 @@ converts to `std::print`.) - [ccache](https://ccache.dev/): a compiler cache - [ClickHouse](https://github.com/ClickHouse/ClickHouse): an analytical database management system -- [ContextVision](https://www.contextvision.com/): medical imaging software - [Contour](https://github.com/contour-terminal/contour/): a modern terminal emulator - [CUAUV](https://cuauv.org/): Cornell University\'s autonomous diff --git a/3rdparty/fmt/include/fmt/args.h b/3rdparty/fmt/include/fmt/args.h index 6ed30c0bd5c0..31a60e8faf1a 100644 --- a/3rdparty/fmt/include/fmt/args.h +++ b/3rdparty/fmt/include/fmt/args.h @@ -17,6 +17,7 @@ #include "format.h" // std_string_view FMT_BEGIN_NAMESPACE + namespace detail { template struct is_reference_wrapper : std::false_type {}; @@ -71,13 +72,19 @@ class dynamic_arg_list { * It can be implicitly converted into `fmt::basic_format_args` for passing * into type-erased formatting functions such as `fmt::vformat`. */ -template class dynamic_format_arg_store { +template +class dynamic_format_arg_store +#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409 + // Workaround a GCC template argument substitution bug. + : public basic_format_args +#endif +{ private: using char_type = typename Context::char_type; template struct need_copy { static constexpr detail::type mapped_type = - detail::mapped_type_constant::value; + detail::mapped_type_constant::value; enum { value = !(detail::is_reference_wrapper::value || @@ -90,7 +97,7 @@ template class dynamic_format_arg_store { }; template - using stored_t = conditional_t< + using stored_type = conditional_t< std::is_convertible>::value && !detail::is_reference_wrapper::value, std::basic_string, T>; @@ -105,37 +112,41 @@ template class dynamic_format_arg_store { friend class basic_format_args; + auto get_types() const -> unsigned long long { + return detail::is_unpacked_bit | data_.size() | + (named_info_.empty() + ? 0ULL + : static_cast(detail::has_named_args_bit)); + } + auto data() const -> const basic_format_arg* { return named_info_.empty() ? data_.data() : data_.data() + 1; } template void emplace_arg(const T& arg) { - data_.emplace_back(arg); + data_.emplace_back(detail::make_arg(arg)); } template void emplace_arg(const detail::named_arg& arg) { - if (named_info_.empty()) - data_.insert(data_.begin(), basic_format_arg(nullptr, 0)); - data_.emplace_back(detail::unwrap(arg.value)); + if (named_info_.empty()) { + constexpr const detail::named_arg_info* zero_ptr{nullptr}; + data_.insert(data_.begin(), {zero_ptr, 0}); + } + data_.emplace_back(detail::make_arg(detail::unwrap(arg.value))); auto pop_one = [](std::vector>* data) { data->pop_back(); }; std::unique_ptr>, decltype(pop_one)> guard{&data_, pop_one}; named_info_.push_back({arg.name, static_cast(data_.size() - 2u)}); - data_[0] = {named_info_.data(), named_info_.size()}; + data_[0].value_.named_args = {named_info_.data(), named_info_.size()}; guard.release(); } public: constexpr dynamic_format_arg_store() = default; - operator basic_format_args() const { - return basic_format_args(data(), static_cast(data_.size()), - !named_info_.empty()); - } - /** * Adds an argument into the dynamic store for later passing to a formatting * function. @@ -153,7 +164,7 @@ template class dynamic_format_arg_store { */ template void push_back(const T& arg) { if (detail::const_check(need_copy::value)) - emplace_arg(dynamic_args_.push>(arg)); + emplace_arg(dynamic_args_.push>(arg)); else emplace_arg(detail::unwrap(arg)); } @@ -189,7 +200,7 @@ template class dynamic_format_arg_store { dynamic_args_.push>(arg.name).c_str(); if (detail::const_check(need_copy::value)) { emplace_arg( - fmt::arg(arg_name, dynamic_args_.push>(arg.value))); + fmt::arg(arg_name, dynamic_args_.push>(arg.value))); } else { emplace_arg(fmt::arg(arg_name, arg.value)); } @@ -199,14 +210,14 @@ template class dynamic_format_arg_store { void clear() { data_.clear(); named_info_.clear(); - dynamic_args_ = {}; + dynamic_args_ = detail::dynamic_arg_list(); } /// Reserves space to store at least `new_cap` arguments including /// `new_cap_named` named arguments. void reserve(size_t new_cap, size_t new_cap_named) { FMT_ASSERT(new_cap >= new_cap_named, - "set of arguments includes set of named arguments"); + "Set of arguments includes set of named arguments"); data_.reserve(new_cap); named_info_.reserve(new_cap_named); } diff --git a/3rdparty/fmt/include/fmt/base.h b/3rdparty/fmt/include/fmt/base.h index e0baae256347..6276494253dd 100644 --- a/3rdparty/fmt/include/fmt/base.h +++ b/3rdparty/fmt/include/fmt/base.h @@ -15,8 +15,10 @@ #ifndef FMT_MODULE # include // CHAR_BIT # include // FILE -# include // memcmp +# include // strlen +// is also included transitively from . +# include // std::byte # include // std::enable_if #endif @@ -76,11 +78,6 @@ #else # define FMT_HAS_INCLUDE(x) 0 #endif -#ifdef __has_builtin -# define FMT_HAS_BUILTIN(x) __has_builtin(x) -#else -# define FMT_HAS_BUILTIN(x) 0 -#endif #ifdef __has_cpp_attribute # define FMT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x) #else @@ -141,17 +138,40 @@ # define FMT_CONSTEXPR20 #endif +#if defined(FMT_USE_NONTYPE_TEMPLATE_ARGS) +// Use the provided definition. +#elif defined(__NVCOMPILER) +# define FMT_USE_NONTYPE_TEMPLATE_ARGS 0 +#elif FMT_GCC_VERSION >= 903 && FMT_CPLUSPLUS >= 201709L +# define FMT_USE_NONTYPE_TEMPLATE_ARGS 1 +#elif defined(__cpp_nontype_template_args) && \ + __cpp_nontype_template_args >= 201911L +# define FMT_USE_NONTYPE_TEMPLATE_ARGS 1 +#elif FMT_CLANG_VERSION >= 1200 && FMT_CPLUSPLUS >= 202002L +# define FMT_USE_NONTYPE_TEMPLATE_ARGS 1 +#else +# define FMT_USE_NONTYPE_TEMPLATE_ARGS 0 +#endif + +#ifdef FMT_USE_CONCEPTS +// Use the provided definition. +#elif defined(__cpp_concepts) +# define FMT_USE_CONCEPTS 1 +#else +# define FMT_USE_CONCEPTS 0 +#endif + // Check if exceptions are disabled. -#ifdef FMT_USE_EXCEPTIONS +#ifdef FMT_EXCEPTIONS // Use the provided definition. #elif defined(__GNUC__) && !defined(__EXCEPTIONS) -# define FMT_USE_EXCEPTIONS 0 +# define FMT_EXCEPTIONS 0 #elif FMT_MSC_VERSION && !_HAS_EXCEPTIONS -# define FMT_USE_EXCEPTIONS 0 +# define FMT_EXCEPTIONS 0 #else -# define FMT_USE_EXCEPTIONS 1 +# define FMT_EXCEPTIONS 1 #endif -#if FMT_USE_EXCEPTIONS +#if FMT_EXCEPTIONS # define FMT_TRY try # define FMT_CATCH(x) catch (x) #else @@ -177,12 +197,12 @@ # define FMT_NORETURN #endif -#ifdef FMT_NODISCARD -// Use the provided definition. -#elif FMT_HAS_CPP17_ATTRIBUTE(nodiscard) -# define FMT_NODISCARD [[nodiscard]] -#else -# define FMT_NODISCARD +#ifndef FMT_NODISCARD +# if FMT_HAS_CPP17_ATTRIBUTE(nodiscard) +# define FMT_NODISCARD [[nodiscard]] +# else +# define FMT_NODISCARD +# endif #endif #ifdef FMT_DEPRECATED @@ -193,14 +213,14 @@ # define FMT_DEPRECATED /* deprecated */ #endif -#ifdef FMT_ALWAYS_INLINE +#ifdef FMT_INLINE // Use the provided definition. #elif FMT_GCC_VERSION || FMT_CLANG_VERSION # define FMT_ALWAYS_INLINE inline __attribute__((always_inline)) #else # define FMT_ALWAYS_INLINE inline #endif -// A version of FMT_ALWAYS_INLINE to prevent code bloat in debug mode. +// A version of FMT_INLINE to prevent code bloat in debug mode. #ifdef NDEBUG # define FMT_INLINE FMT_ALWAYS_INLINE #else @@ -213,24 +233,30 @@ # define FMT_VISIBILITY(value) #endif -// Detect pragmas. -#define FMT_PRAGMA_IMPL(x) _Pragma(#x) -#if FMT_GCC_VERSION >= 504 && !defined(__NVCOMPILER) +#ifndef FMT_GCC_PRAGMA // Workaround a _Pragma bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59884 // and an nvhpc warning: https://github.com/fmtlib/fmt/pull/2582. -# define FMT_PRAGMA_GCC(x) FMT_PRAGMA_IMPL(GCC x) -#else -# define FMT_PRAGMA_GCC(x) +# if FMT_GCC_VERSION >= 504 && !defined(__NVCOMPILER) +# define FMT_GCC_PRAGMA(arg) _Pragma(arg) +# else +# define FMT_GCC_PRAGMA(arg) +# endif #endif -#if FMT_CLANG_VERSION -# define FMT_PRAGMA_CLANG(x) FMT_PRAGMA_IMPL(clang x) + +// GCC < 5 requires this-> in decltype. +#if FMT_GCC_VERSION && FMT_GCC_VERSION < 500 +# define FMT_DECLTYPE_THIS this-> #else -# define FMT_PRAGMA_CLANG(x) +# define FMT_DECLTYPE_THIS #endif + #if FMT_MSC_VERSION # define FMT_MSC_WARNING(...) __pragma(warning(__VA_ARGS__)) +# define FMT_UNCHECKED_ITERATOR(It) \ + using _Unchecked_type = It // Mark iterator as checked. #else # define FMT_MSC_WARNING(...) +# define FMT_UNCHECKED_ITERATOR(It) using unchecked_type = It #endif #ifndef FMT_BEGIN_NAMESPACE @@ -248,13 +274,7 @@ # define FMT_END_EXPORT #endif -#ifdef _WIN32 -# define FMT_WIN32 1 -#else -# define FMT_WIN32 0 -#endif - -#if !defined(FMT_HEADER_ONLY) && FMT_WIN32 +#if !defined(FMT_HEADER_ONLY) && defined(_WIN32) # if defined(FMT_LIB_EXPORT) # define FMT_API __declspec(dllexport) # elif defined(FMT_SHARED) @@ -267,26 +287,28 @@ # define FMT_API #endif -#ifndef FMT_OPTIMIZE_SIZE -# define FMT_OPTIMIZE_SIZE 0 +#ifndef FMT_UNICODE +# define FMT_UNICODE 1 #endif -// FMT_BUILTIN_TYPE=0 may result in smaller library size at the cost of higher -// per-call binary size by passing built-in types through the extension API. -#ifndef FMT_BUILTIN_TYPES -# define FMT_BUILTIN_TYPES 1 +// Check if rtti is available. +#ifndef FMT_USE_RTTI +// __RTTI is for EDG compilers. _CPPRTTI is for MSVC. +# if defined(__GXX_RTTI) || FMT_HAS_FEATURE(cxx_rtti) || defined(_CPPRTTI) || \ + defined(__INTEL_RTTI__) || defined(__RTTI) +# define FMT_USE_RTTI 1 +# else +# define FMT_USE_RTTI 0 +# endif #endif -#define FMT_APPLY_VARIADIC(expr) \ - using ignore = int[]; \ - (void)ignore { 0, (expr, 0)... } +#define FMT_FWD(...) static_cast(__VA_ARGS__) // Enable minimal optimizations for more compact code in debug mode. -FMT_PRAGMA_GCC(push_options) +FMT_GCC_PRAGMA("GCC push_options") #if !defined(__OPTIMIZE__) && !defined(__CUDACC__) -FMT_PRAGMA_GCC(optimize("Og")) +FMT_GCC_PRAGMA("GCC optimize(\"Og\")") #endif -FMT_PRAGMA_CLANG(diagnostic push) FMT_BEGIN_NAMESPACE @@ -302,15 +324,17 @@ template using remove_const_t = typename std::remove_const::type; template using remove_cvref_t = typename std::remove_cv>::type; +template struct type_identity { + using type = T; +}; +template using type_identity_t = typename type_identity::type; template using make_unsigned_t = typename std::make_unsigned::type; template using underlying_t = typename std::underlying_type::type; -template using decay_t = typename std::decay::type; -using nullptr_t = decltype(nullptr); #if FMT_GCC_VERSION && FMT_GCC_VERSION < 500 -// A workaround for gcc 4.9 to make void_t work in a SFINAE context. +// A workaround for gcc 4.8 to make void_t work in a SFINAE context. template struct void_t_impl { using type = void; }; @@ -332,12 +356,14 @@ struct monostate { # define FMT_ENABLE_IF(...) fmt::enable_if_t<(__VA_ARGS__), int> = 0 #endif -template constexpr auto min_of(T a, T b) -> T { - return a < b ? a : b; -} -template constexpr auto max_of(T a, T b) -> T { - return a > b ? a : b; +// This is defined in base.h instead of format.h to avoid injecting in std. +// It is a template to avoid undesirable implicit conversions to std::byte. +#ifdef __cpp_lib_byte +template ::value)> +inline auto format_as(T b) -> unsigned char { + return static_cast(b); } +#endif namespace detail { // Suppresses "unused variable" warnings with the method described in @@ -347,8 +373,9 @@ template FMT_CONSTEXPR void ignore_unused(const T&...) {} constexpr auto is_constant_evaluated(bool default_value = false) noexcept -> bool { -// Workaround for incompatibility between clang 14 and libstdc++ consteval-based -// std::is_constant_evaluated: https://github.com/fmtlib/fmt/issues/3247. +// Workaround for incompatibility between libstdc++ consteval-based +// std::is_constant_evaluated() implementation and clang-14: +// https://github.com/fmtlib/fmt/issues/3247. #if FMT_CPLUSPLUS >= 202002L && FMT_GLIBCXX_RELEASE >= 12 && \ (FMT_CLANG_VERSION >= 1400 && FMT_CLANG_VERSION < 1500) ignore_unused(default_value); @@ -381,14 +408,15 @@ FMT_NORETURN FMT_API void assert_fail(const char* file, int line, #endif #ifdef FMT_USE_INT128 -// Use the provided definition. +// Do nothing. #elif defined(__SIZEOF_INT128__) && !defined(__NVCC__) && \ !(FMT_CLANG_VERSION && FMT_MSC_VERSION) # define FMT_USE_INT128 1 using int128_opt = __int128_t; // An optional native 128-bit integer. using uint128_opt = __uint128_t; -inline auto map(int128_opt x) -> int128_opt { return x; } -inline auto map(uint128_opt x) -> uint128_opt { return x; } +template inline auto convert_for_visit(T value) -> T { + return value; +} #else # define FMT_USE_INT128 0 #endif @@ -396,23 +424,9 @@ inline auto map(uint128_opt x) -> uint128_opt { return x; } enum class int128_opt {}; enum class uint128_opt {}; // Reduce template instantiations. -inline auto map(int128_opt) -> monostate { return {}; } -inline auto map(uint128_opt) -> monostate { return {}; } -#endif - -#ifndef FMT_USE_BITINT -# define FMT_USE_BITINT (FMT_CLANG_VERSION >= 1500) +template auto convert_for_visit(T) -> monostate { return {}; } #endif -#if FMT_USE_BITINT -FMT_PRAGMA_CLANG(diagnostic ignored "-Wbit-int-extension") -template using bitint = _BitInt(N); -template using ubitint = unsigned _BitInt(N); -#else -template struct bitint {}; -template struct ubitint {}; -#endif // FMT_USE_BITINT - // Casts a nonnegative integer to unsigned. template FMT_CONSTEXPR auto to_unsigned(Int value) -> make_unsigned_t { @@ -420,9 +434,6 @@ FMT_CONSTEXPR auto to_unsigned(Int value) -> make_unsigned_t { return static_cast>(value); } -template -using unsigned_char = conditional_t; - // A heuristic to detect std::string and std::[experimental::]string_view. // It is mainly used to avoid dependency on <[experimental/]string_view>. template @@ -433,19 +444,25 @@ struct is_std_string_like().find_first_of( : std::is_convertible().data()), const typename T::value_type*> {}; -// Check if the literal encoding is UTF-8. -enum { is_utf8_enabled = "\u00A7"[1] == '\xA7' }; -enum { use_utf8 = !FMT_WIN32 || is_utf8_enabled }; - -#ifndef FMT_UNICODE -# define FMT_UNICODE 1 -#endif +// Returns true iff the literal encoding is UTF-8. +constexpr auto is_utf8_enabled() -> bool { + // Avoid an MSVC sign extension bug: https://github.com/fmtlib/fmt/pull/2297. + using uchar = unsigned char; + return sizeof("\u00A7") == 3 && uchar("\u00A7"[0]) == 0xC2 && + uchar("\u00A7"[1]) == 0xA7; +} +constexpr auto use_utf8() -> bool { + return !FMT_MSC_VERSION || is_utf8_enabled(); +} -static_assert(!FMT_UNICODE || use_utf8, +static_assert(!FMT_UNICODE || use_utf8(), "Unicode support requires compiling with /utf-8"); -template constexpr const char* narrow(const T*) { return nullptr; } -constexpr FMT_ALWAYS_INLINE const char* narrow(const char* s) { return s; } +template FMT_CONSTEXPR auto length(const Char* s) -> size_t { + size_t len = 0; + while (*s++) ++len; + return len; +} template FMT_CONSTEXPR auto compare(const Char* s1, const Char* s2, std::size_t n) @@ -477,18 +494,17 @@ struct is_back_insert_iterator< // Extracts a reference to the container from *insert_iterator. template -inline FMT_CONSTEXPR20 auto get_container(OutputIt it) -> - typename OutputIt::container_type& { +inline auto get_container(OutputIt it) -> typename OutputIt::container_type& { struct accessor : OutputIt { - FMT_CONSTEXPR20 accessor(OutputIt base) : OutputIt(base) {} + accessor(OutputIt base) : OutputIt(base) {} using OutputIt::container; }; return *accessor(it).container; } } // namespace detail -// Parsing-related public API and forward declarations. -FMT_BEGIN_EXPORT +// Checks whether T is a container with contiguous storage. +template struct is_contiguous : std::false_type {}; /** * An implementation of `std::basic_string_view` for pre-C++17. It provides a @@ -497,6 +513,7 @@ FMT_BEGIN_EXPORT * compiled with a different `-std` option than the client code (which is not * recommended). */ +FMT_EXPORT template class basic_string_view { private: const Char* data_; @@ -512,23 +529,16 @@ template class basic_string_view { constexpr basic_string_view(const Char* s, size_t count) noexcept : data_(s), size_(count) {} - constexpr basic_string_view(nullptr_t) = delete; + constexpr basic_string_view(std::nullptr_t) = delete; /// Constructs a string reference object from a C string. -#if FMT_GCC_VERSION - FMT_ALWAYS_INLINE -#endif - FMT_CONSTEXPR20 basic_string_view(const Char* s) : data_(s) { -#if FMT_HAS_BUILTIN(__buitin_strlen) || FMT_GCC_VERSION || FMT_CLANG_VERSION - if (std::is_same::value) { - size_ = __builtin_strlen(detail::narrow(s)); - return; - } -#endif - size_t len = 0; - while (*s++) ++len; - size_ = len; - } + FMT_CONSTEXPR20 + basic_string_view(const Char* s) + : data_(s), + size_(detail::const_check(std::is_same::value && + !detail::is_constant_evaluated(false)) + ? strlen(reinterpret_cast(s)) + : detail::length(s)) {} /// Constructs a string reference from a `std::basic_string` or a /// `std::basic_string_view` object. @@ -569,10 +579,11 @@ template class basic_string_view { // Lexicographically compare this string reference to other. FMT_CONSTEXPR auto compare(basic_string_view other) const -> int { - int result = - detail::compare(data_, other.data_, min_of(size_, other.size_)); - if (result != 0) return result; - return size_ == other.size_ ? 0 : (size_ < other.size_ ? -1 : 1); + size_t str_size = size_ < other.size_ ? size_ : other.size_; + int result = detail::compare(data_, other.data_, str_size); + if (result == 0) + result = size_ == other.size_ ? 0 : (size_ < other.size_ ? -1 : 1); + return result; } FMT_CONSTEXPR friend auto operator==(basic_string_view lhs, @@ -596,307 +607,14 @@ template class basic_string_view { } }; +FMT_EXPORT using string_view = basic_string_view; -/// Specifies if `T` is an extended character type. Can be specialized by users. -template struct is_xchar : std::false_type {}; -template <> struct is_xchar : std::true_type {}; -template <> struct is_xchar : std::true_type {}; -template <> struct is_xchar : std::true_type {}; -#ifdef __cpp_char8_t -template <> struct is_xchar : std::true_type {}; -#endif - -// DEPRECATED! Will be replaced with an alias to prevent specializations. -template struct is_char : is_xchar {}; +/// Specifies if `T` is a character type. Can be specialized by users. +FMT_EXPORT +template struct is_char : std::false_type {}; template <> struct is_char : std::true_type {}; -template class basic_appender; -using appender = basic_appender; - -// Checks whether T is a container with contiguous storage. -template struct is_contiguous : std::false_type {}; - -class context; -template class generic_context; -template class parse_context; - -// Longer aliases for C++20 compatibility. -template using basic_format_parse_context = parse_context; -using format_parse_context = parse_context; -template -using basic_format_context = - conditional_t::value, context, - generic_context>; -using format_context = context; - -template -using buffered_context = - conditional_t::value, context, - generic_context, Char>>; - -template class basic_format_arg; -template class basic_format_args; - -// A separate type would result in shorter symbols but break ABI compatibility -// between clang and gcc on ARM (#1919). -using format_args = basic_format_args; - -// A formatter for objects of type T. -template -struct formatter { - // A deleted default constructor indicates a disabled formatter. - formatter() = delete; -}; - -/// Reports a format error at compile time or, via a `format_error` exception, -/// at runtime. -// This function is intentionally not constexpr to give a compile-time error. -FMT_NORETURN FMT_API void report_error(const char* message); - -enum class presentation_type : unsigned char { - // Common specifiers: - none = 0, - debug = 1, // '?' - string = 2, // 's' (string, bool) - - // Integral, bool and character specifiers: - dec = 3, // 'd' - hex, // 'x' or 'X' - oct, // 'o' - bin, // 'b' or 'B' - chr, // 'c' - - // String and pointer specifiers: - pointer = 3, // 'p' - - // Floating-point specifiers: - exp = 1, // 'e' or 'E' (1 since there is no FP debug presentation) - fixed, // 'f' or 'F' - general, // 'g' or 'G' - hexfloat // 'a' or 'A' -}; - -enum class align { none, left, right, center, numeric }; -enum class sign { none, minus, plus, space }; -enum class arg_id_kind { none, index, name }; - -// Basic format specifiers for built-in and string types. -class basic_specs { - private: - // Data is arranged as follows: - // - // 0 1 2 3 - // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - // |type |align| w | p | s |u|#|L| f | unused | - // +-----+-----+---+---+---+-+-+-+-----+---------------------------+ - // - // w - dynamic width info - // p - dynamic precision info - // s - sign - // u - uppercase (e.g. 'X' for 'x') - // # - alternate form ('#') - // L - localized - // f - fill size - // - // Bitfields are not used because of compiler bugs such as gcc bug 61414. - enum : unsigned { - type_mask = 0x00007, - align_mask = 0x00038, - width_mask = 0x000C0, - precision_mask = 0x00300, - sign_mask = 0x00C00, - uppercase_mask = 0x01000, - alternate_mask = 0x02000, - localized_mask = 0x04000, - fill_size_mask = 0x38000, - - align_shift = 3, - width_shift = 6, - precision_shift = 8, - sign_shift = 10, - fill_size_shift = 15, - - max_fill_size = 4 - }; - - size_t data_ = 1 << fill_size_shift; - - // Character (code unit) type is erased to prevent template bloat. - char fill_data_[max_fill_size] = {' '}; - - FMT_CONSTEXPR void set_fill_size(size_t size) { - data_ = (data_ & ~fill_size_mask) | (size << fill_size_shift); - } - - public: - constexpr auto type() const -> presentation_type { - return static_cast(data_ & type_mask); - } - FMT_CONSTEXPR void set_type(presentation_type t) { - data_ = (data_ & ~type_mask) | static_cast(t); - } - - constexpr auto align() const -> align { - return static_cast((data_ & align_mask) >> align_shift); - } - FMT_CONSTEXPR void set_align(fmt::align a) { - data_ = (data_ & ~align_mask) | (static_cast(a) << align_shift); - } - - constexpr auto dynamic_width() const -> arg_id_kind { - return static_cast((data_ & width_mask) >> width_shift); - } - FMT_CONSTEXPR void set_dynamic_width(arg_id_kind w) { - data_ = (data_ & ~width_mask) | (static_cast(w) << width_shift); - } - - FMT_CONSTEXPR auto dynamic_precision() const -> arg_id_kind { - return static_cast((data_ & precision_mask) >> - precision_shift); - } - FMT_CONSTEXPR void set_dynamic_precision(arg_id_kind p) { - data_ = (data_ & ~precision_mask) | - (static_cast(p) << precision_shift); - } - - constexpr bool dynamic() const { - return (data_ & (width_mask | precision_mask)) != 0; - } - - constexpr auto sign() const -> sign { - return static_cast((data_ & sign_mask) >> sign_shift); - } - FMT_CONSTEXPR void set_sign(fmt::sign s) { - data_ = (data_ & ~sign_mask) | (static_cast(s) << sign_shift); - } - - constexpr auto upper() const -> bool { return (data_ & uppercase_mask) != 0; } - FMT_CONSTEXPR void set_upper() { data_ |= uppercase_mask; } - - constexpr auto alt() const -> bool { return (data_ & alternate_mask) != 0; } - FMT_CONSTEXPR void set_alt() { data_ |= alternate_mask; } - FMT_CONSTEXPR void clear_alt() { data_ &= ~alternate_mask; } - - constexpr auto localized() const -> bool { - return (data_ & localized_mask) != 0; - } - FMT_CONSTEXPR void set_localized() { data_ |= localized_mask; } - - constexpr auto fill_size() const -> size_t { - return (data_ & fill_size_mask) >> fill_size_shift; - } - - template ::value)> - constexpr auto fill() const -> const Char* { - return fill_data_; - } - template ::value)> - constexpr auto fill() const -> const Char* { - return nullptr; - } - - template constexpr auto fill_unit() const -> Char { - using uchar = unsigned char; - return static_cast(static_cast(fill_data_[0]) | - (static_cast(fill_data_[1]) << 8) | - (static_cast(fill_data_[2]) << 16)); - } - - FMT_CONSTEXPR void set_fill(char c) { - fill_data_[0] = c; - set_fill_size(1); - } - - template - FMT_CONSTEXPR void set_fill(basic_string_view s) { - auto size = s.size(); - set_fill_size(size); - if (size == 1) { - unsigned uchar = static_cast>(s[0]); - fill_data_[0] = static_cast(uchar); - fill_data_[1] = static_cast(uchar >> 8); - fill_data_[2] = static_cast(uchar >> 16); - return; - } - FMT_ASSERT(size <= max_fill_size, "invalid fill"); - for (size_t i = 0; i < size; ++i) - fill_data_[i & 3] = static_cast(s[i]); - } -}; - -// Format specifiers for built-in and string types. -struct format_specs : basic_specs { - int width; - int precision; - - constexpr format_specs() : width(0), precision(-1) {} -}; - -/** - * Parsing context consisting of a format string range being parsed and an - * argument counter for automatic indexing. - */ -template class parse_context { - private: - basic_string_view fmt_; - int next_arg_id_; - - enum { use_constexpr_cast = !FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200 }; - - FMT_CONSTEXPR void do_check_arg_id(int arg_id); - - public: - using char_type = Char; - using iterator = const Char*; - - explicit constexpr parse_context(basic_string_view fmt, - int next_arg_id = 0) - : fmt_(fmt), next_arg_id_(next_arg_id) {} - - /// Returns an iterator to the beginning of the format string range being - /// parsed. - constexpr auto begin() const noexcept -> iterator { return fmt_.begin(); } - - /// Returns an iterator past the end of the format string range being parsed. - constexpr auto end() const noexcept -> iterator { return fmt_.end(); } - - /// Advances the begin iterator to `it`. - FMT_CONSTEXPR void advance_to(iterator it) { - fmt_.remove_prefix(detail::to_unsigned(it - begin())); - } - - /// Reports an error if using the manual argument indexing; otherwise returns - /// the next argument index and switches to the automatic indexing. - FMT_CONSTEXPR auto next_arg_id() -> int { - if (next_arg_id_ < 0) { - report_error("cannot switch from manual to automatic argument indexing"); - return 0; - } - int id = next_arg_id_++; - do_check_arg_id(id); - return id; - } - - /// Reports an error if using the automatic argument indexing; otherwise - /// switches to the manual indexing. - FMT_CONSTEXPR void check_arg_id(int id) { - if (next_arg_id_ > 0) { - report_error("cannot switch from automatic to manual argument indexing"); - return; - } - next_arg_id_ = -1; - do_check_arg_id(id); - } - FMT_CONSTEXPR void check_arg_id(basic_string_view) { - next_arg_id_ = -1; - } - FMT_CONSTEXPR void check_dynamic_spec(int arg_id); -}; - -FMT_END_EXPORT - namespace detail { // Constructs fmt::basic_string_view from types implicitly convertible @@ -925,10 +643,16 @@ struct has_to_string_view< T, void_t()))>> : std::true_type {}; -/// String's character (code unit) type. detail:: is intentional to prevent ADL. -template ()))> -using char_t = typename V::value_type; +template struct string_literal { + static constexpr Char value[sizeof...(C)] = {C...}; + constexpr operator basic_string_view() const { + return {value, sizeof...(C)}; + } +}; +#if FMT_CPLUSPLUS < 201703L +template +constexpr Char string_literal::value[sizeof...(C)]; +#endif enum class type { none_type, @@ -1003,196 +727,103 @@ enum { cstring_set = set(type::cstring_type), pointer_set = set(type::pointer_type) }; +} // namespace detail -struct view {}; - -template struct named_arg; -template struct is_named_arg : std::false_type {}; -template struct is_static_named_arg : std::false_type {}; +/// Reports a format error at compile time or, via a `format_error` exception, +/// at runtime. +// This function is intentionally not constexpr to give a compile-time error. +FMT_NORETURN FMT_API void report_error(const char* message); -template -struct is_named_arg> : std::true_type {}; +FMT_DEPRECATED FMT_NORETURN inline void throw_format_error( + const char* message) { + report_error(message); +} -template struct named_arg : view { - const Char* name; - const T& value; +/// String's character (code unit) type. +template ()))> +using char_t = typename V::value_type; - named_arg(const Char* n, const T& v) : name(n), value(v) {} - static_assert(!is_named_arg::value, "nested named arguments"); -}; +/** + * Parsing context consisting of a format string range being parsed and an + * argument counter for automatic indexing. + * You can use the `format_parse_context` type alias for `char` instead. + */ +FMT_EXPORT +template class basic_format_parse_context { + private: + basic_string_view format_str_; + int next_arg_id_; -template constexpr auto count() -> size_t { return B ? 1 : 0; } -template constexpr auto count() -> size_t { - return (B1 ? 1 : 0) + count(); -} + FMT_CONSTEXPR void do_check_arg_id(int id); -template constexpr auto count_named_args() -> size_t { - return count::value...>(); -} -template constexpr auto count_static_named_args() -> size_t { - return count::value...>(); -} - -template struct named_arg_info { - const Char* name; - int id; -}; - -template ::value)> -void init_named_arg(named_arg_info*, int& arg_index, int&, const T&) { - ++arg_index; -} -template ::value)> -void init_named_arg(named_arg_info* named_args, int& arg_index, - int& named_arg_index, const T& arg) { - named_args[named_arg_index++] = {arg.name, arg_index++}; -} - -template ::value)> -FMT_CONSTEXPR void init_static_named_arg(named_arg_info*, int& arg_index, - int&) { - ++arg_index; -} -template ::value)> -FMT_CONSTEXPR void init_static_named_arg(named_arg_info* named_args, - int& arg_index, int& named_arg_index) { - named_args[named_arg_index++] = {T::name, arg_index++}; -} + public: + using char_type = Char; + using iterator = const Char*; -// 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. -enum { long_short = sizeof(long) == sizeof(int) }; -using long_type = conditional_t; -using ulong_type = conditional_t; + explicit constexpr basic_format_parse_context( + basic_string_view format_str, int next_arg_id = 0) + : format_str_(format_str), next_arg_id_(next_arg_id) {} -template -using format_as_result = - remove_cvref_t()))>; -template -using format_as_member_result = - remove_cvref_t::format_as(std::declval()))>; + /// Returns an iterator to the beginning of the format string range being + /// parsed. + constexpr auto begin() const noexcept -> iterator { + return format_str_.begin(); + } -template -struct use_format_as : std::false_type {}; -// format_as member is only used to avoid injection into the std namespace. -template -struct use_format_as_member : std::false_type {}; + /// Returns an iterator past the end of the format string range being parsed. + constexpr auto end() const noexcept -> iterator { return format_str_.end(); } -// Only map owning types because mapping views can be unsafe. -template -struct use_format_as< - T, bool_constant>::value>> - : std::true_type {}; -template -struct use_format_as_member< - T, bool_constant>::value>> - : std::true_type {}; + /// Advances the begin iterator to `it`. + FMT_CONSTEXPR void advance_to(iterator it) { + format_str_.remove_prefix(detail::to_unsigned(it - begin())); + } -template > -using use_formatter = - bool_constant<(std::is_class::value || std::is_enum::value || - std::is_union::value || std::is_array::value) && - !has_to_string_view::value && !is_named_arg::value && - !use_format_as::value && !use_format_as_member::value>; - -template > -auto has_formatter_impl(T* p, buffered_context* ctx = nullptr) - -> decltype(formatter().format(*p, *ctx), std::true_type()); -template auto has_formatter_impl(...) -> std::false_type; - -// T can be const-qualified to check if it is const-formattable. -template constexpr auto has_formatter() -> bool { - return decltype(has_formatter_impl(static_cast(nullptr)))::value; -} - -// Maps formatting argument types to natively supported types or user-defined -// types with formatters. Returns void on errors to be SFINAE-friendly. -template struct type_mapper { - static auto map(signed char) -> int; - static auto map(unsigned char) -> unsigned; - static auto map(short) -> int; - static auto map(unsigned short) -> unsigned; - static auto map(int) -> int; - static auto map(unsigned) -> unsigned; - static auto map(long) -> long_type; - static auto map(unsigned long) -> ulong_type; - static auto map(long long) -> long long; - static auto map(unsigned long long) -> unsigned long long; - static auto map(int128_opt) -> int128_opt; - static auto map(uint128_opt) -> uint128_opt; - static auto map(bool) -> bool; - - template - static auto map(bitint) -> conditional_t; - template - static auto map(ubitint) - -> conditional_t; - - template ::value)> - static auto map(T) -> conditional_t< - std::is_same::value || std::is_same::value, Char, void>; - - static auto map(float) -> float; - static auto map(double) -> double; - static auto map(long double) -> long double; - - static auto map(Char*) -> const Char*; - static auto map(const Char*) -> const Char*; - template , - FMT_ENABLE_IF(!std::is_pointer::value)> - static auto map(const T&) -> conditional_t::value, - basic_string_view, void>; - - static auto map(void*) -> const void*; - static auto map(const void*) -> const void*; - static auto map(volatile void*) -> const void*; - static auto map(const volatile void*) -> const void*; - static auto map(nullptr_t) -> const void*; - template ::value || - std::is_member_pointer::value)> - static auto map(const T&) -> void; - - template ::value)> - static auto map(const T& x) -> decltype(map(format_as(x))); - template ::value)> - static auto map(const T& x) -> decltype(map(formatter::format_as(x))); - - template ::value)> - static auto map(T&) -> conditional_t(), T&, void>; + /// Reports an error if using the manual argument indexing; otherwise returns + /// the next argument index and switches to the automatic indexing. + FMT_CONSTEXPR auto next_arg_id() -> int { + if (next_arg_id_ < 0) { + report_error("cannot switch from manual to automatic argument indexing"); + return 0; + } + int id = next_arg_id_++; + do_check_arg_id(id); + return id; + } - template ::value)> - static auto map(const T& named_arg) -> decltype(map(named_arg.value)); + /// Reports an error if using the automatic argument indexing; otherwise + /// switches to the manual indexing. + FMT_CONSTEXPR void check_arg_id(int id) { + if (next_arg_id_ > 0) { + report_error("cannot switch from automatic to manual argument indexing"); + return; + } + next_arg_id_ = -1; + do_check_arg_id(id); + } + FMT_CONSTEXPR void check_arg_id(basic_string_view) { + next_arg_id_ = -1; + } + FMT_CONSTEXPR void check_dynamic_spec(int arg_id); }; -// detail:: is used to workaround a bug in MSVC 2017. -template -using mapped_t = decltype(detail::type_mapper::map(std::declval())); +FMT_EXPORT +using format_parse_context = basic_format_parse_context; -// A type constant after applying type_mapper. -template -using mapped_type_constant = type_constant, Char>; - -template ::value> -using stored_type_constant = std::integral_constant< - type, Context::builtin_types || TYPE == type::int_type ? TYPE - : type::custom_type>; +namespace detail { // A parse context with extra data used only in compile-time checks. template -class compile_parse_context : public parse_context { +class compile_parse_context : public basic_format_parse_context { private: int num_args_; const type* types_; - using base = parse_context; + using base = basic_format_parse_context; public: - explicit FMT_CONSTEXPR compile_parse_context(basic_string_view fmt, - int num_args, const type* types, - int next_arg_id = 0) - : base(fmt, next_arg_id), num_args_(num_args), types_(types) {} + explicit FMT_CONSTEXPR compile_parse_context( + basic_string_view format_str, int num_args, const type* types, + int next_arg_id = 0) + : base(format_str, next_arg_id), num_args_(num_args), types_(types) {} constexpr auto num_args() const -> int { return num_args_; } constexpr auto arg_type(int id) const -> type { return types_[id]; } @@ -1210,570 +841,90 @@ class compile_parse_context : public parse_context { using base::check_arg_id; FMT_CONSTEXPR void check_dynamic_spec(int arg_id) { - ignore_unused(arg_id); + detail::ignore_unused(arg_id); if (arg_id < num_args_ && types_ && !is_integral_type(types_[arg_id])) report_error("width/precision is not integer"); } }; -// An argument reference. -template union arg_ref { - FMT_CONSTEXPR arg_ref(int idx = 0) : index(idx) {} - FMT_CONSTEXPR arg_ref(basic_string_view n) : name(n) {} - - int index; - basic_string_view name; -}; +/// A contiguous memory buffer with an optional growing ability. It is an +/// internal class and shouldn't be used directly, only via `memory_buffer`. +template class buffer { + private: + T* ptr_; + size_t size_; + size_t capacity_; -// Format specifiers with width and precision resolved at formatting rather -// than parsing time to allow reusing the same parsed specifiers with -// different sets of arguments (precompilation of format strings). -template struct dynamic_format_specs : format_specs { - arg_ref width_ref; - arg_ref precision_ref; -}; + using grow_fun = void (*)(buffer& buf, size_t capacity); + grow_fun grow_; -// Converts a character to ASCII. Returns '\0' on conversion failure. -template ::value)> -constexpr auto to_ascii(Char c) -> char { - return c <= 0xff ? static_cast(c) : '\0'; -} + protected: + // Don't initialize ptr_ since it is not accessed to save a few cycles. + FMT_MSC_WARNING(suppress : 26495) + FMT_CONSTEXPR20 buffer(grow_fun grow, size_t sz) noexcept + : size_(sz), capacity_(sz), grow_(grow) {} -// Returns the number of code units in a code point or 1 on error. -template -FMT_CONSTEXPR auto code_point_length(const Char* begin) -> int { - if (const_check(sizeof(Char) != 1)) return 1; - auto c = static_cast(*begin); - return static_cast((0x3a55000000000000ull >> (2 * (c >> 3))) & 3) + 1; -} + constexpr buffer(grow_fun grow, T* p = nullptr, size_t sz = 0, + size_t cap = 0) noexcept + : ptr_(p), size_(sz), capacity_(cap), grow_(grow) {} -// 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 auto parse_nonnegative_int(const Char*& begin, const Char* end, - int error_value) noexcept -> int { - FMT_ASSERT(begin != end && '0' <= *begin && *begin <= '9', ""); - unsigned value = 0, prev = 0; - auto p = begin; - do { - prev = value; - value = value * 10 + unsigned(*p - '0'); - ++p; - } while (p != end && '0' <= *p && *p <= '9'); - auto num_digits = p - begin; - begin = p; - int digits10 = static_cast(sizeof(int) * CHAR_BIT * 3 / 10); - if (num_digits <= digits10) return static_cast(value); - // Check for overflow. - unsigned max = INT_MAX; - return num_digits == digits10 + 1 && - prev * 10ull + unsigned(p[-1] - '0') <= max - ? static_cast(value) - : error_value; -} + FMT_CONSTEXPR20 ~buffer() = default; + buffer(buffer&&) = default; -FMT_CONSTEXPR inline auto parse_align(char c) -> align { - switch (c) { - case '<': return align::left; - case '>': return align::right; - case '^': return align::center; + /// Sets the buffer data and capacity. + FMT_CONSTEXPR void set(T* buf_data, size_t buf_capacity) noexcept { + ptr_ = buf_data; + capacity_ = buf_capacity; } - return align::none; -} -template constexpr auto is_name_start(Char c) -> bool { - return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '_'; -} + public: + using value_type = T; + using const_reference = const T&; -template -FMT_CONSTEXPR auto parse_arg_id(const Char* begin, const Char* end, - Handler&& handler) -> const Char* { - Char c = *begin; - if (c >= '0' && c <= '9') { - int index = 0; - if (c != '0') - index = parse_nonnegative_int(begin, end, INT_MAX); - else - ++begin; - if (begin == end || (*begin != '}' && *begin != ':')) - report_error("invalid format string"); - else - handler.on_index(index); - return begin; - } - if (FMT_OPTIMIZE_SIZE > 1 || !is_name_start(c)) { - report_error("invalid format string"); - return begin; - } - auto it = begin; - do { - ++it; - } while (it != end && (is_name_start(*it) || ('0' <= *it && *it <= '9'))); - handler.on_name({begin, to_unsigned(it - begin)}); - return it; -} + buffer(const buffer&) = delete; + void operator=(const buffer&) = delete; -template struct dynamic_spec_handler { - parse_context& ctx; - arg_ref& ref; - arg_id_kind& kind; + auto begin() noexcept -> T* { return ptr_; } + auto end() noexcept -> T* { return ptr_ + size_; } - FMT_CONSTEXPR void on_index(int id) { - ref = id; - kind = arg_id_kind::index; - ctx.check_arg_id(id); - ctx.check_dynamic_spec(id); - } - FMT_CONSTEXPR void on_name(basic_string_view id) { - ref = id; - kind = arg_id_kind::name; - ctx.check_arg_id(id); - } -}; + auto begin() const noexcept -> const T* { return ptr_; } + auto end() const noexcept -> const T* { return ptr_ + size_; } -template struct parse_dynamic_spec_result { - const Char* end; - arg_id_kind kind; -}; + /// Returns the size of this buffer. + constexpr auto size() const noexcept -> size_t { return size_; } -// Parses integer | "{" [arg_id] "}". -template -FMT_CONSTEXPR auto parse_dynamic_spec(const Char* begin, const Char* end, - int& value, arg_ref& ref, - parse_context& ctx) - -> parse_dynamic_spec_result { - FMT_ASSERT(begin != end, ""); - auto kind = arg_id_kind::none; - if ('0' <= *begin && *begin <= '9') { - int val = parse_nonnegative_int(begin, end, -1); - if (val == -1) report_error("number is too big"); - value = val; - } else { - if (*begin == '{') { - ++begin; - if (begin != end) { - Char c = *begin; - if (c == '}' || c == ':') { - int id = ctx.next_arg_id(); - ref = id; - kind = arg_id_kind::index; - ctx.check_dynamic_spec(id); - } else { - begin = parse_arg_id(begin, end, - dynamic_spec_handler{ctx, ref, kind}); - } - } - if (begin != end && *begin == '}') return {++begin, kind}; - } - report_error("invalid format string"); - } - return {begin, kind}; -} + /// Returns the capacity of this buffer. + constexpr auto capacity() const noexcept -> size_t { return capacity_; } -template -FMT_CONSTEXPR auto parse_width(const Char* begin, const Char* end, - format_specs& specs, arg_ref& width_ref, - parse_context& ctx) -> const Char* { - auto result = parse_dynamic_spec(begin, end, specs.width, width_ref, ctx); - specs.set_dynamic_width(result.kind); - return result.end; -} + /// Returns a pointer to the buffer data (not null-terminated). + FMT_CONSTEXPR auto data() noexcept -> T* { return ptr_; } + FMT_CONSTEXPR auto data() const noexcept -> const T* { return ptr_; } -template -FMT_CONSTEXPR auto parse_precision(const Char* begin, const Char* end, - format_specs& specs, - arg_ref& precision_ref, - parse_context& ctx) -> const Char* { - ++begin; - if (begin == end) { - report_error("invalid precision"); - return begin; + /// Clears this buffer. + void clear() { size_ = 0; } + + // Tries resizing the buffer to contain `count` elements. If T is a POD type + // the new elements may not be initialized. + FMT_CONSTEXPR void try_resize(size_t count) { + try_reserve(count); + size_ = count <= capacity_ ? count : capacity_; } - auto result = - parse_dynamic_spec(begin, end, specs.precision, precision_ref, ctx); - specs.set_dynamic_precision(result.kind); - return result.end; -} -enum class state { start, align, sign, hash, zero, width, precision, locale }; + // Tries increasing the buffer capacity to `new_capacity`. It can increase the + // capacity by a smaller amount than requested but guarantees there is space + // for at least one additional element either by increasing the capacity or by + // flushing the buffer if it is full. + FMT_CONSTEXPR void try_reserve(size_t new_capacity) { + if (new_capacity > capacity_) grow_(*this, new_capacity); + } -// Parses standard format specifiers. -template -FMT_CONSTEXPR auto parse_format_specs(const Char* begin, const Char* end, - dynamic_format_specs& specs, - parse_context& ctx, type arg_type) - -> const Char* { - auto c = '\0'; - if (end - begin > 1) { - auto next = to_ascii(begin[1]); - c = parse_align(next) == align::none ? to_ascii(*begin) : '\0'; - } else { - if (begin == end) return begin; - c = to_ascii(*begin); - } - - struct { - state current_state = state::start; - FMT_CONSTEXPR void operator()(state s, bool valid = true) { - if (current_state >= s || !valid) - report_error("invalid format specifier"); - current_state = s; - } - } enter_state; - - using pres = presentation_type; - constexpr auto integral_set = sint_set | uint_set | bool_set | char_set; - struct { - const Char*& begin; - format_specs& specs; - type arg_type; - - FMT_CONSTEXPR auto operator()(pres pres_type, int set) -> const Char* { - if (!in(arg_type, set)) report_error("invalid format specifier"); - specs.set_type(pres_type); - return begin + 1; - } - } parse_presentation_type{begin, specs, arg_type}; - - for (;;) { - switch (c) { - case '<': - case '>': - case '^': - enter_state(state::align); - specs.set_align(parse_align(c)); - ++begin; - break; - case '+': - case ' ': - specs.set_sign(c == ' ' ? sign::space : sign::plus); - FMT_FALLTHROUGH; - case '-': - enter_state(state::sign, in(arg_type, sint_set | float_set)); - ++begin; - break; - case '#': - enter_state(state::hash, is_arithmetic_type(arg_type)); - specs.set_alt(); - ++begin; - break; - case '0': - enter_state(state::zero); - if (!is_arithmetic_type(arg_type)) - report_error("format specifier requires numeric argument"); - if (specs.align() == align::none) { - // Ignore 0 if align is specified for compatibility with std::format. - specs.set_align(align::numeric); - specs.set_fill('0'); - } - ++begin; - break; - // clang-format off - case '1': case '2': case '3': case '4': case '5': - case '6': case '7': case '8': case '9': case '{': - // clang-format on - enter_state(state::width); - begin = parse_width(begin, end, specs, specs.width_ref, ctx); - break; - case '.': - enter_state(state::precision, - in(arg_type, float_set | string_set | cstring_set)); - begin = parse_precision(begin, end, specs, specs.precision_ref, ctx); - break; - case 'L': - enter_state(state::locale, is_arithmetic_type(arg_type)); - specs.set_localized(); - ++begin; - break; - case 'd': return parse_presentation_type(pres::dec, integral_set); - case 'X': specs.set_upper(); FMT_FALLTHROUGH; - case 'x': return parse_presentation_type(pres::hex, integral_set); - case 'o': return parse_presentation_type(pres::oct, integral_set); - case 'B': specs.set_upper(); FMT_FALLTHROUGH; - case 'b': return parse_presentation_type(pres::bin, integral_set); - case 'E': specs.set_upper(); FMT_FALLTHROUGH; - case 'e': return parse_presentation_type(pres::exp, float_set); - case 'F': specs.set_upper(); FMT_FALLTHROUGH; - case 'f': return parse_presentation_type(pres::fixed, float_set); - case 'G': specs.set_upper(); FMT_FALLTHROUGH; - case 'g': return parse_presentation_type(pres::general, float_set); - case 'A': specs.set_upper(); FMT_FALLTHROUGH; - case 'a': return parse_presentation_type(pres::hexfloat, float_set); - case 'c': - if (arg_type == type::bool_type) report_error("invalid format specifier"); - return parse_presentation_type(pres::chr, integral_set); - case 's': - return parse_presentation_type(pres::string, - bool_set | string_set | cstring_set); - case 'p': - return parse_presentation_type(pres::pointer, pointer_set | cstring_set); - case '?': - return parse_presentation_type(pres::debug, - char_set | string_set | cstring_set); - case '}': return begin; - default: { - if (*begin == '}') return begin; - // Parse fill and alignment. - auto fill_end = begin + code_point_length(begin); - if (end - fill_end <= 0) { - report_error("invalid format specifier"); - return begin; - } - if (*begin == '{') { - report_error("invalid fill character '{'"); - return begin; - } - auto alignment = parse_align(to_ascii(*fill_end)); - enter_state(state::align, alignment != align::none); - specs.set_fill( - basic_string_view(begin, to_unsigned(fill_end - begin))); - specs.set_align(alignment); - begin = fill_end + 1; - } - } - if (begin == end) return begin; - c = to_ascii(*begin); - } -} - -template -FMT_CONSTEXPR FMT_INLINE auto parse_replacement_field(const Char* begin, - const Char* end, - Handler&& handler) - -> const Char* { - ++begin; - if (begin == end) { - handler.on_error("invalid format string"); - return end; - } - int arg_id = 0; - switch (*begin) { - case '}': - handler.on_replacement_field(handler.on_arg_id(), begin); - return begin + 1; - case '{': handler.on_text(begin, begin + 1); return begin + 1; - case ':': arg_id = handler.on_arg_id(); break; - default: { - struct id_adapter { - Handler& handler; - int arg_id; - - FMT_CONSTEXPR void on_index(int id) { arg_id = handler.on_arg_id(id); } - FMT_CONSTEXPR void on_name(basic_string_view id) { - arg_id = handler.on_arg_id(id); - } - } adapter = {handler, 0}; - begin = parse_arg_id(begin, end, adapter); - arg_id = adapter.arg_id; - Char c = begin != end ? *begin : Char(); - if (c == '}') { - handler.on_replacement_field(arg_id, begin); - return begin + 1; - } - if (c != ':') { - handler.on_error("missing '}' in format string"); - return end; - } - break; - } - } - begin = handler.on_format_specs(arg_id, begin + 1, end); - if (begin == end || *begin != '}') - return handler.on_error("unknown format specifier"), end; - return begin + 1; -} - -template -FMT_CONSTEXPR void parse_format_string(basic_string_view fmt, - Handler&& handler) { - auto begin = fmt.data(), end = begin + fmt.size(); - auto p = begin; - while (p != end) { - auto c = *p++; - if (c == '{') { - handler.on_text(begin, p - 1); - begin = p = parse_replacement_field(p - 1, end, handler); - } else if (c == '}') { - if (p == end || *p != '}') - return handler.on_error("unmatched '}' in format string"); - handler.on_text(begin, p); - begin = ++p; - } - } - handler.on_text(begin, end); -} - -// Checks char specs and returns true iff the presentation type is char-like. -FMT_CONSTEXPR inline auto check_char_specs(const format_specs& specs) -> bool { - auto type = specs.type(); - if (type != presentation_type::none && type != presentation_type::chr && - type != presentation_type::debug) { - return false; - } - if (specs.align() == align::numeric || specs.sign() != sign::none || - specs.alt()) { - report_error("invalid format specifier for char"); - } - return true; -} - -// A base class for compile-time strings. -struct compile_string {}; - -template -FMT_VISIBILITY("hidden") // Suppress an ld warning on macOS (#3769). -FMT_CONSTEXPR auto invoke_parse(parse_context& ctx) -> const Char* { - using mapped_type = remove_cvref_t>; - constexpr bool formattable = - std::is_constructible>::value; - if (!formattable) return ctx.begin(); // Error is reported in the value ctor. - using formatted_type = conditional_t; - return formatter().parse(ctx); -} - -template struct arg_pack {}; - -template -class format_string_checker { - private: - type types_[max_of(1, NUM_ARGS)]; - named_arg_info named_args_[max_of(1, NUM_NAMED_ARGS)]; - compile_parse_context context_; - - using parse_func = auto (*)(parse_context&) -> const Char*; - parse_func parse_funcs_[max_of(1, NUM_ARGS)]; - - public: - template - explicit FMT_CONSTEXPR format_string_checker(basic_string_view fmt, - arg_pack) - : types_{mapped_type_constant::value...}, - named_args_{}, - context_(fmt, NUM_ARGS, types_), - parse_funcs_{&invoke_parse...} { - int arg_index = 0, named_arg_index = 0; - FMT_APPLY_VARIADIC( - init_static_named_arg(named_args_, arg_index, named_arg_index)); - ignore_unused(arg_index, named_arg_index); - } - - FMT_CONSTEXPR void on_text(const Char*, const Char*) {} - - FMT_CONSTEXPR auto on_arg_id() -> int { return context_.next_arg_id(); } - FMT_CONSTEXPR auto on_arg_id(int id) -> int { - context_.check_arg_id(id); - return id; - } - FMT_CONSTEXPR auto on_arg_id(basic_string_view id) -> int { - for (int i = 0; i < NUM_NAMED_ARGS; ++i) { - if (named_args_[i].name == id) return named_args_[i].id; - } - if (!DYNAMIC_NAMES) on_error("argument not found"); - return -1; - } - - FMT_CONSTEXPR void on_replacement_field(int id, const Char* begin) { - on_format_specs(id, begin, begin); // Call parse() on empty specs. - } - - FMT_CONSTEXPR auto on_format_specs(int id, const Char* begin, const Char* end) - -> const Char* { - context_.advance_to(begin); - if (id >= 0 && id < NUM_ARGS) return parse_funcs_[id](context_); - while (begin != end && *begin != '}') ++begin; - return begin; - } - - FMT_NORETURN FMT_CONSTEXPR void on_error(const char* message) { - report_error(message); - } -}; - -/// A contiguous memory buffer with an optional growing ability. It is an -/// internal class and shouldn't be used directly, only via `memory_buffer`. -template class buffer { - private: - T* ptr_; - size_t size_; - size_t capacity_; - - using grow_fun = void (*)(buffer& buf, size_t capacity); - grow_fun grow_; - - protected: - // Don't initialize ptr_ since it is not accessed to save a few cycles. - FMT_MSC_WARNING(suppress : 26495) - FMT_CONSTEXPR buffer(grow_fun grow, size_t sz) noexcept - : size_(sz), capacity_(sz), grow_(grow) {} - - constexpr buffer(grow_fun grow, T* p = nullptr, size_t sz = 0, - size_t cap = 0) noexcept - : ptr_(p), size_(sz), capacity_(cap), grow_(grow) {} - - FMT_CONSTEXPR20 ~buffer() = default; - buffer(buffer&&) = default; - - /// Sets the buffer data and capacity. - FMT_CONSTEXPR void set(T* buf_data, size_t buf_capacity) noexcept { - ptr_ = buf_data; - capacity_ = buf_capacity; - } - - public: - using value_type = T; - using const_reference = const T&; - - buffer(const buffer&) = delete; - void operator=(const buffer&) = delete; - - auto begin() noexcept -> T* { return ptr_; } - auto end() noexcept -> T* { return ptr_ + size_; } - - auto begin() const noexcept -> const T* { return ptr_; } - auto end() const noexcept -> const T* { return ptr_ + size_; } - - /// Returns the size of this buffer. - constexpr auto size() const noexcept -> size_t { return size_; } - - /// Returns the capacity of this buffer. - constexpr auto capacity() const noexcept -> size_t { return capacity_; } - - /// Returns a pointer to the buffer data (not null-terminated). - FMT_CONSTEXPR auto data() noexcept -> T* { return ptr_; } - FMT_CONSTEXPR auto data() const noexcept -> const T* { return ptr_; } - - /// Clears this buffer. - FMT_CONSTEXPR void clear() { size_ = 0; } - - // Tries resizing the buffer to contain `count` elements. If T is a POD type - // the new elements may not be initialized. - FMT_CONSTEXPR void try_resize(size_t count) { - try_reserve(count); - size_ = min_of(count, capacity_); - } - - // Tries increasing the buffer capacity to `new_capacity`. It can increase the - // capacity by a smaller amount than requested but guarantees there is space - // for at least one additional element either by increasing the capacity or by - // flushing the buffer if it is full. - FMT_CONSTEXPR void try_reserve(size_t new_capacity) { - if (new_capacity > capacity_) grow_(*this, new_capacity); - } - - FMT_CONSTEXPR void push_back(const T& value) { - try_reserve(size_ + 1); - ptr_[size_++] = value; + FMT_CONSTEXPR void push_back(const T& value) { + try_reserve(size_ + 1); + ptr_[size_++] = value; } /// Appends data to the end of the buffer. - template -// Workaround for MSVC2019 to fix error C2893: Failed to specialize function -// template 'void fmt::v11::detail::buffer::append(const U *,const U *)'. -#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1940 - FMT_CONSTEXPR20 -#endif - void - append(const U* begin, const U* end) { + template void append(const U* begin, const U* end) { while (begin != end) { auto count = to_unsigned(end - begin); try_reserve(size_ + count); @@ -1797,9 +948,9 @@ template class buffer { }; struct buffer_traits { - constexpr explicit buffer_traits(size_t) {} - constexpr auto count() const -> size_t { return 0; } - constexpr auto limit(size_t size) const -> size_t { return size; } + explicit buffer_traits(size_t) {} + auto count() const -> size_t { return 0; } + auto limit(size_t size) -> size_t { return size; } }; class fixed_buffer_traits { @@ -1808,12 +959,12 @@ class fixed_buffer_traits { size_t limit_; public: - constexpr explicit fixed_buffer_traits(size_t limit) : limit_(limit) {} - constexpr auto count() const -> size_t { return count_; } - FMT_CONSTEXPR auto limit(size_t size) -> size_t { + explicit fixed_buffer_traits(size_t limit) : limit_(limit) {} + auto count() const -> size_t { return count_; } + auto limit(size_t size) -> size_t { size_t n = limit_ > count_ ? limit_ - count_ : 0; count_ += size; - return min_of(size, n); + return size < n ? size : n; } }; @@ -1910,41 +1061,32 @@ template class iterator_buffer : public buffer { auto out() -> T* { return &*this->end(); } }; -template -class container_buffer : public buffer { - private: - using value_type = typename Container::value_type; - - static FMT_CONSTEXPR void grow(buffer& buf, size_t capacity) { - auto& self = static_cast(buf); - self.container.resize(capacity); - self.set(&self.container[0], capacity); - } - - public: - Container& container; - - explicit container_buffer(Container& c) - : buffer(grow, c.size()), container(c) {} -}; - // A buffer that writes to a container with the contiguous storage. template class iterator_buffer< OutputIt, - enable_if_t::value && + enable_if_t::value && is_contiguous::value, typename OutputIt::container_type::value_type>> - : public container_buffer { + : public buffer { private: - using base = container_buffer; + using container_type = typename OutputIt::container_type; + using value_type = typename container_type::value_type; + container_type& container_; + + static FMT_CONSTEXPR void grow(buffer& buf, size_t capacity) { + auto& self = static_cast(buf); + self.container_.resize(capacity); + self.set(&self.container_[0], capacity); + } public: - explicit iterator_buffer(typename OutputIt::container_type& c) : base(c) {} + explicit iterator_buffer(container_type& c) + : buffer(grow, c.size()), container_(c) {} explicit iterator_buffer(OutputIt out, size_t = 0) - : base(get_container(out)) {} + : iterator_buffer(get_container(out)) {} - auto out() -> OutputIt { return OutputIt(this->container); } + auto out() -> OutputIt { return back_inserter(container_); } }; // A buffer that counts the number of code units written discarding the output. @@ -1961,26 +1103,111 @@ template class counting_buffer : public buffer { } public: - FMT_CONSTEXPR counting_buffer() : buffer(grow, data_, 0, buffer_size) {} + counting_buffer() : buffer(grow, data_, 0, buffer_size) {} - constexpr auto count() const noexcept -> size_t { - return count_ + this->size(); - } + auto count() -> size_t { return count_ + this->size(); } }; +} // namespace detail -template -struct is_back_insert_iterator> : std::true_type {}; - -// An optimized version of std::copy with the output value type (T). -template ::value)> -FMT_CONSTEXPR20 auto copy(InputIt begin, InputIt end, OutputIt out) - -> OutputIt { - get_container(out).append(begin, end); - return out; +template +FMT_CONSTEXPR void basic_format_parse_context::do_check_arg_id(int id) { + // Argument id is only checked at compile-time during parsing because + // formatting has its own validation. + if (detail::is_constant_evaluated() && + (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) { + using context = detail::compile_parse_context; + if (id >= static_cast(this)->num_args()) + report_error("argument not found"); + } } -template +FMT_CONSTEXPR void basic_format_parse_context::check_dynamic_spec( + int arg_id) { + if (detail::is_constant_evaluated() && + (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) { + using context = detail::compile_parse_context; + static_cast(this)->check_dynamic_spec(arg_id); + } +} + +FMT_EXPORT template class basic_format_arg; +FMT_EXPORT template class basic_format_args; +FMT_EXPORT template class dynamic_format_arg_store; + +// A formatter for objects of type T. +FMT_EXPORT +template +struct formatter { + // A deleted default constructor indicates a disabled formatter. + formatter() = delete; +}; + +// Specifies if T has an enabled formatter specialization. A type can be +// formattable even if it doesn't have a formatter e.g. via a conversion. +template +using has_formatter = + std::is_constructible>; + +// An output iterator that appends to a buffer. It is used instead of +// back_insert_iterator to reduce symbol sizes and avoid dependency. +template class basic_appender { + private: + detail::buffer* buffer_; + + friend auto get_container(basic_appender app) -> detail::buffer& { + return *app.buffer_; + } + + public: + using iterator_category = int; + using value_type = T; + using difference_type = ptrdiff_t; + using pointer = T*; + using reference = T&; + using container_type = detail::buffer; + FMT_UNCHECKED_ITERATOR(basic_appender); + + FMT_CONSTEXPR basic_appender(detail::buffer& buf) : buffer_(&buf) {} + + auto operator=(T c) -> basic_appender& { + buffer_->push_back(c); + return *this; + } + auto operator*() -> basic_appender& { return *this; } + auto operator++() -> basic_appender& { return *this; } + auto operator++(int) -> basic_appender { return *this; } +}; + +using appender = basic_appender; + +namespace detail { +template +struct is_back_insert_iterator> : std::true_type {}; + +template +struct locking : std::true_type {}; +template +struct locking>::nonlocking>> + : std::false_type {}; + +template FMT_CONSTEXPR inline auto is_locking() -> bool { + return locking::value; +} +template +FMT_CONSTEXPR inline auto is_locking() -> bool { + return locking::value || is_locking(); +} + +// An optimized version of std::copy with the output value type (T). +template ::value)> +auto copy(InputIt begin, InputIt end, OutputIt out) -> OutputIt { + get_container(out).append(begin, end); + return out; +} + +template ::value)> FMT_CONSTEXPR auto copy(InputIt begin, InputIt end, OutputIt out) -> OutputIt { while (begin != end) *out++ = static_cast(*begin++); @@ -1992,6 +1219,22 @@ FMT_CONSTEXPR auto copy(basic_string_view s, OutputIt out) -> OutputIt { return copy(s.begin(), s.end(), out); } +template +constexpr auto has_const_formatter_impl(T*) + -> decltype(typename Context::template formatter_type().format( + std::declval(), std::declval()), + true) { + return true; +} +template +constexpr auto has_const_formatter_impl(...) -> bool { + return false; +} +template +constexpr auto has_const_formatter() -> bool { + return has_const_formatter_impl(static_cast(nullptr)); +} + template struct is_buffer_appender : std::false_type {}; template @@ -2023,19 +1266,46 @@ auto get_iterator(buffer&, OutputIt out) -> OutputIt { return out; } -// This type is intentionally undefined, only used for errors. -template struct type_is_unformattable_for; +struct view {}; + +template struct named_arg : view { + const Char* name; + const T& value; + named_arg(const Char* n, const T& v) : name(n), value(v) {} +}; + +template struct named_arg_info { + const Char* name; + int id; +}; + +template struct is_named_arg : std::false_type {}; +template struct is_statically_named_arg : std::false_type {}; + +template +struct is_named_arg> : std::true_type {}; + +template constexpr auto count() -> size_t { return B ? 1 : 0; } +template constexpr auto count() -> size_t { + return (B1 ? 1 : 0) + count(); +} + +template constexpr auto count_named_args() -> size_t { + return count::value...>(); +} + +template +constexpr auto count_statically_named_args() -> size_t { + return count::value...>(); +} + +struct unformattable {}; +struct unformattable_char : unformattable {}; +struct unformattable_pointer : unformattable {}; template struct string_value { const Char* data; size_t size; - auto str() const -> basic_string_view { return {data, size}; } -}; - -template struct custom_value { - using char_type = typename Context::char_type; - void* value; - void (*format)(void* arg, parse_context& parse_ctx, Context& ctx); }; template struct named_arg_value { @@ -2043,13 +1313,11 @@ template struct named_arg_value { size_t size; }; -struct custom_tag {}; - -#if !FMT_BUILTIN_TYPES -# define FMT_BUILTIN , monostate -#else -# define FMT_BUILTIN -#endif +template struct custom_value { + using parse_context = typename Context::parse_context_type; + void* value; + void (*format)(void* arg, parse_context& parse_ctx, Context& ctx); +}; // A formatting argument value. template class value { @@ -2075,132 +1343,223 @@ template class value { named_arg_value named_args; }; - constexpr FMT_INLINE value() : no_value() {} - constexpr FMT_INLINE value(signed char x) : int_value(x) {} - constexpr FMT_INLINE value(unsigned char x FMT_BUILTIN) : uint_value(x) {} - constexpr FMT_INLINE value(signed short x) : int_value(x) {} - constexpr FMT_INLINE value(unsigned short x FMT_BUILTIN) : uint_value(x) {} - constexpr FMT_INLINE value(int x) : int_value(x) {} - constexpr FMT_INLINE value(unsigned x FMT_BUILTIN) : uint_value(x) {} - FMT_CONSTEXPR FMT_INLINE value(long x FMT_BUILTIN) : value(long_type(x)) {} - FMT_CONSTEXPR FMT_INLINE value(unsigned long x FMT_BUILTIN) - : value(ulong_type(x)) {} - constexpr FMT_INLINE value(long long x FMT_BUILTIN) : long_long_value(x) {} - constexpr FMT_INLINE value(unsigned long long x FMT_BUILTIN) - : ulong_long_value(x) {} - FMT_INLINE value(int128_opt x FMT_BUILTIN) : int128_value(x) {} - FMT_INLINE value(uint128_opt x FMT_BUILTIN) : uint128_value(x) {} - constexpr FMT_INLINE value(bool x FMT_BUILTIN) : bool_value(x) {} - - template - constexpr FMT_INLINE value(bitint x FMT_BUILTIN) : long_long_value(x) { - static_assert(N <= 64, "unsupported _BitInt"); - } - template - constexpr FMT_INLINE value(ubitint x FMT_BUILTIN) : ulong_long_value(x) { - static_assert(N <= 64, "unsupported _BitInt"); - } - - template ::value)> - constexpr FMT_INLINE value(T x FMT_BUILTIN) : char_value(x) { - static_assert( - std::is_same::value || std::is_same::value, - "mixing character types is disallowed"); - } - - constexpr FMT_INLINE value(float x FMT_BUILTIN) : float_value(x) {} - constexpr FMT_INLINE value(double x FMT_BUILTIN) : double_value(x) {} - FMT_INLINE value(long double x FMT_BUILTIN) : long_double_value(x) {} - - FMT_CONSTEXPR FMT_INLINE value(char_type* x FMT_BUILTIN) { - string.data = x; - if (is_constant_evaluated()) string.size = 0; - } - FMT_CONSTEXPR FMT_INLINE value(const char_type* x FMT_BUILTIN) { - string.data = x; - if (is_constant_evaluated()) string.size = 0; - } - template , - FMT_ENABLE_IF(!std::is_pointer::value)> - FMT_CONSTEXPR value(const T& x FMT_BUILTIN) { - static_assert(std::is_same::value, - "mixing character types is disallowed"); - auto sv = to_string_view(x); - string.data = sv.data(); - string.size = sv.size(); - } - FMT_INLINE value(void* x FMT_BUILTIN) : pointer(x) {} - FMT_INLINE value(const void* x FMT_BUILTIN) : pointer(x) {} - FMT_INLINE value(volatile void* x FMT_BUILTIN) - : pointer(const_cast(x)) {} - FMT_INLINE value(const volatile void* x FMT_BUILTIN) - : pointer(const_cast(x)) {} - FMT_INLINE value(nullptr_t) : pointer(nullptr) {} - - template ::value || - std::is_member_pointer::value)> - value(const T&) { - // Formatting of arbitrary pointers is disallowed. If you want to format a - // pointer cast it to `void*` or `const void*`. In particular, this forbids - // formatting of `[const] volatile char*` printed as bool by iostreams. - static_assert(sizeof(T) == 0, - "formatting of non-void pointers is disallowed"); - } - - template ::value)> - value(const T& x) : value(format_as(x)) {} - template ::value)> - value(const T& x) : value(formatter::format_as(x)) {} - - template ::value)> - value(const T& named_arg) : value(named_arg.value) {} - - template ::value || !FMT_BUILTIN_TYPES)> - FMT_CONSTEXPR20 FMT_INLINE value(T& x) : value(x, custom_tag()) {} - + constexpr FMT_ALWAYS_INLINE value() : no_value() {} + constexpr FMT_ALWAYS_INLINE value(int val) : int_value(val) {} + constexpr FMT_ALWAYS_INLINE value(unsigned val) : uint_value(val) {} + constexpr FMT_ALWAYS_INLINE value(long long val) : long_long_value(val) {} + constexpr FMT_ALWAYS_INLINE value(unsigned long long val) + : ulong_long_value(val) {} + FMT_ALWAYS_INLINE value(int128_opt val) : int128_value(val) {} + FMT_ALWAYS_INLINE value(uint128_opt val) : uint128_value(val) {} + constexpr FMT_ALWAYS_INLINE value(float val) : float_value(val) {} + constexpr FMT_ALWAYS_INLINE value(double val) : double_value(val) {} + FMT_ALWAYS_INLINE value(long double val) : long_double_value(val) {} + constexpr FMT_ALWAYS_INLINE value(bool val) : bool_value(val) {} + constexpr FMT_ALWAYS_INLINE value(char_type val) : char_value(val) {} + FMT_CONSTEXPR FMT_ALWAYS_INLINE value(const char_type* val) { + string.data = val; + if (is_constant_evaluated()) string.size = {}; + } + FMT_CONSTEXPR FMT_ALWAYS_INLINE value(basic_string_view val) { + string.data = val.data(); + string.size = val.size(); + } + FMT_ALWAYS_INLINE value(const void* val) : pointer(val) {} FMT_ALWAYS_INLINE value(const named_arg_info* args, size_t size) : named_args{args, size} {} - private: - template ())> - FMT_CONSTEXPR value(T& x, custom_tag) { + template FMT_CONSTEXPR20 FMT_ALWAYS_INLINE value(T& val) { using value_type = remove_const_t; // T may overload operator& e.g. std::vector::reference in libc++. - if (!is_constant_evaluated()) { - custom.value = - const_cast(&reinterpret_cast(x)); - } else { - custom.value = nullptr; #if defined(__cpp_if_constexpr) - if constexpr (std::is_same*>::value) - custom.value = const_cast(&x); + if constexpr (std::is_same::value) + custom.value = const_cast(&val); #endif - } - custom.format = format_custom>; - } - - template ())> - FMT_CONSTEXPR value(const T&, custom_tag) { - // Cannot format an argument; to make type T formattable provide a - // formatter specialization: https://fmt.dev/latest/api.html#udt. - type_is_unformattable_for _; - } + if (!is_constant_evaluated()) + custom.value = const_cast(&reinterpret_cast(val)); + // 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`. + custom.format = format_custom_arg< + value_type, typename Context::template formatter_type>; + } + value(unformattable); + value(unformattable_char); + value(unformattable_pointer); + private: // Formats an argument of a custom type, such as a user-defined class. template - static void format_custom(void* arg, parse_context& parse_ctx, - Context& ctx) { + static void format_custom_arg(void* arg, + typename Context::parse_context_type& parse_ctx, + Context& ctx) { auto f = Formatter(); parse_ctx.advance_to(f.parse(parse_ctx)); using qualified_type = - conditional_t(), const T, T>; + conditional_t(), const T, T>; // format must be const for compatibility with std::format and compilation. const auto& cf = f; ctx.advance_to(cf.format(*static_cast(arg), ctx)); } }; +// 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. +enum { long_short = sizeof(long) == sizeof(int) }; +using long_type = conditional_t; +using ulong_type = conditional_t; + +template struct format_as_result { + template ::value || std::is_class::value)> + static auto map(U*) -> remove_cvref_t()))>; + static auto map(...) -> void; + + using type = decltype(map(static_cast(nullptr))); +}; +template using format_as_t = typename format_as_result::type; + +template +struct has_format_as + : bool_constant, void>::value> {}; + +#define FMT_MAP_API FMT_CONSTEXPR FMT_ALWAYS_INLINE + +// Maps formatting arguments to core types. +// arg_mapper reports errors by returning unformattable instead of using +// static_assert because it's used in the is_formattable trait. +template struct arg_mapper { + using char_type = typename Context::char_type; + + FMT_MAP_API auto map(signed char val) -> int { return val; } + FMT_MAP_API auto map(unsigned char val) -> unsigned { return val; } + FMT_MAP_API auto map(short val) -> int { return val; } + FMT_MAP_API auto map(unsigned short val) -> unsigned { return val; } + FMT_MAP_API auto map(int val) -> int { return val; } + FMT_MAP_API auto map(unsigned val) -> unsigned { return val; } + FMT_MAP_API auto map(long val) -> long_type { return val; } + FMT_MAP_API auto map(unsigned long val) -> ulong_type { return val; } + FMT_MAP_API auto map(long long val) -> long long { return val; } + FMT_MAP_API auto map(unsigned long long val) -> unsigned long long { + return val; + } + FMT_MAP_API auto map(int128_opt val) -> int128_opt { return val; } + FMT_MAP_API auto map(uint128_opt val) -> uint128_opt { return val; } + FMT_MAP_API auto map(bool val) -> bool { return val; } + + template ::value || + std::is_same::value)> + FMT_MAP_API auto map(T val) -> char_type { + return val; + } + template ::value || +#ifdef __cpp_char8_t + std::is_same::value || +#endif + std::is_same::value || + std::is_same::value) && + !std::is_same::value, + int> = 0> + FMT_MAP_API auto map(T) -> unformattable_char { + return {}; + } + + FMT_MAP_API auto map(float val) -> float { return val; } + FMT_MAP_API auto map(double val) -> double { return val; } + FMT_MAP_API auto map(long double val) -> long double { return val; } + + FMT_MAP_API auto map(char_type* val) -> const char_type* { return val; } + FMT_MAP_API auto map(const char_type* val) -> const char_type* { return val; } + template , + FMT_ENABLE_IF(std::is_same::value && + !std::is_pointer::value)> + FMT_MAP_API auto map(const T& val) -> basic_string_view { + return to_string_view(val); + } + template , + FMT_ENABLE_IF(!std::is_same::value && + !std::is_pointer::value)> + FMT_MAP_API auto map(const T&) -> unformattable_char { + return {}; + } + + FMT_MAP_API auto map(void* val) -> const void* { return val; } + FMT_MAP_API auto map(const void* val) -> const void* { return val; } + FMT_MAP_API auto map(volatile void* val) -> const void* { + return const_cast(val); + } + FMT_MAP_API auto map(const volatile void* val) -> const void* { + return const_cast(val); + } + FMT_MAP_API auto map(std::nullptr_t val) -> const void* { return val; } + + // Use SFINAE instead of a const T* parameter to avoid a conflict with the + // array overload. + template < + typename T, + FMT_ENABLE_IF( + std::is_pointer::value || std::is_member_pointer::value || + std::is_function::type>::value || + (std::is_array::value && + !std::is_convertible::value))> + FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer { + return {}; + } + + template ::value)> + FMT_MAP_API auto map(const T (&values)[N]) -> const T (&)[N] { + return values; + } + + // Only map owning types because mapping views can be unsafe. + template , + FMT_ENABLE_IF(std::is_arithmetic::value)> + FMT_MAP_API auto map(const T& val) -> decltype(FMT_DECLTYPE_THIS map(U())) { + return map(format_as(val)); + } + + template > + struct formattable : bool_constant() || + (has_formatter::value && + !std::is_const::value)> {}; + + template ::value)> + FMT_MAP_API auto do_map(T& val) -> T& { + return val; + } + template ::value)> + FMT_MAP_API auto do_map(T&) -> unformattable { + return {}; + } + + // is_fundamental is used to allow formatters for extended FP types. + template , + FMT_ENABLE_IF( + (std::is_class::value || std::is_enum::value || + std::is_union::value || std::is_fundamental::value) && + !has_to_string_view::value && !is_char::value && + !is_named_arg::value && !std::is_integral::value && + !std::is_arithmetic>::value)> + FMT_MAP_API auto map(T& val) -> decltype(FMT_DECLTYPE_THIS do_map(val)) { + return do_map(val); + } + + template ::value)> + FMT_MAP_API auto map(const T& named_arg) + -> decltype(FMT_DECLTYPE_THIS map(named_arg.value)) { + return map(named_arg.value); + } + + auto map(...) -> unformattable { return {}; } +}; + +// A type constant after applying arg_mapper. +template +using mapped_type_constant = + type_constant().map(std::declval())), + typename Context::char_type>; + enum { packed_arg_bits = 4 }; // Maximum number of arguments with packed types. enum { max_packed_args = 62 / packed_arg_bits }; @@ -2214,28 +1573,19 @@ template <> struct is_output_iterator : std::true_type {}; template struct is_output_iterator< - It, T, - void_t&>()++ = std::declval())>> + It, T, void_t()++ = std::declval())>> : std::true_type {}; -#ifndef FMT_USE_LOCALE -# define FMT_USE_LOCALE (FMT_OPTIMIZE_SIZE <= 1) -#endif - // A type-erased reference to an std::locale to avoid a heavy include. -struct locale_ref { -#if FMT_USE_LOCALE +class locale_ref { private: const void* locale_; // A type-erased pointer to std::locale. public: constexpr locale_ref() : locale_(nullptr) {} + template explicit locale_ref(const Locale& loc); - template - locale_ref(const Locale& loc); - - inline explicit operator bool() const noexcept { return locale_ != nullptr; } -#endif // FMT_USE_LOCALE + explicit operator bool() const noexcept { return locale_ != nullptr; } template auto get() const -> Locale; }; @@ -2246,157 +1596,131 @@ template constexpr auto encode_types() -> unsigned long long { template constexpr auto encode_types() -> unsigned long long { - return static_cast(stored_type_constant::value) | + return static_cast(mapped_type_constant::value) | (encode_types() << packed_arg_bits); } template -constexpr auto make_descriptor() -> unsigned long long { +constexpr unsigned long long make_descriptor() { return NUM_ARGS <= max_packed_args ? encode_types() : is_unpacked_bit | NUM_ARGS; } +// This type is intentionally undefined, only used for errors. +template +#if FMT_CLANG_VERSION && FMT_CLANG_VERSION <= 1500 +// https://github.com/fmtlib/fmt/issues/3796 +struct type_is_unformattable_for { +}; +#else +struct type_is_unformattable_for; +#endif + +template +FMT_CONSTEXPR auto make_arg(T& val) -> value { + using arg_type = remove_cvref_t().map(val))>; + + // Use enum instead of constexpr because the latter may generate code. + enum { + formattable_char = !std::is_same::value + }; + static_assert(formattable_char, "Mixing character types is disallowed."); + + // Formatting of arbitrary pointers is disallowed. If you want to format a + // pointer cast it to `void*` or `const void*`. In particular, this forbids + // formatting of `[const] volatile char*` printed as bool by iostreams. + enum { + formattable_pointer = !std::is_same::value + }; + static_assert(formattable_pointer, + "Formatting of non-void pointers is disallowed."); + + enum { formattable = !std::is_same::value }; +#if defined(__cpp_if_constexpr) + if constexpr (!formattable) + type_is_unformattable_for _; +#endif + static_assert( + formattable, + "Cannot format an argument. To make type T formattable provide a " + "formatter specialization: https://fmt.dev/latest/api.html#udt"); + return {arg_mapper().map(val)}; +} + +template +FMT_CONSTEXPR auto make_arg(T& val) -> basic_format_arg { + auto arg = basic_format_arg(); + arg.type_ = mapped_type_constant::value; + arg.value_ = make_arg(val); + return arg; +} + +template +FMT_CONSTEXPR inline auto make_arg(T& val) -> basic_format_arg { + return make_arg(val); +} + template using arg_t = conditional_t, basic_format_arg>; +template ::value)> +void init_named_arg(named_arg_info*, int& arg_index, int&, const T&) { + ++arg_index; +} +template ::value)> +void init_named_arg(named_arg_info* named_args, int& arg_index, + int& named_arg_index, const T& arg) { + named_args[named_arg_index++] = {arg.name, arg_index++}; +} + +// An array of references to arguments. It can be implicitly converted to +// `fmt::basic_format_args` for passing into type-erased formatting functions +// such as `fmt::vformat`. template -struct named_arg_store { +struct format_arg_store { // args_[0].named_args points to named_args to avoid bloating format_args. - arg_t args[1 + NUM_ARGS]; + // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning. + static constexpr size_t ARGS_ARR_SIZE = 1 + (NUM_ARGS != 0 ? NUM_ARGS : +1); + + arg_t args[ARGS_ARR_SIZE]; named_arg_info named_args[NUM_NAMED_ARGS]; template - FMT_CONSTEXPR FMT_ALWAYS_INLINE named_arg_store(T&... values) - : args{{named_args, NUM_NAMED_ARGS}, values...} { + FMT_MAP_API format_arg_store(T&... values) + : args{{named_args, NUM_NAMED_ARGS}, + make_arg(values)...} { + using dummy = int[]; int arg_index = 0, named_arg_index = 0; - FMT_APPLY_VARIADIC( - init_named_arg(named_args, arg_index, named_arg_index, values)); + (void)dummy{ + 0, + (init_named_arg(named_args, arg_index, named_arg_index, values), 0)...}; } - named_arg_store(named_arg_store&& rhs) { + format_arg_store(format_arg_store&& rhs) { args[0] = {named_args, NUM_NAMED_ARGS}; - for (size_t i = 1; i < sizeof(args) / sizeof(*args); ++i) - args[i] = rhs.args[i]; + for (size_t i = 1; i < ARGS_ARR_SIZE; ++i) args[i] = rhs.args[i]; for (size_t i = 0; i < NUM_NAMED_ARGS; ++i) named_args[i] = rhs.named_args[i]; } - named_arg_store(const named_arg_store& rhs) = delete; - named_arg_store& operator=(const named_arg_store& rhs) = delete; - named_arg_store& operator=(named_arg_store&& rhs) = delete; - operator const arg_t*() const { return args + 1; } + format_arg_store(const format_arg_store& rhs) = delete; + format_arg_store& operator=(const format_arg_store& rhs) = delete; + format_arg_store& operator=(format_arg_store&& rhs) = delete; }; -// An array of references to arguments. It can be implicitly converted to -// `basic_format_args` for passing into type-erased formatting functions -// such as `vformat`. It is a plain struct to reduce binary size in debug mode. -template -struct format_arg_store { +// A specialization of format_arg_store without named arguments. +// It is a plain struct to reduce binary size in debug mode. +template +struct format_arg_store { // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning. - using type = - conditional_t[max_of(1, NUM_ARGS)], - named_arg_store>; - type args; -}; - -// TYPE can be different from type_constant, e.g. for __float128. -template struct native_formatter { - private: - dynamic_format_specs specs_; - - public: - using nonlocking = void; - - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { - if (ctx.begin() == ctx.end() || *ctx.begin() == '}') return ctx.begin(); - auto end = parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, TYPE); - if (const_check(TYPE == type::char_type)) check_char_specs(specs_); - return end; - } - - template - FMT_CONSTEXPR void set_debug_format(bool set = true) { - specs_.set_type(set ? presentation_type::debug : presentation_type::none); - } - - FMT_PRAGMA_CLANG(diagnostic ignored "-Wundefined-inline") - template - FMT_CONSTEXPR auto format(const T& val, FormatContext& ctx) const - -> decltype(ctx.out()); + arg_t args[NUM_ARGS != 0 ? NUM_ARGS : +1]; }; -template -struct locking - : bool_constant::value == type::custom_type> {}; -template -struct locking>::nonlocking>> - : std::false_type {}; - -template FMT_CONSTEXPR inline auto is_locking() -> bool { - return locking::value; -} -template -FMT_CONSTEXPR inline auto is_locking() -> bool { - return locking::value || is_locking(); -} - -FMT_API void vformat_to(buffer& buf, string_view fmt, format_args args, - locale_ref loc = {}); - -#if FMT_WIN32 -FMT_API void vprint_mojibake(FILE*, string_view, format_args, bool); -#else // format_args is passed by reference since it is defined later. -inline void vprint_mojibake(FILE*, string_view, const format_args&, bool) {} -#endif } // namespace detail - -// The main public API. - -template -FMT_CONSTEXPR void parse_context::do_check_arg_id(int arg_id) { - // Argument id is only checked at compile time during parsing because - // formatting has its own validation. - if (detail::is_constant_evaluated() && use_constexpr_cast) { - auto ctx = static_cast*>(this); - if (arg_id >= ctx->num_args()) report_error("argument not found"); - } -} - -template -FMT_CONSTEXPR void parse_context::check_dynamic_spec(int arg_id) { - using detail::compile_parse_context; - if (detail::is_constant_evaluated() && use_constexpr_cast) - static_cast*>(this)->check_dynamic_spec(arg_id); -} - FMT_BEGIN_EXPORT -// An output iterator that appends to a buffer. It is used instead of -// back_insert_iterator to reduce symbol sizes and avoid dependency. -template class basic_appender { - protected: - detail::buffer* container; - - public: - using container_type = detail::buffer; - - FMT_CONSTEXPR basic_appender(detail::buffer& buf) : container(&buf) {} - - FMT_CONSTEXPR20 auto operator=(T c) -> basic_appender& { - container->push_back(c); - return *this; - } - FMT_CONSTEXPR20 auto operator*() -> basic_appender& { return *this; } - FMT_CONSTEXPR20 auto operator++() -> basic_appender& { return *this; } - FMT_CONSTEXPR20 auto operator++(int) -> basic_appender { return *this; } -}; - // A formatting argument. Context is a template parameter for the compiled API // where output can be unbuffered. template class basic_format_arg { @@ -2404,304 +1728,1123 @@ template class basic_format_arg { detail::value value_; detail::type type_; + template + friend FMT_CONSTEXPR auto detail::make_arg(T& value) + -> basic_format_arg; + friend class basic_format_args; + friend class dynamic_format_arg_store; using char_type = typename Context::char_type; + template + friend struct detail::format_arg_store; + + basic_format_arg(const detail::named_arg_info* args, size_t size) + : value_(args, size) {} + public: class handle { - private: - detail::custom_value custom_; - public: explicit handle(detail::custom_value custom) : custom_(custom) {} - void format(parse_context& parse_ctx, Context& ctx) const { + void format(typename Context::parse_context_type& parse_ctx, + Context& ctx) const { custom_.format(custom_.value, parse_ctx, ctx); } + + private: + detail::custom_value custom_; }; constexpr basic_format_arg() : type_(detail::type::none_type) {} - basic_format_arg(const detail::named_arg_info* args, size_t size) - : value_(args, size) {} - template - basic_format_arg(T&& val) - : value_(val), type_(detail::stored_type_constant::value) {} constexpr explicit operator bool() const noexcept { return type_ != detail::type::none_type; } - auto type() const -> detail::type { return type_; } - /** - * Visits an argument dispatching to the appropriate visit method based on - * the argument type. For example, if the argument type is `double` then - * `vis(value)` will be called with the value of type `double`. - */ - template - FMT_CONSTEXPR FMT_INLINE auto visit(Visitor&& vis) const -> decltype(vis(0)) { - using detail::map; - switch (type_) { - case detail::type::none_type: break; - case detail::type::int_type: return vis(value_.int_value); - case detail::type::uint_type: return vis(value_.uint_value); - case detail::type::long_long_type: return vis(value_.long_long_value); - case detail::type::ulong_long_type: return vis(value_.ulong_long_value); - case detail::type::int128_type: return vis(map(value_.int128_value)); - case detail::type::uint128_type: return vis(map(value_.uint128_value)); - case detail::type::bool_type: return vis(value_.bool_value); - case detail::type::char_type: return vis(value_.char_value); - case detail::type::float_type: return vis(value_.float_value); - case detail::type::double_type: return vis(value_.double_value); - case detail::type::long_double_type: return vis(value_.long_double_value); - case detail::type::cstring_type: return vis(value_.string.data); - case detail::type::string_type: return vis(value_.string.str()); - case detail::type::pointer_type: return vis(value_.pointer); - case detail::type::custom_type: return vis(handle(value_.custom)); + auto type() const -> detail::type { return type_; } + + auto is_integral() const -> bool { return detail::is_integral_type(type_); } + auto is_arithmetic() const -> bool { + return detail::is_arithmetic_type(type_); + } + + /** + * Visits an argument dispatching to the appropriate visit method based on + * the argument type. For example, if the argument type is `double` then + * `vis(value)` will be called with the value of type `double`. + */ + template + FMT_CONSTEXPR FMT_INLINE auto visit(Visitor&& vis) const -> decltype(vis(0)) { + switch (type_) { + case detail::type::none_type: + break; + case detail::type::int_type: + return vis(value_.int_value); + case detail::type::uint_type: + return vis(value_.uint_value); + case detail::type::long_long_type: + return vis(value_.long_long_value); + case detail::type::ulong_long_type: + return vis(value_.ulong_long_value); + case detail::type::int128_type: + return vis(detail::convert_for_visit(value_.int128_value)); + case detail::type::uint128_type: + return vis(detail::convert_for_visit(value_.uint128_value)); + case detail::type::bool_type: + return vis(value_.bool_value); + case detail::type::char_type: + return vis(value_.char_value); + case detail::type::float_type: + return vis(value_.float_value); + case detail::type::double_type: + return vis(value_.double_value); + case detail::type::long_double_type: + return vis(value_.long_double_value); + case detail::type::cstring_type: + return vis(value_.string.data); + case detail::type::string_type: + using sv = basic_string_view; + return vis(sv(value_.string.data, value_.string.size)); + case detail::type::pointer_type: + return vis(value_.pointer); + case detail::type::custom_type: + return vis(typename basic_format_arg::handle(value_.custom)); + } + return vis(monostate()); + } + + auto format_custom(const char_type* parse_begin, + typename Context::parse_context_type& parse_ctx, + Context& ctx) -> bool { + if (type_ != detail::type::custom_type) return false; + parse_ctx.advance_to(parse_begin); + value_.custom.format(value_.custom.value, parse_ctx, ctx); + return true; + } +}; + +template +FMT_DEPRECATED FMT_CONSTEXPR auto visit_format_arg( + Visitor&& vis, const basic_format_arg& arg) -> decltype(vis(0)) { + return arg.visit(static_cast(vis)); +} + +/** + * A view of a collection of formatting arguments. To avoid lifetime issues it + * should only be used as a parameter type in type-erased functions such as + * `vformat`: + * + * void vlog(fmt::string_view fmt, fmt::format_args args); // OK + * fmt::format_args args = fmt::make_format_args(); // Dangling reference + */ +template class basic_format_args { + public: + using size_type = int; + using format_arg = basic_format_arg; + + private: + // A descriptor that contains information about formatting arguments. + // If the number of arguments is less or equal to max_packed_args then + // argument types are passed in the descriptor. This reduces binary code size + // per formatting function call. + unsigned long long desc_; + union { + // If is_packed() returns true then argument values are stored in values_; + // otherwise they are stored in args_. This is done to improve cache + // locality and reduce compiled code size since 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 detail::value* values_; + const format_arg* args_; + }; + + constexpr auto is_packed() const -> bool { + return (desc_ & detail::is_unpacked_bit) == 0; + } + constexpr auto has_named_args() const -> bool { + return (desc_ & detail::has_named_args_bit) != 0; + } + + FMT_CONSTEXPR auto type(int index) const -> detail::type { + int shift = index * detail::packed_arg_bits; + unsigned int mask = (1 << detail::packed_arg_bits) - 1; + return static_cast((desc_ >> shift) & mask); + } + + public: + constexpr basic_format_args() : desc_(0), args_(nullptr) {} + + /// Constructs a `basic_format_args` object from `format_arg_store`. + template + constexpr FMT_ALWAYS_INLINE basic_format_args( + const detail::format_arg_store& + store) + : desc_(DESC), values_(store.args + (NUM_NAMED_ARGS != 0 ? 1 : 0)) {} + + template detail::max_packed_args)> + constexpr basic_format_args( + const detail::format_arg_store& + store) + : desc_(DESC), args_(store.args + (NUM_NAMED_ARGS != 0 ? 1 : 0)) {} + + /// Constructs a `basic_format_args` object from `dynamic_format_arg_store`. + constexpr basic_format_args(const dynamic_format_arg_store& store) + : desc_(store.get_types()), args_(store.data()) {} + + /// Constructs a `basic_format_args` object from a dynamic list of arguments. + constexpr basic_format_args(const format_arg* args, int count) + : desc_(detail::is_unpacked_bit | detail::to_unsigned(count)), + args_(args) {} + + /// Returns the argument with the specified id. + FMT_CONSTEXPR auto get(int id) const -> format_arg { + format_arg arg; + if (!is_packed()) { + if (id < max_size()) arg = args_[id]; + return arg; + } + if (static_cast(id) >= detail::max_packed_args) return arg; + arg.type_ = type(id); + if (arg.type_ == detail::type::none_type) return arg; + arg.value_ = values_[id]; + return arg; + } + + template + auto get(basic_string_view name) const -> format_arg { + int id = get_id(name); + return id >= 0 ? get(id) : format_arg(); + } + + template + FMT_CONSTEXPR auto get_id(basic_string_view name) const -> int { + if (!has_named_args()) return -1; + const auto& named_args = + (is_packed() ? values_[-1] : args_[-1].value_).named_args; + for (size_t i = 0; i < named_args.size; ++i) { + if (named_args.data[i].name == name) return named_args.data[i].id; + } + return -1; + } + + auto max_size() const -> int { + unsigned long long max_packed = detail::max_packed_args; + return static_cast(is_packed() ? max_packed + : desc_ & ~detail::is_unpacked_bit); + } +}; + +// A formatting context. +class context { + private: + appender out_; + basic_format_args args_; + detail::locale_ref loc_; + + public: + /// The character type for the output. + using char_type = char; + + using iterator = appender; + using format_arg = basic_format_arg; + using parse_context_type = basic_format_parse_context; + template using formatter_type = formatter; + + /// Constructs a `basic_format_context` object. References to the arguments + /// are stored in the object so make sure they have appropriate lifetimes. + FMT_CONSTEXPR context(iterator out, basic_format_args ctx_args, + detail::locale_ref loc = {}) + : out_(out), args_(ctx_args), loc_(loc) {} + context(context&&) = default; + context(const context&) = delete; + void operator=(const context&) = delete; + + FMT_CONSTEXPR auto arg(int id) const -> format_arg { return args_.get(id); } + auto arg(string_view name) -> format_arg { return args_.get(name); } + FMT_CONSTEXPR auto arg_id(string_view name) -> int { + return args_.get_id(name); + } + auto args() const -> const basic_format_args& { return args_; } + + // Returns an iterator to the beginning of the output range. + FMT_CONSTEXPR auto out() -> iterator { return out_; } + + // Advances the begin iterator to `it`. + void advance_to(iterator) {} + + FMT_CONSTEXPR auto locale() -> detail::locale_ref { return loc_; } +}; + +template class generic_context; + +// Longer aliases for C++20 compatibility. +template +using basic_format_context = + conditional_t::value, context, + generic_context>; +using format_context = context; + +template +using buffered_context = basic_format_context, Char>; + +template +using is_formattable = bool_constant>() + .map(std::declval()))>::value>; + +#if FMT_USE_CONCEPTS +template +concept formattable = is_formattable, Char>::value; +#endif + +/** + * Constructs an object that stores references to arguments and can be + * implicitly converted to `format_args`. `Context` can be omitted in which case + * it defaults to `format_context`. See `arg` for lifetime considerations. + */ +// Take arguments by lvalue references to avoid some lifetime issues, e.g. +// auto args = make_format_args(std::string()); +template (), + unsigned long long DESC = detail::make_descriptor(), + FMT_ENABLE_IF(NUM_NAMED_ARGS == 0)> +constexpr FMT_ALWAYS_INLINE auto make_format_args(T&... args) + -> detail::format_arg_store { + return {{detail::make_arg( + args)...}}; +} + +#ifndef FMT_DOC +template (), + unsigned long long DESC = + detail::make_descriptor() | + static_cast(detail::has_named_args_bit), + FMT_ENABLE_IF(NUM_NAMED_ARGS != 0)> +constexpr auto make_format_args(T&... args) + -> detail::format_arg_store { + return {args...}; +} +#endif + +/** + * Returns a named argument to be used in a formatting function. + * It should only be used in a call to a formatting function or + * `dynamic_format_arg_store::push_back`. + * + * **Example**: + * + * fmt::print("The answer is {answer}.", fmt::arg("answer", 42)); + */ +template +inline auto arg(const Char* name, const T& arg) -> detail::named_arg { + static_assert(!detail::is_named_arg(), "nested named arguments"); + return {name, arg}; +} +FMT_END_EXPORT + +/// An alias for `basic_format_args`. +// A separate type would result in shorter symbols but break ABI compatibility +// between clang and gcc on ARM (#1919). +FMT_EXPORT using format_args = basic_format_args; + +// We cannot use enum classes as bit fields because of a gcc bug, so we put them +// in namespaces instead (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414). +// Additionally, if an underlying type is specified, older gcc incorrectly warns +// that the type is too small. Both bugs are fixed in gcc 9.3. +#if FMT_GCC_VERSION && FMT_GCC_VERSION < 903 +# define FMT_ENUM_UNDERLYING_TYPE(type) +#else +# define FMT_ENUM_UNDERLYING_TYPE(type) : type +#endif +namespace align { +enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, left, right, center, + numeric}; +} +using align_t = align::type; +namespace sign { +enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, minus, plus, space}; +} +using sign_t = sign::type; + +namespace detail { + +template +using unsigned_char = typename conditional_t::value, + std::make_unsigned, + type_identity>::type; + +// Character (code unit) type is erased to prevent template bloat. +struct fill_t { + private: + enum { max_size = 4 }; + char data_[max_size] = {' '}; + unsigned char size_ = 1; + + public: + template + FMT_CONSTEXPR void operator=(basic_string_view s) { + auto size = s.size(); + size_ = static_cast(size); + if (size == 1) { + unsigned uchar = static_cast>(s[0]); + data_[0] = static_cast(uchar); + data_[1] = static_cast(uchar >> 8); + return; + } + FMT_ASSERT(size <= max_size, "invalid fill"); + for (size_t i = 0; i < size; ++i) data_[i] = static_cast(s[i]); + } + + FMT_CONSTEXPR void operator=(char c) { + data_[0] = c; + size_ = 1; + } + + constexpr auto size() const -> size_t { return size_; } + + template constexpr auto get() const -> Char { + using uchar = unsigned char; + return static_cast(static_cast(data_[0]) | + (static_cast(data_[1]) << 8)); + } + + template ::value)> + constexpr auto data() const -> const Char* { + return data_; + } + template ::value)> + constexpr auto data() const -> const Char* { + return nullptr; + } +}; +} // namespace detail + +enum class presentation_type : unsigned char { + // Common specifiers: + none = 0, + debug = 1, // '?' + string = 2, // 's' (string, bool) + + // Integral, bool and character specifiers: + dec = 3, // 'd' + hex, // 'x' or 'X' + oct, // 'o' + bin, // 'b' or 'B' + chr, // 'c' + + // String and pointer specifiers: + pointer = 3, // 'p' + + // Floating-point specifiers: + exp = 1, // 'e' or 'E' (1 since there is no FP debug presentation) + fixed, // 'f' or 'F' + general, // 'g' or 'G' + hexfloat // 'a' or 'A' +}; + +// Format specifiers for built-in and string types. +struct format_specs { + int width; + int precision; + presentation_type type; + align_t align : 4; + sign_t sign : 3; + bool upper : 1; // An uppercase version e.g. 'X' for 'x'. + bool alt : 1; // Alternate form ('#'). + bool localized : 1; + detail::fill_t fill; + + constexpr format_specs() + : width(0), + precision(-1), + type(presentation_type::none), + align(align::none), + sign(sign::none), + upper(false), + alt(false), + localized(false) {} +}; + +namespace detail { + +enum class arg_id_kind { none, index, name }; + +// An argument reference. +template struct arg_ref { + FMT_CONSTEXPR arg_ref() : kind(arg_id_kind::none), val() {} + + FMT_CONSTEXPR explicit arg_ref(int index) + : kind(arg_id_kind::index), val(index) {} + FMT_CONSTEXPR explicit arg_ref(basic_string_view name) + : kind(arg_id_kind::name), val(name) {} + + FMT_CONSTEXPR auto operator=(int idx) -> arg_ref& { + kind = arg_id_kind::index; + val.index = idx; + return *this; + } + + arg_id_kind kind; + union value { + FMT_CONSTEXPR value(int idx = 0) : index(idx) {} + FMT_CONSTEXPR value(basic_string_view n) : name(n) {} + + int index; + basic_string_view name; + } val; +}; + +// Format specifiers with width and precision resolved at formatting rather +// than parsing time to allow reusing the same parsed specifiers with +// different sets of arguments (precompilation of format strings). +template struct dynamic_format_specs : format_specs { + arg_ref width_ref; + arg_ref precision_ref; +}; + +// Converts a character to ASCII. Returns '\0' on conversion failure. +template ::value)> +constexpr auto to_ascii(Char c) -> char { + return c <= 0xff ? static_cast(c) : '\0'; +} + +// Returns the number of code units in a code point or 1 on error. +template +FMT_CONSTEXPR auto code_point_length(const Char* begin) -> int { + if (const_check(sizeof(Char) != 1)) return 1; + auto c = static_cast(*begin); + return static_cast((0x3a55000000000000ull >> (2 * (c >> 3))) & 0x3) + 1; +} + +// Return the result via the out param to workaround gcc bug 77539. +template +FMT_CONSTEXPR auto find(Ptr first, Ptr last, T value, Ptr& out) -> bool { + for (out = first; out != last; ++out) { + if (*out == value) return true; + } + return false; +} + +template <> +inline auto find(const char* first, const char* last, char value, + const char*& out) -> bool { + out = + static_cast(memchr(first, value, to_unsigned(last - first))); + return out != nullptr; +} + +// 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 auto parse_nonnegative_int(const Char*& begin, const Char* end, + int error_value) noexcept -> int { + FMT_ASSERT(begin != end && '0' <= *begin && *begin <= '9', ""); + unsigned value = 0, prev = 0; + auto p = begin; + do { + prev = value; + value = value * 10 + unsigned(*p - '0'); + ++p; + } while (p != end && '0' <= *p && *p <= '9'); + auto num_digits = p - begin; + begin = p; + int digits10 = static_cast(sizeof(int) * CHAR_BIT * 3 / 10); + if (num_digits <= digits10) return static_cast(value); + // Check for overflow. + unsigned max = INT_MAX; + return num_digits == digits10 + 1 && + prev * 10ull + unsigned(p[-1] - '0') <= max + ? static_cast(value) + : error_value; +} + +FMT_CONSTEXPR inline auto parse_align(char c) -> align_t { + switch (c) { + case '<': + return align::left; + case '>': + return align::right; + case '^': + return align::center; + } + return align::none; +} + +template constexpr auto is_name_start(Char c) -> bool { + return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '_'; +} + +template +FMT_CONSTEXPR auto do_parse_arg_id(const Char* begin, const Char* end, + Handler&& handler) -> const Char* { + Char c = *begin; + if (c >= '0' && c <= '9') { + int index = 0; + if (c != '0') + index = parse_nonnegative_int(begin, end, INT_MAX); + else + ++begin; + if (begin == end || (*begin != '}' && *begin != ':')) + report_error("invalid format string"); + else + handler.on_index(index); + return begin; + } + if (!is_name_start(c)) { + report_error("invalid format string"); + return begin; + } + auto it = begin; + do { + ++it; + } while (it != end && (is_name_start(*it) || ('0' <= *it && *it <= '9'))); + handler.on_name({begin, to_unsigned(it - begin)}); + return it; +} + +template +FMT_CONSTEXPR auto parse_arg_id(const Char* begin, const Char* end, + Handler&& handler) -> const Char* { + FMT_ASSERT(begin != end, ""); + Char c = *begin; + if (c != '}' && c != ':') return do_parse_arg_id(begin, end, handler); + handler.on_auto(); + return begin; +} + +template struct dynamic_spec_id_handler { + basic_format_parse_context& ctx; + arg_ref& ref; + + FMT_CONSTEXPR void on_auto() { + int id = ctx.next_arg_id(); + ref = arg_ref(id); + ctx.check_dynamic_spec(id); + } + FMT_CONSTEXPR void on_index(int id) { + ref = arg_ref(id); + ctx.check_arg_id(id); + ctx.check_dynamic_spec(id); + } + FMT_CONSTEXPR void on_name(basic_string_view id) { + ref = arg_ref(id); + ctx.check_arg_id(id); + } +}; + +// Parses [integer | "{" [arg_id] "}"]. +template +FMT_CONSTEXPR auto parse_dynamic_spec(const Char* begin, const Char* end, + int& value, arg_ref& ref, + basic_format_parse_context& ctx) + -> const Char* { + FMT_ASSERT(begin != end, ""); + if ('0' <= *begin && *begin <= '9') { + int val = parse_nonnegative_int(begin, end, -1); + if (val != -1) + value = val; + else + report_error("number is too big"); + } else if (*begin == '{') { + ++begin; + auto handler = dynamic_spec_id_handler{ctx, ref}; + if (begin != end) begin = parse_arg_id(begin, end, handler); + if (begin != end && *begin == '}') return ++begin; + report_error("invalid format string"); + } + return begin; +} + +template +FMT_CONSTEXPR auto parse_precision(const Char* begin, const Char* end, + int& value, arg_ref& ref, + basic_format_parse_context& ctx) + -> const Char* { + ++begin; + if (begin == end || *begin == '}') { + report_error("invalid precision"); + return begin; + } + return parse_dynamic_spec(begin, end, value, ref, ctx); +} + +enum class state { start, align, sign, hash, zero, width, precision, locale }; + +// Parses standard format specifiers. +template +FMT_CONSTEXPR auto parse_format_specs(const Char* begin, const Char* end, + dynamic_format_specs& specs, + basic_format_parse_context& ctx, + type arg_type) -> const Char* { + auto c = '\0'; + if (end - begin > 1) { + auto next = to_ascii(begin[1]); + c = parse_align(next) == align::none ? to_ascii(*begin) : '\0'; + } else { + if (begin == end) return begin; + c = to_ascii(*begin); + } + + struct { + state current_state = state::start; + FMT_CONSTEXPR void operator()(state s, bool valid = true) { + if (current_state >= s || !valid) + report_error("invalid format specifier"); + current_state = s; + } + } enter_state; + + using pres = presentation_type; + constexpr auto integral_set = sint_set | uint_set | bool_set | char_set; + struct { + const Char*& begin; + dynamic_format_specs& specs; + type arg_type; + + FMT_CONSTEXPR auto operator()(pres pres_type, int set) -> const Char* { + if (!in(arg_type, set)) { + if (arg_type == type::none_type) return begin; + report_error("invalid format specifier"); + } + specs.type = pres_type; + return begin + 1; + } + } parse_presentation_type{begin, specs, arg_type}; + + for (;;) { + switch (c) { + case '<': + case '>': + case '^': + enter_state(state::align); + specs.align = parse_align(c); + ++begin; + break; + case '+': + case '-': + case ' ': + if (arg_type == type::none_type) return begin; + enter_state(state::sign, in(arg_type, sint_set | float_set)); + switch (c) { + case '+': + specs.sign = sign::plus; + break; + case '-': + specs.sign = sign::minus; + break; + case ' ': + specs.sign = sign::space; + break; + } + ++begin; + break; + case '#': + if (arg_type == type::none_type) return begin; + enter_state(state::hash, is_arithmetic_type(arg_type)); + specs.alt = true; + ++begin; + break; + case '0': + enter_state(state::zero); + if (!is_arithmetic_type(arg_type)) { + if (arg_type == type::none_type) return begin; + report_error("format specifier requires numeric argument"); + } + if (specs.align == align::none) { + // Ignore 0 if align is specified for compatibility with std::format. + specs.align = align::numeric; + specs.fill = '0'; + } + ++begin; + break; + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '{': + enter_state(state::width); + begin = parse_dynamic_spec(begin, end, specs.width, specs.width_ref, ctx); + break; + case '.': + if (arg_type == type::none_type) return begin; + enter_state(state::precision, + in(arg_type, float_set | string_set | cstring_set)); + begin = parse_precision(begin, end, specs.precision, specs.precision_ref, + ctx); + break; + case 'L': + if (arg_type == type::none_type) return begin; + enter_state(state::locale, is_arithmetic_type(arg_type)); + specs.localized = true; + ++begin; + break; + case 'd': + return parse_presentation_type(pres::dec, integral_set); + case 'X': + specs.upper = true; + FMT_FALLTHROUGH; + case 'x': + return parse_presentation_type(pres::hex, integral_set); + case 'o': + return parse_presentation_type(pres::oct, integral_set); + case 'B': + specs.upper = true; + FMT_FALLTHROUGH; + case 'b': + return parse_presentation_type(pres::bin, integral_set); + case 'E': + specs.upper = true; + FMT_FALLTHROUGH; + case 'e': + return parse_presentation_type(pres::exp, float_set); + case 'F': + specs.upper = true; + FMT_FALLTHROUGH; + case 'f': + return parse_presentation_type(pres::fixed, float_set); + case 'G': + specs.upper = true; + FMT_FALLTHROUGH; + case 'g': + return parse_presentation_type(pres::general, float_set); + case 'A': + specs.upper = true; + FMT_FALLTHROUGH; + case 'a': + return parse_presentation_type(pres::hexfloat, float_set); + case 'c': + if (arg_type == type::bool_type) report_error("invalid format specifier"); + return parse_presentation_type(pres::chr, integral_set); + case 's': + return parse_presentation_type(pres::string, + bool_set | string_set | cstring_set); + case 'p': + return parse_presentation_type(pres::pointer, pointer_set | cstring_set); + case '?': + return parse_presentation_type(pres::debug, + char_set | string_set | cstring_set); + case '}': + return begin; + default: { + if (*begin == '}') return begin; + // Parse fill and alignment. + auto fill_end = begin + code_point_length(begin); + if (end - fill_end <= 0) { + report_error("invalid format specifier"); + return begin; + } + if (*begin == '{') { + report_error("invalid fill character '{'"); + return begin; + } + auto align = parse_align(to_ascii(*fill_end)); + enter_state(state::align, align != align::none); + specs.fill = + basic_string_view(begin, to_unsigned(fill_end - begin)); + specs.align = align; + begin = fill_end + 1; + } + } + if (begin == end) return begin; + c = to_ascii(*begin); + } +} + +template +FMT_CONSTEXPR auto parse_replacement_field(const Char* begin, const Char* end, + Handler&& handler) -> const Char* { + struct id_adapter { + Handler& handler; + int arg_id; + + FMT_CONSTEXPR void on_auto() { arg_id = handler.on_arg_id(); } + FMT_CONSTEXPR void on_index(int id) { arg_id = handler.on_arg_id(id); } + FMT_CONSTEXPR void on_name(basic_string_view id) { + arg_id = handler.on_arg_id(id); + } + }; + + ++begin; + if (begin == end) return handler.on_error("invalid format string"), end; + if (*begin == '}') { + handler.on_replacement_field(handler.on_arg_id(), begin); + } else if (*begin == '{') { + handler.on_text(begin, begin + 1); + } else { + auto adapter = id_adapter{handler, 0}; + begin = parse_arg_id(begin, end, adapter); + Char c = begin != end ? *begin : Char(); + if (c == '}') { + handler.on_replacement_field(adapter.arg_id, begin); + } else if (c == ':') { + begin = handler.on_format_specs(adapter.arg_id, begin + 1, end); + if (begin == end || *begin != '}') + return handler.on_error("unknown format specifier"), end; + } else { + return handler.on_error("missing '}' in format string"), end; + } + } + return begin + 1; +} + +template +FMT_CONSTEXPR void parse_format_string(basic_string_view format_str, + Handler&& handler) { + auto begin = format_str.data(); + auto end = begin + format_str.size(); + if (end - begin < 32) { + // Use a simple loop instead of memchr for small strings. + const Char* p = begin; + while (p != end) { + auto c = *p++; + if (c == '{') { + handler.on_text(begin, p - 1); + begin = p = parse_replacement_field(p - 1, end, handler); + } else if (c == '}') { + if (p == end || *p != '}') + return handler.on_error("unmatched '}' in format string"); + handler.on_text(begin, p); + begin = ++p; + } } - return vis(monostate()); + handler.on_text(begin, end); + return; + } + struct writer { + FMT_CONSTEXPR void operator()(const Char* from, const Char* to) { + if (from == to) return; + for (;;) { + const Char* p = nullptr; + if (!find(from, to, Char('}'), p)) + return handler_.on_text(from, to); + ++p; + if (p == to || *p != '}') + return handler_.on_error("unmatched '}' in format string"); + handler_.on_text(from, p); + from = p + 1; + } + } + Handler& handler_; + } write = {handler}; + while (begin != end) { + // Doing two passes with memchr (one for '{' and another for '}') is up to + // 2.5x faster than the naive one-pass implementation on big format strings. + const Char* p = begin; + if (*begin != '{' && !find(begin + 1, end, Char('{'), p)) + return write(begin, end); + write(begin, p); + begin = parse_replacement_field(p, end, handler); } +} - auto format_custom(const char_type* parse_begin, - parse_context& parse_ctx, Context& ctx) - -> bool { - if (type_ != detail::type::custom_type) return false; - parse_ctx.advance_to(parse_begin); - value_.custom.format(value_.custom.value, parse_ctx, ctx); - return true; - } +template ::value> struct strip_named_arg { + using type = T; +}; +template struct strip_named_arg { + using type = remove_cvref_t; }; -/** - * A view of a collection of formatting arguments. To avoid lifetime issues it - * should only be used as a parameter type in type-erased functions such as - * `vformat`: - * - * void vlog(fmt::string_view fmt, fmt::format_args args); // OK - * fmt::format_args args = fmt::make_format_args(); // Dangling reference - */ -template class basic_format_args { - private: - // A descriptor that contains information about formatting arguments. - // If the number of arguments is less or equal to max_packed_args then - // argument types are passed in the descriptor. This reduces binary code size - // per formatting function call. - unsigned long long desc_; - union { - // If is_packed() returns true then argument values are stored in values_; - // otherwise they are stored in args_. This is done to improve cache - // locality and reduce compiled code size since 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 detail::value* values_; - const basic_format_arg* args_; - }; - - constexpr auto is_packed() const -> bool { - return (desc_ & detail::is_unpacked_bit) == 0; +template +FMT_VISIBILITY("hidden") // Suppress an ld warning on macOS (#3769). +FMT_CONSTEXPR auto parse_format_specs(ParseContext& ctx) + -> decltype(ctx.begin()) { + using char_type = typename ParseContext::char_type; + using context = buffered_context; + using mapped_type = conditional_t< + mapped_type_constant::value != type::custom_type, + decltype(arg_mapper().map(std::declval())), + typename strip_named_arg::type>; +#if defined(__cpp_if_constexpr) + if constexpr (std::is_default_constructible< + formatter>::value) { + return formatter().parse(ctx); + } else { + type_is_unformattable_for _; + return ctx.begin(); } - constexpr auto has_named_args() const -> bool { - return (desc_ & detail::has_named_args_bit) != 0; +#else + return formatter().parse(ctx); +#endif +} + +// Checks char specs and returns true iff the presentation type is char-like. +FMT_CONSTEXPR inline auto check_char_specs(const format_specs& specs) -> bool { + if (specs.type != presentation_type::none && + specs.type != presentation_type::chr && + specs.type != presentation_type::debug) { + return false; } + if (specs.align == align::numeric || specs.sign != sign::none || specs.alt) + report_error("invalid format specifier for char"); + return true; +} - FMT_CONSTEXPR auto type(int index) const -> detail::type { - int shift = index * detail::packed_arg_bits; - unsigned mask = (1 << detail::packed_arg_bits) - 1; - return static_cast((desc_ >> shift) & mask); +#if FMT_USE_NONTYPE_TEMPLATE_ARGS +template +constexpr auto get_arg_index_by_name(basic_string_view name) -> int { + if constexpr (is_statically_named_arg()) { + if (name == T::name) return N; } + if constexpr (sizeof...(Args) > 0) + return get_arg_index_by_name(name); + (void)name; // Workaround an MSVC bug about "unused" parameter. + return -1; +} +#endif - template - using store = - detail::format_arg_store; +template +FMT_CONSTEXPR auto get_arg_index_by_name(basic_string_view name) -> int { +#if FMT_USE_NONTYPE_TEMPLATE_ARGS + if constexpr (sizeof...(Args) > 0) + return get_arg_index_by_name<0, Args...>(name); +#endif + (void)name; + return -1; +} - public: - using format_arg = basic_format_arg; +template class format_string_checker { + private: + using parse_context_type = compile_parse_context; + static constexpr int num_args = sizeof...(Args); - constexpr basic_format_args() : desc_(0), args_(nullptr) {} + // Format specifier parsing function. + // In the future basic_format_parse_context will replace compile_parse_context + // here and will use is_constant_evaluated and downcasting to access the data + // needed for compile-time checks: https://godbolt.org/z/GvWzcTjh1. + using parse_func = const Char* (*)(parse_context_type&); - /// Constructs a `basic_format_args` object from `format_arg_store`. - template - constexpr FMT_ALWAYS_INLINE basic_format_args( - const store& s) - : desc_(DESC | (NUM_NAMED_ARGS != 0 ? +detail::has_named_args_bit : 0)), - values_(s.args) {} + type types_[num_args > 0 ? static_cast(num_args) : 1]; + parse_context_type context_; + parse_func parse_funcs_[num_args > 0 ? static_cast(num_args) : 1]; - template detail::max_packed_args)> - constexpr basic_format_args(const store& s) - : desc_(DESC | (NUM_NAMED_ARGS != 0 ? +detail::has_named_args_bit : 0)), - args_(s.args) {} + public: + explicit FMT_CONSTEXPR format_string_checker(basic_string_view fmt) + : types_{mapped_type_constant>::value...}, + context_(fmt, num_args, types_), + parse_funcs_{&parse_format_specs...} {} - /// Constructs a `basic_format_args` object from a dynamic list of arguments. - constexpr basic_format_args(const format_arg* args, int count, - bool has_named = false) - : desc_(detail::is_unpacked_bit | detail::to_unsigned(count) | - (has_named ? +detail::has_named_args_bit : 0)), - args_(args) {} + FMT_CONSTEXPR void on_text(const Char*, const Char*) {} - /// Returns the argument with the specified id. - FMT_CONSTEXPR auto get(int id) const -> format_arg { - auto arg = format_arg(); - if (!is_packed()) { - if (id < max_size()) arg = args_[id]; - return arg; - } - if (static_cast(id) >= detail::max_packed_args) return arg; - arg.type_ = type(id); - if (arg.type_ != detail::type::none_type) arg.value_ = values_[id]; - return arg; + FMT_CONSTEXPR auto on_arg_id() -> int { return context_.next_arg_id(); } + FMT_CONSTEXPR auto on_arg_id(int id) -> int { + return context_.check_arg_id(id), id; + } + FMT_CONSTEXPR auto on_arg_id(basic_string_view id) -> int { +#if FMT_USE_NONTYPE_TEMPLATE_ARGS + auto index = get_arg_index_by_name(id); + if (index < 0) on_error("named argument is not found"); + return index; +#else + (void)id; + on_error("compile-time checks for named arguments require C++20 support"); + return 0; +#endif } - template - auto get(basic_string_view name) const -> format_arg { - int id = get_id(name); - return id >= 0 ? get(id) : format_arg(); + FMT_CONSTEXPR void on_replacement_field(int id, const Char* begin) { + on_format_specs(id, begin, begin); // Call parse() on empty specs. } - template - FMT_CONSTEXPR auto get_id(basic_string_view name) const -> int { - if (!has_named_args()) return -1; - const auto& named_args = - (is_packed() ? values_[-1] : args_[-1].value_).named_args; - for (size_t i = 0; i < named_args.size; ++i) { - if (named_args.data[i].name == name) return named_args.data[i].id; - } - return -1; + FMT_CONSTEXPR auto on_format_specs(int id, const Char* begin, const Char*) + -> const Char* { + context_.advance_to(begin); + // id >= 0 check is a workaround for gcc 10 bug (#2065). + return id >= 0 && id < num_args ? parse_funcs_[id](context_) : begin; } - auto max_size() const -> int { - unsigned long long max_packed = detail::max_packed_args; - return static_cast(is_packed() ? max_packed - : desc_ & ~detail::is_unpacked_bit); + FMT_NORETURN FMT_CONSTEXPR void on_error(const char* message) { + report_error(message); } }; -// A formatting context. -class context : private detail::locale_ref { - private: - appender out_; - format_args args_; - - public: - /// The character type for the output. - using char_type = char; - - using iterator = appender; - using format_arg = basic_format_arg; - using parse_context_type FMT_DEPRECATED = parse_context<>; - template using formatter_type FMT_DEPRECATED = formatter; - enum { builtin_types = FMT_BUILTIN_TYPES }; - - /// Constructs a `context` object. References to the arguments are stored - /// in the object so make sure they have appropriate lifetimes. - FMT_CONSTEXPR context(iterator out, format_args args, - detail::locale_ref loc = {}) - : locale_ref(loc), out_(out), args_(args) {} - context(context&&) = default; - context(const context&) = delete; - void operator=(const context&) = delete; +// A base class for compile-time strings. +struct compile_string {}; - FMT_CONSTEXPR auto arg(int id) const -> format_arg { return args_.get(id); } - inline auto arg(string_view name) -> format_arg { return args_.get(name); } - FMT_CONSTEXPR auto arg_id(string_view name) -> int { - return args_.get_id(name); - } +template +using is_compile_string = std::is_base_of; - // Returns an iterator to the beginning of the output range. - FMT_CONSTEXPR auto out() -> iterator { return out_; } +// Reports a compile-time error if S is not a valid format string. +template ::value)> +FMT_ALWAYS_INLINE void check_format_string(const S&) { +#ifdef FMT_ENFORCE_COMPILE_STRING + static_assert(is_compile_string::value, + "FMT_ENFORCE_COMPILE_STRING requires all format strings to use " + "FMT_STRING."); +#endif +} +template ::value)> +void check_format_string(S format_str) { + using char_t = typename S::char_type; + FMT_CONSTEXPR auto s = basic_string_view(format_str); + using checker = format_string_checker...>; + FMT_CONSTEXPR bool error = (parse_format_string(s, checker(s)), true); + ignore_unused(error); +} - // Advances the begin iterator to `it`. - FMT_CONSTEXPR void advance_to(iterator) {} +// Report truncation to prevent silent data loss. +inline void report_truncation(bool truncated) { + if (truncated) report_error("output is truncated"); +} - FMT_CONSTEXPR auto locale() -> detail::locale_ref { return *this; } +// Use vformat_args and avoid type_identity to keep symbols short and workaround +// a GCC <= 4.8 bug. +template struct vformat_args { + using type = basic_format_args>; }; - -template struct runtime_format_string { - basic_string_view str; +template <> struct vformat_args { + using type = format_args; }; -/** - * Creates a runtime format string. - * - * **Example**: - * - * // Check format string at runtime instead of compile-time. - * fmt::print(fmt::runtime("{:d}"), "I am not a number"); - */ -inline auto runtime(string_view s) -> runtime_format_string<> { return {{s}}; } - -/// A compile-time format string. -template struct fstring { - private: - static constexpr int num_static_named_args = - detail::count_static_named_args(); +template +void vformat_to(buffer& buf, basic_string_view fmt, + typename vformat_args::type args, locale_ref loc = {}); - using checker = detail::format_string_checker< - char, static_cast(sizeof...(T)), num_static_named_args, - num_static_named_args != detail::count_named_args()>; +FMT_API void vprint_mojibake(FILE*, string_view, format_args, bool = false); +#ifndef _WIN32 +inline void vprint_mojibake(FILE*, string_view, format_args, bool) {} +#endif - using arg_pack = detail::arg_pack; +template struct native_formatter { + private: + dynamic_format_specs specs_; public: - string_view str; - using t = fstring; - - // Reports a compile-time error if S is not a valid format string for T. - template - FMT_CONSTEVAL FMT_ALWAYS_INLINE fstring(const char (&s)[N]) : str(s, N - 1) { - using namespace detail; - static_assert(count<(std::is_base_of>::value && - std::is_reference::value)...>() == 0, - "passing views as lvalues is disallowed"); - if (FMT_USE_CONSTEVAL) parse_format_string(s, checker(s, arg_pack())); -#ifdef FMT_ENFORCE_COMPILE_STRING - static_assert( - FMT_USE_CONSTEVAL && sizeof(s) != 0, - "FMT_ENFORCE_COMPILE_STRING requires format strings to use FMT_STRING"); -#endif - } - template ::value)> - FMT_CONSTEVAL FMT_ALWAYS_INLINE fstring(const S& s) : str(s) { - auto sv = string_view(str); - if (FMT_USE_CONSTEVAL) - detail::parse_format_string(sv, checker(sv, arg_pack())); -#ifdef FMT_ENFORCE_COMPILE_STRING - static_assert( - FMT_USE_CONSTEVAL && sizeof(s) != 0, - "FMT_ENFORCE_COMPILE_STRING requires format strings to use FMT_STRING"); -#endif + using nonlocking = void; + + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* { + if (ctx.begin() == ctx.end() || *ctx.begin() == '}') return ctx.begin(); + auto end = parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, TYPE); + if (const_check(TYPE == type::char_type)) check_char_specs(specs_); + return end; } - template ::value&& - std::is_same::value)> - FMT_ALWAYS_INLINE fstring(const S&) : str(S()) { - FMT_CONSTEXPR auto sv = string_view(S()); - FMT_CONSTEXPR int ignore = - (parse_format_string(sv, checker(sv, arg_pack())), 0); - detail::ignore_unused(ignore); - } - fstring(runtime_format_string<> fmt) : str(fmt.str) {} - - // Returning by reference generates better code in debug mode. - FMT_ALWAYS_INLINE operator const string_view&() const { return str; } - auto get() const -> string_view { return str; } -}; -template using format_string = typename fstring::t; + template + FMT_CONSTEXPR void set_debug_format(bool set = true) { + specs_.type = set ? presentation_type::debug : presentation_type::none; + } -template -using is_formattable = bool_constant::value, int*, T>, Char>, - void>::value>; -#ifdef __cpp_concepts -template -concept formattable = is_formattable, Char>::value; -#endif + template + FMT_CONSTEXPR auto format(const T& val, FormatContext& ctx) const + -> decltype(ctx.out()); +}; +} // namespace detail -template -using has_formatter FMT_DEPRECATED = std::is_constructible>; +FMT_BEGIN_EXPORT // A formatter specialization for natively supported types. template @@ -2711,42 +2854,62 @@ struct formatter::value> { }; -/** - * Constructs an object that stores references to arguments and can be - * implicitly converted to `format_args`. `Context` can be omitted in which case - * it defaults to `context`. See `arg` for lifetime considerations. - */ -// Take arguments by lvalue references to avoid some lifetime issues, e.g. -// auto args = make_format_args(std::string()); -template (), - unsigned long long DESC = detail::make_descriptor()> -constexpr FMT_ALWAYS_INLINE auto make_format_args(T&... args) - -> detail::format_arg_store { - // Suppress warnings for pathological types convertible to detail::value. - FMT_PRAGMA_GCC(diagnostic ignored "-Wconversion") - return {{args...}}; -} +template struct runtime_format_string { + basic_string_view str; +}; -template -using vargs = - detail::format_arg_store(), - detail::make_descriptor()>; +/// A compile-time format string. +template class basic_format_string { + private: + basic_string_view str_; + + public: + template < + typename S, + FMT_ENABLE_IF( + std::is_convertible>::value || + (detail::is_compile_string::value && + std::is_constructible, const S&>::value))> + FMT_CONSTEVAL FMT_ALWAYS_INLINE basic_format_string(const S& s) : str_(s) { + static_assert( + detail::count< + (std::is_base_of>::value && + std::is_reference::value)...>() == 0, + "passing views as lvalues is disallowed"); +#if FMT_USE_CONSTEVAL + if constexpr (detail::count_named_args() == + detail::count_statically_named_args()) { + using checker = + detail::format_string_checker...>; + detail::parse_format_string(str_, checker(s)); + } +#else + detail::check_format_string(s); +#endif + } + basic_format_string(runtime_format_string fmt) : str_(fmt.str) {} + FMT_ALWAYS_INLINE operator basic_string_view() const { return str_; } + auto get() const -> basic_string_view { return str_; } +}; + +#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409 +// Workaround broken conversion on older gcc. +template using format_string = string_view; +inline auto runtime(string_view s) -> string_view { return s; } +#else +template +using format_string = basic_format_string...>; /** - * Returns a named argument to be used in a formatting function. - * It should only be used in a call to a formatting function. + * Creates a runtime format string. * * **Example**: * - * fmt::print("The answer is {answer}.", fmt::arg("answer", 42)); + * // Check format string at runtime instead of compile-time. + * fmt::print(fmt::runtime("{:d}"), "I am not a number"); */ -template -inline auto arg(const Char* name, const T& arg) -> detail::named_arg { - return {name, arg}; -} +inline auto runtime(string_view s) -> runtime_format_string<> { return {{s}}; } +#endif /// Formats a string and writes the output to `out`. template ::value)> FMT_INLINE auto format_to(OutputIt&& out, format_string fmt, T&&... args) -> remove_cvref_t { - return vformat_to(out, fmt.str, vargs{{args...}}); + return vformat_to(FMT_FWD(out), fmt, fmt::make_format_args(args...)); } template struct format_to_n_result { @@ -2804,33 +2967,41 @@ template ::value)> FMT_INLINE auto format_to_n(OutputIt out, size_t n, format_string fmt, T&&... args) -> format_to_n_result { - return vformat_to_n(out, n, fmt.str, vargs{{args...}}); + return vformat_to_n(out, n, fmt, fmt::make_format_args(args...)); } +template struct format_to_result { - /// Pointer to just after the last successful write in the array. - char* out; + /// Iterator pointing to just after the last successful write in the range. + OutputIt out; /// Specifies if the output was truncated. bool truncated; - FMT_CONSTEXPR operator char*() const { - // Report truncation to prevent silent data loss. - if (truncated) report_error("output is truncated"); + FMT_CONSTEXPR operator OutputIt&() & { + detail::report_truncation(truncated); + return out; + } + FMT_CONSTEXPR operator const OutputIt&() const& { + detail::report_truncation(truncated); return out; } + FMT_CONSTEXPR operator OutputIt&&() && { + detail::report_truncation(truncated); + return static_cast(out); + } }; template auto vformat_to(char (&out)[N], string_view fmt, format_args args) - -> format_to_result { + -> format_to_result { auto result = vformat_to_n(out, N, fmt, args); return {result.out, result.size > N}; } template FMT_INLINE auto format_to(char (&out)[N], format_string fmt, T&&... args) - -> format_to_result { - auto result = vformat_to_n(out, N, fmt.str, vargs{{args...}}); + -> format_to_result { + auto result = fmt::format_to_n(out, N, fmt, static_cast(args)...); return {result.out, result.size > N}; } @@ -2839,14 +3010,14 @@ template FMT_NODISCARD FMT_INLINE auto formatted_size(format_string fmt, T&&... args) -> size_t { auto buf = detail::counting_buffer<>(); - detail::vformat_to(buf, fmt.str, vargs{{args...}}, {}); + detail::vformat_to(buf, fmt, fmt::make_format_args(args...), {}); return buf.count(); } FMT_API void vprint(string_view fmt, format_args args); FMT_API void vprint(FILE* f, string_view fmt, format_args args); -FMT_API void vprintln(FILE* f, string_view fmt, format_args args); FMT_API void vprint_buffered(FILE* f, string_view fmt, format_args args); +FMT_API void vprintln(FILE* f, string_view fmt, format_args args); /** * Formats `args` according to specifications in `fmt` and writes the output @@ -2858,11 +3029,10 @@ FMT_API void vprint_buffered(FILE* f, string_view fmt, format_args args); */ template FMT_INLINE void print(format_string fmt, T&&... args) { - vargs va = {{args...}}; - if (!detail::use_utf8) - return detail::vprint_mojibake(stdout, fmt.str, va, false); - return detail::is_locking() ? vprint_buffered(stdout, fmt.str, va) - : vprint(fmt.str, va); + const auto& vargs = fmt::make_format_args(args...); + if (!detail::use_utf8()) return detail::vprint_mojibake(stdout, fmt, vargs); + return detail::is_locking() ? vprint_buffered(stdout, fmt, vargs) + : vprint(fmt, vargs); } /** @@ -2875,19 +3045,19 @@ FMT_INLINE void print(format_string fmt, T&&... args) { */ template FMT_INLINE void print(FILE* f, format_string fmt, T&&... args) { - vargs va = {{args...}}; - if (!detail::use_utf8) return detail::vprint_mojibake(f, fmt.str, va, false); - return detail::is_locking() ? vprint_buffered(f, fmt.str, va) - : vprint(f, fmt.str, va); + const auto& vargs = fmt::make_format_args(args...); + if (!detail::use_utf8()) return detail::vprint_mojibake(f, fmt, vargs); + return detail::is_locking() ? vprint_buffered(f, fmt, vargs) + : vprint(f, fmt, vargs); } /// Formats `args` according to specifications in `fmt` and writes the output /// to the file `f` followed by a newline. template FMT_INLINE void println(FILE* f, format_string fmt, T&&... args) { - vargs va = {{args...}}; - return detail::use_utf8 ? vprintln(f, fmt.str, va) - : detail::vprint_mojibake(f, fmt.str, va, true); + const auto& vargs = fmt::make_format_args(args...); + return detail::use_utf8() ? vprintln(f, fmt, vargs) + : detail::vprint_mojibake(f, fmt, vargs, true); } /// Formats `args` according to specifications in `fmt` and writes the output @@ -2898,8 +3068,7 @@ FMT_INLINE void println(format_string fmt, T&&... args) { } FMT_END_EXPORT -FMT_PRAGMA_CLANG(diagnostic pop) -FMT_PRAGMA_GCC(pop_options) +FMT_GCC_PRAGMA("GCC pop_options") FMT_END_NAMESPACE #ifdef FMT_HEADER_ONLY diff --git a/3rdparty/fmt/include/fmt/chrono.h b/3rdparty/fmt/include/fmt/chrono.h index abf3671e5b59..c93123fd3353 100644 --- a/3rdparty/fmt/include/fmt/chrono.h +++ b/3rdparty/fmt/include/fmt/chrono.h @@ -22,22 +22,39 @@ #include "format.h" -namespace fmt_detail { -struct time_zone { - template - auto to_sys(T) - -> std::chrono::time_point { - return {}; - } -}; -template inline auto current_zone(T...) -> time_zone* { - return nullptr; -} +FMT_BEGIN_NAMESPACE -template inline void _tzset(T...) {} -} // namespace fmt_detail +// Check if std::chrono::local_t is available. +#ifndef FMT_USE_LOCAL_TIME +# ifdef __cpp_lib_chrono +# define FMT_USE_LOCAL_TIME (__cpp_lib_chrono >= 201907L) +# else +# define FMT_USE_LOCAL_TIME 0 +# endif +#endif -FMT_BEGIN_NAMESPACE +// Check if std::chrono::utc_timestamp is available. +#ifndef FMT_USE_UTC_TIME +# ifdef __cpp_lib_chrono +# define FMT_USE_UTC_TIME (__cpp_lib_chrono >= 201907L) +# else +# define FMT_USE_UTC_TIME 0 +# endif +#endif + +// Enable tzset. +#ifndef FMT_USE_TZSET +// UWP doesn't provide _tzset. +# if FMT_HAS_INCLUDE("winapifamily.h") +# include +# endif +# if defined(_WIN32) && (!defined(WINAPI_FAMILY) || \ + (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)) +# define FMT_USE_TZSET 1 +# else +# define FMT_USE_TZSET 0 +# endif +#endif // Enable safe chrono durations, unless explicitly disabled. #ifndef FMT_SAFE_DURATION_CAST @@ -168,6 +185,56 @@ FMT_CONSTEXPR auto safe_float_conversion(const From from, int& ec) -> To { return from; } +/// Safe duration cast between integral durations +template ::value), + FMT_ENABLE_IF(std::is_integral::value)> +auto safe_duration_cast(std::chrono::duration from, + int& ec) -> To { + using From = std::chrono::duration; + ec = 0; + // the basic idea is that we need to convert from count() in the from type + // to count() in the To type, by multiplying it with this: + struct Factor + : std::ratio_divide {}; + + static_assert(Factor::num > 0, "num must be positive"); + static_assert(Factor::den > 0, "den must be positive"); + + // the conversion is like this: multiply from.count() with Factor::num + // /Factor::den and convert it to To::rep, all this without + // overflow/underflow. let's start by finding a suitable type that can hold + // both To, From and Factor::num + using IntermediateRep = + typename std::common_type::type; + + // safe conversion to IntermediateRep + IntermediateRep count = + lossless_integral_conversion(from.count(), ec); + if (ec) return {}; + // multiply with Factor::num without overflow or underflow + if (detail::const_check(Factor::num != 1)) { + const auto max1 = detail::max_value() / Factor::num; + if (count > max1) { + ec = 1; + return {}; + } + const auto min1 = + (std::numeric_limits::min)() / Factor::num; + if (detail::const_check(!std::is_unsigned::value) && + count < min1) { + ec = 1; + return {}; + } + count *= Factor::num; + } + + if (detail::const_check(Factor::den != 1)) count /= Factor::den; + auto tocount = lossless_integral_conversion(count, ec); + return ec ? To() : To(tocount); +} + /// Safe duration_cast between floating point durations template ::value), @@ -247,55 +314,11 @@ auto safe_duration_cast(std::chrono::duration from, } // namespace safe_duration_cast #endif -namespace detail { - -// Check if std::chrono::utc_time is available. -#ifdef FMT_USE_UTC_TIME -// Use the provided definition. -#elif defined(__cpp_lib_chrono) -# define FMT_USE_UTC_TIME (__cpp_lib_chrono >= 201907L) -#else -# define FMT_USE_UTC_TIME 0 -#endif -#if FMT_USE_UTC_TIME -using utc_clock = std::chrono::utc_clock; -#else -struct utc_clock { - void to_sys(); -}; -#endif - -// Check if std::chrono::local_time is available. -#ifdef FMT_USE_LOCAL_TIME -// Use the provided definition. -#elif defined(__cpp_lib_chrono) -# define FMT_USE_LOCAL_TIME (__cpp_lib_chrono >= 201907L) -#else -# define FMT_USE_LOCAL_TIME 0 -#endif -#if FMT_USE_LOCAL_TIME -using local_t = std::chrono::local_t; -#else -struct local_t {}; -#endif - -} // namespace detail - -template -using sys_time = std::chrono::time_point; - -template -using utc_time = std::chrono::time_point; - -template -using local_time = std::chrono::time_point; - -namespace detail { - // Prevents expansion of a preceding token as a function-style macro. // Usage: f FMT_NOMACRO() #define FMT_NOMACRO +namespace detail { template struct null {}; inline auto localtime_r FMT_NOMACRO(...) -> null<> { return null<>(); } inline auto localtime_s(...) -> null<> { return null<>(); } @@ -304,12 +327,12 @@ inline auto gmtime_s(...) -> null<> { return null<>(); } // It is defined here and not in ostream.h because the latter has expensive // includes. -template class formatbuf : public StreamBuf { +template class formatbuf : public Streambuf { private: - using char_type = typename StreamBuf::char_type; - using streamsize = decltype(std::declval().sputn(nullptr, 0)); - using int_type = typename StreamBuf::int_type; - using traits_type = typename StreamBuf::traits_type; + using char_type = typename Streambuf::char_type; + using streamsize = decltype(std::declval().sputn(nullptr, 0)); + using int_type = typename Streambuf::int_type; + using traits_type = typename Streambuf::traits_type; buffer& buffer_; @@ -347,16 +370,20 @@ template struct codecvt_result { }; template -void write_codecvt(codecvt_result& out, string_view in, +void write_codecvt(codecvt_result& out, string_view in_buf, const std::locale& loc) { - FMT_PRAGMA_CLANG(diagnostic push) - FMT_PRAGMA_CLANG(diagnostic ignored "-Wdeprecated") +#if FMT_CLANG_VERSION +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wdeprecated" + auto& f = std::use_facet>(loc); +# pragma clang diagnostic pop +#else auto& f = std::use_facet>(loc); - FMT_PRAGMA_CLANG(diagnostic pop) +#endif auto mb = std::mbstate_t(); const char* from_next = nullptr; - auto result = f.in(mb, in.begin(), in.end(), from_next, std::begin(out.buf), - std::end(out.buf), out.end); + auto result = f.in(mb, in_buf.begin(), in_buf.end(), from_next, + std::begin(out.buf), std::end(out.buf), out.end); if (result != std::codecvt_base::ok) FMT_THROW(format_error("failed to format time")); } @@ -364,7 +391,7 @@ void write_codecvt(codecvt_result& out, string_view in, template auto write_encoded_tm_str(OutputIt out, string_view in, const std::locale& loc) -> OutputIt { - if (detail::use_utf8 && loc != get_classic_locale()) { + if (detail::use_utf8() && loc != get_classic_locale()) { // char16_t and char32_t codecvts are broken in MSVC (linkage errors) and // gcc-4. #if FMT_MSC_VERSION != 0 || \ @@ -444,56 +471,16 @@ struct is_same_arithmetic_type std::is_floating_point::value)> { }; -FMT_NORETURN inline void throw_duration_error() { - FMT_THROW(format_error("cannot format duration")); -} - -// Cast one integral duration to another with an overflow check. -template ::value&& - std::is_integral::value)> -auto duration_cast(std::chrono::duration from) -> To { -#if !FMT_SAFE_DURATION_CAST - return std::chrono::duration_cast(from); -#else - // The conversion factor: to.count() == factor * from.count(). - using factor = std::ratio_divide; - - using common_rep = typename std::common_type::type; - - int ec = 0; - auto count = safe_duration_cast::lossless_integral_conversion( - from.count(), ec); - if (ec) throw_duration_error(); - - // Multiply from.count() by factor and check for overflow. - if (const_check(factor::num != 1)) { - if (count > max_value() / factor::num) throw_duration_error(); - const auto min = (std::numeric_limits::min)() / factor::num; - if (const_check(!std::is_unsigned::value) && count < min) - throw_duration_error(); - count *= factor::num; - } - if (const_check(factor::den != 1)) count /= factor::den; - auto to = - To(safe_duration_cast::lossless_integral_conversion( - count, ec)); - if (ec) throw_duration_error(); - return to; -#endif -} - -template ::value&& - std::is_floating_point::value)> -auto duration_cast(std::chrono::duration from) -> To { +template < + typename To, typename FromRep, typename FromPeriod, + FMT_ENABLE_IF(is_same_arithmetic_type::value)> +auto fmt_duration_cast(std::chrono::duration from) -> To { #if FMT_SAFE_DURATION_CAST // Throwing version of safe_duration_cast is only available for // integer to integer or float to float casts. int ec; To to = safe_duration_cast::safe_duration_cast(from, ec); - if (ec) throw_duration_error(); + if (ec) FMT_THROW(format_error("cannot format duration")); return to; #else // Standard duration cast, may overflow. @@ -504,28 +491,22 @@ auto duration_cast(std::chrono::duration from) -> To { template < typename To, typename FromRep, typename FromPeriod, FMT_ENABLE_IF(!is_same_arithmetic_type::value)> -auto duration_cast(std::chrono::duration from) -> To { +auto fmt_duration_cast(std::chrono::duration from) -> To { // Mixed integer <-> float cast is not supported by safe_duration_cast. return std::chrono::duration_cast(from); } template -auto to_time_t(sys_time time_point) -> std::time_t { +auto to_time_t( + std::chrono::time_point time_point) + -> std::time_t { // Cannot use std::chrono::system_clock::to_time_t since this would first // require a cast to std::chrono::system_clock::time_point, which could // overflow. - return detail::duration_cast>( + return fmt_duration_cast>( time_point.time_since_epoch()) .count(); } - -// Workaround a bug in libstdc++ which sets __cpp_lib_chrono to 201907 without -// providing current_zone(): https://github.com/fmtlib/fmt/issues/4160. -template FMT_CONSTEXPR auto has_current_zone() -> bool { - using namespace std::chrono; - using namespace fmt_detail; - return !std::is_same::value; -} } // namespace detail FMT_BEGIN_EXPORT @@ -540,24 +521,24 @@ inline auto localtime(std::time_t time) -> std::tm { std::time_t time_; std::tm tm_; - inline dispatcher(std::time_t t) : time_(t) {} + dispatcher(std::time_t t) : time_(t) {} - inline auto run() -> bool { + auto run() -> bool { using namespace fmt::detail; return handle(localtime_r(&time_, &tm_)); } - inline auto handle(std::tm* tm) -> bool { return tm != nullptr; } + auto handle(std::tm* tm) -> bool { return tm != nullptr; } - inline auto handle(detail::null<>) -> bool { + auto handle(detail::null<>) -> bool { using namespace fmt::detail; return fallback(localtime_s(&tm_, &time_)); } - inline auto fallback(int res) -> bool { return res == 0; } + auto fallback(int res) -> bool { return res == 0; } #if !FMT_MSC_VERSION - inline auto fallback(detail::null<>) -> bool { + auto fallback(detail::null<>) -> bool { using namespace fmt::detail; std::tm* tm = std::localtime(&time_); if (tm) tm_ = *tm; @@ -572,12 +553,10 @@ inline auto localtime(std::time_t time) -> std::tm { } #if FMT_USE_LOCAL_TIME -template ())> +template inline auto localtime(std::chrono::local_time time) -> std::tm { - using namespace std::chrono; - using namespace fmt_detail; - return localtime(detail::to_time_t(current_zone()->to_sys(time))); + return localtime( + detail::to_time_t(std::chrono::current_zone()->to_sys(time))); } #endif @@ -591,24 +570,24 @@ inline auto gmtime(std::time_t time) -> std::tm { std::time_t time_; std::tm tm_; - inline dispatcher(std::time_t t) : time_(t) {} + dispatcher(std::time_t t) : time_(t) {} - inline auto run() -> bool { + auto run() -> bool { using namespace fmt::detail; return handle(gmtime_r(&time_, &tm_)); } - inline auto handle(std::tm* tm) -> bool { return tm != nullptr; } + auto handle(std::tm* tm) -> bool { return tm != nullptr; } - inline auto handle(detail::null<>) -> bool { + auto handle(detail::null<>) -> bool { using namespace fmt::detail; return fallback(gmtime_s(&tm_, &time_)); } - inline auto fallback(int res) -> bool { return res == 0; } + auto fallback(int res) -> bool { return res == 0; } #if !FMT_MSC_VERSION - inline auto fallback(detail::null<>) -> bool { + auto fallback(detail::null<>) -> bool { std::tm* tm = std::gmtime(&time_); if (tm) tm_ = *tm; return tm != nullptr; @@ -622,7 +601,9 @@ inline auto gmtime(std::time_t time) -> std::tm { } template -inline auto gmtime(sys_time time_point) -> std::tm { +inline auto gmtime( + std::chrono::time_point time_point) + -> std::tm { return gmtime(detail::to_time_t(time_point)); } @@ -668,8 +649,7 @@ FMT_CONSTEXPR inline auto get_units() -> const char* { if (std::is_same::value) return "fs"; if (std::is_same::value) return "ps"; if (std::is_same::value) return "ns"; - if (std::is_same::value) - return detail::use_utf8 ? "µs" : "us"; + if (std::is_same::value) return "µs"; if (std::is_same::value) return "ms"; if (std::is_same::value) return "cs"; if (std::is_same::value) return "ds"; @@ -748,7 +728,9 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end, if (ptr == end) FMT_THROW(format_error("invalid format")); c = *ptr++; switch (c) { - case '%': handler.on_text(ptr - 1, ptr); break; + case '%': + handler.on_text(ptr - 1, ptr); + break; case 'n': { const Char newline[] = {'\n'}; handler.on_text(newline, newline + 1); @@ -760,21 +742,45 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end, break; } // Year: - case 'Y': handler.on_year(numeric_system::standard, pad); break; - case 'y': handler.on_short_year(numeric_system::standard); break; - case 'C': handler.on_century(numeric_system::standard); break; - case 'G': handler.on_iso_week_based_year(); break; - case 'g': handler.on_iso_week_based_short_year(); break; + case 'Y': + handler.on_year(numeric_system::standard); + break; + case 'y': + handler.on_short_year(numeric_system::standard); + break; + case 'C': + handler.on_century(numeric_system::standard); + break; + case 'G': + handler.on_iso_week_based_year(); + break; + case 'g': + handler.on_iso_week_based_short_year(); + break; // Day of the week: - case 'a': handler.on_abbr_weekday(); break; - case 'A': handler.on_full_weekday(); break; - case 'w': handler.on_dec0_weekday(numeric_system::standard); break; - case 'u': handler.on_dec1_weekday(numeric_system::standard); break; + case 'a': + handler.on_abbr_weekday(); + break; + case 'A': + handler.on_full_weekday(); + break; + case 'w': + handler.on_dec0_weekday(numeric_system::standard); + break; + case 'u': + handler.on_dec1_weekday(numeric_system::standard); + break; // Month: case 'b': - case 'h': handler.on_abbr_month(); break; - case 'B': handler.on_full_month(); break; - case 'm': handler.on_dec_month(numeric_system::standard, pad); break; + case 'h': + handler.on_abbr_month(); + break; + case 'B': + handler.on_full_month(); + break; + case 'm': + handler.on_dec_month(numeric_system::standard); + break; // Day of the year/month: case 'U': handler.on_dec0_week_of_year(numeric_system::standard, pad); @@ -782,44 +788,99 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end, case 'W': handler.on_dec1_week_of_year(numeric_system::standard, pad); break; - case 'V': handler.on_iso_week_of_year(numeric_system::standard, pad); break; - case 'j': handler.on_day_of_year(pad); break; - case 'd': handler.on_day_of_month(numeric_system::standard, pad); break; + case 'V': + handler.on_iso_week_of_year(numeric_system::standard, pad); + break; + case 'j': + handler.on_day_of_year(); + break; + case 'd': + handler.on_day_of_month(numeric_system::standard, pad); + break; case 'e': handler.on_day_of_month(numeric_system::standard, pad_type::space); break; // Hour, minute, second: - case 'H': handler.on_24_hour(numeric_system::standard, pad); break; - case 'I': handler.on_12_hour(numeric_system::standard, pad); break; - case 'M': handler.on_minute(numeric_system::standard, pad); break; - case 'S': handler.on_second(numeric_system::standard, pad); break; + case 'H': + handler.on_24_hour(numeric_system::standard, pad); + break; + case 'I': + handler.on_12_hour(numeric_system::standard, pad); + break; + case 'M': + handler.on_minute(numeric_system::standard, pad); + break; + case 'S': + handler.on_second(numeric_system::standard, pad); + break; // Other: - case 'c': handler.on_datetime(numeric_system::standard); break; - case 'x': handler.on_loc_date(numeric_system::standard); break; - case 'X': handler.on_loc_time(numeric_system::standard); break; - case 'D': handler.on_us_date(); break; - case 'F': handler.on_iso_date(); break; - case 'r': handler.on_12_hour_time(); break; - case 'R': handler.on_24_hour_time(); break; - case 'T': handler.on_iso_time(); break; - case 'p': handler.on_am_pm(); break; - case 'Q': handler.on_duration_value(); break; - case 'q': handler.on_duration_unit(); break; - case 'z': handler.on_utc_offset(numeric_system::standard); break; - case 'Z': handler.on_tz_name(); break; + case 'c': + handler.on_datetime(numeric_system::standard); + break; + case 'x': + handler.on_loc_date(numeric_system::standard); + break; + case 'X': + handler.on_loc_time(numeric_system::standard); + break; + case 'D': + handler.on_us_date(); + break; + case 'F': + handler.on_iso_date(); + break; + case 'r': + handler.on_12_hour_time(); + break; + case 'R': + handler.on_24_hour_time(); + break; + case 'T': + handler.on_iso_time(); + break; + case 'p': + handler.on_am_pm(); + break; + case 'Q': + handler.on_duration_value(); + break; + case 'q': + handler.on_duration_unit(); + break; + case 'z': + handler.on_utc_offset(numeric_system::standard); + break; + case 'Z': + handler.on_tz_name(); + break; // Alternative representation: case 'E': { if (ptr == end) FMT_THROW(format_error("invalid format")); c = *ptr++; switch (c) { - case 'Y': handler.on_year(numeric_system::alternative, pad); break; - case 'y': handler.on_offset_year(); break; - case 'C': handler.on_century(numeric_system::alternative); break; - case 'c': handler.on_datetime(numeric_system::alternative); break; - case 'x': handler.on_loc_date(numeric_system::alternative); break; - case 'X': handler.on_loc_time(numeric_system::alternative); break; - case 'z': handler.on_utc_offset(numeric_system::alternative); break; - default: FMT_THROW(format_error("invalid format")); + case 'Y': + handler.on_year(numeric_system::alternative); + break; + case 'y': + handler.on_offset_year(); + break; + case 'C': + handler.on_century(numeric_system::alternative); + break; + case 'c': + handler.on_datetime(numeric_system::alternative); + break; + case 'x': + handler.on_loc_date(numeric_system::alternative); + break; + case 'X': + handler.on_loc_time(numeric_system::alternative); + break; + case 'z': + handler.on_utc_offset(numeric_system::alternative); + break; + default: + FMT_THROW(format_error("invalid format")); } break; } @@ -827,8 +888,12 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end, if (ptr == end) FMT_THROW(format_error("invalid format")); c = *ptr++; switch (c) { - case 'y': handler.on_short_year(numeric_system::alternative); break; - case 'm': handler.on_dec_month(numeric_system::alternative, pad); break; + case 'y': + handler.on_short_year(numeric_system::alternative); + break; + case 'm': + handler.on_dec_month(numeric_system::alternative); + break; case 'U': handler.on_dec0_week_of_year(numeric_system::alternative, pad); break; @@ -844,17 +909,33 @@ FMT_CONSTEXPR auto parse_chrono_format(const Char* begin, const Char* end, case 'e': handler.on_day_of_month(numeric_system::alternative, pad_type::space); break; - case 'w': handler.on_dec0_weekday(numeric_system::alternative); break; - case 'u': handler.on_dec1_weekday(numeric_system::alternative); break; - case 'H': handler.on_24_hour(numeric_system::alternative, pad); break; - case 'I': handler.on_12_hour(numeric_system::alternative, pad); break; - case 'M': handler.on_minute(numeric_system::alternative, pad); break; - case 'S': handler.on_second(numeric_system::alternative, pad); break; - case 'z': handler.on_utc_offset(numeric_system::alternative); break; - default: FMT_THROW(format_error("invalid format")); + case 'w': + handler.on_dec0_weekday(numeric_system::alternative); + break; + case 'u': + handler.on_dec1_weekday(numeric_system::alternative); + break; + case 'H': + handler.on_24_hour(numeric_system::alternative, pad); + break; + case 'I': + handler.on_12_hour(numeric_system::alternative, pad); + break; + case 'M': + handler.on_minute(numeric_system::alternative, pad); + break; + case 'S': + handler.on_second(numeric_system::alternative, pad); + break; + case 'z': + handler.on_utc_offset(numeric_system::alternative); + break; + default: + FMT_THROW(format_error("invalid format")); } break; - default: FMT_THROW(format_error("invalid format")); + default: + FMT_THROW(format_error("invalid format")); } begin = ptr; } @@ -866,7 +947,7 @@ template struct null_chrono_spec_handler { FMT_CONSTEXPR void unsupported() { static_cast(this)->unsupported(); } - FMT_CONSTEXPR void on_year(numeric_system, pad_type) { unsupported(); } + FMT_CONSTEXPR void on_year(numeric_system) { unsupported(); } FMT_CONSTEXPR void on_short_year(numeric_system) { unsupported(); } FMT_CONSTEXPR void on_offset_year() { unsupported(); } FMT_CONSTEXPR void on_century(numeric_system) { unsupported(); } @@ -878,7 +959,7 @@ template struct null_chrono_spec_handler { FMT_CONSTEXPR void on_dec1_weekday(numeric_system) { unsupported(); } FMT_CONSTEXPR void on_abbr_month() { unsupported(); } FMT_CONSTEXPR void on_full_month() { unsupported(); } - FMT_CONSTEXPR void on_dec_month(numeric_system, pad_type) { unsupported(); } + FMT_CONSTEXPR void on_dec_month(numeric_system) { unsupported(); } FMT_CONSTEXPR void on_dec0_week_of_year(numeric_system, pad_type) { unsupported(); } @@ -888,7 +969,7 @@ template struct null_chrono_spec_handler { FMT_CONSTEXPR void on_iso_week_of_year(numeric_system, pad_type) { unsupported(); } - FMT_CONSTEXPR void on_day_of_year(pad_type) { unsupported(); } + FMT_CONSTEXPR void on_day_of_year() { unsupported(); } FMT_CONSTEXPR void on_day_of_month(numeric_system, pad_type) { unsupported(); } @@ -912,13 +993,11 @@ template struct null_chrono_spec_handler { }; struct tm_format_checker : null_chrono_spec_handler { - FMT_NORETURN inline void unsupported() { - FMT_THROW(format_error("no format")); - } + FMT_NORETURN void unsupported() { FMT_THROW(format_error("no format")); } template FMT_CONSTEXPR void on_text(const Char*, const Char*) {} - FMT_CONSTEXPR void on_year(numeric_system, pad_type) {} + FMT_CONSTEXPR void on_year(numeric_system) {} FMT_CONSTEXPR void on_short_year(numeric_system) {} FMT_CONSTEXPR void on_offset_year() {} FMT_CONSTEXPR void on_century(numeric_system) {} @@ -930,11 +1009,11 @@ struct tm_format_checker : null_chrono_spec_handler { FMT_CONSTEXPR void on_dec1_weekday(numeric_system) {} FMT_CONSTEXPR void on_abbr_month() {} FMT_CONSTEXPR void on_full_month() {} - FMT_CONSTEXPR void on_dec_month(numeric_system, pad_type) {} + FMT_CONSTEXPR void on_dec_month(numeric_system) {} FMT_CONSTEXPR void on_dec0_week_of_year(numeric_system, pad_type) {} FMT_CONSTEXPR void on_dec1_week_of_year(numeric_system, pad_type) {} FMT_CONSTEXPR void on_iso_week_of_year(numeric_system, pad_type) {} - FMT_CONSTEXPR void on_day_of_year(pad_type) {} + FMT_CONSTEXPR void on_day_of_year() {} FMT_CONSTEXPR void on_day_of_month(numeric_system, pad_type) {} FMT_CONSTEXPR void on_24_hour(numeric_system, pad_type) {} FMT_CONSTEXPR void on_12_hour(numeric_system, pad_type) {} @@ -991,14 +1070,15 @@ template struct has_member_data_tm_zone> : std::true_type {}; +#if FMT_USE_TZSET inline void tzset_once() { - static bool init = []() { - using namespace fmt_detail; + static bool init = []() -> bool { _tzset(); - return false; + return true; }(); ignore_unused(init); } +#endif // Converts value to Int and checks that it's in the range [0, upper). template ::value)> @@ -1049,16 +1129,16 @@ void write_fractional_seconds(OutputIt& out, Duration d, int precision = -1) { using subsecond_precision = std::chrono::duration< typename std::common_type::type, - std::ratio<1, pow10(num_fractional_digits)>>; + std::ratio<1, detail::pow10(num_fractional_digits)>>; - const auto fractional = d - detail::duration_cast(d); + const auto fractional = d - fmt_duration_cast(d); const auto subseconds = std::chrono::treat_as_floating_point< typename subsecond_precision::rep>::value ? fractional.count() - : detail::duration_cast(fractional).count(); + : fmt_duration_cast(fractional).count(); auto n = static_cast>(subseconds); - const int num_digits = count_digits(n); + const int num_digits = detail::count_digits(n); int leading_zeroes = (std::max)(0, num_fractional_digits - num_digits); if (precision < 0) { @@ -1067,21 +1147,23 @@ void write_fractional_seconds(OutputIt& out, Duration d, int precision = -1) { std::chrono::seconds::period>::value) { *out++ = '.'; out = detail::fill_n(out, leading_zeroes, '0'); - out = format_decimal(out, n, num_digits); + out = format_decimal(out, n, num_digits).end; } } else if (precision > 0) { *out++ = '.'; - leading_zeroes = min_of(leading_zeroes, precision); + leading_zeroes = (std::min)(leading_zeroes, precision); int remaining = precision - leading_zeroes; out = detail::fill_n(out, leading_zeroes, '0'); if (remaining < num_digits) { int num_truncated_digits = num_digits - remaining; - n /= to_unsigned(pow10(to_unsigned(num_truncated_digits))); - if (n != 0) out = format_decimal(out, n, remaining); + n /= to_unsigned(detail::pow10(to_unsigned(num_truncated_digits))); + if (n) { + out = format_decimal(out, n, remaining).end; + } return; } - if (n != 0) { - out = format_decimal(out, n, num_digits); + if (n) { + out = format_decimal(out, n, num_digits).end; remaining -= num_digits; } out = detail::fill_n(out, remaining, '0'); @@ -1225,28 +1307,30 @@ class tm_writer { } } - void write_year_extended(long long year, pad_type pad) { + void write_year_extended(long long year) { // At least 4 characters. int width = 4; - bool negative = year < 0; - if (negative) { + if (year < 0) { + *out_++ = '-'; year = 0 - year; --width; } uint32_or_64_or_128_t n = to_unsigned(year); const int num_digits = count_digits(n); - if (negative && pad == pad_type::zero) *out_++ = '-'; - if (width > num_digits) { - out_ = detail::write_padding(out_, pad, width - num_digits); - } - if (negative && pad != pad_type::zero) *out_++ = '-'; - out_ = format_decimal(out_, n, num_digits); + if (width > num_digits) + out_ = detail::fill_n(out_, width - num_digits, '0'); + out_ = format_decimal(out_, n, num_digits).end; } - void write_year(long long year, pad_type pad) { - write_year_extended(year, pad); + void write_year(long long year) { + if (year >= 0 && year < 10000) { + write2(static_cast(year / 100)); + write2(static_cast(year % 100)); + } else { + write_year_extended(year); + } } - void write_utc_offset(long long offset, numeric_system ns) { + void write_utc_offset(long offset, numeric_system ns) { if (offset < 0) { *out_++ = '-'; offset = -offset; @@ -1258,7 +1342,6 @@ class tm_writer { if (ns != numeric_system::standard) *out_++ = ':'; write2(static_cast(offset % 60)); } - template ::value)> void format_utc_offset_impl(const T& tm, numeric_system ns) { write_utc_offset(tm.tm_gmtoff, ns); @@ -1266,7 +1349,9 @@ class tm_writer { template ::value)> void format_utc_offset_impl(const T& tm, numeric_system ns) { #if defined(_WIN32) && defined(_UCRT) +# if FMT_USE_TZSET tzset_once(); +# endif long offset = 0; _get_timezone(&offset); if (tm.tm_isdst) { @@ -1283,7 +1368,7 @@ class tm_writer { std::time_t gt = std::mktime(>m); std::tm ltm = gmtime(gt); std::time_t lt = std::mktime(<m); - long long offset = gt - lt; + long offset = gt - lt; write_utc_offset(offset, ns); #endif } @@ -1367,7 +1452,7 @@ class tm_writer { *out_++ = ' '; on_iso_time(); *out_++ = ' '; - on_year(numeric_system::standard, pad_type::space); + on_year(numeric_system::standard); } else { format_localized('c', ns == numeric_system::standard ? '\0' : 'E'); } @@ -1396,10 +1481,10 @@ class tm_writer { char buf[10]; size_t offset = 0; if (year >= 0 && year < 10000) { - write2digits(buf, static_cast(year / 100)); + copy2(buf, digits2(static_cast(year / 100))); } else { offset = 4; - write_year_extended(year, pad_type::zero); + write_year_extended(year); year = 0; } write_digit2_separated(buf + 2, static_cast(year % 100), @@ -1411,9 +1496,9 @@ class tm_writer { void on_utc_offset(numeric_system ns) { format_utc_offset_impl(tm_, ns); } void on_tz_name() { format_tz_name_impl(tm_); } - void on_year(numeric_system ns, pad_type pad) { + void on_year(numeric_system ns) { if (is_classic_ || ns == numeric_system::standard) - return write_year(tm_year(), pad); + return write_year(tm_year()); format_localized('Y', 'E'); } void on_short_year(numeric_system ns) { @@ -1444,9 +1529,9 @@ class tm_writer { } } - void on_dec_month(numeric_system ns, pad_type pad) { + void on_dec_month(numeric_system ns) { if (is_classic_ || ns == numeric_system::standard) - return write2(tm_mon() + 1, pad); + return write2(tm_mon() + 1); format_localized('m', 'O'); } @@ -1473,24 +1558,16 @@ class tm_writer { format_localized('V', 'O'); } - void on_iso_week_based_year() { - write_year(tm_iso_week_year(), pad_type::zero); - } + void on_iso_week_based_year() { write_year(tm_iso_week_year()); } void on_iso_week_based_short_year() { write2(split_year_lower(tm_iso_week_year())); } - void on_day_of_year(pad_type pad) { + void on_day_of_year() { auto yday = tm_yday() + 1; - auto digit1 = yday / 100; - if (digit1 != 0) { - write1(digit1); - } else { - out_ = detail::write_padding(out_, pad); - } - write2(yday % 100, pad); + write1(yday / 100); + write2(yday % 100); } - void on_day_of_month(numeric_system ns, pad_type pad) { if (is_classic_ || ns == numeric_system::standard) return write2(tm_mday(), pad); @@ -1522,7 +1599,7 @@ class tm_writer { write_floating_seconds(buf, *subsecs_); if (buf.size() > 1) { // Remove the leading "0", write something like ".123". - out_ = copy(buf.begin() + 1, buf.end(), out_); + out_ = std::copy(buf.begin() + 1, buf.end(), out_); } } else { write_fractional_seconds(out_, *subsecs_); @@ -1574,11 +1651,11 @@ class tm_writer { struct chrono_format_checker : null_chrono_spec_handler { bool has_precision_integral = false; - FMT_NORETURN inline void unsupported() { FMT_THROW(format_error("no date")); } + FMT_NORETURN void unsupported() { FMT_THROW(format_error("no date")); } template FMT_CONSTEXPR void on_text(const Char*, const Char*) {} - FMT_CONSTEXPR void on_day_of_year(pad_type) {} + FMT_CONSTEXPR void on_day_of_year() {} FMT_CONSTEXPR void on_24_hour(numeric_system, pad_type) {} FMT_CONSTEXPR void on_12_hour(numeric_system, pad_type) {} FMT_CONSTEXPR void on_minute(numeric_system, pad_type) {} @@ -1588,8 +1665,9 @@ struct chrono_format_checker : null_chrono_spec_handler { FMT_CONSTEXPR void on_iso_time() {} FMT_CONSTEXPR void on_am_pm() {} FMT_CONSTEXPR void on_duration_value() const { - if (has_precision_integral) + if (has_precision_integral) { FMT_THROW(format_error("precision not allowed for this argument type")); + } } FMT_CONSTEXPR void on_duration_unit() {} }; @@ -1629,17 +1707,17 @@ inline auto get_milliseconds(std::chrono::duration d) #if FMT_SAFE_DURATION_CAST using CommonSecondsType = typename std::common_type::type; - const auto d_as_common = detail::duration_cast(d); + const auto d_as_common = fmt_duration_cast(d); const auto d_as_whole_seconds = - detail::duration_cast(d_as_common); + fmt_duration_cast(d_as_common); // this conversion should be nonproblematic const auto diff = d_as_common - d_as_whole_seconds; const auto ms = - detail::duration_cast>(diff); + fmt_duration_cast>(diff); return ms; #else - auto s = detail::duration_cast(d); - return detail::duration_cast(d - s); + auto s = fmt_duration_cast(d); + return fmt_duration_cast(d - s); #endif } @@ -1654,14 +1732,14 @@ template OutputIt { auto specs = format_specs(); specs.precision = precision; - specs.set_type(precision >= 0 ? presentation_type::fixed - : presentation_type::general); + specs.type = + precision >= 0 ? presentation_type::fixed : presentation_type::general; return write(out, val, specs); } template auto copy_unit(string_view unit, OutputIt out, Char) -> OutputIt { - return copy(unit.begin(), unit.end(), out); + return std::copy(unit.begin(), unit.end(), out); } template @@ -1669,7 +1747,7 @@ auto copy_unit(string_view unit, OutputIt out, wchar_t) -> OutputIt { // This works when wchar_t is UTF-32 because units only contain characters // that have the same representation in UTF-16 and UTF-32. utf8_to_utf16 u(unit); - return copy(u.c_str(), u.c_str() + u.size(), out); + return std::copy(u.c_str(), u.c_str() + u.size(), out); } template @@ -1695,14 +1773,16 @@ class get_locale { bool has_locale_ = false; public: - inline get_locale(bool localized, locale_ref loc) : has_locale_(localized) { + get_locale(bool localized, locale_ref loc) : has_locale_(localized) { +#ifndef FMT_STATIC_THOUSANDS_SEPARATOR if (localized) ::new (&locale_) std::locale(loc.template get()); +#endif } - inline ~get_locale() { + ~get_locale() { if (has_locale_) locale_.~locale(); } - inline operator const std::locale&() const { + operator const std::locale&() const { return has_locale_ ? locale_ : get_classic_locale(); } }; @@ -1741,7 +1821,7 @@ struct chrono_formatter { // this may overflow and/or the result may not fit in the // target type. // might need checked conversion (rep!=Rep) - s = detail::duration_cast(std::chrono::duration(val)); + s = fmt_duration_cast(std::chrono::duration(val)); } // returns true if nan or inf, writes to out. @@ -1801,7 +1881,7 @@ struct chrono_formatter { if (width > num_digits) { out = detail::write_padding(out, pad, width - num_digits); } - out = format_decimal(out, n, num_digits); + out = format_decimal(out, n, num_digits).end; } void write_nan() { std::copy_n("nan", 3, out); } @@ -1818,7 +1898,7 @@ struct chrono_formatter { } void on_text(const char_type* begin, const char_type* end) { - copy(begin, end, out); + std::copy(begin, end, out); } // These are not implemented because durations don't have date information. @@ -1835,19 +1915,19 @@ struct chrono_formatter { void on_iso_date() {} void on_utc_offset(numeric_system) {} void on_tz_name() {} - void on_year(numeric_system, pad_type) {} + void on_year(numeric_system) {} void on_short_year(numeric_system) {} void on_offset_year() {} void on_century(numeric_system) {} void on_iso_week_based_year() {} void on_iso_week_based_short_year() {} - void on_dec_month(numeric_system, pad_type) {} + void on_dec_month(numeric_system) {} void on_dec0_week_of_year(numeric_system, pad_type) {} void on_dec1_week_of_year(numeric_system, pad_type) {} void on_iso_week_of_year(numeric_system, pad_type) {} void on_day_of_month(numeric_system, pad_type) {} - void on_day_of_year(pad_type) { + void on_day_of_year() { if (handle_nan_inf()) return; write(days(), 0); } @@ -1891,7 +1971,7 @@ struct chrono_formatter { if (buf.size() < 2 || buf[1] == '.') { out = detail::write_padding(out, pad); } - out = copy(buf.begin(), buf.end(), out); + out = std::copy(buf.begin(), buf.end(), out); } else { write(second(), 2, pad); write_fractional_seconds( @@ -2020,7 +2100,8 @@ struct formatter : private formatter { bool use_tm_formatter_ = false; public: - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) + -> decltype(ctx.begin()) { auto it = ctx.begin(), end = ctx.end(); if (it != end && *it == 'L') { ++it; @@ -2049,7 +2130,8 @@ struct formatter : private formatter { bool use_tm_formatter_ = false; public: - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) + -> decltype(ctx.begin()) { auto it = ctx.begin(), end = ctx.end(); use_tm_formatter_ = it != end && *it != '}'; return use_tm_formatter_ ? formatter::parse(ctx) : it; @@ -2074,7 +2156,8 @@ struct formatter : private formatter { bool use_tm_formatter_ = false; public: - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) + -> decltype(ctx.begin()) { auto it = ctx.begin(), end = ctx.end(); if (it != end && *it == 'L') { ++it; @@ -2103,7 +2186,8 @@ struct formatter : private formatter { bool use_tm_formatter_ = false; public: - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) + -> decltype(ctx.begin()) { auto it = ctx.begin(), end = ctx.end(); use_tm_formatter_ = it != end && *it != '}'; return use_tm_formatter_ ? formatter::parse(ctx) : it; @@ -2116,7 +2200,7 @@ struct formatter : private formatter { if (use_tm_formatter_) return formatter::format(time, ctx); detail::get_locale loc(false, ctx.locale()); auto w = detail::tm_writer(loc, ctx.out(), time); - w.on_year(detail::numeric_system::standard, detail::pad_type::zero); + w.on_year(detail::numeric_system::standard); return w.out(); } }; @@ -2127,7 +2211,8 @@ struct formatter : private formatter { bool use_tm_formatter_ = false; public: - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) + -> decltype(ctx.begin()) { auto it = ctx.begin(), end = ctx.end(); use_tm_formatter_ = it != end && *it != '}'; return use_tm_formatter_ ? formatter::parse(ctx) : it; @@ -2155,33 +2240,32 @@ struct formatter, Char> { detail::arg_ref width_ref_; detail::arg_ref precision_ref_; bool localized_ = false; - basic_string_view fmt_; + basic_string_view format_str_; public: - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) + -> decltype(ctx.begin()) { auto it = ctx.begin(), end = ctx.end(); if (it == end || *it == '}') return it; it = detail::parse_align(it, end, specs_); if (it == end) return it; - Char c = *it; - if ((c >= '0' && c <= '9') || c == '{') { - it = detail::parse_width(it, end, specs_, width_ref_, ctx); - if (it == end) return it; - } + it = detail::parse_dynamic_spec(it, end, specs_.width, width_ref_, ctx); + if (it == end) return it; auto checker = detail::chrono_format_checker(); if (*it == '.') { checker.has_precision_integral = !std::is_floating_point::value; - it = detail::parse_precision(it, end, specs_, precision_ref_, ctx); + it = detail::parse_precision(it, end, specs_.precision, precision_ref_, + ctx); } if (it != end && *it == 'L') { localized_ = true; ++it; } end = detail::parse_chrono_format(it, end, checker); - fmt_ = {it, detail::to_unsigned(end - it)}; + format_str_ = {it, detail::to_unsigned(end - it)}; return end; } @@ -2191,15 +2275,15 @@ struct formatter, Char> { auto specs = specs_; auto precision = specs.precision; specs.precision = -1; - auto begin = fmt_.begin(), end = fmt_.end(); + auto begin = format_str_.begin(), end = format_str_.end(); // As a possible future optimization, we could avoid extra copying if width // is not specified. auto buf = basic_memory_buffer(); - auto out = basic_appender(buf); - detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, width_ref_, - ctx); - detail::handle_dynamic_spec(specs.dynamic_precision(), precision, - precision_ref_, ctx); + auto out = std::back_inserter(buf); + detail::handle_dynamic_spec(specs.width, width_ref_, + ctx); + detail::handle_dynamic_spec(precision, + precision_ref_, ctx); if (begin == end || *begin == '}') { out = detail::format_duration_value(out, d.count(), precision); detail::format_duration_unit(out); @@ -2216,119 +2300,129 @@ struct formatter, Char> { } }; +template +struct formatter, + Char> : formatter { + FMT_CONSTEXPR formatter() { + this->format_str_ = detail::string_literal{}; + } + + template + auto format(std::chrono::time_point val, + FormatContext& ctx) const -> decltype(ctx.out()) { + std::tm tm = gmtime(val); + using period = typename Duration::period; + if (detail::const_check( + period::num == 1 && period::den == 1 && + !std::is_floating_point::value)) { + return formatter::format(tm, ctx); + } + Duration epoch = val.time_since_epoch(); + Duration subsecs = detail::fmt_duration_cast( + epoch - detail::fmt_duration_cast(epoch)); + if (subsecs.count() < 0) { + auto second = + detail::fmt_duration_cast(std::chrono::seconds(1)); + if (tm.tm_sec != 0) + --tm.tm_sec; + else + tm = gmtime(val - second); + subsecs += detail::fmt_duration_cast(std::chrono::seconds(1)); + } + return formatter::do_format(tm, ctx, &subsecs); + } +}; + +#if FMT_USE_LOCAL_TIME +template +struct formatter, Char> + : formatter { + FMT_CONSTEXPR formatter() { + this->format_str_ = detail::string_literal{}; + } + + template + auto format(std::chrono::local_time val, FormatContext& ctx) const + -> decltype(ctx.out()) { + using period = typename Duration::period; + if (period::num != 1 || period::den != 1 || + std::is_floating_point::value) { + const auto epoch = val.time_since_epoch(); + const auto subsecs = detail::fmt_duration_cast( + epoch - detail::fmt_duration_cast(epoch)); + + return formatter::do_format(localtime(val), ctx, &subsecs); + } + + return formatter::format(localtime(val), ctx); + } +}; +#endif + +#if FMT_USE_UTC_TIME +template +struct formatter, + Char> + : formatter, + Char> { + template + auto format(std::chrono::time_point val, + FormatContext& ctx) const -> decltype(ctx.out()) { + return formatter< + std::chrono::time_point, + Char>::format(std::chrono::utc_clock::to_sys(val), ctx); + } +}; +#endif + template struct formatter { private: format_specs specs_; detail::arg_ref width_ref_; protected: - basic_string_view fmt_; + basic_string_view format_str_; - template + template auto do_format(const std::tm& tm, FormatContext& ctx, const Duration* subsecs) const -> decltype(ctx.out()) { auto specs = specs_; auto buf = basic_memory_buffer(); - auto out = basic_appender(buf); - detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, width_ref_, - ctx); + auto out = std::back_inserter(buf); + detail::handle_dynamic_spec(specs.width, width_ref_, + ctx); auto loc_ref = ctx.locale(); detail::get_locale loc(static_cast(loc_ref), loc_ref); auto w = detail::tm_writer(loc, out, tm, subsecs); - detail::parse_chrono_format(fmt_.begin(), fmt_.end(), w); + detail::parse_chrono_format(format_str_.begin(), format_str_.end(), w); return detail::write( ctx.out(), basic_string_view(buf.data(), buf.size()), specs); } public: - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) + -> decltype(ctx.begin()) { auto it = ctx.begin(), end = ctx.end(); if (it == end || *it == '}') return it; it = detail::parse_align(it, end, specs_); if (it == end) return it; - Char c = *it; - if ((c >= '0' && c <= '9') || c == '{') { - it = detail::parse_width(it, end, specs_, width_ref_, ctx); - if (it == end) return it; - } + it = detail::parse_dynamic_spec(it, end, specs_.width, width_ref_, ctx); + if (it == end) return it; end = detail::parse_chrono_format(it, end, detail::tm_format_checker()); - // Replace the default format string only if the new spec is not empty. - if (end != it) fmt_ = {it, detail::to_unsigned(end - it)}; + // Replace the default format_str only if the new spec is not empty. + if (end != it) format_str_ = {it, detail::to_unsigned(end - it)}; return end; } template auto format(const std::tm& tm, FormatContext& ctx) const -> decltype(ctx.out()) { - return do_format(tm, ctx, nullptr); - } -}; - -template -struct formatter, Char> : formatter { - FMT_CONSTEXPR formatter() { - this->fmt_ = detail::string_literal(); - } - - template - auto format(sys_time val, FormatContext& ctx) const - -> decltype(ctx.out()) { - std::tm tm = gmtime(val); - using period = typename Duration::period; - if (detail::const_check( - period::num == 1 && period::den == 1 && - !std::is_floating_point::value)) { - return formatter::format(tm, ctx); - } - Duration epoch = val.time_since_epoch(); - Duration subsecs = detail::duration_cast( - epoch - detail::duration_cast(epoch)); - if (subsecs.count() < 0) { - auto second = detail::duration_cast(std::chrono::seconds(1)); - if (tm.tm_sec != 0) - --tm.tm_sec; - else - tm = gmtime(val - second); - subsecs += detail::duration_cast(std::chrono::seconds(1)); - } - return formatter::do_format(tm, ctx, &subsecs); - } -}; - -template -struct formatter, Char> - : formatter, Char> { - template - auto format(utc_time val, FormatContext& ctx) const - -> decltype(ctx.out()) { - return formatter, Char>::format( - detail::utc_clock::to_sys(val), ctx); - } -}; - -template -struct formatter, Char> : formatter { - FMT_CONSTEXPR formatter() { - this->fmt_ = detail::string_literal(); - } - - template - auto format(local_time val, FormatContext& ctx) const - -> decltype(ctx.out()) { - using period = typename Duration::period; - if (period::num == 1 && period::den == 1 && - !std::is_floating_point::value) { - return formatter::format(localtime(val), ctx); - } - auto epoch = val.time_since_epoch(); - auto subsecs = detail::duration_cast( - epoch - detail::duration_cast(epoch)); - return formatter::do_format(localtime(val), ctx, &subsecs); + return do_format(tm, ctx, nullptr); } }; diff --git a/3rdparty/fmt/include/fmt/color.h b/3rdparty/fmt/include/fmt/color.h index 2faaf3a067a6..f0e9dd94ef3a 100644 --- a/3rdparty/fmt/include/fmt/color.h +++ b/3rdparty/fmt/include/fmt/color.h @@ -330,7 +330,7 @@ FMT_CONSTEXPR inline auto operator|(emphasis lhs, emphasis rhs) noexcept namespace detail { template struct ansi_color_escape { - FMT_CONSTEXPR ansi_color_escape(color_type text_color, + FMT_CONSTEXPR ansi_color_escape(detail::color_type text_color, const char* esc) noexcept { // If we have a terminal color, we need to output another escape code // sequence. @@ -412,13 +412,13 @@ template struct ansi_color_escape { }; template -FMT_CONSTEXPR auto make_foreground_color(color_type foreground) noexcept +FMT_CONSTEXPR auto make_foreground_color(detail::color_type foreground) noexcept -> ansi_color_escape { return ansi_color_escape(foreground, "\x1b[38;2;"); } template -FMT_CONSTEXPR auto make_background_color(color_type background) noexcept +FMT_CONSTEXPR auto make_background_color(detail::color_type background) noexcept -> ansi_color_escape { return ansi_color_escape(background, "\x1b[48;2;"); } @@ -434,35 +434,36 @@ template inline void reset_color(buffer& buffer) { buffer.append(reset_color.begin(), reset_color.end()); } -template struct styled_arg : view { +template struct styled_arg : detail::view { const T& value; text_style style; styled_arg(const T& v, text_style s) : value(v), style(s) {} }; template -void vformat_to(buffer& buf, const text_style& ts, - basic_string_view fmt, - basic_format_args> args) { +void vformat_to( + buffer& buf, const text_style& ts, basic_string_view format_str, + basic_format_args>> args) { bool has_style = false; if (ts.has_emphasis()) { has_style = true; - auto emphasis = make_emphasis(ts.get_emphasis()); + auto emphasis = detail::make_emphasis(ts.get_emphasis()); buf.append(emphasis.begin(), emphasis.end()); } if (ts.has_foreground()) { has_style = true; - auto foreground = make_foreground_color(ts.get_foreground()); + auto foreground = detail::make_foreground_color(ts.get_foreground()); buf.append(foreground.begin(), foreground.end()); } if (ts.has_background()) { has_style = true; - auto background = make_background_color(ts.get_background()); + auto background = detail::make_background_color(ts.get_background()); buf.append(background.begin(), background.end()); } - vformat_to(buf, fmt, args); - if (has_style) reset_color(buf); + detail::vformat_to(buf, format_str, args, {}); + if (has_style) detail::reset_color(buf); } + } // namespace detail inline void vprint(FILE* f, const text_style& ts, string_view fmt, @@ -484,7 +485,7 @@ inline void vprint(FILE* f, const text_style& ts, string_view fmt, template void print(FILE* f, const text_style& ts, format_string fmt, T&&... args) { - vprint(f, ts, fmt.str, vargs{{args...}}); + vprint(f, ts, fmt, fmt::make_format_args(args...)); } /** @@ -523,7 +524,7 @@ inline auto vformat(const text_style& ts, string_view fmt, format_args args) template inline auto format(const text_style& ts, format_string fmt, T&&... args) -> std::string { - return fmt::vformat(ts, fmt.str, vargs{{args...}}); + return fmt::vformat(ts, fmt, fmt::make_format_args(args...)); } /// Formats a string with the given text_style and writes the output to `out`. @@ -550,7 +551,7 @@ template ::value)> inline auto format_to(OutputIt out, const text_style& ts, format_string fmt, T&&... args) -> OutputIt { - return vformat_to(out, ts, fmt.str, vargs{{args...}}); + return vformat_to(out, ts, fmt, fmt::make_format_args(args...)); } template @@ -559,30 +560,31 @@ struct formatter, Char> : formatter { auto format(const detail::styled_arg& arg, FormatContext& ctx) const -> decltype(ctx.out()) { const auto& ts = arg.style; + const auto& value = arg.value; auto out = ctx.out(); bool has_style = false; if (ts.has_emphasis()) { has_style = true; auto emphasis = detail::make_emphasis(ts.get_emphasis()); - out = detail::copy(emphasis.begin(), emphasis.end(), out); + out = std::copy(emphasis.begin(), emphasis.end(), out); } if (ts.has_foreground()) { has_style = true; auto foreground = detail::make_foreground_color(ts.get_foreground()); - out = detail::copy(foreground.begin(), foreground.end(), out); + out = std::copy(foreground.begin(), foreground.end(), out); } if (ts.has_background()) { has_style = true; auto background = detail::make_background_color(ts.get_background()); - out = detail::copy(background.begin(), background.end(), out); + out = std::copy(background.begin(), background.end(), out); } - out = formatter::format(arg.value, ctx); + out = formatter::format(value, ctx); if (has_style) { auto reset_color = string_view("\x1b[0m"); - out = detail::copy(reset_color.begin(), reset_color.end(), out); + out = std::copy(reset_color.begin(), reset_color.end(), out); } return out; } diff --git a/3rdparty/fmt/include/fmt/compile.h b/3rdparty/fmt/include/fmt/compile.h index 2922635093c3..b2afc2c309f4 100644 --- a/3rdparty/fmt/include/fmt/compile.h +++ b/3rdparty/fmt/include/fmt/compile.h @@ -21,6 +21,12 @@ FMT_EXPORT class compiled_string {}; namespace detail { +template +FMT_CONSTEXPR inline auto copy(InputIt begin, InputIt end, counting_iterator it) + -> counting_iterator { + return it + (end - begin); +} + template struct is_compiled_string : std::is_base_of {}; @@ -36,13 +42,14 @@ struct is_compiled_string : std::is_base_of {}; * std::string s = fmt::format(FMT_COMPILE("{}"), 42); */ #if defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction) -# define FMT_COMPILE(s) FMT_STRING_IMPL(s, fmt::compiled_string) +# define FMT_COMPILE(s) FMT_STRING_IMPL(s, fmt::compiled_string, explicit) #else # define FMT_COMPILE(s) FMT_STRING(s) #endif #if FMT_USE_NONTYPE_TEMPLATE_ARGS -template Str> +template Str> struct udl_compiled_string : compiled_string { using char_type = Char; explicit constexpr operator basic_string_view() const { @@ -70,29 +77,6 @@ constexpr const auto& get([[maybe_unused]] const T& first, return detail::get(rest...); } -# if FMT_USE_NONTYPE_TEMPLATE_ARGS -template -constexpr auto get_arg_index_by_name(basic_string_view name) -> int { - if constexpr (is_static_named_arg()) { - if (name == T::name) return N; - } - if constexpr (sizeof...(Args) > 0) - return get_arg_index_by_name(name); - (void)name; // Workaround an MSVC bug about "unused" parameter. - return -1; -} -# endif - -template -FMT_CONSTEXPR auto get_arg_index_by_name(basic_string_view name) -> int { -# if FMT_USE_NONTYPE_TEMPLATE_ARGS - if constexpr (sizeof...(Args) > 0) - return get_arg_index_by_name<0, Args...>(name); -# endif - (void)name; - return -1; -} - template constexpr int get_arg_index_by_name(basic_string_view name, type_list) { @@ -165,9 +149,8 @@ template struct field { if constexpr (std::is_convertible>::value) { auto s = basic_string_view(arg); return copy(s.begin(), s.end(), out); - } else { - return write(out, arg); } + return write(out, arg); } }; @@ -292,7 +275,6 @@ constexpr parse_specs_result parse_specs(basic_string_view str, } template struct arg_id_handler { - arg_id_kind kind; arg_ref arg_id; constexpr int on_auto() { @@ -300,28 +282,25 @@ template struct arg_id_handler { return 0; } constexpr int on_index(int id) { - kind = arg_id_kind::index; arg_id = arg_ref(id); return 0; } constexpr int on_name(basic_string_view id) { - kind = arg_id_kind::name; arg_id = arg_ref(id); return 0; } }; template struct parse_arg_id_result { - arg_id_kind kind; arg_ref arg_id; const Char* arg_id_end; }; template constexpr auto parse_arg_id(const Char* begin, const Char* end) { - auto handler = arg_id_handler{arg_id_kind::none, arg_ref{}}; + auto handler = arg_id_handler{arg_ref{}}; auto arg_id_end = parse_arg_id(begin, end, handler); - return parse_arg_id_result{handler.kind, handler.arg_id, arg_id_end}; + return parse_arg_id_result{handler.arg_id, arg_id_end}; } template struct field_type { @@ -384,18 +363,18 @@ constexpr auto compile_format_string(S fmt) { constexpr char_type c = arg_id_end_pos != str.size() ? str[arg_id_end_pos] : char_type(); static_assert(c == '}' || c == ':', "missing '}' in format string"); - if constexpr (arg_id_result.kind == arg_id_kind::index) { + if constexpr (arg_id_result.arg_id.kind == arg_id_kind::index) { static_assert( ID == manual_indexing_id || ID == 0, "cannot switch from automatic to manual argument indexing"); - constexpr auto arg_index = arg_id_result.arg_id.index; + constexpr auto arg_index = arg_id_result.arg_id.val.index; return parse_replacement_field_then_tail, Args, arg_id_end_pos, arg_index, manual_indexing_id>( fmt); - } else if constexpr (arg_id_result.kind == arg_id_kind::name) { + } else if constexpr (arg_id_result.arg_id.kind == arg_id_kind::name) { constexpr auto arg_index = - get_arg_index_by_name(arg_id_result.arg_id.name, Args{}); + get_arg_index_by_name(arg_id_result.arg_id.val.name, Args{}); if constexpr (arg_index >= 0) { constexpr auto next_id = ID != manual_indexing_id ? ID + 1 : manual_indexing_id; @@ -404,7 +383,8 @@ constexpr auto compile_format_string(S fmt) { arg_index, next_id>(fmt); } else if constexpr (c == '}') { return parse_tail( - runtime_named_field{arg_id_result.arg_id.name}, fmt); + runtime_named_field{arg_id_result.arg_id.val.name}, + fmt); } else if constexpr (c == ':') { return unknown_format(); // no type info for specs parsing } @@ -516,9 +496,7 @@ template ::value)> FMT_CONSTEXPR20 auto formatted_size(const S& fmt, const Args&... args) -> size_t { - auto buf = detail::counting_buffer<>(); - fmt::format_to(appender(buf), fmt, args...); - return buf.count(); + return fmt::format_to(detail::counting_iterator(), fmt, args...).count(); } template constexpr auto operator""_cf() { +template constexpr auto operator""_cf() { using char_t = remove_cvref_t; return detail::udl_compiled_string(); diff --git a/3rdparty/fmt/include/fmt/format-inl.h b/3rdparty/fmt/include/fmt/format-inl.h index 38308bf2a0b1..a887483b6f46 100644 --- a/3rdparty/fmt/include/fmt/format-inl.h +++ b/3rdparty/fmt/include/fmt/format-inl.h @@ -14,6 +14,10 @@ # include # include # include + +# if !defined(FMT_STATIC_THOUSANDS_SEPARATOR) +# include +# endif #endif #if defined(_WIN32) && !defined(FMT_USE_WRITE_CONSOLE) @@ -22,22 +26,16 @@ #include "format.h" -#if FMT_USE_LOCALE -# include -#endif - -#ifndef FMT_FUNC -# define FMT_FUNC -#endif - FMT_BEGIN_NAMESPACE namespace detail { FMT_FUNC void assert_fail(const char* file, int line, const char* message) { // Use unchecked std::fprintf to avoid triggering another assertion when - // writing to stderr fails. - fprintf(stderr, "%s:%d: assertion failed: %s", file, line, message); - abort(); + // writing to stderr fails + std::fprintf(stderr, "%s:%d: assertion failed: %s", file, line, message); + // Chosen instead of std::abort to satisfy Clang in CUDA mode during device + // code pass. + std::terminate(); } FMT_FUNC void format_error_code(detail::buffer& out, int error_code, @@ -63,93 +61,86 @@ FMT_FUNC void format_error_code(detail::buffer& out, int error_code, FMT_ASSERT(out.size() <= inline_buffer_size, ""); } -FMT_FUNC void do_report_error(format_func func, int error_code, - const char* message) noexcept { +FMT_FUNC void report_error(format_func func, int error_code, + const char* message) noexcept { memory_buffer full_message; func(full_message, error_code, message); - // Don't use fwrite_all because the latter may throw. + // Don't use fwrite_fully because the latter may throw. if (std::fwrite(full_message.data(), full_message.size(), 1, stderr) > 0) std::fputc('\n', stderr); } // A wrapper around fwrite that throws on error. -inline void fwrite_all(const void* ptr, size_t count, FILE* stream) { +inline void fwrite_fully(const void* ptr, size_t count, FILE* stream) { size_t written = std::fwrite(ptr, 1, count, stream); if (written < count) FMT_THROW(system_error(errno, FMT_STRING("cannot write to file"))); } -#if FMT_USE_LOCALE -using std::locale; -using std::numpunct; -using std::use_facet; - -template > +#ifndef FMT_STATIC_THOUSANDS_SEPARATOR +template locale_ref::locale_ref(const Locale& loc) : locale_(&loc) { - static_assert(std::is_same::value, ""); + static_assert(std::is_same::value, ""); } -#else -struct locale {}; -template struct numpunct { - auto grouping() const -> std::string { return "\03"; } - auto thousands_sep() const -> Char { return ','; } - auto decimal_point() const -> Char { return '.'; } -}; -template Facet use_facet(locale) { return {}; } -#endif // FMT_USE_LOCALE template auto locale_ref::get() const -> Locale { - static_assert(std::is_same::value, ""); -#if FMT_USE_LOCALE - if (locale_) return *static_cast(locale_); -#endif - return locale(); + static_assert(std::is_same::value, ""); + return locale_ ? *static_cast(locale_) : std::locale(); } template FMT_FUNC auto thousands_sep_impl(locale_ref loc) -> thousands_sep_result { - auto&& facet = use_facet>(loc.get()); + auto& facet = std::use_facet>(loc.get()); auto grouping = facet.grouping(); auto thousands_sep = grouping.empty() ? Char() : facet.thousands_sep(); return {std::move(grouping), thousands_sep}; } template FMT_FUNC auto decimal_point_impl(locale_ref loc) -> Char { - return use_facet>(loc.get()).decimal_point(); + return std::use_facet>(loc.get()) + .decimal_point(); } +#else +template +FMT_FUNC auto thousands_sep_impl(locale_ref) -> thousands_sep_result { + return {"\03", FMT_STATIC_THOUSANDS_SEPARATOR}; +} +template FMT_FUNC Char decimal_point_impl(locale_ref) { + return '.'; +} +#endif -#if FMT_USE_LOCALE FMT_FUNC auto write_loc(appender out, loc_value value, const format_specs& specs, locale_ref loc) -> bool { +#ifdef FMT_STATIC_THOUSANDS_SEPARATOR + value.visit(loc_writer<>{ + out, specs, std::string(1, FMT_STATIC_THOUSANDS_SEPARATOR), "\3", "."}); + return true; +#else auto locale = loc.get(); // We cannot use the num_put facet because it may produce output in // a wrong encoding. using facet = format_facet; if (std::has_facet(locale)) - return use_facet(locale).put(out, value, specs); + return std::use_facet(locale).put(out, value, specs); return facet(locale).put(out, value, specs); -} #endif +} } // namespace detail FMT_FUNC void report_error(const char* message) { -#if FMT_USE_EXCEPTIONS - throw format_error(message); -#else - fputs(message, stderr); - abort(); -#endif + FMT_THROW(format_error(message)); } template typename Locale::id format_facet::id; +#ifndef FMT_STATIC_THOUSANDS_SEPARATOR template format_facet::format_facet(Locale& loc) { - auto& np = detail::use_facet>(loc); - grouping_ = np.grouping(); - if (!grouping_.empty()) separator_ = std::string(1, np.thousands_sep()); + auto& numpunct = std::use_facet>(loc); + grouping_ = numpunct.grouping(); + if (!grouping_.empty()) separator_ = std::string(1, numpunct.thousands_sep()); } -#if FMT_USE_LOCALE template <> FMT_API FMT_FUNC auto format_facet::do_put( appender out, loc_value val, const format_specs& specs) const -> bool { @@ -1434,7 +1425,7 @@ FMT_FUNC void format_system_error(detail::buffer& out, int error_code, FMT_FUNC void report_system_error(int error_code, const char* message) noexcept { - do_report_error(format_system_error, error_code, message); + report_error(format_system_error, error_code, message); } FMT_FUNC auto vformat(string_view fmt, format_args args) -> std::string { @@ -1447,15 +1438,6 @@ FMT_FUNC auto vformat(string_view fmt, format_args args) -> std::string { namespace detail { -FMT_FUNC void vformat_to(buffer& buf, string_view fmt, format_args args, - locale_ref loc) { - auto out = appender(buf); - if (fmt.size() == 2 && equal2(fmt.data(), "{}")) - return args.get(0).visit(default_arg_formatter{out}); - parse_format_string( - fmt, format_handler{parse_context(fmt), {out, args, loc}}); -} - template struct span { T* data; size_t size; @@ -1526,7 +1508,6 @@ template class glibc_file : public file_base { void init_buffer() { if (this->file_->_IO_write_ptr) return; // Force buffer initialization by placing and removing a char in a buffer. - assume(this->file_->_IO_write_ptr >= this->file_->_IO_write_end); putc_unlocked(0, this->file_); --this->file_->_IO_write_ptr; } @@ -1634,7 +1615,7 @@ template class fallback_file : public file_base { }; #ifndef FMT_USE_FALLBACK_FILE -# define FMT_USE_FALLBACK_FILE 0 +# define FMT_USE_FALLBACK_FILE 1 #endif template // std::signbit -# include // std::byte # include // uint32_t # include // std::memcpy # include // std::initializer_list # include // std::numeric_limits -# include // std::bad_alloc # if defined(__GLIBCXX__) && !defined(_GLIBCXX_USE_DUAL_ABI) // Workaround for pre gcc 5 libstdc++. # include // std::allocator_traits @@ -67,42 +65,26 @@ # include # define FMT_USE_STRING_VIEW # endif - -# if FMT_MSC_VERSION -# include // _BitScanReverse[64], _BitScanForward[64], _umul128 -# endif #endif // FMT_MODULE -#if defined(FMT_USE_NONTYPE_TEMPLATE_ARGS) -// Use the provided definition. -#elif defined(__NVCOMPILER) -# define FMT_USE_NONTYPE_TEMPLATE_ARGS 0 -#elif FMT_GCC_VERSION >= 903 && FMT_CPLUSPLUS >= 201709L -# define FMT_USE_NONTYPE_TEMPLATE_ARGS 1 -#elif defined(__cpp_nontype_template_args) && \ - __cpp_nontype_template_args >= 201911L -# define FMT_USE_NONTYPE_TEMPLATE_ARGS 1 -#elif FMT_CLANG_VERSION >= 1200 && FMT_CPLUSPLUS >= 202002L -# define FMT_USE_NONTYPE_TEMPLATE_ARGS 1 -#else -# define FMT_USE_NONTYPE_TEMPLATE_ARGS 0 -#endif - #if defined __cpp_inline_variables && __cpp_inline_variables >= 201606L # define FMT_INLINE_VARIABLE inline #else # define FMT_INLINE_VARIABLE #endif -// Check if RTTI is disabled. -#ifdef FMT_USE_RTTI -// Use the provided definition. -#elif defined(__GXX_RTTI) || FMT_HAS_FEATURE(cxx_rtti) || defined(_CPPRTTI) || \ - defined(__INTEL_RTTI__) || defined(__RTTI) -// __RTTI is for EDG compilers. _CPPRTTI is for MSVC. -# define FMT_USE_RTTI 1 -#else -# define FMT_USE_RTTI 0 +#ifndef FMT_NO_UNIQUE_ADDRESS +# if FMT_CPLUSPLUS >= 202002L +# if FMT_HAS_CPP_ATTRIBUTE(no_unique_address) +# define FMT_NO_UNIQUE_ADDRESS [[no_unique_address]] +// VS2019 v16.10 and later except clang-cl (https://reviews.llvm.org/D110485). +# elif (FMT_MSC_VERSION >= 1929) && !FMT_CLANG_VERSION +# define FMT_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]] +# endif +# endif +#endif +#ifndef FMT_NO_UNIQUE_ADDRESS +# define FMT_NO_UNIQUE_ADDRESS #endif // Visibility when compiled as a shared library/object. @@ -112,6 +94,12 @@ # define FMT_SO_VISIBILITY(value) #endif +#ifdef __has_builtin +# define FMT_HAS_BUILTIN(x) __has_builtin(x) +#else +# define FMT_HAS_BUILTIN(x) 0 +#endif + #if FMT_GCC_VERSION || FMT_CLANG_VERSION # define FMT_NOINLINE __attribute__((noinline)) #else @@ -119,18 +107,14 @@ #endif namespace std { -template struct iterator_traits> { +template <> struct iterator_traits { using iterator_category = output_iterator_tag; - using value_type = T; - using difference_type = - decltype(static_cast(nullptr) - static_cast(nullptr)); - using pointer = void; - using reference = void; + using value_type = char; }; } // namespace std #ifndef FMT_THROW -# if FMT_USE_EXCEPTIONS +# if FMT_EXCEPTIONS # if FMT_MSC_VERSION || defined(__NVCC__) FMT_BEGIN_NAMESPACE namespace detail { @@ -152,18 +136,26 @@ FMT_END_NAMESPACE # endif #endif -#ifdef FMT_NO_UNIQUE_ADDRESS -// Use the provided definition. -#elif FMT_CPLUSPLUS < 202002L -// Not supported. -#elif FMT_HAS_CPP_ATTRIBUTE(no_unique_address) -# define FMT_NO_UNIQUE_ADDRESS [[no_unique_address]] -// VS2019 v16.10 and later except clang-cl (https://reviews.llvm.org/D110485). -#elif FMT_MSC_VERSION >= 1929 && !FMT_CLANG_VERSION -# define FMT_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]] +#ifndef FMT_MAYBE_UNUSED +# if FMT_HAS_CPP17_ATTRIBUTE(maybe_unused) +# define FMT_MAYBE_UNUSED [[maybe_unused]] +# else +# define FMT_MAYBE_UNUSED +# endif #endif -#ifndef FMT_NO_UNIQUE_ADDRESS -# define FMT_NO_UNIQUE_ADDRESS + +#ifndef FMT_USE_USER_DEFINED_LITERALS +// EDG based compilers (Intel, NVIDIA, Elbrus, etc), GCC and MSVC support UDLs. +// +// GCC before 4.9 requires a space in `operator"" _a` which is invalid in later +// compiler versions. +# if (FMT_HAS_FEATURE(cxx_user_literals) || FMT_GCC_VERSION >= 409 || \ + FMT_MSC_VERSION >= 1900) && \ + (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= /* UDL feature */ 480) +# define FMT_USE_USER_DEFINED_LITERALS 1 +# else +# define FMT_USE_USER_DEFINED_LITERALS 0 +# endif #endif // Defining FMT_REDUCE_INT_INSTANTIATIONS to 1, will reduce the number of @@ -174,7 +166,7 @@ FMT_END_NAMESPACE # define FMT_REDUCE_INT_INSTANTIATIONS 0 #endif -// __builtin_clz is broken in clang with Microsoft codegen: +// __builtin_clz is broken in clang with Microsoft CodeGen: // https://github.com/fmtlib/fmt/issues/519. #if !FMT_MSC_VERSION # if FMT_HAS_BUILTIN(__builtin_clz) || FMT_GCC_VERSION || FMT_ICC_VERSION @@ -198,6 +190,10 @@ FMT_END_NAMESPACE # endif #endif +#if FMT_MSC_VERSION +# include // _BitScanReverse[64], _BitScanForward[64], _umul128 +#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. @@ -294,17 +290,6 @@ template using std_string_view = std::basic_string_view; template struct std_string_view {}; #endif -template struct string_literal { - static constexpr Char value[sizeof...(C)] = {C...}; - constexpr operator basic_string_view() const { - return {value, sizeof...(C)}; - } -}; -#if FMT_CPLUSPLUS < 201703L -template -constexpr Char string_literal::value[sizeof...(C)]; -#endif - // Implementation of std::bit_cast for pre-C++20. template FMT_CONSTEXPR20 auto bit_cast(const From& from) -> To { @@ -374,14 +359,13 @@ class uint128_fallback { -> uint128_fallback { return {~n.hi_, ~n.lo_}; } - friend FMT_CONSTEXPR auto operator+(const uint128_fallback& lhs, - const uint128_fallback& rhs) - -> uint128_fallback { + friend auto operator+(const uint128_fallback& lhs, + const uint128_fallback& rhs) -> uint128_fallback { auto result = uint128_fallback(lhs); result += rhs; return result; } - friend FMT_CONSTEXPR auto operator*(const uint128_fallback& lhs, uint32_t rhs) + friend auto operator*(const uint128_fallback& lhs, uint32_t rhs) -> uint128_fallback { FMT_ASSERT(lhs.hi_ == 0, ""); uint64_t hi = (lhs.lo_ >> 32) * rhs; @@ -389,7 +373,7 @@ class uint128_fallback { uint64_t new_lo = (hi << 32) + lo; return {(hi >> 32) + (new_lo < lo ? 1 : 0), new_lo}; } - friend constexpr auto operator-(const uint128_fallback& lhs, uint64_t rhs) + friend auto operator-(const uint128_fallback& lhs, uint64_t rhs) -> uint128_fallback { return {lhs.hi_ - (lhs.lo_ < rhs ? 1 : 0), lhs.lo_ - rhs}; } @@ -515,6 +499,21 @@ FMT_INLINE void assume(bool condition) { #endif } +// An approximation of iterator_t for pre-C++20 systems. +template +using iterator_t = decltype(std::begin(std::declval())); +template using sentinel_t = decltype(std::end(std::declval())); + +// A workaround for std::string not having mutable data() until C++17. +template +inline auto get_data(std::basic_string& s) -> Char* { + return &s[0]; +} +template +inline auto get_data(Container& c) -> typename Container::value_type* { + return c.data(); +} + // Attempts to reserve space for n extra characters in the output range. // Returns a pointer to the reserved range or a reference to it. template = 307 && !FMT_ICC_VERSION __attribute__((no_sanitize("undefined"))) #endif -FMT_CONSTEXPR20 inline auto +inline auto reserve(OutputIt it, size_t n) -> typename OutputIt::value_type* { auto& c = get_container(it); size_t size = c.size(); c.resize(size + n); - return &c[size]; + return get_data(c) + size; } template -FMT_CONSTEXPR20 inline auto reserve(basic_appender it, size_t n) - -> basic_appender { +inline auto reserve(basic_appender it, size_t n) -> basic_appender { buffer& buf = get_container(it); buf.try_reserve(buf.size() + n); return it; @@ -552,8 +550,7 @@ template constexpr auto to_pointer(OutputIt, size_t) -> T* { return nullptr; } -template -FMT_CONSTEXPR20 auto to_pointer(basic_appender it, size_t n) -> T* { +template auto to_pointer(basic_appender it, size_t n) -> T* { buffer& buf = get_container(it); auto size = buf.size(); buf.try_reserve(size + n); @@ -586,7 +583,9 @@ FMT_CONSTEXPR auto fill_n(OutputIt out, Size count, const T& value) } template FMT_CONSTEXPR20 auto fill_n(T* out, Size count, char value) -> T* { - if (is_constant_evaluated()) return fill_n(out, count, value); + if (is_constant_evaluated()) { + return fill_n(out, count, value); + } std::memset(out, value, to_unsigned(count)); return out + count; } @@ -665,7 +664,6 @@ FMT_CONSTEXPR void for_each_codepoint(string_view s, F f) { string_view(ptr, error ? 1 : to_unsigned(end - buf_ptr))); return result ? (error ? buf_ptr + 1 : end) : nullptr; }; - auto p = s.data(); const size_t block_size = 4; // utf8_decode always reads blocks of 4 chars. if (s.size() >= block_size) { @@ -674,19 +672,17 @@ FMT_CONSTEXPR void for_each_codepoint(string_view s, F f) { if (!p) return; } } - auto num_chars_left = to_unsigned(s.data() + s.size() - p); - if (num_chars_left == 0) return; - - FMT_ASSERT(num_chars_left < block_size, ""); - char buf[2 * block_size - 1] = {}; - copy(p, p + num_chars_left, buf); - const char* buf_ptr = buf; - do { - auto end = decode(buf_ptr, p); - if (!end) return; - p += end - buf_ptr; - buf_ptr = end; - } while (buf_ptr < buf + num_chars_left); + if (auto num_chars_left = s.data() + s.size() - p) { + char buf[2 * block_size - 1] = {}; + copy(p, p + num_chars_left, buf); + const char* buf_ptr = buf; + do { + auto end = decode(buf_ptr, p); + if (!end) return; + p += end - buf_ptr; + buf_ptr = end; + } while (buf_ptr - buf < num_chars_left); + } } template @@ -701,7 +697,7 @@ FMT_CONSTEXPR inline auto compute_width(string_view s) -> size_t { struct count_code_points { size_t* count; FMT_CONSTEXPR auto operator()(uint32_t cp, string_view) const -> bool { - *count += to_unsigned( + *count += detail::to_unsigned( 1 + (cp >= 0x1100 && (cp <= 0x115f || // Hangul Jamo init. consonants @@ -731,7 +727,8 @@ FMT_CONSTEXPR inline auto compute_width(string_view s) -> size_t { template inline auto code_point_index(basic_string_view s, size_t n) -> size_t { - return min_of(n, s.size()); + size_t size = s.size(); + return n < size ? n : size; } // Calculates the index of the nth code point in a UTF-8 string. @@ -764,6 +761,16 @@ using is_integer = !std::is_same::value && !std::is_same::value>; +#ifndef FMT_USE_FLOAT +# define FMT_USE_FLOAT 1 +#endif +#ifndef FMT_USE_DOUBLE +# define FMT_USE_DOUBLE 1 +#endif +#ifndef FMT_USE_LONG_DOUBLE +# define FMT_USE_LONG_DOUBLE 1 +#endif + #if defined(FMT_USE_FLOAT128) // Use the provided definition. #elif FMT_CLANG_VERSION && FMT_HAS_INCLUDE() @@ -777,7 +784,7 @@ using is_integer = #if FMT_USE_FLOAT128 using float128 = __float128; #else -struct float128 {}; +using float128 = void; #endif template using is_float128 = std::is_same; @@ -798,21 +805,10 @@ using is_double_double = bool_constant::digits == 106>; # define FMT_USE_FULL_CACHE_DRAGONBOX 0 #endif -// An allocator that uses malloc/free to allow removing dependency on the C++ -// standard libary runtime. -template struct allocator { - using value_type = T; - - T* allocate(size_t n) { - FMT_ASSERT(n <= max_value() / sizeof(T), ""); - T* p = static_cast(malloc(n * sizeof(T))); - if (!p) FMT_THROW(std::bad_alloc()); - return p; - } - - void deallocate(T* p, size_t) { free(p); } -}; - +template +struct is_locale : std::false_type {}; +template +struct is_locale> : std::true_type {}; } // namespace detail FMT_BEGIN_EXPORT @@ -835,7 +831,7 @@ enum { inline_buffer_size = 500 }; * converted to `std::string` with `to_string(out)`. */ template > + typename Allocator = std::allocator> class basic_memory_buffer : public detail::buffer { private: T store_[SIZE]; @@ -859,7 +855,7 @@ class basic_memory_buffer : public detail::buffer { if (size > new_capacity) new_capacity = size; else if (new_capacity > max_size) - new_capacity = max_of(size, max_size); + new_capacity = size > max_size ? size : max_size; T* old_data = buf.data(); T* new_data = self.alloc_.allocate(new_capacity); // Suppress a bogus -Wstringop-overflow in gcc 13.1 (#3481). @@ -877,7 +873,7 @@ class basic_memory_buffer : public detail::buffer { using value_type = T; using const_reference = const T&; - FMT_CONSTEXPR explicit basic_memory_buffer( + FMT_CONSTEXPR20 explicit basic_memory_buffer( const Allocator& alloc = Allocator()) : detail::buffer(grow), alloc_(alloc) { this->set(store_, SIZE); @@ -925,63 +921,20 @@ class basic_memory_buffer : public detail::buffer { /// Resizes the buffer to contain `count` elements. If T is a POD type new /// elements may not be initialized. - FMT_CONSTEXPR void resize(size_t count) { this->try_resize(count); } + FMT_CONSTEXPR20 void resize(size_t count) { this->try_resize(count); } /// Increases the buffer capacity to `new_capacity`. void reserve(size_t new_capacity) { this->try_reserve(new_capacity); } using detail::buffer::append; template - FMT_CONSTEXPR20 void append(const ContiguousRange& range) { + void append(const ContiguousRange& range) { append(range.data(), range.data() + range.size()); } }; using memory_buffer = basic_memory_buffer; -template -FMT_NODISCARD auto to_string(basic_memory_buffer& buf) - -> std::string { - auto size = buf.size(); - detail::assume(size < std::string().max_size()); - return {buf.data(), size}; -} - -// A writer to a buffered stream. It doesn't own the underlying stream. -class writer { - private: - detail::buffer* buf_; - - // We cannot create a file buffer in advance because any write to a FILE may - // invalidate it. - FILE* file_; - - public: - inline writer(FILE* f) : buf_(nullptr), file_(f) {} - inline writer(detail::buffer& buf) : buf_(&buf) {} - - /// Formats `args` according to specifications in `fmt` and writes the - /// output to the file. - template void print(format_string fmt, T&&... args) { - if (buf_) - fmt::format_to(appender(*buf_), fmt, std::forward(args)...); - else - fmt::print(file_, fmt, std::forward(args)...); - } -}; - -class string_buffer { - private: - std::string str_; - detail::container_buffer buf_; - - public: - inline string_buffer() : buf_(str_) {} - - inline operator writer() { return buf_; } - inline std::string& str() { return str_; } -}; - template struct is_contiguous> : std::true_type { }; @@ -989,13 +942,15 @@ struct is_contiguous> : std::true_type { FMT_END_EXPORT namespace detail { FMT_API auto write_console(int fd, string_view text) -> bool; -FMT_API void print(FILE*, string_view); +FMT_API void print(std::FILE*, string_view); } // namespace detail FMT_BEGIN_EXPORT // Suppress a misleading warning in older versions of clang. -FMT_PRAGMA_CLANG(diagnostic ignored "-Wweak-vtables") +#if FMT_CLANG_VERSION +# pragma clang diagnostic ignored "-Wweak-vtables" +#endif /// An error reported from a formatting function. class FMT_SO_VISIBILITY("default") format_error : public std::runtime_error { @@ -1003,14 +958,16 @@ class FMT_SO_VISIBILITY("default") format_error : public std::runtime_error { using std::runtime_error::runtime_error; }; -namespace detail { +namespace detail_exported { +#if FMT_USE_NONTYPE_TEMPLATE_ARGS template struct fixed_string { - FMT_CONSTEXPR20 fixed_string(const Char (&s)[N]) { - detail::copy(static_cast(s), s + N, - data); + constexpr fixed_string(const Char (&str)[N]) { + detail::copy(static_cast(str), + str + N, data); } Char data[N] = {}; }; +#endif // Converts a compile-time string to basic_string_view. template @@ -1025,7 +982,7 @@ constexpr auto compile_string_to_view(basic_string_view s) -> basic_string_view { return s; } -} // namespace detail +} // namespace detail_exported // A generic formatting context with custom output iterator and character // (code unit) support. Char is the format string code unit type which can be @@ -1039,15 +996,13 @@ template class generic_context { public: using char_type = Char; using iterator = OutputIt; - using parse_context_type FMT_DEPRECATED = parse_context; - template - using formatter_type FMT_DEPRECATED = formatter; - enum { builtin_types = FMT_BUILTIN_TYPES }; + using parse_context_type = basic_format_parse_context; + template using formatter_type = formatter; constexpr generic_context(OutputIt out, - basic_format_args args, + basic_format_args ctx_args, detail::locale_ref loc = {}) - : out_(out), args_(args), loc_(loc) {} + : out_(out), args_(ctx_args), loc_(loc) {} generic_context(generic_context&&) = default; generic_context(const generic_context&) = delete; void operator=(const generic_context&) = delete; @@ -1061,6 +1016,9 @@ template class generic_context { FMT_CONSTEXPR auto arg_id(basic_string_view name) -> int { return args_.get_id(name); } + auto args() const -> const basic_format_args& { + return args_; + } FMT_CONSTEXPR auto out() -> iterator { return out_; } @@ -1073,11 +1031,11 @@ template class generic_context { class loc_value { private: - basic_format_arg value_; + basic_format_arg value_; public: template ::value)> - loc_value(T value) : value_(value) {} + loc_value(T value) : value_(detail::make_arg(value)) {} template ::value)> loc_value(T) {} @@ -1131,6 +1089,14 @@ constexpr auto is_negative(T) -> bool { return false; } +template +FMT_CONSTEXPR auto is_supported_floating_point(T) -> bool { + if (std::is_same()) return FMT_USE_FLOAT; + if (std::is_same()) return FMT_USE_DOUBLE; + if (std::is_same()) return FMT_USE_LONG_DOUBLE; + return true; +} + // Smallest of uint32_t, uint64_t, uint128_t that is large enough to // represent all values of an integral type T. template @@ -1147,22 +1113,21 @@ using uint64_or_128_t = conditional_t() <= 64, uint64_t, uint128_t>; (factor) * 100000000, (factor) * 1000000000 // Converts value in the range [0, 100) to a string. -// GCC generates slightly better code when value is pointer-size. -inline auto digits2(size_t value) -> const char* { - // Align data since unaligned access may be slower when crossing a - // hardware-specific boundary. - alignas(2) static const char data[] = - "0001020304050607080910111213141516171819" - "2021222324252627282930313233343536373839" - "4041424344454647484950515253545556575859" - "6061626364656667686970717273747576777879" - "8081828384858687888990919293949596979899"; - return &data[value * 2]; -} - -template constexpr auto getsign(sign s) -> Char { - return static_cast(((' ' << 24) | ('+' << 16) | ('-' << 8)) >> - (static_cast(s) * 8)); +constexpr auto digits2(size_t value) -> const char* { + // GCC generates slightly better code when value is pointer-size. + return &"0001020304050607080910111213141516171819" + "2021222324252627282930313233343536373839" + "4041424344454647484950515253545556575859" + "6061626364656667686970717273747576777879" + "8081828384858687888990919293949596979899"[value * 2]; +} + +// Sign is a template parameter to workaround a bug in gcc 4.8. +template constexpr auto sign(Sign s) -> Char { +#if !FMT_GCC_VERSION || FMT_GCC_VERSION >= 604 + static_assert(std::is_same::value, ""); +#endif + return static_cast(((' ' << 24) | ('+' << 16) | ('-' << 8)) >> (s * 8)); } template FMT_CONSTEXPR auto count_digits_fallback(T n) -> int { @@ -1210,7 +1175,7 @@ inline auto do_count_digits(uint64_t n) -> int { // except for n == 0 in which case count_digits returns 1. FMT_CONSTEXPR20 inline auto count_digits(uint64_t n) -> int { #ifdef FMT_BUILTIN_CLZLL - if (!is_constant_evaluated() && !FMT_OPTIMIZE_SIZE) return do_count_digits(n); + if (!is_constant_evaluated()) return do_count_digits(n); #endif return count_digits_fallback(n); } @@ -1260,7 +1225,9 @@ FMT_INLINE auto do_count_digits(uint32_t n) -> int { // Optional version of count_digits for better performance on 32-bit platforms. FMT_CONSTEXPR20 inline auto count_digits(uint32_t n) -> int { #ifdef FMT_BUILTIN_CLZ - if (!is_constant_evaluated() && !FMT_OPTIMIZE_SIZE) return do_count_digits(n); + if (!is_constant_evaluated()) { + return do_count_digits(n); + } #endif return count_digits_fallback(n); } @@ -1297,17 +1264,6 @@ template <> inline auto decimal_point(locale_ref loc) -> wchar_t { return decimal_point_impl(loc); } -#ifndef FMT_HEADER_ONLY -FMT_BEGIN_EXPORT -extern template FMT_API auto thousands_sep_impl(locale_ref) - -> thousands_sep_result; -extern template FMT_API auto thousands_sep_impl(locale_ref) - -> thousands_sep_result; -extern template FMT_API auto decimal_point_impl(locale_ref) -> char; -extern template FMT_API auto decimal_point_impl(locale_ref) -> wchar_t; -FMT_END_EXPORT -#endif // FMT_HEADER_ONLY - // Compares two characters for equality. template auto equal2(const Char* lhs, const char* rhs) -> bool { return lhs[0] == Char(rhs[0]) && lhs[1] == Char(rhs[1]); @@ -1316,98 +1272,82 @@ inline auto equal2(const char* lhs, const char* rhs) -> bool { return memcmp(lhs, rhs, 2) == 0; } -// Writes a two-digit value to out. +// Copies two characters from src to dst. template -FMT_CONSTEXPR20 FMT_INLINE void write2digits(Char* out, size_t value) { - if (!is_constant_evaluated() && std::is_same::value && - !FMT_OPTIMIZE_SIZE) { - memcpy(out, digits2(value), 2); +FMT_CONSTEXPR20 FMT_INLINE void copy2(Char* dst, const char* src) { + if (!is_constant_evaluated() && sizeof(Char) == sizeof(char)) { + memcpy(dst, src, 2); return; } - *out++ = static_cast('0' + value / 10); - *out = static_cast('0' + value % 10); + *dst++ = static_cast(*src++); + *dst = static_cast(*src); } -// Formats a decimal unsigned integer value writing to out pointing to a buffer -// of specified size. The caller must ensure that the buffer is large enough. +template struct format_decimal_result { + Iterator begin; + Iterator end; +}; + +// Formats a decimal unsigned integer value writing into out pointing to a +// buffer of specified size. The caller must ensure that the buffer is large +// enough. template -FMT_CONSTEXPR20 auto do_format_decimal(Char* out, UInt value, int size) - -> Char* { +FMT_CONSTEXPR20 auto format_decimal(Char* out, UInt value, int size) + -> format_decimal_result { FMT_ASSERT(size >= count_digits(value), "invalid digit count"); - unsigned n = to_unsigned(size); + out += size; + Char* end = out; 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. - n -= 2; - write2digits(out + n, static_cast(value % 100)); + out -= 2; + copy2(out, digits2(static_cast(value % 100))); value /= 100; } - if (value >= 10) { - n -= 2; - write2digits(out + n, static_cast(value)); - } else { - out[--n] = static_cast('0' + value); + if (value < 10) { + *--out = static_cast('0' + value); + return {out, end}; } - return out + n; -} - -template -FMT_CONSTEXPR FMT_INLINE auto format_decimal(Char* out, UInt value, - int num_digits) -> Char* { - do_format_decimal(out, value, num_digits); - return out + num_digits; + out -= 2; + copy2(out, digits2(static_cast(value))); + return {out, end}; } -template ::value)> -FMT_CONSTEXPR auto format_decimal(OutputIt out, UInt value, int num_digits) - -> OutputIt { - if (auto ptr = to_pointer(out, to_unsigned(num_digits))) { - do_format_decimal(ptr, value, num_digits); - return out; - } +template >::value)> +FMT_CONSTEXPR inline auto format_decimal(Iterator out, UInt value, int size) + -> format_decimal_result { // Buffer is large enough to hold all digits (digits10 + 1). - char buffer[digits10() + 1]; - if (is_constant_evaluated()) fill_n(buffer, sizeof(buffer), '\0'); - do_format_decimal(buffer, value, num_digits); - return copy_noinline(buffer, buffer + num_digits, out); + Char buffer[digits10() + 1] = {}; + auto end = format_decimal(buffer, value, size).end; + return {out, detail::copy_noinline(buffer, end, out)}; } -template -FMT_CONSTEXPR auto do_format_base2e(int base_bits, Char* out, UInt value, - int size, bool upper = false) -> Char* { - out += size; +template +FMT_CONSTEXPR auto format_uint(Char* buffer, UInt value, int num_digits, + bool upper = false) -> Char* { + buffer += num_digits; + Char* end = buffer; do { const char* digits = upper ? "0123456789ABCDEF" : "0123456789abcdef"; - unsigned digit = static_cast(value & ((1 << base_bits) - 1)); - *--out = static_cast(base_bits < 4 ? static_cast('0' + digit) - : digits[digit]); - } while ((value >>= base_bits) != 0); - return out; -} - -// Formats an unsigned integer in the power of two base (binary, octal, hex). -template -FMT_CONSTEXPR auto format_base2e(int base_bits, Char* out, UInt value, - int num_digits, bool upper = false) -> Char* { - do_format_base2e(base_bits, out, value, num_digits, upper); - return out + num_digits; + unsigned digit = static_cast(value & ((1 << BASE_BITS) - 1)); + *--buffer = static_cast(BASE_BITS < 4 ? static_cast('0' + digit) + : digits[digit]); + } while ((value >>= BASE_BITS) != 0); + return end; } -template ::value)> -FMT_CONSTEXPR inline auto format_base2e(int base_bits, OutputIt out, UInt value, - int num_digits, bool upper = false) - -> OutputIt { +template +FMT_CONSTEXPR inline auto format_uint(It out, UInt value, int num_digits, + bool upper = false) -> It { if (auto ptr = to_pointer(out, to_unsigned(num_digits))) { - format_base2e(base_bits, ptr, value, num_digits, upper); + format_uint(ptr, value, num_digits, upper); return out; } - // Make buffer large enough for any base. - char buffer[num_bits()]; - if (is_constant_evaluated()) fill_n(buffer, sizeof(buffer), '\0'); - format_base2e(base_bits, buffer, value, num_digits, upper); + // Buffer should be large enough to hold all digits (digits / BASE_BITS + 1). + char buffer[num_bits() / BASE_BITS + 1] = {}; + format_uint(buffer, value, num_digits, upper); return detail::copy_noinline(buffer, buffer + num_digits, out); } @@ -1418,12 +1358,10 @@ class utf8_to_utf16 { public: FMT_API explicit utf8_to_utf16(string_view s); - inline operator basic_string_view() const { - return {&buffer_[0], size()}; - } - inline auto size() const -> size_t { return buffer_.size() - 1; } - inline auto c_str() const -> const wchar_t* { return &buffer_[0]; } - inline auto str() const -> std::wstring { return {&buffer_[0], size()}; } + operator basic_string_view() const { return {&buffer_[0], size()}; } + auto size() const -> size_t { return buffer_.size() - 1; } + auto c_str() const -> const wchar_t* { return &buffer_[0]; } + auto str() const -> std::wstring { return {&buffer_[0], size()}; } }; enum class to_utf8_error_policy { abort, replace }; @@ -1470,12 +1408,10 @@ template class to_utf8 { if (policy == to_utf8_error_policy::abort) return false; buf.append(string_view("\xEF\xBF\xBD")); --p; - continue; } else { c = (c << 10) + static_cast(*p) - 0x35fdc00; } - } - if (c < 0x80) { + } else if (c < 0x80) { buf.push_back(static_cast(c)); } else if (c < 0x800) { buf.push_back(static_cast(0xc0 | (c >> 6))); @@ -1643,30 +1579,25 @@ template constexpr auto exponent_bias() -> int { } // Writes the exponent exp in the form "[+-]d{2,3}" to buffer. -template -FMT_CONSTEXPR auto write_exponent(int exp, OutputIt out) -> OutputIt { +template +FMT_CONSTEXPR auto write_exponent(int exp, It it) -> It { FMT_ASSERT(-10000 < exp && exp < 10000, "exponent out of range"); if (exp < 0) { - *out++ = static_cast('-'); + *it++ = static_cast('-'); exp = -exp; } else { - *out++ = static_cast('+'); + *it++ = static_cast('+'); } - auto uexp = static_cast(exp); - if (is_constant_evaluated()) { - if (uexp < 10) *out++ = '0'; - return format_decimal(out, uexp, count_digits(uexp)); - } - if (uexp >= 100u) { - const char* top = digits2(uexp / 100); - if (uexp >= 1000u) *out++ = static_cast(top[0]); - *out++ = static_cast(top[1]); - uexp %= 100; - } - const char* d = digits2(uexp); - *out++ = static_cast(d[0]); - *out++ = static_cast(d[1]); - return out; + if (exp >= 100) { + const char* top = digits2(to_unsigned(exp / 100)); + if (exp >= 1000) *it++ = static_cast(top[0]); + *it++ = static_cast(top[1]); + exp %= 100; + } + const char* d = digits2(to_unsigned(exp)); + *it++ = static_cast(d[0]); + *it++ = static_cast(d[1]); + return it; } // A floating-point number f * pow(2, e) where F is an unsigned type. @@ -1768,11 +1699,11 @@ constexpr auto convert_float(T value) -> convert_float_result { } template -FMT_NOINLINE FMT_CONSTEXPR auto fill(OutputIt it, size_t n, - const basic_specs& specs) -> OutputIt { - auto fill_size = specs.fill_size(); - if (fill_size == 1) return detail::fill_n(it, n, specs.fill_unit()); - if (const Char* data = specs.fill()) { +FMT_NOINLINE FMT_CONSTEXPR auto fill(OutputIt it, size_t n, const fill_t& fill) + -> OutputIt { + auto fill_size = fill.size(); + if (fill_size == 1) return detail::fill_n(it, n, fill.template get()); + if (const Char* data = fill.template data()) { for (size_t i = 0; i < n; ++i) it = copy(data, data + fill_size, it); } return it; @@ -1781,38 +1712,36 @@ FMT_NOINLINE FMT_CONSTEXPR auto fill(OutputIt it, size_t n, // Writes the output of f, padded according to format specifications in specs. // size: output size in code units. // width: output display width in (terminal) column positions. -template FMT_CONSTEXPR auto write_padded(OutputIt out, const format_specs& specs, size_t size, size_t width, F&& f) -> OutputIt { - static_assert(default_align == align::left || default_align == align::right, - ""); + static_assert(align == align::left || align == align::right, ""); unsigned spec_width = to_unsigned(specs.width); size_t padding = spec_width > width ? spec_width - width : 0; // Shifts are encoded as string literals because static constexpr is not // supported in constexpr functions. - auto* shifts = - default_align == align::left ? "\x1f\x1f\x00\x01" : "\x00\x1f\x00\x01"; - size_t left_padding = padding >> shifts[static_cast(specs.align())]; + auto* shifts = align == align::left ? "\x1f\x1f\x00\x01" : "\x00\x1f\x00\x01"; + size_t left_padding = padding >> shifts[specs.align]; size_t right_padding = padding - left_padding; - auto it = reserve(out, size + padding * specs.fill_size()); - if (left_padding != 0) it = fill(it, left_padding, specs); + auto it = reserve(out, size + padding * specs.fill.size()); + if (left_padding != 0) it = fill(it, left_padding, specs.fill); it = f(it); - if (right_padding != 0) it = fill(it, right_padding, specs); + if (right_padding != 0) it = fill(it, right_padding, specs.fill); return base_iterator(out, it); } -template constexpr auto write_padded(OutputIt out, const format_specs& specs, size_t size, F&& f) -> OutputIt { - return write_padded(out, specs, size, size, f); + return write_padded(out, specs, size, size, f); } -template +template FMT_CONSTEXPR auto write_bytes(OutputIt out, string_view bytes, const format_specs& specs = {}) -> OutputIt { - return write_padded( + return write_padded( out, specs, bytes.size(), [bytes](reserve_iterator it) { const char* data = bytes.data(); return copy(data, data + bytes.size(), it); @@ -1827,7 +1756,7 @@ auto write_ptr(OutputIt out, UIntPtr value, const format_specs* specs) auto write = [=](reserve_iterator it) { *it++ = static_cast('0'); *it++ = static_cast('x'); - return format_base2e(4, it, value, num_digits); + return format_uint<4, Char>(it, value, num_digits); }; return specs ? write_padded(out, *specs, size, write) : base_iterator(out, write(reserve(out, size))); @@ -1837,9 +1766,8 @@ auto write_ptr(OutputIt out, UIntPtr value, const format_specs* specs) FMT_API auto is_printable(uint32_t cp) -> bool; inline auto needs_escape(uint32_t cp) -> bool { - if (cp < 0x20 || cp == 0x7f || cp == '"' || cp == '\\') return true; - if (FMT_OPTIMIZE_SIZE > 1) return false; - return !is_printable(cp); + return cp < 0x20 || cp == 0x7f || cp == '"' || cp == '\\' || + !is_printable(cp); } template struct find_escape_result { @@ -1861,7 +1789,7 @@ auto find_escape(const Char* begin, const Char* end) inline auto find_escape(const char* begin, const char* end) -> find_escape_result { - if (!detail::use_utf8) return find_escape(begin, end); + if (!use_utf8()) return find_escape(begin, end); auto result = find_escape_result{end, nullptr, 0}; for_each_codepoint(string_view(begin, to_unsigned(end - begin)), [&](uint32_t cp, string_view sv) { @@ -1874,13 +1802,37 @@ inline auto find_escape(const char* begin, const char* end) return result; } +#define FMT_STRING_IMPL(s, base, explicit) \ + [] { \ + /* Use the hidden visibility as a workaround for a GCC bug (#1973). */ \ + /* Use a macro-like name to avoid shadowing warnings. */ \ + struct FMT_VISIBILITY("hidden") FMT_COMPILE_STRING : base { \ + using char_type FMT_MAYBE_UNUSED = fmt::remove_cvref_t; \ + FMT_MAYBE_UNUSED FMT_CONSTEXPR explicit \ + operator fmt::basic_string_view() const { \ + return fmt::detail_exported::compile_string_to_view(s); \ + } \ + }; \ + return FMT_COMPILE_STRING(); \ + }() + +/** + * Constructs a compile-time format string from a string literal `s`. + * + * **Example**: + * + * // A compile-time error because 'd' is an invalid specifier for strings. + * std::string s = fmt::format(FMT_STRING("{:d}"), "foo"); + */ +#define FMT_STRING(s) FMT_STRING_IMPL(s, fmt::detail::compile_string, ) + template auto write_codepoint(OutputIt out, char prefix, uint32_t cp) -> OutputIt { *out++ = static_cast('\\'); *out++ = static_cast(prefix); Char buf[width]; fill_n(buf, width, static_cast('0')); - format_base2e(4, buf, cp, width); + format_uint<4>(buf, cp, width); return copy(buf, buf + width, out); } @@ -1901,9 +1853,13 @@ auto write_escaped_cp(OutputIt out, const find_escape_result& escape) *out++ = static_cast('\\'); c = static_cast('t'); break; - case '"': FMT_FALLTHROUGH; - case '\'': FMT_FALLTHROUGH; - case '\\': *out++ = static_cast('\\'); break; + case '"': + FMT_FALLTHROUGH; + case '\'': + FMT_FALLTHROUGH; + case '\\': + *out++ = static_cast('\\'); + break; default: if (escape.cp < 0x100) return write_codepoint<2, Char>(out, 'x', escape.cp); if (escape.cp < 0x10000) @@ -1956,7 +1912,7 @@ auto write_escaped_char(OutputIt out, Char v) -> OutputIt { template FMT_CONSTEXPR auto write_char(OutputIt out, Char value, const format_specs& specs) -> OutputIt { - bool is_debug = specs.type() == presentation_type::debug; + bool is_debug = specs.type == presentation_type::debug; return write_padded(out, specs, 1, [=](reserve_iterator it) { if (is_debug) return write_escaped_char(it, value); *it++ = value; @@ -1974,6 +1930,56 @@ FMT_CONSTEXPR auto write(OutputIt out, Char value, const format_specs& specs, : write(out, static_cast(value), specs, loc); } +// Data for write_int that doesn't depend on output iterator type. It is used to +// avoid template code bloat. +template struct write_int_data { + size_t size; + size_t padding; + + FMT_CONSTEXPR write_int_data(int num_digits, unsigned prefix, + const format_specs& specs) + : size((prefix >> 24) + to_unsigned(num_digits)), padding(0) { + if (specs.align == align::numeric) { + auto width = to_unsigned(specs.width); + if (width > size) { + padding = width - size; + size = width; + } + } else if (specs.precision > num_digits) { + size = (prefix >> 24) + to_unsigned(specs.precision); + padding = to_unsigned(specs.precision - num_digits); + } + } +}; + +// Writes an integer in the format +// +// where are written by write_digits(it). +// prefix contains chars in three lower bytes and the size in the fourth byte. +template +FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, int num_digits, + unsigned prefix, + const format_specs& specs, + W write_digits) -> OutputIt { + // Slightly faster check for specs.width == 0 && specs.precision == -1. + if ((specs.width | (specs.precision + 1)) == 0) { + auto it = reserve(out, to_unsigned(num_digits) + (prefix >> 24)); + if (prefix != 0) { + for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8) + *it++ = static_cast(p & 0xff); + } + return base_iterator(out, write_digits(it)); + } + auto data = write_int_data(num_digits, prefix, specs); + return write_padded( + out, specs, data.size, [=](reserve_iterator it) { + for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8) + *it++ = static_cast(p & 0xff); + it = detail::fill_n(it, data.padding, static_cast('0')); + return write_digits(it); + }); +} + template class digit_grouping { private: std::string grouping_; @@ -2051,32 +2057,34 @@ auto write_int(OutputIt out, UInt value, unsigned prefix, static_assert(std::is_same, UInt>::value, ""); int num_digits = 0; auto buffer = memory_buffer(); - switch (specs.type()) { - default: FMT_ASSERT(false, ""); FMT_FALLTHROUGH; + switch (specs.type) { + default: + FMT_ASSERT(false, ""); + FMT_FALLTHROUGH; case presentation_type::none: case presentation_type::dec: num_digits = count_digits(value); format_decimal(appender(buffer), value, num_digits); break; case presentation_type::hex: - if (specs.alt()) - prefix_append(prefix, unsigned(specs.upper() ? 'X' : 'x') << 8 | '0'); + if (specs.alt) + prefix_append(prefix, unsigned(specs.upper ? 'X' : 'x') << 8 | '0'); num_digits = count_digits<4>(value); - format_base2e(4, appender(buffer), value, num_digits, specs.upper()); + format_uint<4, char>(appender(buffer), value, num_digits, specs.upper); break; case presentation_type::oct: num_digits = count_digits<3>(value); // Octal prefix '0' is counted as a digit, so only add it if precision // is not greater than the number of digits. - if (specs.alt() && specs.precision <= num_digits && value != 0) + if (specs.alt && specs.precision <= num_digits && value != 0) prefix_append(prefix, '0'); - format_base2e(3, appender(buffer), value, num_digits); + format_uint<3, char>(appender(buffer), value, num_digits); break; case presentation_type::bin: - if (specs.alt()) - prefix_append(prefix, unsigned(specs.upper() ? 'B' : 'b') << 8 | '0'); + if (specs.alt) + prefix_append(prefix, unsigned(specs.upper ? 'B' : 'b') << 8 | '0'); num_digits = count_digits<1>(value); - format_base2e(1, appender(buffer), value, num_digits); + format_uint<1, char>(appender(buffer), value, num_digits); break; case presentation_type::chr: return write_char(out, static_cast(value), specs); @@ -2092,11 +2100,9 @@ auto write_int(OutputIt out, UInt value, unsigned prefix, }); } -#if FMT_USE_LOCALE // Writes a localized value. FMT_API auto write_loc(appender out, loc_value value, const format_specs& specs, locale_ref loc) -> bool; -#endif template inline auto write_loc(OutputIt, loc_value, const format_specs&, locale_ref) -> bool { @@ -2109,7 +2115,7 @@ template struct write_int_arg { }; template -FMT_CONSTEXPR auto make_write_int_arg(T value, sign s) +FMT_CONSTEXPR auto make_write_int_arg(T value, sign_t sign) -> write_int_arg> { auto prefix = 0u; auto abs_value = static_cast>(value); @@ -2119,7 +2125,7 @@ FMT_CONSTEXPR auto make_write_int_arg(T value, sign s) } else { constexpr const unsigned prefixes[4] = {0, 0, 0x1000000u | '+', 0x1000000u | ' '}; - prefix = prefixes[static_cast(s)]; + prefix = prefixes[sign]; } return {abs_value, prefix}; } @@ -2133,7 +2139,7 @@ template struct loc_writer { template ::value)> auto operator()(T value) -> bool { - auto arg = make_write_int_arg(value, specs.sign()); + auto arg = make_write_int_arg(value, specs.sign); write_int(out, static_cast>(arg.abs_value), arg.prefix, specs, digit_grouping(grouping, sep)); return true; @@ -2145,99 +2151,65 @@ template struct loc_writer { } }; -// Size and padding computation separate from write_int to avoid template bloat. -struct size_padding { - unsigned size; - unsigned padding; - - FMT_CONSTEXPR size_padding(int num_digits, unsigned prefix, - const format_specs& specs) - : size((prefix >> 24) + to_unsigned(num_digits)), padding(0) { - if (specs.align() == align::numeric) { - auto width = to_unsigned(specs.width); - if (width > size) { - padding = width - size; - size = width; - } - } else if (specs.precision > num_digits) { - size = (prefix >> 24) + to_unsigned(specs.precision); - padding = to_unsigned(specs.precision - num_digits); - } - } -}; - template FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, write_int_arg arg, - const format_specs& specs) -> OutputIt { + const format_specs& specs, locale_ref) + -> OutputIt { static_assert(std::is_same>::value, ""); - - constexpr int buffer_size = num_bits(); - char buffer[buffer_size]; - if (is_constant_evaluated()) fill_n(buffer, buffer_size, '\0'); - const char* begin = nullptr; - const char* end = buffer + buffer_size; - auto abs_value = arg.abs_value; auto prefix = arg.prefix; - switch (specs.type()) { - default: FMT_ASSERT(false, ""); FMT_FALLTHROUGH; + switch (specs.type) { + default: + FMT_ASSERT(false, ""); + FMT_FALLTHROUGH; case presentation_type::none: - case presentation_type::dec: - begin = do_format_decimal(buffer, abs_value, buffer_size); - break; - case presentation_type::hex: - begin = do_format_base2e(4, buffer, abs_value, buffer_size, specs.upper()); - if (specs.alt()) - prefix_append(prefix, unsigned(specs.upper() ? 'X' : 'x') << 8 | '0'); - break; + case presentation_type::dec: { + int num_digits = count_digits(abs_value); + return write_int( + out, num_digits, prefix, specs, [=](reserve_iterator it) { + return format_decimal(it, abs_value, num_digits).end; + }); + } + case presentation_type::hex: { + if (specs.alt) + prefix_append(prefix, unsigned(specs.upper ? 'X' : 'x') << 8 | '0'); + int num_digits = count_digits<4>(abs_value); + return write_int( + out, num_digits, prefix, specs, [=](reserve_iterator it) { + return format_uint<4, Char>(it, abs_value, num_digits, specs.upper); + }); + } case presentation_type::oct: { - begin = do_format_base2e(3, buffer, abs_value, buffer_size); + int num_digits = count_digits<3>(abs_value); // Octal prefix '0' is counted as a digit, so only add it if precision // is not greater than the number of digits. - auto num_digits = end - begin; - if (specs.alt() && specs.precision <= num_digits && abs_value != 0) + if (specs.alt && specs.precision <= num_digits && abs_value != 0) prefix_append(prefix, '0'); - break; + return write_int( + out, num_digits, prefix, specs, [=](reserve_iterator it) { + return format_uint<3, Char>(it, abs_value, num_digits); + }); + } + case presentation_type::bin: { + if (specs.alt) + prefix_append(prefix, unsigned(specs.upper ? 'B' : 'b') << 8 | '0'); + int num_digits = count_digits<1>(abs_value); + return write_int( + out, num_digits, prefix, specs, [=](reserve_iterator it) { + return format_uint<1, Char>(it, abs_value, num_digits); + }); } - case presentation_type::bin: - begin = do_format_base2e(1, buffer, abs_value, buffer_size); - if (specs.alt()) - prefix_append(prefix, unsigned(specs.upper() ? 'B' : 'b') << 8 | '0'); - break; case presentation_type::chr: return write_char(out, static_cast(abs_value), specs); } - - // Write an integer in the format - // - // prefix contains chars in three lower bytes and the size in the fourth byte. - int num_digits = static_cast(end - begin); - // Slightly faster check for specs.width == 0 && specs.precision == -1. - if ((specs.width | (specs.precision + 1)) == 0) { - auto it = reserve(out, to_unsigned(num_digits) + (prefix >> 24)); - for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8) - *it++ = static_cast(p & 0xff); - return base_iterator(out, copy(begin, end, it)); - } - auto sp = size_padding(num_digits, prefix, specs); - unsigned padding = sp.padding; - return write_padded( - out, specs, sp.size, [=](reserve_iterator it) { - for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8) - *it++ = static_cast(p & 0xff); - it = detail::fill_n(it, padding, static_cast('0')); - return copy(begin, end, it); - }); } - template FMT_CONSTEXPR FMT_NOINLINE auto write_int_noinline(OutputIt out, write_int_arg arg, - const format_specs& specs) - -> OutputIt { - return write_int(out, arg, specs); + const format_specs& specs, + locale_ref loc) -> OutputIt { + return write_int(out, arg, specs, loc); } - template ::value && !std::is_same::value && @@ -2245,11 +2217,10 @@ template out, T value, const format_specs& specs, locale_ref loc) -> basic_appender { - if (specs.localized() && write_loc(out, value, specs, loc)) return out; - return write_int_noinline(out, make_write_int_arg(value, specs.sign()), - specs); + if (specs.localized && write_loc(out, value, specs, loc)) return out; + return write_int_noinline(out, make_write_int_arg(value, specs.sign), + specs, loc); } - // An inlined version of write used in format string compilation. template ::value && @@ -2259,10 +2230,51 @@ template OutputIt { - if (specs.localized() && write_loc(out, value, specs, loc)) return out; - return write_int(out, make_write_int_arg(value, specs.sign()), specs); + if (specs.localized && write_loc(out, value, specs, loc)) return out; + return write_int(out, make_write_int_arg(value, specs.sign), specs, + loc); } +// An output iterator that counts the number of objects written to it and +// discards them. +class counting_iterator { + private: + size_t count_; + + public: + using iterator_category = std::output_iterator_tag; + using difference_type = std::ptrdiff_t; + using pointer = void; + using reference = void; + FMT_UNCHECKED_ITERATOR(counting_iterator); + + struct value_type { + template FMT_CONSTEXPR void operator=(const T&) {} + }; + + FMT_CONSTEXPR counting_iterator() : count_(0) {} + + FMT_CONSTEXPR auto count() const -> size_t { return count_; } + + FMT_CONSTEXPR auto operator++() -> counting_iterator& { + ++count_; + return *this; + } + FMT_CONSTEXPR auto operator++(int) -> counting_iterator { + auto it = *this; + ++*this; + return it; + } + + FMT_CONSTEXPR friend auto operator+(counting_iterator it, difference_type n) + -> counting_iterator { + it.count_ += static_cast(n); + return it; + } + + FMT_CONSTEXPR auto operator*() const -> value_type { return {}; } +}; + template FMT_CONSTEXPR auto write(OutputIt out, basic_string_view s, const format_specs& specs) -> OutputIt { @@ -2270,34 +2282,33 @@ FMT_CONSTEXPR auto write(OutputIt out, basic_string_view s, auto size = s.size(); if (specs.precision >= 0 && to_unsigned(specs.precision) < size) size = code_point_index(s, to_unsigned(specs.precision)); + bool is_debug = specs.type == presentation_type::debug; + size_t width = 0; - bool is_debug = specs.type() == presentation_type::debug; - if (is_debug) { - auto buf = counting_buffer(); - write_escaped_string(basic_appender(buf), s); - size = buf.count(); - } + if (is_debug) size = write_escaped_string(counting_iterator{}, s).count(); - size_t width = 0; if (specs.width != 0) { - width = - is_debug ? size : compute_width(basic_string_view(data, size)); + if (is_debug) + width = size; + else + width = compute_width(basic_string_view(data, size)); } - return write_padded( - out, specs, size, width, [=](reserve_iterator it) { - return is_debug ? write_escaped_string(it, s) - : copy(data, data + size, it); - }); + return write_padded(out, specs, size, width, + [=](reserve_iterator it) { + if (is_debug) return write_escaped_string(it, s); + return copy(data, data + size, it); + }); } template -FMT_CONSTEXPR auto write(OutputIt out, basic_string_view s, +FMT_CONSTEXPR auto write(OutputIt out, + basic_string_view> s, const format_specs& specs, locale_ref) -> OutputIt { return write(out, s, specs); } template FMT_CONSTEXPR auto write(OutputIt out, const Char* s, const format_specs& specs, locale_ref) -> OutputIt { - if (specs.type() == presentation_type::pointer) + if (specs.type == presentation_type::pointer) return write_ptr(out, bit_cast(s), &specs); if (!s) report_error("string pointer is null"); return write(out, basic_string_view(s), specs, {}); @@ -2320,23 +2331,30 @@ FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt { return out; } if (negative) *out++ = static_cast('-'); - return format_decimal(out, abs_value, num_digits); + return format_decimal(out, abs_value, num_digits).end; } +// DEPRECATED! template FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end, format_specs& specs) -> const Char* { FMT_ASSERT(begin != end, ""); - auto alignment = align::none; + auto align = align::none; auto p = begin + code_point_length(begin); if (end - p <= 0) p = begin; for (;;) { switch (to_ascii(*p)) { - case '<': alignment = align::left; break; - case '>': alignment = align::right; break; - case '^': alignment = align::center; break; + case '<': + align = align::left; + break; + case '>': + align = align::right; + break; + case '^': + align = align::center; + break; } - if (alignment != align::none) { + if (align != align::none) { if (p != begin) { auto c = *begin; if (c == '}') return begin; @@ -2344,7 +2362,7 @@ FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end, report_error("invalid fill character '{'"); return begin; } - specs.set_fill(basic_string_view(begin, to_unsigned(p - begin))); + specs.fill = basic_string_view(begin, to_unsigned(p - begin)); begin = p + 1; } else { ++begin; @@ -2355,25 +2373,68 @@ FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end, } p = begin; } - specs.set_align(alignment); + specs.align = align; return begin; } -template -FMT_CONSTEXPR20 auto write_nonfinite(OutputIt out, bool isnan, - format_specs specs, sign s) -> OutputIt { - auto str = - isnan ? (specs.upper() ? "NAN" : "nan") : (specs.upper() ? "INF" : "inf"); - constexpr size_t str_size = 3; - auto size = str_size + (s != sign::none ? 1 : 0); - // Replace '0'-padding with space for non-finite values. - const bool is_zero_fill = - specs.fill_size() == 1 && specs.fill_unit() == '0'; - if (is_zero_fill) specs.set_fill(' '); +// A floating-point presentation format. +enum class float_format : unsigned char { + general, // General: exponent notation or fixed point based on magnitude. + exp, // Exponent notation with the default precision of 6, e.g. 1.2e-3. + fixed // Fixed point with the default precision of 6, e.g. 0.0012. +}; + +struct float_specs { + int precision; + float_format format : 8; + sign_t sign : 8; + bool locale : 1; + bool binary32 : 1; + bool showpoint : 1; +}; + +// DEPRECATED! +FMT_CONSTEXPR inline auto parse_float_type_spec(const format_specs& specs) + -> float_specs { + auto result = float_specs(); + result.showpoint = specs.alt; + result.locale = specs.localized; + switch (specs.type) { + default: + FMT_FALLTHROUGH; + case presentation_type::none: + result.format = float_format::general; + break; + case presentation_type::exp: + result.format = float_format::exp; + result.showpoint |= specs.precision != 0; + break; + case presentation_type::fixed: + result.format = float_format::fixed; + result.showpoint |= specs.precision != 0; + break; + case presentation_type::general: + result.format = float_format::general; + break; + } + return result; +} + +template +FMT_CONSTEXPR20 auto write_nonfinite(OutputIt out, bool isnan, + format_specs specs, sign_t sign) + -> OutputIt { + auto str = + isnan ? (specs.upper ? "NAN" : "nan") : (specs.upper ? "INF" : "inf"); + constexpr size_t str_size = 3; + auto size = str_size + (sign ? 1 : 0); + // Replace '0'-padding with space for non-finite values. + const bool is_zero_fill = + specs.fill.size() == 1 && specs.fill.template get() == '0'; + if (is_zero_fill) specs.fill = ' '; return write_padded(out, specs, size, [=](reserve_iterator it) { - if (s != sign::none) - *it++ = detail::getsign(s); + if (sign) *it++ = detail::sign(sign); return copy(str, str + str_size, it); }); } @@ -2401,7 +2462,7 @@ constexpr auto write_significand(OutputIt out, const char* significand, template inline auto write_significand(OutputIt out, UInt significand, int significand_size) -> OutputIt { - return format_decimal(out, significand, significand_size); + return format_decimal(out, significand, significand_size).end; } template FMT_CONSTEXPR20 auto write_significand(OutputIt out, T significand, @@ -2421,13 +2482,14 @@ template ::value)> inline auto write_significand(Char* out, UInt significand, int significand_size, int integral_size, Char decimal_point) -> Char* { - if (!decimal_point) return format_decimal(out, significand, significand_size); + if (!decimal_point) + return format_decimal(out, significand, significand_size).end; out += significand_size + 1; Char* end = out; int floating_size = significand_size - integral_size; for (int i = floating_size / 2; i > 0; --i) { out -= 2; - write2digits(out, static_cast(significand % 100)); + copy2(out, digits2(static_cast(significand % 100))); significand /= 100; } if (floating_size % 2 != 0) { @@ -2484,31 +2546,33 @@ FMT_CONSTEXPR20 auto write_significand(OutputIt out, T significand, template > FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f, - const format_specs& specs, sign s, - locale_ref loc) -> OutputIt { + const format_specs& specs, + float_specs fspecs, locale_ref loc) + -> OutputIt { auto significand = f.significand; int significand_size = get_significand_size(f); const Char zero = static_cast('0'); - size_t size = to_unsigned(significand_size) + (s != sign::none ? 1 : 0); + auto sign = fspecs.sign; + size_t size = to_unsigned(significand_size) + (sign ? 1 : 0); using iterator = reserve_iterator; - Char decimal_point = specs.localized() ? detail::decimal_point(loc) - : static_cast('.'); + Char decimal_point = + fspecs.locale ? detail::decimal_point(loc) : static_cast('.'); int output_exp = f.exponent + significand_size - 1; auto use_exp_format = [=]() { - if (specs.type() == presentation_type::exp) return true; - if (specs.type() == presentation_type::fixed) return false; + if (fspecs.format == float_format::exp) return true; + if (fspecs.format != float_format::general) return false; // Use the fixed notation if the exponent is in [exp_lower, exp_upper), // e.g. 0.0001 instead of 1e-04. Otherwise use the exponent notation. const int exp_lower = -4, exp_upper = 16; return output_exp < exp_lower || - output_exp >= (specs.precision > 0 ? specs.precision : exp_upper); + output_exp >= (fspecs.precision > 0 ? fspecs.precision : exp_upper); }; if (use_exp_format()) { int num_zeros = 0; - if (specs.alt()) { - num_zeros = specs.precision - significand_size; + if (fspecs.showpoint) { + num_zeros = fspecs.precision - significand_size; if (num_zeros < 0) num_zeros = 0; size += to_unsigned(num_zeros); } else if (significand_size == 1) { @@ -2519,9 +2583,9 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f, if (abs_output_exp >= 100) exp_digits = abs_output_exp >= 1000 ? 4 : 3; size += to_unsigned((decimal_point ? 1 : 0) + 2 + exp_digits); - char exp_char = specs.upper() ? 'E' : 'e'; + char exp_char = specs.upper ? 'E' : 'e'; auto write = [=](iterator it) { - if (s != sign::none) *it++ = detail::getsign(s); + if (sign) *it++ = detail::sign(sign); // Insert a decimal point after the first digit and add an exponent. it = write_significand(it, significand, significand_size, 1, decimal_point); @@ -2538,32 +2602,31 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f, if (f.exponent >= 0) { // 1234e5 -> 123400000[.0+] size += to_unsigned(f.exponent); - int num_zeros = specs.precision - exp; + int num_zeros = fspecs.precision - exp; abort_fuzzing_if(num_zeros > 5000); - if (specs.alt()) { + if (fspecs.showpoint) { ++size; - if (num_zeros <= 0 && specs.type() != presentation_type::fixed) - num_zeros = 0; + if (num_zeros <= 0 && fspecs.format != float_format::fixed) num_zeros = 0; if (num_zeros > 0) size += to_unsigned(num_zeros); } - auto grouping = Grouping(loc, specs.localized()); + auto grouping = Grouping(loc, fspecs.locale); size += to_unsigned(grouping.count_separators(exp)); return write_padded(out, specs, size, [&](iterator it) { - if (s != sign::none) *it++ = detail::getsign(s); + if (sign) *it++ = detail::sign(sign); it = write_significand(it, significand, significand_size, f.exponent, grouping); - if (!specs.alt()) return it; + if (!fspecs.showpoint) return it; *it++ = decimal_point; return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it; }); } else if (exp > 0) { // 1234e-2 -> 12.34[0+] - int num_zeros = specs.alt() ? specs.precision - significand_size : 0; - size += 1 + static_cast(max_of(num_zeros, 0)); - auto grouping = Grouping(loc, specs.localized()); + int num_zeros = fspecs.showpoint ? fspecs.precision - significand_size : 0; + size += 1 + to_unsigned(num_zeros > 0 ? num_zeros : 0); + auto grouping = Grouping(loc, fspecs.locale); size += to_unsigned(grouping.count_separators(exp)); return write_padded(out, specs, size, [&](iterator it) { - if (s != sign::none) *it++ = detail::getsign(s); + if (sign) *it++ = detail::sign(sign); it = write_significand(it, significand, significand_size, exp, decimal_point, grouping); return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it; @@ -2571,14 +2634,14 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f, } // 1234e-6 -> 0.001234 int num_zeros = -exp; - if (significand_size == 0 && specs.precision >= 0 && - specs.precision < num_zeros) { - num_zeros = specs.precision; + if (significand_size == 0 && fspecs.precision >= 0 && + fspecs.precision < num_zeros) { + num_zeros = fspecs.precision; } - bool pointy = num_zeros != 0 || significand_size != 0 || specs.alt(); + bool pointy = num_zeros != 0 || significand_size != 0 || fspecs.showpoint; size += 1 + (pointy ? 1 : 0) + to_unsigned(num_zeros); return write_padded(out, specs, size, [&](iterator it) { - if (s != sign::none) *it++ = detail::getsign(s); + if (sign) *it++ = detail::sign(sign); *it++ = zero; if (!pointy) return it; *it++ = decimal_point; @@ -2603,13 +2666,14 @@ template class fallback_digit_grouping { template FMT_CONSTEXPR20 auto write_float(OutputIt out, const DecimalFP& f, - const format_specs& specs, sign s, + const format_specs& specs, float_specs fspecs, locale_ref loc) -> OutputIt { if (is_constant_evaluated()) { return do_write_float>(out, f, specs, s, loc); + fallback_digit_grouping>(out, f, specs, fspecs, + loc); } else { - return do_write_float(out, f, specs, s, loc); + return do_write_float(out, f, specs, fspecs, loc); } } @@ -2662,48 +2726,52 @@ inline FMT_CONSTEXPR20 void adjust_precision(int& precision, int exp10) { class bigint { private: - // A bigint is a number in the form bigit_[N - 1] ... bigit_[0] * 32^exp_. - using bigit = uint32_t; // A big digit. + // A bigint is stored as an array of bigits (big digits), with bigit at index + // 0 being the least significant one. + using bigit = uint32_t; using double_bigit = uint64_t; - enum { bigit_bits = num_bits() }; enum { bigits_capacity = 32 }; basic_memory_buffer bigits_; int exp_; - friend struct formatter; - - FMT_CONSTEXPR auto get_bigit(int i) const -> bigit { - return i >= exp_ && i < num_bigits() ? bigits_[i - exp_] : 0; + FMT_CONSTEXPR20 auto operator[](int index) const -> bigit { + return bigits_[to_unsigned(index)]; + } + FMT_CONSTEXPR20 auto operator[](int index) -> bigit& { + return bigits_[to_unsigned(index)]; } - FMT_CONSTEXPR void subtract_bigits(int index, bigit other, bigit& borrow) { - auto result = double_bigit(bigits_[index]) - other - borrow; - bigits_[index] = static_cast(result); + static constexpr const int bigit_bits = num_bits(); + + friend struct formatter; + + FMT_CONSTEXPR20 void subtract_bigits(int index, bigit other, bigit& borrow) { + auto result = static_cast((*this)[index]) - other - borrow; + (*this)[index] = static_cast(result); borrow = static_cast(result >> (bigit_bits * 2 - 1)); } - FMT_CONSTEXPR void remove_leading_zeros() { + FMT_CONSTEXPR20 void remove_leading_zeros() { int num_bigits = static_cast(bigits_.size()) - 1; - while (num_bigits > 0 && bigits_[num_bigits] == 0) --num_bigits; + while (num_bigits > 0 && (*this)[num_bigits] == 0) --num_bigits; bigits_.resize(to_unsigned(num_bigits + 1)); } // Computes *this -= other assuming aligned bigints and *this >= other. - FMT_CONSTEXPR void subtract_aligned(const bigint& other) { + FMT_CONSTEXPR20 void subtract_aligned(const bigint& other) { FMT_ASSERT(other.exp_ >= exp_, "unaligned bigints"); FMT_ASSERT(compare(*this, other) >= 0, ""); bigit borrow = 0; int i = other.exp_ - exp_; for (size_t j = 0, n = other.bigits_.size(); j != n; ++i, ++j) subtract_bigits(i, other.bigits_[j], borrow); - if (borrow != 0) subtract_bigits(i, 0, borrow); - FMT_ASSERT(borrow == 0, ""); + while (borrow > 0) subtract_bigits(i, 0, borrow); remove_leading_zeros(); } - FMT_CONSTEXPR void multiply(uint32_t value) { - bigit carry = 0; + FMT_CONSTEXPR20 void multiply(uint32_t value) { const double_bigit wide_value = value; + bigit carry = 0; for (size_t i = 0, n = bigits_.size(); i < n; ++i) { double_bigit result = bigits_[i] * wide_value + carry; bigits_[i] = static_cast(result); @@ -2714,7 +2782,7 @@ class bigint { template ::value || std::is_same::value)> - FMT_CONSTEXPR void multiply(UInt value) { + FMT_CONSTEXPR20 void multiply(UInt value) { using half_uint = conditional_t::value, uint64_t, uint32_t>; const int shift = num_bits() - bigit_bits; @@ -2735,7 +2803,7 @@ class bigint { template ::value || std::is_same::value)> - FMT_CONSTEXPR void assign(UInt n) { + FMT_CONSTEXPR20 void assign(UInt n) { size_t num_bigits = 0; do { bigits_[num_bigits++] = static_cast(n); @@ -2746,13 +2814,13 @@ class bigint { } public: - FMT_CONSTEXPR bigint() : exp_(0) {} + FMT_CONSTEXPR20 bigint() : exp_(0) {} explicit bigint(uint64_t n) { assign(n); } bigint(const bigint&) = delete; void operator=(const bigint&) = delete; - FMT_CONSTEXPR void assign(const bigint& other) { + FMT_CONSTEXPR20 void assign(const bigint& other) { auto size = other.bigits_.size(); bigits_.resize(size); auto data = other.bigits_.data(); @@ -2760,16 +2828,16 @@ class bigint { exp_ = other.exp_; } - template FMT_CONSTEXPR void operator=(Int n) { + template FMT_CONSTEXPR20 void operator=(Int n) { FMT_ASSERT(n > 0, ""); assign(uint64_or_128_t(n)); } - FMT_CONSTEXPR auto num_bigits() const -> int { + FMT_CONSTEXPR20 auto num_bigits() const -> int { return static_cast(bigits_.size()) + exp_; } - FMT_CONSTEXPR auto operator<<=(int shift) -> bigint& { + FMT_NOINLINE FMT_CONSTEXPR20 auto operator<<=(int shift) -> bigint& { FMT_ASSERT(shift >= 0, ""); exp_ += shift / bigit_bits; shift %= bigit_bits; @@ -2784,39 +2852,49 @@ class bigint { return *this; } - template FMT_CONSTEXPR auto operator*=(Int value) -> bigint& { + template + FMT_CONSTEXPR20 auto operator*=(Int value) -> bigint& { FMT_ASSERT(value > 0, ""); multiply(uint32_or_64_or_128_t(value)); return *this; } - friend FMT_CONSTEXPR auto compare(const bigint& b1, const bigint& b2) -> int { - int num_bigits1 = b1.num_bigits(), num_bigits2 = b2.num_bigits(); - if (num_bigits1 != num_bigits2) return num_bigits1 > num_bigits2 ? 1 : -1; - int i = static_cast(b1.bigits_.size()) - 1; - int j = static_cast(b2.bigits_.size()) - 1; + friend FMT_CONSTEXPR20 auto compare(const bigint& lhs, const bigint& rhs) + -> int { + int num_lhs_bigits = lhs.num_bigits(), num_rhs_bigits = rhs.num_bigits(); + if (num_lhs_bigits != num_rhs_bigits) + return num_lhs_bigits > num_rhs_bigits ? 1 : -1; + int i = static_cast(lhs.bigits_.size()) - 1; + int j = static_cast(rhs.bigits_.size()) - 1; int end = i - j; if (end < 0) end = 0; for (; i >= end; --i, --j) { - bigit b1_bigit = b1.bigits_[i], b2_bigit = b2.bigits_[j]; - if (b1_bigit != b2_bigit) return b1_bigit > b2_bigit ? 1 : -1; + bigit lhs_bigit = lhs[i], rhs_bigit = rhs[j]; + if (lhs_bigit != rhs_bigit) return lhs_bigit > rhs_bigit ? 1 : -1; } if (i != j) return i > j ? 1 : -1; return 0; } // Returns compare(lhs1 + lhs2, rhs). - friend FMT_CONSTEXPR auto add_compare(const bigint& lhs1, const bigint& lhs2, - const bigint& rhs) -> int { - int max_lhs_bigits = max_of(lhs1.num_bigits(), lhs2.num_bigits()); + friend FMT_CONSTEXPR20 auto add_compare(const bigint& lhs1, + const bigint& lhs2, const bigint& rhs) + -> int { + auto minimum = [](int a, int b) { return a < b ? a : b; }; + auto maximum = [](int a, int b) { return a > b ? a : b; }; + int max_lhs_bigits = maximum(lhs1.num_bigits(), lhs2.num_bigits()); int num_rhs_bigits = rhs.num_bigits(); if (max_lhs_bigits + 1 < num_rhs_bigits) return -1; if (max_lhs_bigits > num_rhs_bigits) return 1; + auto get_bigit = [](const bigint& n, int i) -> bigit { + return i >= n.exp_ && i < n.num_bigits() ? n[i - n.exp_] : 0; + }; double_bigit borrow = 0; - int min_exp = min_of(min_of(lhs1.exp_, lhs2.exp_), rhs.exp_); + int min_exp = minimum(minimum(lhs1.exp_, lhs2.exp_), rhs.exp_); for (int i = num_rhs_bigits - 1; i >= min_exp; --i) { - double_bigit sum = double_bigit(lhs1.get_bigit(i)) + lhs2.get_bigit(i); - bigit rhs_bigit = rhs.get_bigit(i); + double_bigit sum = + static_cast(get_bigit(lhs1, i)) + get_bigit(lhs2, i); + bigit rhs_bigit = get_bigit(rhs, i); if (sum > rhs_bigit + borrow) return 1; borrow = rhs_bigit + borrow - sum; if (borrow > 1) return -1; @@ -2829,8 +2907,10 @@ class bigint { FMT_CONSTEXPR20 void assign_pow10(int exp) { FMT_ASSERT(exp >= 0, ""); if (exp == 0) return *this = 1; - int bitmask = 1 << (num_bits() - - countl_zero(static_cast(exp)) - 1); + // Find the top bit. + int bitmask = 1; + while (exp >= bitmask) bitmask <<= 1; + bitmask >>= 1; // pow(10, exp) = pow(5, exp) * pow(2, exp). First compute pow(5, exp) by // repeated squaring and multiplication. *this = 5; @@ -2854,17 +2934,17 @@ class bigint { // cross-product terms n[i] * n[j] such that i + j == bigit_index. for (int i = 0, j = bigit_index; j >= 0; ++i, --j) { // Most terms are multiplied twice which can be optimized in the future. - sum += double_bigit(n[i]) * n[j]; + sum += static_cast(n[i]) * n[j]; } - bigits_[bigit_index] = static_cast(sum); + (*this)[bigit_index] = static_cast(sum); sum >>= num_bits(); // Compute the carry. } // Do the same for the top half. for (int bigit_index = num_bigits; bigit_index < num_result_bigits; ++bigit_index) { for (int j = num_bigits - 1, i = bigit_index - j; i < num_bigits;) - sum += double_bigit(n[i++]) * n[j--]; - bigits_[bigit_index] = static_cast(sum); + sum += static_cast(n[i++]) * n[j--]; + (*this)[bigit_index] = static_cast(sum); sum >>= num_bits(); } remove_leading_zeros(); @@ -2873,7 +2953,7 @@ class bigint { // If this bigint has a bigger exponent than other, adds trailing zero to make // exponents equal. This simplifies some operations such as subtraction. - FMT_CONSTEXPR void align(const bigint& other) { + FMT_CONSTEXPR20 void align(const bigint& other) { int exp_difference = exp_ - other.exp_; if (exp_difference <= 0) return; int num_bigits = static_cast(bigits_.size()); @@ -2886,7 +2966,7 @@ class bigint { // Divides this bignum by divisor, assigning the remainder to this and // returning the quotient. - FMT_CONSTEXPR auto divmod_assign(const bigint& divisor) -> int { + FMT_CONSTEXPR20 auto divmod_assign(const bigint& divisor) -> int { FMT_ASSERT(this != &divisor, ""); if (compare(*this, divisor) < 0) return 0; FMT_ASSERT(divisor.bigits_[divisor.bigits_.size() - 1u] != 0, ""); @@ -3057,17 +3137,18 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, format_specs specs, // Assume Float is in the format [sign][exponent][significand]. using carrier_uint = typename info::carrier_uint; - const auto num_float_significand_bits = detail::num_significand_bits(); + constexpr auto num_float_significand_bits = + detail::num_significand_bits(); basic_fp f(value); f.e += num_float_significand_bits; if (!has_implicit_bit()) --f.e; - const auto num_fraction_bits = + constexpr auto num_fraction_bits = num_float_significand_bits + (has_implicit_bit() ? 1 : 0); - const auto num_xdigits = (num_fraction_bits + 3) / 4; + constexpr auto num_xdigits = (num_fraction_bits + 3) / 4; - const auto leading_shift = ((num_xdigits - 1) * 4); + constexpr auto leading_shift = ((num_xdigits - 1) * 4); const auto leading_mask = carrier_uint(0xF) << leading_shift; const auto leading_xdigit = static_cast((f.f & leading_mask) >> leading_shift); @@ -3099,20 +3180,20 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, format_specs specs, char xdigits[num_bits() / 4]; detail::fill_n(xdigits, sizeof(xdigits), '0'); - format_base2e(4, xdigits, f.f, num_xdigits, specs.upper()); + format_uint<4>(xdigits, f.f, num_xdigits, specs.upper); // Remove zero tail while (print_xdigits > 0 && xdigits[print_xdigits] == '0') --print_xdigits; buf.push_back('0'); - buf.push_back(specs.upper() ? 'X' : 'x'); + buf.push_back(specs.upper ? 'X' : 'x'); buf.push_back(xdigits[0]); - if (specs.alt() || print_xdigits > 0 || print_xdigits < specs.precision) + if (specs.alt || print_xdigits > 0 || print_xdigits < specs.precision) buf.push_back('.'); buf.append(xdigits + 1, xdigits + 1 + print_xdigits); for (; print_xdigits < specs.precision; ++print_xdigits) buf.push_back('0'); - buf.push_back(specs.upper() ? 'P' : 'p'); + buf.push_back(specs.upper ? 'P' : 'p'); uint32_t abs_e; if (f.e < 0) { @@ -3143,15 +3224,15 @@ constexpr auto fractional_part_rounding_thresholds(int index) -> uint32_t { } template -FMT_CONSTEXPR20 auto format_float(Float value, int precision, - const format_specs& specs, bool binary32, +FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs, buffer& buf) -> int { // float is passed as double to reduce the number of instantiations. static_assert(!std::is_same::value, ""); + FMT_ASSERT(value >= 0, "value is negative"); auto converted_value = convert_float(value); - const bool fixed = specs.type() == presentation_type::fixed; - if (value == 0) { + const bool fixed = specs.format == float_format::fixed; + if (value <= 0) { // <= instead of == to silence a warning. if (precision <= 0 || !fixed) { buf.push_back('0'); return 0; @@ -3176,6 +3257,16 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, exp = static_cast(e); if (e > exp) ++exp; // Compute ceil. dragon_flags = dragon::fixup; + } else if (precision < 0) { + // Use Dragonbox for the shortest format. + if (specs.binary32) { + auto dec = dragonbox::to_decimal(static_cast(value)); + write(appender(buf), dec.significand); + return dec.exponent; + } + auto dec = dragonbox::to_decimal(static_cast(value)); + write(appender(buf), dec.significand); + return dec.exponent; } else { // Extract significand bits and exponent bits. using info = dragonbox::float_info; @@ -3274,7 +3365,7 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, uint64_t prod; uint32_t digits; bool should_round_up; - int number_of_digits_to_print = min_of(precision, 9); + int number_of_digits_to_print = precision > 9 ? 9 : precision; // Print a 9-digits subsegment, either the first or the second. auto print_subsegment = [&](uint32_t subsegment, char* buffer) { @@ -3302,7 +3393,7 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, // for details. prod = ((subsegment * static_cast(450359963)) >> 20) + 1; digits = static_cast(prod >> 32); - write2digits(buffer, digits); + copy2(buffer, digits2(digits)); number_of_digits_printed += 2; } @@ -3310,7 +3401,7 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, while (number_of_digits_printed < number_of_digits_to_print) { prod = static_cast(prod) * static_cast(100); digits = static_cast(prod >> 32); - write2digits(buffer + number_of_digits_printed, digits); + copy2(buffer + number_of_digits_printed, digits2(digits)); number_of_digits_printed += 2; } }; @@ -3419,8 +3510,9 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, } if (use_dragon) { auto f = basic_fp(); - bool is_predecessor_closer = binary32 ? f.assign(static_cast(value)) - : f.assign(converted_value); + bool is_predecessor_closer = specs.binary32 + ? f.assign(static_cast(value)) + : f.assign(converted_value); if (is_predecessor_closer) dragon_flags |= dragon::predecessor_closer; if (fixed) dragon_flags |= dragon::fixed; // Limit precision to the maximum possible number of significant digits in @@ -3429,7 +3521,7 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, if (precision > max_double_digits) precision = max_double_digits; format_dragon(f, dragon_flags, precision, buf, exp); } - if (!fixed && !specs.alt()) { + if (!fixed && !specs.showpoint) { // Remove trailing zeros. auto num_digits = buf.size(); while (num_digits > 0 && buf[num_digits - 1] == '0') { @@ -3444,62 +3536,59 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, template FMT_CONSTEXPR20 auto write_float(OutputIt out, T value, format_specs specs, locale_ref loc) -> OutputIt { - // Use signbit because value < 0 is false for NaN. - sign s = detail::signbit(value) ? sign::minus : specs.sign(); + sign_t sign = specs.sign; + if (detail::signbit(value)) { // value < 0 is false for NaN so use signbit. + sign = sign::minus; + value = -value; + } else if (sign == sign::minus) { + sign = sign::none; + } if (!detail::isfinite(value)) - return write_nonfinite(out, detail::isnan(value), specs, s); + return write_nonfinite(out, detail::isnan(value), specs, sign); - if (specs.align() == align::numeric && s != sign::none) { - *out++ = detail::getsign(s); - s = sign::none; + if (specs.align == align::numeric && sign) { + auto it = reserve(out, 1); + *it++ = detail::sign(sign); + out = base_iterator(out, it); + sign = sign::none; if (specs.width != 0) --specs.width; } - int precision = specs.precision; - if (precision < 0) { - if (specs.type() != presentation_type::none) { - precision = 6; - } else if (is_fast_float::value && !is_constant_evaluated()) { - // Use Dragonbox for the shortest format. - using floaty = conditional_t= sizeof(double), double, float>; - auto dec = dragonbox::to_decimal(static_cast(value)); - return write_float(out, dec, specs, s, loc); - } - } - memory_buffer buffer; - if (specs.type() == presentation_type::hexfloat) { - if (s != sign::none) buffer.push_back(detail::getsign(s)); + if (specs.type == presentation_type::hexfloat) { + if (sign) buffer.push_back(detail::sign(sign)); format_hexfloat(convert_float(value), specs, buffer); return write_bytes(out, {buffer.data(), buffer.size()}, specs); } - if (specs.type() == presentation_type::exp) { + int precision = specs.precision >= 0 || specs.type == presentation_type::none + ? specs.precision + : 6; + if (specs.type == presentation_type::exp) { if (precision == max_value()) report_error("number is too big"); else ++precision; - if (specs.precision != 0) specs.set_alt(); - } else if (specs.type() == presentation_type::fixed) { - if (specs.precision != 0) specs.set_alt(); - } else if (precision == 0) { + } else if (specs.type != presentation_type::fixed && precision == 0) { precision = 1; } - int exp = format_float(convert_float(value), precision, specs, - std::is_same(), buffer); - - specs.precision = precision; + float_specs fspecs = parse_float_type_spec(specs); + fspecs.sign = sign; + if (const_check(std::is_same())) fspecs.binary32 = true; + int exp = format_float(convert_float(value), precision, fspecs, buffer); + fspecs.precision = precision; auto f = big_decimal_fp{buffer.data(), static_cast(buffer.size()), exp}; - return write_float(out, f, specs, s, loc); + return write_float(out, f, specs, fspecs, loc); } template ::value)> FMT_CONSTEXPR20 auto write(OutputIt out, T value, format_specs specs, locale_ref loc = {}) -> OutputIt { - return specs.localized() && write_loc(out, value, specs, loc) + if (const_check(!is_supported_floating_point(value))) return out; + return specs.localized && write_loc(out, value, specs, loc) ? out : write_float(out, value, specs, loc); } @@ -3508,18 +3597,25 @@ template ::value)> FMT_CONSTEXPR20 auto write(OutputIt out, T value) -> OutputIt { if (is_constant_evaluated()) return write(out, value, format_specs()); + if (const_check(!is_supported_floating_point(value))) return out; - auto s = detail::signbit(value) ? sign::minus : sign::none; + auto sign = sign_t::none; + if (detail::signbit(value)) { + sign = sign::minus; + value = -value; + } constexpr auto specs = format_specs(); - using floaty = conditional_t= sizeof(double), double, float>; + using floaty = conditional_t::value, double, T>; using floaty_uint = typename dragonbox::float_info::carrier_uint; floaty_uint mask = exponent_mask(); if ((bit_cast(value) & mask) == mask) - return write_nonfinite(out, std::isnan(value), specs, s); + return write_nonfinite(out, std::isnan(value), specs, sign); + auto fspecs = float_specs(); + fspecs.sign = sign; auto dec = dragonbox::to_decimal(static_cast(value)); - return write_float(out, dec, specs, s, {}); + return write_float(out, dec, specs, fspecs, {}); } template OutputIt { // FMT_ENABLE_IF() condition separated to workaround an MSVC bug. template < typename Char, typename OutputIt, typename T, - bool check = std::is_enum::value && !std::is_same::value && - mapped_type_constant::value != type::custom_type, + bool check = + std::is_enum::value && !std::is_same::value && + mapped_type_constant>::value != + type::custom_type, FMT_ENABLE_IF(check)> FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt { return write(out, static_cast>(value)); @@ -3562,8 +3660,8 @@ template ::value)> FMT_CONSTEXPR auto write(OutputIt out, T value, const format_specs& specs = {}, locale_ref = {}) -> OutputIt { - return specs.type() != presentation_type::none && - specs.type() != presentation_type::string + return specs.type != presentation_type::none && + specs.type != presentation_type::string ? write(out, value ? 1 : 0, specs, {}) : write_bytes(out, value ? "true" : "false", specs); } @@ -3589,137 +3687,158 @@ auto write(OutputIt out, const T* value, const format_specs& specs = {}, return write_ptr(out, bit_cast(value), &specs); } +// A write overload that handles implicit conversions. template ::value == - type::custom_type && - !std::is_fundamental::value)> -FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> OutputIt { - auto f = formatter(); - auto parse_ctx = parse_context({}); - f.parse(parse_ctx); - auto ctx = basic_format_context(out, {}, {}); - return f.format(value, ctx); + typename Context = basic_format_context> +FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> enable_if_t< + std::is_class::value && !has_to_string_view::value && + !is_floating_point::value && !std::is_same::value && + !std::is_same().map( + value))>>::value, + OutputIt> { + return write(out, arg_mapper().map(value)); } -template -using is_builtin = - bool_constant::value || FMT_BUILTIN_TYPES>; +template > +FMT_CONSTEXPR auto write(OutputIt out, const T& value) + -> enable_if_t::value == + type::custom_type && + !std::is_fundamental::value, + OutputIt> { + auto formatter = typename Context::template formatter_type(); + auto parse_ctx = typename Context::parse_context_type({}); + formatter.parse(parse_ctx); + auto ctx = Context(out, {}, {}); + return formatter.format(value, ctx); +} // An argument visitor that formats the argument and writes it via the output // iterator. It's a class and not a generic lambda for compatibility with C++11. template struct default_arg_formatter { + using iterator = basic_appender; using context = buffered_context; - basic_appender out; - - void operator()(monostate) { report_error("argument not found"); } + iterator out; + basic_format_args args; + locale_ref loc; - template ::value)> - void operator()(T value) { - write(out, value); + template auto operator()(T value) -> iterator { + return write(out, value); } - - template ::value)> - void operator()(T) { - FMT_ASSERT(false, ""); - } - - void operator()(typename basic_format_arg::handle h) { - // Use a null locale since the default format must be unlocalized. - auto parse_ctx = parse_context({}); - auto format_ctx = context(out, {}, {}); + auto operator()(typename basic_format_arg::handle h) -> iterator { + basic_format_parse_context parse_ctx({}); + context format_ctx(out, args, loc); h.format(parse_ctx, format_ctx); + return format_ctx.out(); } }; template struct arg_formatter { - basic_appender out; + using iterator = basic_appender; + using context = buffered_context; + + iterator out; const format_specs& specs; - FMT_NO_UNIQUE_ADDRESS locale_ref locale; + locale_ref locale; - template ::value)> - FMT_CONSTEXPR FMT_INLINE void operator()(T value) { - detail::write(out, value, specs, locale); + template + FMT_CONSTEXPR FMT_INLINE auto operator()(T value) -> iterator { + return detail::write(out, value, specs, locale); } + auto operator()(typename basic_format_arg::handle) -> iterator { + // User-defined types are handled separately because they require access + // to the parse context. + return out; + } +}; - template ::value)> - void operator()(T) { - FMT_ASSERT(false, ""); +struct width_checker { + template ::value)> + FMT_CONSTEXPR auto operator()(T value) -> unsigned long long { + if (is_negative(value)) report_error("negative width"); + return static_cast(value); } - void operator()(typename basic_format_arg>::handle) { - // User-defined types are handled separately because they require access - // to the parse context. + template ::value)> + FMT_CONSTEXPR auto operator()(T) -> unsigned long long { + report_error("width is not integer"); + return 0; } }; -struct dynamic_spec_getter { +struct precision_checker { template ::value)> FMT_CONSTEXPR auto operator()(T value) -> unsigned long long { - return is_negative(value) ? ~0ull : static_cast(value); + if (is_negative(value)) report_error("negative precision"); + return static_cast(value); } template ::value)> FMT_CONSTEXPR auto operator()(T) -> unsigned long long { - report_error("width/precision is not integer"); + report_error("precision is not integer"); return 0; } }; +template +FMT_CONSTEXPR auto get_dynamic_spec(FormatArg arg) -> int { + unsigned long long value = arg.visit(Handler()); + if (value > to_unsigned(max_value())) report_error("number is too big"); + return static_cast(value); +} + template -FMT_CONSTEXPR auto get_arg(Context& ctx, ID id) -> basic_format_arg { +FMT_CONSTEXPR auto get_arg(Context& ctx, ID id) -> decltype(ctx.arg(id)) { auto arg = ctx.arg(id); if (!arg) report_error("argument not found"); return arg; } -template -FMT_CONSTEXPR int get_dynamic_spec( - arg_id_kind kind, const arg_ref& ref, - Context& ctx) { - FMT_ASSERT(kind != arg_id_kind::none, ""); - auto arg = - kind == arg_id_kind::index ? ctx.arg(ref.index) : ctx.arg(ref.name); - if (!arg) report_error("argument not found"); - unsigned long long value = arg.visit(dynamic_spec_getter()); - if (value > to_unsigned(max_value())) - report_error("width/precision is out of range"); - return static_cast(value); -} - -template -FMT_CONSTEXPR void handle_dynamic_spec( - arg_id_kind kind, int& value, - const arg_ref& ref, Context& ctx) { - if (kind != arg_id_kind::none) value = get_dynamic_spec(kind, ref, ctx); +template +FMT_CONSTEXPR void handle_dynamic_spec(int& value, + arg_ref ref, + Context& ctx) { + switch (ref.kind) { + case arg_id_kind::none: + break; + case arg_id_kind::index: + value = detail::get_dynamic_spec(get_arg(ctx, ref.val.index)); + break; + case arg_id_kind::name: + value = detail::get_dynamic_spec(get_arg(ctx, ref.val.name)); + break; + } } -#if FMT_USE_NONTYPE_TEMPLATE_ARGS +#if FMT_USE_USER_DEFINED_LITERALS +# if FMT_USE_NONTYPE_TEMPLATE_ARGS template Str> -struct static_named_arg : view { + fmt::detail_exported::fixed_string Str> +struct statically_named_arg : view { static constexpr auto name = Str.data; const T& value; - static_named_arg(const T& v) : value(v) {} + statically_named_arg(const T& v) : value(v) {} }; template Str> -struct is_named_arg> : std::true_type {}; + fmt::detail_exported::fixed_string Str> +struct is_named_arg> : std::true_type {}; template Str> -struct is_static_named_arg> : std::true_type { -}; + fmt::detail_exported::fixed_string Str> +struct is_statically_named_arg> + : std::true_type {}; -template Str> +template Str> struct udl_arg { template auto operator=(T&& value) const { - return static_named_arg(std::forward(value)); + return statically_named_arg(std::forward(value)); } }; -#else +# else template struct udl_arg { const Char* str; @@ -3727,102 +3846,148 @@ template struct udl_arg { return {str, std::forward(value)}; } }; -#endif // FMT_USE_NONTYPE_TEMPLATE_ARGS +# endif +#endif // FMT_USE_USER_DEFINED_LITERALS + +template +auto vformat(const Locale& loc, basic_string_view fmt, + typename detail::vformat_args::type args) + -> std::basic_string { + auto buf = basic_memory_buffer(); + detail::vformat_to(buf, fmt, args, detail::locale_ref(loc)); + return {buf.data(), buf.size()}; +} -template struct format_handler { - parse_context parse_ctx; - buffered_context ctx; +using format_func = void (*)(detail::buffer&, int, const char*); - void on_text(const Char* begin, const Char* end) { - copy_noinline(begin, end, ctx.out()); - } +FMT_API void format_error_code(buffer& out, int error_code, + string_view message) noexcept; - FMT_CONSTEXPR auto on_arg_id() -> int { return parse_ctx.next_arg_id(); } - FMT_CONSTEXPR auto on_arg_id(int id) -> int { - parse_ctx.check_arg_id(id); - return id; - } - FMT_CONSTEXPR auto on_arg_id(basic_string_view id) -> int { - parse_ctx.check_arg_id(id); - int arg_id = ctx.arg_id(id); - if (arg_id < 0) report_error("argument not found"); - return arg_id; - } +using fmt::report_error; +FMT_API void report_error(format_func func, int error_code, + const char* message) noexcept; +} // namespace detail - FMT_INLINE void on_replacement_field(int id, const Char*) { - ctx.arg(id).visit(default_arg_formatter{ctx.out()}); - } +FMT_BEGIN_EXPORT +FMT_API auto vsystem_error(int error_code, string_view format_str, + format_args args) -> std::system_error; + +/** + * Constructs `std::system_error` with a message formatted with + * `fmt::format(fmt, args...)`. + * `error_code` is a system error code as given by `errno`. + * + * **Example**: + * + * // This throws std::system_error with the description + * // cannot open file 'madeup': No such file or directory + * // or similar (system message may vary). + * const char* filename = "madeup"; + * std::FILE* file = std::fopen(filename, "r"); + * if (!file) + * throw fmt::system_error(errno, "cannot open file '{}'", filename); + */ +template +auto system_error(int error_code, format_string fmt, T&&... args) + -> std::system_error { + return vsystem_error(error_code, fmt, fmt::make_format_args(args...)); +} - auto on_format_specs(int id, const Char* begin, const Char* end) - -> const Char* { - auto arg = get_arg(ctx, id); - // Not using a visitor for custom types gives better codegen. - if (arg.format_custom(begin, parse_ctx, ctx)) return parse_ctx.begin(); +/** + * Formats an error message for an error returned by an operating system or a + * language runtime, for example a file opening error, and writes it to `out`. + * The format is the same as the one used by `std::system_error(ec, message)` + * where `ec` is `std::error_code(error_code, std::generic_category())`. + * It is implementation-defined but normally looks like: + * + * : + * + * where `` is the passed message and `` is the system + * message corresponding to the error code. + * `error_code` is a system error code as given by `errno`. + */ +FMT_API void format_system_error(detail::buffer& out, int error_code, + const char* message) noexcept; - auto specs = dynamic_format_specs(); - begin = parse_format_specs(begin, end, specs, parse_ctx, arg.type()); - if (specs.dynamic()) { - handle_dynamic_spec(specs.dynamic_width(), specs.width, specs.width_ref, - ctx); - handle_dynamic_spec(specs.dynamic_precision(), specs.precision, - specs.precision_ref, ctx); - } +// Reports a system error without throwing an exception. +// Can be used to report errors from destructors. +FMT_API void report_system_error(int error_code, const char* message) noexcept; + +/// A fast integer formatter. +class format_int { + private: + // Buffer should be large enough to hold all digits (digits10 + 1), + // a sign and a null character. + enum { buffer_size = std::numeric_limits::digits10 + 3 }; + mutable char buffer_[buffer_size]; + char* str_; - arg.visit(arg_formatter{ctx.out(), specs, ctx.locale()}); + template + FMT_CONSTEXPR20 auto format_unsigned(UInt value) -> char* { + auto n = static_cast>(value); + return detail::format_decimal(buffer_, n, buffer_size - 1).begin; + } + + template + FMT_CONSTEXPR20 auto format_signed(Int value) -> char* { + auto abs_value = static_cast>(value); + bool negative = value < 0; + if (negative) abs_value = 0 - abs_value; + auto begin = format_unsigned(abs_value); + if (negative) *--begin = '-'; return begin; } - FMT_NORETURN void on_error(const char* message) { report_error(message); } -}; + public: + explicit FMT_CONSTEXPR20 format_int(int value) : str_(format_signed(value)) {} + explicit FMT_CONSTEXPR20 format_int(long value) + : str_(format_signed(value)) {} + explicit FMT_CONSTEXPR20 format_int(long long value) + : str_(format_signed(value)) {} + explicit FMT_CONSTEXPR20 format_int(unsigned value) + : str_(format_unsigned(value)) {} + explicit FMT_CONSTEXPR20 format_int(unsigned long value) + : str_(format_unsigned(value)) {} + explicit FMT_CONSTEXPR20 format_int(unsigned long long value) + : str_(format_unsigned(value)) {} -using format_func = void (*)(detail::buffer&, int, const char*); -FMT_API void do_report_error(format_func func, int error_code, - const char* message) noexcept; + /// Returns the number of characters written to the output buffer. + FMT_CONSTEXPR20 auto size() const -> size_t { + return detail::to_unsigned(buffer_ - str_ + buffer_size - 1); + } -FMT_API void format_error_code(buffer& out, int error_code, - string_view message) noexcept; + /// Returns a pointer to the output buffer content. No terminating null + /// character is appended. + FMT_CONSTEXPR20 auto data() const -> const char* { return str_; } -template -template -FMT_CONSTEXPR auto native_formatter::format( - const T& val, FormatContext& ctx) const -> decltype(ctx.out()) { - if (!specs_.dynamic()) - return write(ctx.out(), val, specs_, ctx.locale()); - auto specs = format_specs(specs_); - handle_dynamic_spec(specs.dynamic_width(), specs.width, specs_.width_ref, - ctx); - handle_dynamic_spec(specs.dynamic_precision(), specs.precision, - specs_.precision_ref, ctx); - return write(ctx.out(), val, specs, ctx.locale()); -} + /// Returns a pointer to the output buffer content with terminating null + /// character appended. + FMT_CONSTEXPR20 auto c_str() const -> const char* { + buffer_[buffer_size - 1] = '\0'; + return str_; + } -// DEPRECATED! -template struct vformat_args { - using type = basic_format_args>; -}; -template <> struct vformat_args { - using type = format_args; + /// Returns the content of the output buffer as an `std::string`. + auto str() const -> std::string { return std::string(str_, size()); } }; -template -void vformat_to(buffer& buf, basic_string_view fmt, - typename vformat_args::type args, locale_ref loc = {}) { - auto out = basic_appender(buf); - parse_format_string( - fmt, format_handler{parse_context(fmt), {out, args, loc}}); -} -} // namespace detail - -FMT_BEGIN_EXPORT +template +struct formatter::value>> + : formatter, Char> { + template + auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) { + auto&& val = format_as(value); // Make an lvalue reference for format. + return formatter, Char>::format(val, ctx); + } +}; -#define FMT_FORMAT_AS(Type, Base) \ - template \ - struct formatter : formatter { \ - template \ - FMT_CONSTEXPR auto format(Type value, FormatContext& ctx) const \ - -> decltype(ctx.out()) { \ - return formatter::format(value, ctx); \ - } \ +#define FMT_FORMAT_AS(Type, Base) \ + template \ + struct formatter : formatter { \ + template \ + auto format(Type value, FormatContext& ctx) const -> decltype(ctx.out()) { \ + return formatter::format(value, ctx); \ + } \ } FMT_FORMAT_AS(signed char, int); @@ -3832,38 +3997,16 @@ FMT_FORMAT_AS(unsigned short, unsigned); FMT_FORMAT_AS(long, detail::long_type); FMT_FORMAT_AS(unsigned long, detail::ulong_type); FMT_FORMAT_AS(Char*, const Char*); -FMT_FORMAT_AS(detail::std_string_view, basic_string_view); FMT_FORMAT_AS(std::nullptr_t, const void*); +FMT_FORMAT_AS(detail::std_string_view, basic_string_view); FMT_FORMAT_AS(void*, const void*); -template -struct formatter : formatter, Char> {}; - template class formatter, Char> : public formatter, Char> {}; -template -struct formatter, Char> : formatter {}; -template -struct formatter, Char> - : formatter {}; - -template -struct formatter - : detail::native_formatter {}; - -template -struct formatter>> - : formatter, Char> { - template - FMT_CONSTEXPR auto format(const T& value, FormatContext& ctx) const - -> decltype(ctx.out()) { - auto&& val = format_as(value); // Make an lvalue reference for format. - return formatter, Char>::format(val, ctx); - } -}; +template +struct formatter : formatter, Char> {}; /** * Converts `p` to `const void*` for pointer formatting. @@ -3897,22 +4040,13 @@ constexpr auto format_as(Enum e) noexcept -> underlying_t { } } // namespace enums -#ifdef __cpp_lib_byte -template <> struct formatter : formatter { - static auto format_as(std::byte b) -> unsigned char { - return static_cast(b); - } - template - auto format(std::byte b, Context& ctx) const -> decltype(ctx.out()) { - return formatter::format(format_as(b), ctx); - } -}; -#endif - -struct bytes { - string_view data; +class bytes { + private: + string_view data_; + friend struct formatter; - inline explicit bytes(string_view s) : data(s) {} + public: + explicit bytes(string_view data) : data_(data) {} }; template <> struct formatter { @@ -3920,7 +4054,8 @@ template <> struct formatter { detail::dynamic_format_specs<> specs_; public: - FMT_CONSTEXPR auto parse(parse_context<>& ctx) -> const char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const char* { return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, detail::type::string_type); } @@ -3928,11 +4063,11 @@ template <> struct formatter { template auto format(bytes b, FormatContext& ctx) const -> decltype(ctx.out()) { auto specs = specs_; - detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, - specs.width_ref, ctx); - detail::handle_dynamic_spec(specs.dynamic_precision(), specs.precision, - specs.precision_ref, ctx); - return detail::write_bytes(ctx.out(), b.data, specs); + detail::handle_dynamic_spec(specs.width, + specs.width_ref, ctx); + detail::handle_dynamic_spec( + specs.precision, specs.precision_ref, ctx); + return detail::write_bytes(ctx.out(), b.data_, specs); } }; @@ -3959,7 +4094,8 @@ template struct formatter> : formatter { detail::dynamic_format_specs<> specs_; public: - FMT_CONSTEXPR auto parse(parse_context<>& ctx) -> const char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const char* { return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, detail::type::int_type); } @@ -3968,11 +4104,11 @@ template struct formatter> : formatter { auto format(group_digits_view t, FormatContext& ctx) const -> decltype(ctx.out()) { auto specs = specs_; - detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, - specs.width_ref, ctx); - detail::handle_dynamic_spec(specs.dynamic_precision(), specs.precision, - specs.precision_ref, ctx); - auto arg = detail::make_write_int_arg(t.value, specs.sign()); + detail::handle_dynamic_spec(specs.width, + specs.width_ref, ctx); + detail::handle_dynamic_spec( + specs.precision, specs.precision_ref, ctx); + auto arg = detail::make_write_int_arg(t.value, specs.sign); return detail::write_int( ctx.out(), static_cast>(arg.abs_value), arg.prefix, specs, detail::digit_grouping("\3", ",")); @@ -3986,7 +4122,8 @@ template struct nested_view { template struct formatter, Char> { - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { return ctx.begin(); } template @@ -3998,25 +4135,22 @@ struct formatter, Char> { template struct nested_formatter { private: - basic_specs specs_; int width_; + detail::fill_t fill_; + align_t align_ : 4; formatter formatter_; public: - constexpr nested_formatter() : width_(0) {} - - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { - auto it = ctx.begin(), end = ctx.end(); - if (it == end) return it; - auto specs = format_specs(); - it = detail::parse_align(it, end, specs); - specs_ = specs; - Char c = *it; - auto width_ref = detail::arg_ref(); - if ((c >= '0' && c <= '9') || c == '{') { - it = detail::parse_width(it, end, specs, width_ref, ctx); - width_ = specs.width; - } + constexpr nested_formatter() : width_(0), align_(align_t::none) {} + + FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) + -> decltype(ctx.begin()) { + auto specs = detail::dynamic_format_specs(); + auto it = parse_format_specs(ctx.begin(), ctx.end(), specs, ctx, + detail::type::none_type); + width_ = specs.width; + fill_ = specs.fill; + align_ = specs.align; ctx.advance_to(it); return formatter_.parse(ctx); } @@ -4028,9 +4162,8 @@ template struct nested_formatter { write(basic_appender(buf)); auto specs = format_specs(); specs.width = width_; - specs.set_fill( - basic_string_view(specs_.fill(), specs_.fill_size())); - specs.set_align(specs_.align()); + specs.fill = fill_; + specs.align = align_; return detail::write( ctx.out(), basic_string_view(buf.data(), buf.size()), specs); } @@ -4040,193 +4173,180 @@ template struct nested_formatter { } }; -inline namespace literals { -#if FMT_USE_NONTYPE_TEMPLATE_ARGS -template constexpr auto operator""_a() { - using char_t = remove_cvref_t; - return detail::udl_arg(); -} -#else /** - * User-defined literal equivalent of `fmt::arg`. + * Converts `value` to `std::string` using the default format for type `T`. * * **Example**: * - * using namespace fmt::literals; - * fmt::print("The answer is {answer}.", "answer"_a=42); + * std::string answer = fmt::to_string(42); */ -constexpr auto operator""_a(const char* s, size_t) -> detail::udl_arg { - return {s}; +template ::value && + !detail::has_format_as::value)> +inline auto to_string(const T& value) -> std::string { + auto buffer = memory_buffer(); + detail::write(appender(buffer), value); + return {buffer.data(), buffer.size()}; } -#endif // FMT_USE_NONTYPE_TEMPLATE_ARGS -} // namespace literals -/// A fast integer formatter. -class format_int { - private: - // Buffer should be large enough to hold all digits (digits10 + 1), - // a sign and a null character. - enum { buffer_size = std::numeric_limits::digits10 + 3 }; - mutable char buffer_[buffer_size]; - char* str_; +template ::value)> +FMT_NODISCARD inline auto to_string(T value) -> std::string { + // The buffer should be large enough to store the number including the sign + // or "false" for bool. + constexpr int max_size = detail::digits10() + 2; + char buffer[max_size > 5 ? static_cast(max_size) : 5]; + char* begin = buffer; + return std::string(begin, detail::write(begin, value)); +} - template - FMT_CONSTEXPR20 auto format_unsigned(UInt value) -> char* { - auto n = static_cast>(value); - return detail::do_format_decimal(buffer_, n, buffer_size - 1); - } +template +FMT_NODISCARD auto to_string(const basic_memory_buffer& buf) + -> std::basic_string { + auto size = buf.size(); + detail::assume(size < std::basic_string().max_size()); + return std::basic_string(buf.data(), size); +} - template - FMT_CONSTEXPR20 auto format_signed(Int value) -> char* { - auto abs_value = static_cast>(value); - bool negative = value < 0; - if (negative) abs_value = 0 - abs_value; - auto begin = format_unsigned(abs_value); - if (negative) *--begin = '-'; - return begin; - } +template ::value && + detail::has_format_as::value)> +inline auto to_string(const T& value) -> std::string { + return to_string(format_as(value)); +} - public: - explicit FMT_CONSTEXPR20 format_int(int value) : str_(format_signed(value)) {} - explicit FMT_CONSTEXPR20 format_int(long value) - : str_(format_signed(value)) {} - explicit FMT_CONSTEXPR20 format_int(long long value) - : str_(format_signed(value)) {} - explicit FMT_CONSTEXPR20 format_int(unsigned value) - : str_(format_unsigned(value)) {} - explicit FMT_CONSTEXPR20 format_int(unsigned long value) - : str_(format_unsigned(value)) {} - explicit FMT_CONSTEXPR20 format_int(unsigned long long value) - : str_(format_unsigned(value)) {} +FMT_END_EXPORT - /// Returns the number of characters written to the output buffer. - FMT_CONSTEXPR20 auto size() const -> size_t { - return detail::to_unsigned(buffer_ - str_ + buffer_size - 1); +namespace detail { + +template +void vformat_to(buffer& buf, basic_string_view fmt, + typename vformat_args::type args, locale_ref loc) { + auto out = basic_appender(buf); + if (fmt.size() == 2 && equal2(fmt.data(), "{}")) { + auto arg = args.get(0); + if (!arg) report_error("argument not found"); + arg.visit(default_arg_formatter{out, args, loc}); + return; } - /// Returns a pointer to the output buffer content. No terminating null - /// character is appended. - FMT_CONSTEXPR20 auto data() const -> const char* { return str_; } + struct format_handler { + basic_format_parse_context parse_context; + buffered_context context; - /// Returns a pointer to the output buffer content with terminating null - /// character appended. - FMT_CONSTEXPR20 auto c_str() const -> const char* { - buffer_[buffer_size - 1] = '\0'; - return str_; - } + format_handler(basic_appender p_out, basic_string_view str, + basic_format_args> p_args, + locale_ref p_loc) + : parse_context(str), context(p_out, p_args, p_loc) {} - /// Returns the content of the output buffer as an `std::string`. - inline auto str() const -> std::string { return {str_, size()}; } -}; + void on_text(const Char* begin, const Char* end) { + auto text = basic_string_view(begin, to_unsigned(end - begin)); + context.advance_to(write(context.out(), text)); + } -#define FMT_STRING_IMPL(s, base) \ - [] { \ - /* Use the hidden visibility as a workaround for a GCC bug (#1973). */ \ - /* Use a macro-like name to avoid shadowing warnings. */ \ - struct FMT_VISIBILITY("hidden") FMT_COMPILE_STRING : base { \ - using char_type = fmt::remove_cvref_t; \ - FMT_CONSTEXPR explicit operator fmt::basic_string_view() \ - const { \ - return fmt::detail::compile_string_to_view(s); \ - } \ - }; \ - using FMT_STRING_VIEW = \ - fmt::basic_string_view; \ - fmt::detail::ignore_unused(FMT_STRING_VIEW(FMT_COMPILE_STRING())); \ - return FMT_COMPILE_STRING(); \ - }() + FMT_CONSTEXPR auto on_arg_id() -> int { + return parse_context.next_arg_id(); + } + FMT_CONSTEXPR auto on_arg_id(int id) -> int { + parse_context.check_arg_id(id); + return id; + } + FMT_CONSTEXPR auto on_arg_id(basic_string_view id) -> int { + parse_context.check_arg_id(id); + int arg_id = context.arg_id(id); + if (arg_id < 0) report_error("argument not found"); + return arg_id; + } -/** - * Constructs a compile-time format string from a string literal `s`. - * - * **Example**: - * - * // A compile-time error because 'd' is an invalid specifier for strings. - * std::string s = fmt::format(FMT_STRING("{:d}"), "foo"); - */ -#define FMT_STRING(s) FMT_STRING_IMPL(s, fmt::detail::compile_string) + FMT_INLINE void on_replacement_field(int id, const Char*) { + auto arg = get_arg(context, id); + context.advance_to(arg.visit(default_arg_formatter{ + context.out(), context.args(), context.locale()})); + } -FMT_API auto vsystem_error(int error_code, string_view fmt, format_args args) - -> std::system_error; + auto on_format_specs(int id, const Char* begin, const Char* end) + -> const Char* { + auto arg = get_arg(context, id); + // Not using a visitor for custom types gives better codegen. + if (arg.format_custom(begin, parse_context, context)) + return parse_context.begin(); + auto specs = detail::dynamic_format_specs(); + begin = parse_format_specs(begin, end, specs, parse_context, arg.type()); + detail::handle_dynamic_spec( + specs.width, specs.width_ref, context); + detail::handle_dynamic_spec( + specs.precision, specs.precision_ref, context); + if (begin == end || *begin != '}') + report_error("missing '}' in format string"); + context.advance_to(arg.visit( + arg_formatter{context.out(), specs, context.locale()})); + return begin; + } -/** - * Constructs `std::system_error` with a message formatted with - * `fmt::format(fmt, args...)`. - * `error_code` is a system error code as given by `errno`. - * - * **Example**: - * - * // This throws std::system_error with the description - * // cannot open file 'madeup': No such file or directory - * // or similar (system message may vary). - * const char* filename = "madeup"; - * FILE* file = fopen(filename, "r"); - * if (!file) - * throw fmt::system_error(errno, "cannot open file '{}'", filename); - */ -template -auto system_error(int error_code, format_string fmt, T&&... args) - -> std::system_error { - return vsystem_error(error_code, fmt.str, vargs{{args...}}); + FMT_NORETURN void on_error(const char* message) { report_error(message); } + }; + detail::parse_format_string(fmt, format_handler(out, fmt, args, loc)); } -/** - * Formats an error message for an error returned by an operating system or a - * language runtime, for example a file opening error, and writes it to `out`. - * The format is the same as the one used by `std::system_error(ec, message)` - * where `ec` is `std::error_code(error_code, std::generic_category())`. - * It is implementation-defined but normally looks like: - * - * : - * - * where `` is the passed message and `` is the system - * message corresponding to the error code. - * `error_code` is a system error code as given by `errno`. - */ -FMT_API void format_system_error(detail::buffer& out, int error_code, - const char* message) noexcept; +FMT_BEGIN_EXPORT -// Reports a system error without throwing an exception. -// Can be used to report errors from destructors. -FMT_API void report_system_error(int error_code, const char* message) noexcept; +#ifndef FMT_HEADER_ONLY +extern template FMT_API void vformat_to(buffer&, string_view, + typename vformat_args<>::type, + locale_ref); +extern template FMT_API auto thousands_sep_impl(locale_ref) + -> thousands_sep_result; +extern template FMT_API auto thousands_sep_impl(locale_ref) + -> thousands_sep_result; +extern template FMT_API auto decimal_point_impl(locale_ref) -> char; +extern template FMT_API auto decimal_point_impl(locale_ref) -> wchar_t; +#endif // FMT_HEADER_ONLY -inline auto vformat(detail::locale_ref loc, string_view fmt, format_args args) - -> std::string { - auto buf = memory_buffer(); - detail::vformat_to(buf, fmt, args, loc); - return {buf.data(), buf.size()}; -} +FMT_END_EXPORT -template -FMT_INLINE auto format(detail::locale_ref loc, format_string fmt, - T&&... args) -> std::string { - return vformat(loc, fmt.str, vargs{{args...}}); +template +template +FMT_CONSTEXPR FMT_INLINE auto native_formatter::format( + const T& val, FormatContext& ctx) const -> decltype(ctx.out()) { + if (specs_.width_ref.kind == arg_id_kind::none && + specs_.precision_ref.kind == arg_id_kind::none) { + return write(ctx.out(), val, specs_, ctx.locale()); + } + auto specs = specs_; + handle_dynamic_spec(specs.width, specs.width_ref, ctx); + handle_dynamic_spec(specs.precision, specs.precision_ref, + ctx); + return write(ctx.out(), val, specs, ctx.locale()); } -template ::value)> -auto vformat_to(OutputIt out, detail::locale_ref loc, string_view fmt, - format_args args) -> OutputIt { - auto&& buf = detail::get_buffer(out); - detail::vformat_to(buf, fmt, args, loc); - return detail::get_iterator(buf, out); -} +} // namespace detail -template ::value)> -FMT_INLINE auto format_to(OutputIt out, detail::locale_ref loc, - format_string fmt, T&&... args) -> OutputIt { - return fmt::vformat_to(out, loc, fmt.str, vargs{{args...}}); -} +FMT_BEGIN_EXPORT -template -FMT_NODISCARD FMT_INLINE auto formatted_size(detail::locale_ref loc, - format_string fmt, - T&&... args) -> size_t { - auto buf = detail::counting_buffer<>(); - detail::vformat_to(buf, fmt.str, vargs{{args...}}, loc); - return buf.count(); +template +struct formatter + : detail::native_formatter {}; + +#if FMT_USE_USER_DEFINED_LITERALS +inline namespace literals { +/** + * User-defined literal equivalent of `fmt::arg`. + * + * **Example**: + * + * using namespace fmt::literals; + * fmt::print("The answer is {answer}.", "answer"_a=42); + */ +# if FMT_USE_NONTYPE_TEMPLATE_ARGS +template constexpr auto operator""_a() { + using char_t = remove_cvref_t; + return detail::udl_arg(); +} +# else +constexpr auto operator""_a(const char* s, size_t) -> detail::udl_arg { + return {s}; } +# endif +} // namespace literals +#endif // FMT_USE_USER_DEFINED_LITERALS FMT_API auto vformat(string_view fmt, format_args args) -> std::string; @@ -4242,44 +4362,61 @@ FMT_API auto vformat(string_view fmt, format_args args) -> std::string; template FMT_NODISCARD FMT_INLINE auto format(format_string fmt, T&&... args) -> std::string { - return vformat(fmt.str, vargs{{args...}}); + return vformat(fmt, fmt::make_format_args(args...)); } -/** - * Converts `value` to `std::string` using the default format for type `T`. - * - * **Example**: - * - * std::string answer = fmt::to_string(42); - */ -template ::value)> -FMT_NODISCARD auto to_string(T value) -> std::string { - // The buffer should be large enough to store the number including the sign - // or "false" for bool. - char buffer[max_of(detail::digits10() + 2, 5)]; - char* begin = buffer; - return {buffer, detail::write(begin, value)}; +template ::value)> +inline auto vformat(const Locale& loc, string_view fmt, format_args args) + -> std::string { + return detail::vformat(loc, fmt, args); } -template ::value)> -FMT_NODISCARD auto to_string(const T& value) -> std::string { - return to_string(format_as(value)); +template ::value)> +inline auto format(const Locale& loc, format_string fmt, T&&... args) + -> std::string { + return fmt::vformat(loc, string_view(fmt), fmt::make_format_args(args...)); } -template ::value && - !detail::use_format_as::value)> -FMT_NODISCARD auto to_string(const T& value) -> std::string { - auto buffer = memory_buffer(); - detail::write(appender(buffer), value); - return {buffer.data(), buffer.size()}; +template ::value&& + detail::is_locale::value)> +auto vformat_to(OutputIt out, const Locale& loc, string_view fmt, + format_args args) -> OutputIt { + using detail::get_buffer; + auto&& buf = get_buffer(out); + detail::vformat_to(buf, fmt, args, detail::locale_ref(loc)); + return detail::get_iterator(buf, out); +} + +template ::value&& + detail::is_locale::value)> +FMT_INLINE auto format_to(OutputIt out, const Locale& loc, + format_string fmt, T&&... args) -> OutputIt { + return vformat_to(out, loc, fmt, fmt::make_format_args(args...)); +} + +template ::value)> +FMT_NODISCARD FMT_INLINE auto formatted_size(const Locale& loc, + format_string fmt, + T&&... args) -> size_t { + auto buf = detail::counting_buffer<>(); + detail::vformat_to(buf, fmt, fmt::make_format_args(args...), + detail::locale_ref(loc)); + return buf.count(); } FMT_END_EXPORT + FMT_END_NAMESPACE #ifdef FMT_HEADER_ONLY # define FMT_FUNC inline # include "format-inl.h" +#else +# define FMT_FUNC #endif // Restore _LIBCPP_REMOVE_TRANSITIVE_INCLUDES. diff --git a/3rdparty/fmt/include/fmt/os.h b/3rdparty/fmt/include/fmt/os.h index b2cc5e4b85ff..5c85ea08ff4e 100644 --- a/3rdparty/fmt/include/fmt/os.h +++ b/3rdparty/fmt/include/fmt/os.h @@ -118,7 +118,7 @@ FMT_API void format_windows_error(buffer& out, int error_code, const char* message) noexcept; } -FMT_API std::system_error vwindows_error(int error_code, string_view fmt, +FMT_API std::system_error vwindows_error(int error_code, string_view format_str, format_args args); /** @@ -146,10 +146,10 @@ FMT_API std::system_error vwindows_error(int error_code, string_view fmt, * "cannot open file '{}'", filename); * } */ -template -auto windows_error(int error_code, string_view message, const T&... args) - -> std::system_error { - return vwindows_error(error_code, message, vargs{{args...}}); +template +std::system_error windows_error(int error_code, string_view message, + const Args&... args) { + return vwindows_error(error_code, message, fmt::make_format_args(args...)); } // Reports a Windows error without throwing an exception. @@ -164,8 +164,8 @@ inline auto system_category() noexcept -> const std::error_category& { // std::system is not available on some platforms such as iOS (#2248). #ifdef __OSX__ template > -void say(const S& fmt, Args&&... args) { - std::system(format("say \"{}\"", format(fmt, args...)).c_str()); +void say(const S& format_str, Args&&... args) { + std::system(format("say \"{}\"", format(format_str, args...)).c_str()); } #endif @@ -176,24 +176,24 @@ class buffered_file { friend class file; - inline explicit buffered_file(FILE* f) : file_(f) {} + explicit buffered_file(FILE* f) : file_(f) {} public: buffered_file(const buffered_file&) = delete; void operator=(const buffered_file&) = delete; // Constructs a buffered_file object which doesn't represent any file. - inline buffered_file() noexcept : file_(nullptr) {} + buffered_file() noexcept : file_(nullptr) {} // Destroys the object closing the file it represents if any. FMT_API ~buffered_file() noexcept; public: - inline buffered_file(buffered_file&& other) noexcept : file_(other.file_) { + buffered_file(buffered_file&& other) noexcept : file_(other.file_) { other.file_ = nullptr; } - inline auto operator=(buffered_file&& other) -> buffered_file& { + auto operator=(buffered_file&& other) -> buffered_file& { close(); file_ = other.file_; other.file_ = nullptr; @@ -207,13 +207,13 @@ class buffered_file { FMT_API void close(); // Returns the pointer to a FILE object representing this file. - inline auto get() const noexcept -> FILE* { return file_; } + auto get() const noexcept -> FILE* { return file_; } FMT_API auto descriptor() const -> int; template inline void print(string_view fmt, const T&... args) { - fmt::vargs vargs = {{args...}}; + const auto& vargs = fmt::make_format_args(args...); detail::is_locking() ? fmt::vprint_buffered(file_, fmt, vargs) : fmt::vprint(file_, fmt, vargs); } @@ -248,7 +248,7 @@ class FMT_API file { }; // Constructs a file object which doesn't represent any file. - inline file() noexcept : fd_(-1) {} + file() noexcept : fd_(-1) {} // Opens a file and constructs a file object representing this file. file(cstring_view path, int oflag); @@ -257,10 +257,10 @@ class FMT_API file { file(const file&) = delete; void operator=(const file&) = delete; - inline file(file&& other) noexcept : fd_(other.fd_) { other.fd_ = -1; } + file(file&& other) noexcept : fd_(other.fd_) { other.fd_ = -1; } // Move assignment is not noexcept because close may throw. - inline auto operator=(file&& other) -> file& { + auto operator=(file&& other) -> file& { close(); fd_ = other.fd_; other.fd_ = -1; @@ -271,7 +271,7 @@ class FMT_API file { ~file() noexcept; // Returns the file descriptor. - inline auto descriptor() const noexcept -> int { return fd_; } + auto descriptor() const noexcept -> int { return fd_; } // Closes the file. void close(); @@ -324,9 +324,9 @@ auto getpagesize() -> long; namespace detail { struct buffer_size { - constexpr buffer_size() = default; + buffer_size() = default; size_t value = 0; - FMT_CONSTEXPR auto operator=(size_t val) const -> buffer_size { + auto operator=(size_t val) const -> buffer_size { auto bs = buffer_size(); bs.value = val; return bs; @@ -337,7 +337,7 @@ struct ostream_params { int oflag = file::WRONLY | file::CREATE | file::TRUNC; size_t buffer_size = BUFSIZ > 32768 ? BUFSIZ : 32768; - constexpr ostream_params() {} + ostream_params() {} template ostream_params(T... params, int new_oflag) : ostream_params(params...) { @@ -358,47 +358,59 @@ struct ostream_params { # endif }; -} // namespace detail - -FMT_INLINE_VARIABLE constexpr auto buffer_size = detail::buffer_size(); - -/// A fast buffered output stream for writing from a single thread. Writing from -/// multiple threads without external synchronization may result in a data race. -class FMT_API ostream : private detail::buffer { +class file_buffer final : public buffer { private: file file_; - ostream(cstring_view path, const detail::ostream_params& params); - - static void grow(buffer& buf, size_t); + FMT_API static void grow(buffer& buf, size_t); public: - ostream(ostream&& other) noexcept; - ~ostream(); + FMT_API file_buffer(cstring_view path, const ostream_params& params); + FMT_API file_buffer(file_buffer&& other) noexcept; + FMT_API ~file_buffer(); - operator writer() { - detail::buffer& buf = *this; - return buf; - } - - inline void flush() { + void flush() { if (size() == 0) return; file_.write(data(), size() * sizeof(data()[0])); clear(); } - template - friend auto output_file(cstring_view path, T... params) -> ostream; - - inline void close() { + void close() { flush(); file_.close(); } +}; + +} // namespace detail + +constexpr auto buffer_size = detail::buffer_size(); + +/// A fast output stream for writing from a single thread. Writing from +/// multiple threads without external synchronization may result in a data race. +class FMT_API ostream { + private: + FMT_MSC_WARNING(suppress : 4251) + detail::file_buffer buffer_; + + ostream(cstring_view path, const detail::ostream_params& params) + : buffer_(path, params) {} + + public: + ostream(ostream&& other) : buffer_(std::move(other.buffer_)) {} + + ~ostream(); + + void flush() { buffer_.flush(); } + + template + friend auto output_file(cstring_view path, T... params) -> ostream; + + void close() { buffer_.close(); } /// Formats `args` according to specifications in `fmt` and writes the /// output to the file. template void print(format_string fmt, T&&... args) { - vformat_to(appender(*this), fmt.str, vargs{{args...}}); + vformat_to(appender(buffer_), fmt, fmt::make_format_args(args...)); } }; diff --git a/3rdparty/fmt/include/fmt/ostream.h b/3rdparty/fmt/include/fmt/ostream.h index 114b8c297665..98faef659f52 100644 --- a/3rdparty/fmt/include/fmt/ostream.h +++ b/3rdparty/fmt/include/fmt/ostream.h @@ -41,12 +41,47 @@ template class file_access FILE*; #endif +inline auto write_ostream_unicode(std::ostream& os, fmt::string_view data) + -> bool { + FILE* f = nullptr; +#if FMT_MSC_VERSION && FMT_USE_RTTI + if (auto* buf = dynamic_cast(os.rdbuf())) + f = get_file(*buf); + else + return false; +#elif defined(_WIN32) && defined(__GLIBCXX__) && FMT_USE_RTTI + auto* rdbuf = os.rdbuf(); + if (auto* sfbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf*>(rdbuf)) + f = sfbuf->file(); + else if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_filebuf*>(rdbuf)) + f = fbuf->file(); + else + return false; +#else + ignore_unused(os, data, f); +#endif +#ifdef _WIN32 + if (f) { + int fd = _fileno(f); + if (_isatty(fd)) { + os.flush(); + return write_console(fd, data); + } + } +#endif + return false; +} +inline auto write_ostream_unicode(std::wostream&, + fmt::basic_string_view) -> bool { + return false; +} + // Write the content of buf to os. // It is a separate function rather than a part of vprint to simplify testing. template void write_buffer(std::basic_ostream& os, buffer& buf) { const Char* buf_data = buf.data(); - using unsigned_streamsize = make_unsigned_t; + using unsigned_streamsize = std::make_unsigned::type; unsigned_streamsize size = buf.size(); unsigned_streamsize max_size = to_unsigned(max_value()); do { @@ -57,9 +92,21 @@ void write_buffer(std::basic_ostream& os, buffer& buf) { } while (size != 0); } +template +void format_value(buffer& buf, const T& value) { + auto&& format_buf = formatbuf>(buf); + auto&& output = std::basic_ostream(&format_buf); +#if !defined(FMT_STATIC_THOUSANDS_SEPARATOR) + output.imbue(std::locale::classic()); // The default is always unlocalized. +#endif + output << value; + output.exceptions(std::ios_base::failbit | std::ios_base::badbit); +} + template struct streamed_view { const T& value; }; + } // namespace detail // Formats an object of type T that has an overloaded ostream operator<<. @@ -70,11 +117,7 @@ struct basic_ostream_formatter : formatter, Char> { template auto format(const T& value, Context& ctx) const -> decltype(ctx.out()) { auto buffer = basic_memory_buffer(); - auto&& formatbuf = detail::formatbuf>(buffer); - auto&& output = std::basic_ostream(&formatbuf); - output.imbue(std::locale::classic()); // The default is always unlocalized. - output << value; - output.exceptions(std::ios_base::failbit | std::ios_base::badbit); + detail::format_value(buffer, value); return formatter, Char>::format( {buffer.data(), buffer.size()}, ctx); } @@ -105,30 +148,24 @@ constexpr auto streamed(const T& value) -> detail::streamed_view { return {value}; } -inline void vprint(std::ostream& os, string_view fmt, format_args args) { +namespace detail { + +inline void vprint_directly(std::ostream& os, string_view format_str, + format_args args) { auto buffer = memory_buffer(); - detail::vformat_to(buffer, fmt, args); - FILE* f = nullptr; -#if FMT_MSC_VERSION && FMT_USE_RTTI - if (auto* buf = dynamic_cast(os.rdbuf())) - f = detail::get_file(*buf); -#elif defined(_WIN32) && defined(__GLIBCXX__) && FMT_USE_RTTI - auto* rdbuf = os.rdbuf(); - if (auto* sfbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf*>(rdbuf)) - f = sfbuf->file(); - else if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_filebuf*>(rdbuf)) - f = fbuf->file(); -#endif -#ifdef _WIN32 - if (f) { - int fd = _fileno(f); - if (_isatty(fd)) { - os.flush(); - if (detail::write_console(fd, {buffer.data(), buffer.size()})) return; - } - } -#endif - detail::ignore_unused(f); + detail::vformat_to(buffer, format_str, args); + detail::write_buffer(os, buffer); +} + +} // namespace detail + +FMT_EXPORT template +void vprint(std::basic_ostream& os, + basic_string_view> format_str, + typename detail::vformat_args::type args) { + auto buffer = basic_memory_buffer(); + detail::vformat_to(buffer, format_str, args); + if (detail::write_ostream_unicode(os, {buffer.data(), buffer.size()})) return; detail::write_buffer(os, buffer); } @@ -141,11 +178,19 @@ inline void vprint(std::ostream& os, string_view fmt, format_args args) { */ FMT_EXPORT template void print(std::ostream& os, format_string fmt, T&&... args) { - fmt::vargs vargs = {{args...}}; - if (detail::use_utf8) return vprint(os, fmt.str, vargs); - auto buffer = memory_buffer(); - detail::vformat_to(buffer, fmt.str, vargs); - detail::write_buffer(os, buffer); + const auto& vargs = fmt::make_format_args(args...); + if (detail::use_utf8()) + vprint(os, fmt, vargs); + else + detail::vprint_directly(os, fmt, vargs); +} + +FMT_EXPORT +template +void print(std::wostream& os, + basic_format_string...> fmt, + Args&&... args) { + vprint(os, fmt, fmt::make_format_args>(args...)); } FMT_EXPORT template @@ -153,6 +198,14 @@ void println(std::ostream& os, format_string fmt, T&&... args) { fmt::print(os, "{}\n", fmt::format(fmt, std::forward(args)...)); } +FMT_EXPORT +template +void println(std::wostream& os, + basic_format_string...> fmt, + Args&&... args) { + print(os, L"{}\n", fmt::format(fmt, std::forward(args)...)); +} + FMT_END_NAMESPACE #endif // FMT_OSTREAM_H_ diff --git a/3rdparty/fmt/include/fmt/printf.h b/3rdparty/fmt/include/fmt/printf.h index e72684018546..072cc6b309d4 100644 --- a/3rdparty/fmt/include/fmt/printf.h +++ b/3rdparty/fmt/include/fmt/printf.h @@ -33,9 +33,8 @@ template class basic_printf_context { public: using char_type = Char; - using parse_context_type = parse_context; + using parse_context_type = basic_format_parse_context; template using formatter_type = printf_formatter; - enum { builtin_types = 1 }; /// Constructs a `printf_context` object. References to the arguments are /// stored in the context object so make sure they have appropriate lifetimes. @@ -55,23 +54,6 @@ template class basic_printf_context { namespace detail { -// Return the result via the out param to workaround gcc bug 77539. -template -FMT_CONSTEXPR auto find(Ptr first, Ptr last, T value, Ptr& out) -> bool { - for (out = first; out != last; ++out) { - if (*out == value) return true; - } - return false; -} - -template <> -inline auto find(const char* first, const char* last, char value, - const char*& out) -> bool { - out = - static_cast(memchr(first, value, to_unsigned(last - first))); - return out != nullptr; -} - // Checks if a value fits in int - used to avoid warnings about comparing // signed and unsigned integers. template struct int_checker { @@ -79,7 +61,7 @@ template struct int_checker { unsigned max = to_unsigned(max_value()); return value <= max; } - inline static auto fits_in_int(bool) -> bool { return true; } + static auto fits_in_int(bool) -> bool { return true; } }; template <> struct int_checker { @@ -87,7 +69,7 @@ template <> struct int_checker { return value >= (std::numeric_limits::min)() && value <= max_value(); } - inline static auto fits_in_int(int) -> bool { return true; } + static auto fits_in_int(int) -> bool { return true; } }; struct printf_precision_handler { @@ -145,19 +127,25 @@ template class arg_converter { using target_type = conditional_t::value, U, T>; if (const_check(sizeof(target_type) <= sizeof(int))) { // Extra casts are used to silence warnings. - using unsigned_type = typename make_unsigned_or_bool::type; - if (is_signed) - arg_ = static_cast(static_cast(value)); - else - arg_ = static_cast(static_cast(value)); + if (is_signed) { + auto n = static_cast(static_cast(value)); + arg_ = detail::make_arg(n); + } else { + using unsigned_type = typename make_unsigned_or_bool::type; + auto n = static_cast(static_cast(value)); + arg_ = detail::make_arg(n); + } } else { - // glibc's printf doesn't sign extend arguments of smaller types: - // std::printf("%lld", -42); // prints "4294967254" - // but we don't have to do the same because it's a UB. - if (is_signed) - arg_ = static_cast(value); - else - arg_ = static_cast::type>(value); + if (is_signed) { + // glibc's printf doesn't sign extend arguments of smaller types: + // std::printf("%lld", -42); // prints "4294967254" + // but we don't have to do the same because it's a UB. + auto n = static_cast(value); + arg_ = detail::make_arg(n); + } else { + auto n = static_cast::type>(value); + arg_ = detail::make_arg(n); + } } } @@ -184,7 +172,8 @@ template class char_converter { template ::value)> void operator()(T value) { - arg_ = static_cast(value); + auto c = static_cast(value); + arg_ = detail::make_arg(c); } template ::value)> @@ -205,13 +194,13 @@ class printf_width_handler { format_specs& specs_; public: - inline explicit printf_width_handler(format_specs& specs) : specs_(specs) {} + explicit printf_width_handler(format_specs& specs) : specs_(specs) {} template ::value)> auto operator()(T value) -> unsigned { auto width = static_cast>(value); if (detail::is_negative(value)) { - specs_.set_align(align::left); + specs_.align = align::left; width = 0 - width; } unsigned int_max = to_unsigned(max_value()); @@ -245,74 +234,69 @@ class printf_arg_formatter : public arg_formatter { void write_null_pointer(bool is_string = false) { auto s = this->specs; - s.set_type(presentation_type::none); + s.type = presentation_type::none; write_bytes(this->out, is_string ? "(null)" : "(nil)", s); } - template void write(T value) { - detail::write(this->out, value, this->specs, this->locale); - } - public: printf_arg_formatter(basic_appender iter, format_specs& s, context_type& ctx) : base(make_arg_formatter(iter, s)), context_(ctx) {} - void operator()(monostate value) { write(value); } + void operator()(monostate value) { base::operator()(value); } template ::value)> void operator()(T value) { // MSVC2013 fails to compile separate overloads for bool and Char so use // std::is_same instead. if (!std::is_same::value) { - write(value); + base::operator()(value); return; } format_specs s = this->specs; - if (s.type() != presentation_type::none && - s.type() != presentation_type::chr) { + if (s.type != presentation_type::none && s.type != presentation_type::chr) { return (*this)(static_cast(value)); } - s.set_sign(sign::none); - s.clear_alt(); - s.set_fill(' '); // Ignore '0' flag for char types. + s.sign = sign::none; + s.alt = false; + s.fill = ' '; // Ignore '0' flag for char types. // align::numeric needs to be overwritten here since the '0' flag is // ignored for non-numeric types - if (s.align() == align::none || s.align() == align::numeric) - s.set_align(align::right); - detail::write(this->out, static_cast(value), s); + if (s.align == align::none || s.align == align::numeric) + s.align = align::right; + write(this->out, static_cast(value), s); } template ::value)> void operator()(T value) { - write(value); + base::operator()(value); } void operator()(const char* value) { if (value) - write(value); + base::operator()(value); else - write_null_pointer(this->specs.type() != presentation_type::pointer); + write_null_pointer(this->specs.type != presentation_type::pointer); } void operator()(const wchar_t* value) { if (value) - write(value); + base::operator()(value); else - write_null_pointer(this->specs.type() != presentation_type::pointer); + write_null_pointer(this->specs.type != presentation_type::pointer); } - void operator()(basic_string_view value) { write(value); } + void operator()(basic_string_view value) { base::operator()(value); } void operator()(const void* value) { if (value) - write(value); + base::operator()(value); else write_null_pointer(); } void operator()(typename basic_format_arg::handle handle) { - auto parse_ctx = parse_context({}); + auto parse_ctx = basic_format_parse_context({}); handle.format(parse_ctx, context_); } }; @@ -321,14 +305,23 @@ template void parse_flags(format_specs& specs, const Char*& it, const Char* end) { for (; it != end; ++it) { switch (*it) { - case '-': specs.set_align(align::left); break; - case '+': specs.set_sign(sign::plus); break; - case '0': specs.set_fill('0'); break; + case '-': + specs.align = align::left; + break; + case '+': + specs.sign = sign::plus; + break; + case '0': + specs.fill = '0'; + break; case ' ': - if (specs.sign() != sign::plus) specs.set_sign(sign::space); + if (specs.sign != sign::plus) specs.sign = sign::space; break; - case '#': specs.set_alt(); break; - default: return; + case '#': + specs.alt = true; + break; + default: + return; } } } @@ -346,7 +339,7 @@ auto parse_header(const Char*& it, const Char* end, format_specs& specs, ++it; arg_index = value != -1 ? value : max_value(); } else { - if (c == '0') specs.set_fill('0'); + if (c == '0') specs.fill = '0'; if (value != 0) { // Nonzero value means that we parsed width and don't need to // parse it or flags again, so return now. @@ -376,22 +369,43 @@ inline auto parse_printf_presentation_type(char c, type t, bool& upper) using pt = presentation_type; constexpr auto integral_set = sint_set | uint_set | bool_set | char_set; switch (c) { - case 'd': return in(t, integral_set) ? pt::dec : pt::none; - case 'o': return in(t, integral_set) ? pt::oct : pt::none; - case 'X': upper = true; FMT_FALLTHROUGH; - case 'x': return in(t, integral_set) ? pt::hex : pt::none; - case 'E': upper = true; FMT_FALLTHROUGH; - case 'e': return in(t, float_set) ? pt::exp : pt::none; - case 'F': upper = true; FMT_FALLTHROUGH; - case 'f': return in(t, float_set) ? pt::fixed : pt::none; - case 'G': upper = true; FMT_FALLTHROUGH; - case 'g': return in(t, float_set) ? pt::general : pt::none; - case 'A': upper = true; FMT_FALLTHROUGH; - case 'a': return in(t, float_set) ? pt::hexfloat : pt::none; - case 'c': return in(t, integral_set) ? pt::chr : pt::none; - case 's': return in(t, string_set | cstring_set) ? pt::string : pt::none; - case 'p': return in(t, pointer_set | cstring_set) ? pt::pointer : pt::none; - default: return pt::none; + case 'd': + return in(t, integral_set) ? pt::dec : pt::none; + case 'o': + return in(t, integral_set) ? pt::oct : pt::none; + case 'X': + upper = true; + FMT_FALLTHROUGH; + case 'x': + return in(t, integral_set) ? pt::hex : pt::none; + case 'E': + upper = true; + FMT_FALLTHROUGH; + case 'e': + return in(t, float_set) ? pt::exp : pt::none; + case 'F': + upper = true; + FMT_FALLTHROUGH; + case 'f': + return in(t, float_set) ? pt::fixed : pt::none; + case 'G': + upper = true; + FMT_FALLTHROUGH; + case 'g': + return in(t, float_set) ? pt::general : pt::none; + case 'A': + upper = true; + FMT_FALLTHROUGH; + case 'a': + return in(t, float_set) ? pt::hexfloat : pt::none; + case 'c': + return in(t, integral_set) ? pt::chr : pt::none; + case 's': + return in(t, string_set | cstring_set) ? pt::string : pt::none; + case 'p': + return in(t, pointer_set | cstring_set) ? pt::pointer : pt::none; + default: + return pt::none; } } @@ -401,7 +415,7 @@ void vprintf(buffer& buf, basic_string_view format, using iterator = basic_appender; auto out = iterator(buf); auto context = basic_printf_context(out, args); - auto parse_ctx = parse_context(format); + auto parse_ctx = basic_format_parse_context(format); // Returns the argument with specified index or, if arg_index is -1, the next // argument. @@ -430,7 +444,7 @@ void vprintf(buffer& buf, basic_string_view format, write(out, basic_string_view(start, to_unsigned(it - 1 - start))); auto specs = format_specs(); - specs.set_align(align::right); + specs.align = align::right; // Parse argument index, flags and width. int arg_index = parse_header(it, end, specs, get_arg); @@ -454,9 +468,9 @@ void vprintf(buffer& buf, basic_string_view format, auto arg = get_arg(arg_index); // For d, i, o, u, x, and X conversion specifiers, if a precision is // specified, the '0' flag is ignored - if (specs.precision >= 0 && is_integral_type(arg.type())) { + if (specs.precision >= 0 && arg.is_integral()) { // Ignore '0' for non-numeric types or if '-' present. - specs.set_fill(' '); + specs.fill = ' '; } if (specs.precision >= 0 && arg.type() == type::cstring_type) { auto str = arg.visit(get_cstring()); @@ -464,16 +478,15 @@ void vprintf(buffer& buf, basic_string_view format, auto nul = std::find(str, str_end, Char()); auto sv = basic_string_view( str, to_unsigned(nul != str_end ? nul - str : specs.precision)); - arg = sv; + arg = make_arg>(sv); } - if (specs.alt() && arg.visit(is_zero_int())) specs.clear_alt(); - if (specs.fill_unit() == '0') { - if (is_arithmetic_type(arg.type()) && specs.align() != align::left) { - specs.set_align(align::numeric); - } else { - // Ignore '0' flag for non-numeric types or if '-' flag is also present. - specs.set_fill(' '); - } + if (specs.alt && arg.visit(is_zero_int())) specs.alt = false; + if (specs.fill.template get() == '0') { + if (arg.is_arithmetic() && specs.align != align::left) + specs.align = align::numeric; + else + specs.fill = ' '; // Ignore '0' flag for non-numeric types or if '-' + // flag is also present. } // Parse length and convert the argument to the required type. @@ -498,34 +511,44 @@ void vprintf(buffer& buf, basic_string_view format, convert_arg(arg, t); } break; - case 'j': convert_arg(arg, t); break; - case 'z': convert_arg(arg, t); break; - case 't': convert_arg(arg, t); break; + case 'j': + convert_arg(arg, t); + break; + case 'z': + convert_arg(arg, t); + break; + case 't': + convert_arg(arg, t); + break; case 'L': // printf produces garbage when 'L' is omitted for long double, no // need to do the same. break; - default: --it; convert_arg(arg, c); + default: + --it; + convert_arg(arg, c); } // Parse type. if (it == end) report_error("invalid format string"); char type = static_cast(*it++); - if (is_integral_type(arg.type())) { + if (arg.is_integral()) { // Normalize type. switch (type) { case 'i': - case 'u': type = 'd'; break; + case 'u': + type = 'd'; + break; case 'c': arg.visit(char_converter>(arg)); break; } } bool upper = false; - specs.set_type(parse_printf_presentation_type(type, arg.type(), upper)); - if (specs.type() == presentation_type::none) + specs.type = parse_printf_presentation_type(type, arg.type(), upper); + if (specs.type == presentation_type::none) report_error("invalid format specifier"); - if (upper) specs.set_upper(); + specs.upper = upper; start = it; @@ -560,7 +583,7 @@ inline auto vsprintf(basic_string_view fmt, -> std::basic_string { auto buf = basic_memory_buffer(); detail::vprintf(buf, fmt, args); - return {buf.data(), buf.size()}; + return to_string(buf); } /** @@ -571,7 +594,7 @@ inline auto vsprintf(basic_string_view fmt, * * std::string message = fmt::sprintf("The answer is %d", 42); */ -template > +template > inline auto sprintf(const S& fmt, const T&... args) -> std::basic_string { return vsprintf(detail::to_string_view(fmt), fmt::make_format_args>(args...)); @@ -596,7 +619,7 @@ inline auto vfprintf(std::FILE* f, basic_string_view fmt, * * fmt::fprintf(stderr, "Don't %s!", "panic"); */ -template > +template > inline auto fprintf(std::FILE* f, const S& fmt, const T&... args) -> int { return vfprintf(f, detail::to_string_view(fmt), make_printf_args(args...)); diff --git a/3rdparty/fmt/include/fmt/ranges.h b/3rdparty/fmt/include/fmt/ranges.h index c6020abee61a..0d3dfbd8d378 100644 --- a/3rdparty/fmt/include/fmt/ranges.h +++ b/3rdparty/fmt/include/fmt/ranges.h @@ -44,6 +44,18 @@ template class is_set { !std::is_void(nullptr))>::value && !is_map::value; }; +template struct conditional_helper {}; + +template struct is_range_ : std::false_type {}; + +#if !FMT_MSC_VERSION || FMT_MSC_VERSION > 1800 + +# define FMT_DECLTYPE_RETURN(val) \ + ->decltype(val) { return val; } \ + static_assert( \ + true, "") // This makes it so that a semicolon is required after the + // macro, which helps clang-format handle the formatting. + // C array overload template auto range_begin(const T (&arr)[N]) -> const T* { @@ -64,13 +76,9 @@ struct has_member_fn_begin_end_t().begin()), // Member function overloads. template -auto range_begin(T&& rng) -> decltype(static_cast(rng).begin()) { - return static_cast(rng).begin(); -} +auto range_begin(T&& rng) FMT_DECLTYPE_RETURN(static_cast(rng).begin()); template -auto range_end(T&& rng) -> decltype(static_cast(rng).end()) { - return static_cast(rng).end(); -} +auto range_end(T&& rng) FMT_DECLTYPE_RETURN(static_cast(rng).end()); // ADL overloads. Only participate in overload resolution if member functions // are not found. @@ -107,16 +115,17 @@ struct has_mutable_begin_end< // SFINAE properly unless there are distinct types int>> : std::true_type {}; -template struct is_range_ : std::false_type {}; template struct is_range_ : std::integral_constant::value || has_mutable_begin_end::value)> {}; +# undef FMT_DECLTYPE_RETURN +#endif // tuple_size and tuple_element check. template class is_tuple_like_ { - template ::type> - static auto check(U* p) -> decltype(std::tuple_size::value, 0); + template + static auto check(U* p) -> decltype(std::tuple_size::value, int()); template static void check(...); public: @@ -257,12 +266,12 @@ template using range_format_constant = std::integral_constant; // These are not generic lambdas for compatibility with C++11. -template struct parse_empty_specs { +template struct parse_empty_specs { template FMT_CONSTEXPR void operator()(Formatter& f) { f.parse(ctx); detail::maybe_set_debug_format(f, true); } - parse_context& ctx; + ParseContext& ctx; }; template struct format_tuple_element { using char_type = typename FormatContext::char_type; @@ -318,17 +327,11 @@ struct formatter& ctx) -> const Char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { auto it = ctx.begin(); - auto end = ctx.end(); - if (it != end && detail::to_ascii(*it) == 'n') { - ++it; - set_brackets({}, {}); - set_separator({}); - } - if (it != end && *it != '}') report_error("invalid format specifier"); - ctx.advance_to(it); - detail::for_each(formatters_, detail::parse_empty_specs{ctx}); + if (it != ctx.end() && *it != '}') report_error("invalid format specifier"); + detail::for_each(formatters_, detail::parse_empty_specs{ctx}); return it; } @@ -349,9 +352,27 @@ template struct is_range { }; namespace detail { +template struct range_mapper { + using mapper = arg_mapper; + + template , Context>::value)> + static auto map(T&& value) -> T&& { + return static_cast(value); + } + template , Context>::value)> + static auto map(T&& value) + -> decltype(mapper().map(static_cast(value))) { + return mapper().map(static_cast(value)); + } +}; template -using range_formatter_type = formatter, Char>; +using range_formatter_type = + formatter>{} + .map(std::declval()))>, + Char>; template using maybe_const_range = @@ -394,7 +415,7 @@ struct range_formatter< auto buf = basic_memory_buffer(); for (; it != end; ++it) buf.push_back(*it); auto specs = format_specs(); - specs.set_type(presentation_type::debug); + specs.type = presentation_type::debug; return detail::write( out, basic_string_view(buf.data(), buf.size()), specs); } @@ -422,7 +443,8 @@ struct range_formatter< closing_bracket_ = close; } - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { auto it = ctx.begin(); auto end = ctx.end(); detail::maybe_set_debug_format(underlying_, true); @@ -464,6 +486,7 @@ struct range_formatter< template auto format(R&& range, FormatContext& ctx) const -> decltype(ctx.out()) { + auto mapper = detail::range_mapper>(); auto out = ctx.out(); auto it = detail::range_begin(range); auto end = detail::range_end(range); @@ -475,7 +498,7 @@ struct range_formatter< if (i > 0) out = detail::copy(separator_, out); ctx.advance_to(out); auto&& item = *it; // Need an lvalue - out = underlying_.format(item, ctx); + out = underlying_.format(mapper.map(item), ctx); ++i; } out = detail::copy(closing_bracket_, out); @@ -520,7 +543,8 @@ struct formatter< detail::string_literal{}); } - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { return range_formatter_.parse(ctx); } @@ -547,7 +571,8 @@ struct formatter< public: FMT_CONSTEXPR formatter() {} - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { auto it = ctx.begin(); auto end = ctx.end(); if (it != end) { @@ -561,7 +586,7 @@ struct formatter< } ctx.advance_to(it); } - detail::for_each(formatters_, detail::parse_empty_specs{ctx}); + detail::for_each(formatters_, detail::parse_empty_specs{ctx}); return it; } @@ -571,11 +596,12 @@ struct formatter< basic_string_view open = detail::string_literal{}; if (!no_delimiters_) out = detail::copy(open, out); int i = 0; + auto mapper = detail::range_mapper>(); basic_string_view sep = detail::string_literal{}; for (auto&& value : map) { if (i > 0) out = detail::copy(sep, out); ctx.advance_to(out); - detail::for_each2(formatters_, value, + detail::for_each2(formatters_, mapper.map(value), detail::format_tuple_element{ 0, ctx, detail::string_literal{}}); ++i; @@ -605,7 +631,8 @@ struct formatter< formatter underlying_; public: - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { return underlying_.parse(ctx); } @@ -653,7 +680,8 @@ struct formatter, Char> { public: using nonlocking = void; - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* { return value_formatter_.parse(ctx); } @@ -720,7 +748,8 @@ template struct tuple_join_view : detail::view { template struct formatter, Char> { - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { return do_parse(ctx, std::integral_constant()); } @@ -734,16 +763,17 @@ struct formatter, Char> { private: std::tuple::type, Char>...> formatters_; - FMT_CONSTEXPR auto do_parse(parse_context& ctx, + template + FMT_CONSTEXPR auto do_parse(ParseContext& ctx, std::integral_constant) - -> const Char* { + -> decltype(ctx.begin()) { return ctx.begin(); } - template - FMT_CONSTEXPR auto do_parse(parse_context& ctx, + template + FMT_CONSTEXPR auto do_parse(ParseContext& ctx, std::integral_constant) - -> const Char* { + -> decltype(ctx.begin()) { auto end = ctx.begin(); #if FMT_TUPLE_JOIN_SPECIFIERS end = std::get(formatters_).parse(ctx); diff --git a/3rdparty/fmt/include/fmt/std.h b/3rdparty/fmt/include/fmt/std.h index 839e17142f5b..fb43940bc06f 100644 --- a/3rdparty/fmt/include/fmt/std.h +++ b/3rdparty/fmt/include/fmt/std.h @@ -17,7 +17,6 @@ # include # include # include -# include # include # include # include @@ -123,16 +122,14 @@ template struct formatter { public: FMT_CONSTEXPR void set_debug_format(bool set = true) { debug_ = set; } - FMT_CONSTEXPR auto parse(parse_context& ctx) { + template FMT_CONSTEXPR auto parse(ParseContext& ctx) { auto it = ctx.begin(), end = ctx.end(); if (it == end) return it; it = detail::parse_align(it, end, specs_); if (it == end) return it; - Char c = *it; - if ((c >= '0' && c <= '9') || c == '{') - it = detail::parse_width(it, end, specs_, width_ref_, ctx); + it = detail::parse_dynamic_spec(it, end, specs_.width, width_ref_, ctx); if (it != end && *it == '?') { debug_ = true; ++it; @@ -148,8 +145,8 @@ template struct formatter { !path_type_ ? p.native() : p.generic_string(); - detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, width_ref_, - ctx); + detail::handle_dynamic_spec(specs.width, width_ref_, + ctx); if (!debug_) { auto s = detail::get_path_string(p, path_string); return detail::write(ctx.out(), basic_string_view(s), specs); @@ -236,7 +233,7 @@ struct formatter, Char, FMT_CONSTEXPR static void maybe_set_debug_format(U&, ...) {} public: - FMT_CONSTEXPR auto parse(parse_context& ctx) { + template FMT_CONSTEXPR auto parse(ParseContext& ctx) { maybe_set_debug_format(underlying_, true); return underlying_.parse(ctx); } @@ -280,10 +277,10 @@ FMT_BEGIN_NAMESPACE FMT_EXPORT template struct formatter, Char, - std::enable_if_t<(std::is_void::value || - is_formattable::value) && + std::enable_if_t::value && is_formattable::value>> { - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { return ctx.begin(); } @@ -294,8 +291,7 @@ struct formatter, Char, if (value.has_value()) { out = detail::write(out, "expected("); - if constexpr (!std::is_void::value) - out = detail::write_escaped_alternative(out, *value); + out = detail::write_escaped_alternative(out, *value); } else { out = detail::write(out, "unexpected("); out = detail::write_escaped_alternative(out, value.error()); @@ -311,7 +307,9 @@ FMT_END_NAMESPACE FMT_BEGIN_NAMESPACE FMT_EXPORT template <> struct formatter { - FMT_CONSTEXPR auto parse(parse_context<>& ctx) { return ctx.begin(); } + template FMT_CONSTEXPR auto parse(ParseContext& ctx) { + return ctx.begin(); + } template auto format(const std::source_location& loc, FormatContext& ctx) const @@ -367,7 +365,8 @@ template struct is_variant_formattable { FMT_EXPORT template struct formatter { - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { return ctx.begin(); } @@ -384,7 +383,8 @@ struct formatter< Variant, Char, std::enable_if_t, is_variant_formattable>>> { - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { return ctx.begin(); } @@ -413,37 +413,20 @@ FMT_END_NAMESPACE FMT_BEGIN_NAMESPACE FMT_EXPORT -template <> struct formatter { - private: - format_specs specs_; - detail::arg_ref width_ref_; - - public: - FMT_CONSTEXPR auto parse(parse_context<>& ctx) -> const char* { - auto it = ctx.begin(), end = ctx.end(); - if (it == end) return it; - - it = detail::parse_align(it, end, specs_); - if (it == end) return it; - - char c = *it; - if ((c >= '0' && c <= '9') || c == '{') - it = detail::parse_width(it, end, specs_, width_ref_, ctx); - return it; +template struct formatter { + template + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { + return ctx.begin(); } template - FMT_CONSTEXPR20 auto format(const std::error_code& ec, - FormatContext& ctx) const -> decltype(ctx.out()) { - auto specs = specs_; - detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, width_ref_, - ctx); - memory_buffer buf; - buf.append(string_view(ec.category().name())); - buf.push_back(':'); - detail::write(appender(buf), ec.value()); - return detail::write(ctx.out(), string_view(buf.data(), buf.size()), - specs); + FMT_CONSTEXPR auto format(const std::error_code& ec, FormatContext& ctx) const + -> decltype(ctx.out()) { + auto out = ctx.out(); + out = detail::write_bytes(out, ec.category().name(), format_specs()); + out = detail::write(out, Char(':')); + out = detail::write(out, ec.value()); + return out; } }; @@ -523,7 +506,8 @@ template struct formatter { public: - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) + -> decltype(ctx.begin()) { return ctx.begin(); } @@ -544,7 +528,8 @@ struct formatter< bool with_typename_ = false; public: - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) + -> decltype(ctx.begin()) { auto it = ctx.begin(); auto end = ctx.end(); if (it == end || *it == '}') return it; @@ -658,7 +643,7 @@ template struct formatter, Char> { if (c.real() != 0) { *out++ = Char('('); out = detail::write(out, c.real(), specs, ctx.locale()); - specs.set_sign(sign::plus); + specs.sign = sign::plus; out = detail::write(out, c.imag(), specs, ctx.locale()); if (!detail::isfinite(c.imag())) *out++ = Char(' '); *out++ = Char('i'); @@ -672,7 +657,8 @@ template struct formatter, Char> { } public: - FMT_CONSTEXPR auto parse(parse_context& ctx) -> const Char* { + FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) + -> decltype(ctx.begin()) { if (ctx.begin() == ctx.end() || *ctx.begin() == '}') return ctx.begin(); return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, detail::type_constant::value); @@ -682,11 +668,12 @@ template struct formatter, Char> { auto format(const std::complex& c, FormatContext& ctx) const -> decltype(ctx.out()) { auto specs = specs_; - if (specs.dynamic()) { - detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, - specs.width_ref, ctx); - detail::handle_dynamic_spec(specs.dynamic_precision(), specs.precision, - specs.precision_ref, ctx); + if (specs.width_ref.kind != detail::arg_id_kind::none || + specs.precision_ref.kind != detail::arg_id_kind::none) { + detail::handle_dynamic_spec(specs.width, + specs.width_ref, ctx); + detail::handle_dynamic_spec( + specs.precision, specs.precision_ref, ctx); } if (specs.width == 0) return do_format(c, specs, ctx, ctx.out()); @@ -694,14 +681,12 @@ template struct formatter, Char> { auto outer_specs = format_specs(); outer_specs.width = specs.width; - auto fill = specs.template fill(); - if (fill) - outer_specs.set_fill(basic_string_view(fill, specs.fill_size())); - outer_specs.set_align(specs.align()); + outer_specs.fill = specs.fill; + outer_specs.align = specs.align; specs.width = 0; - specs.set_fill({}); - specs.set_align(align::none); + specs.fill = {}; + specs.align = align::none; do_format(c, specs, ctx, basic_appender(buf)); return detail::write(ctx.out(), @@ -710,17 +695,5 @@ template struct formatter, Char> { } }; -FMT_EXPORT -template -struct formatter, Char, - enable_if_t, Char>::value>> - : formatter, Char> { - template - auto format(std::reference_wrapper ref, FormatContext& ctx) const - -> decltype(ctx.out()) { - return formatter, Char>::format(ref.get(), ctx); - } -}; - FMT_END_NAMESPACE #endif // FMT_STD_H_ diff --git a/3rdparty/fmt/include/fmt/xchar.h b/3rdparty/fmt/include/fmt/xchar.h index 08f11231ab28..b1f39ed22202 100644 --- a/3rdparty/fmt/include/fmt/xchar.h +++ b/3rdparty/fmt/include/fmt/xchar.h @@ -10,12 +10,11 @@ #include "color.h" #include "format.h" -#include "ostream.h" #include "ranges.h" #ifndef FMT_MODULE # include -# if FMT_USE_LOCALE +# if !defined(FMT_STATIC_THOUSANDS_SEPARATOR) # include # endif #endif @@ -35,8 +34,7 @@ struct format_string_char< }; template -struct format_string_char< - S, enable_if_t::value>> { +struct format_string_char::value>> { using type = typename S::char_type; }; @@ -45,7 +43,7 @@ using format_string_char_t = typename format_string_char::type; inline auto write_loc(basic_appender out, loc_value value, const format_specs& specs, locale_ref loc) -> bool { -#if FMT_USE_LOCALE +#ifndef FMT_STATIC_THOUSANDS_SEPARATOR auto& numpunct = std::use_facet>(loc.get()); auto separator = std::wstring(); @@ -60,64 +58,30 @@ inline auto write_loc(basic_appender out, loc_value value, FMT_BEGIN_EXPORT using wstring_view = basic_string_view; -using wformat_parse_context = parse_context; +using wformat_parse_context = basic_format_parse_context; using wformat_context = buffered_context; using wformat_args = basic_format_args; using wmemory_buffer = basic_memory_buffer; -template struct basic_fstring { - private: - basic_string_view str_; - - static constexpr int num_static_named_args = - detail::count_static_named_args(); - - using checker = detail::format_string_checker< - Char, static_cast(sizeof...(T)), num_static_named_args, - num_static_named_args != detail::count_named_args()>; - - using arg_pack = detail::arg_pack; - - public: - using t = basic_fstring; - - template >::value)> - FMT_CONSTEVAL FMT_ALWAYS_INLINE basic_fstring(const S& s) : str_(s) { - if (FMT_USE_CONSTEVAL) - detail::parse_format_string(s, checker(s, arg_pack())); - } - template ::value&& - std::is_same::value)> - FMT_ALWAYS_INLINE basic_fstring(const S&) : str_(S()) { - FMT_CONSTEXPR auto sv = basic_string_view(S()); - FMT_CONSTEXPR int ignore = - (parse_format_string(sv, checker(sv, arg_pack())), 0); - detail::ignore_unused(ignore); - } - basic_fstring(runtime_format_string fmt) : str_(fmt.str) {} - - operator basic_string_view() const { return str_; } - auto get() const -> basic_string_view { return str_; } -}; - -template -using basic_format_string = basic_fstring; - -template -using wformat_string = typename basic_format_string::t; +#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409 +// Workaround broken conversion on older gcc. +template using wformat_string = wstring_view; +inline auto runtime(wstring_view s) -> wstring_view { return s; } +#else +template +using wformat_string = basic_format_string...>; inline auto runtime(wstring_view s) -> runtime_format_string { return {{s}}; } +#endif template <> struct is_char : std::true_type {}; template <> struct is_char : std::true_type {}; template <> struct is_char : std::true_type {}; #ifdef __cpp_char8_t -template <> struct is_char : bool_constant {}; +template <> +struct is_char : bool_constant {}; #endif template @@ -126,13 +90,14 @@ constexpr auto make_wformat_args(T&... args) return fmt::make_format_args(args...); } -#if !FMT_USE_NONTYPE_TEMPLATE_ARGS inline namespace literals { -inline auto operator""_a(const wchar_t* s, size_t) -> detail::udl_arg { +#if FMT_USE_USER_DEFINED_LITERALS && !FMT_USE_NONTYPE_TEMPLATE_ARGS +constexpr auto operator""_a(const wchar_t* s, size_t) + -> detail::udl_arg { return {s}; } -} // namespace literals #endif +} // namespace literals template auto join(It begin, Sentinel end, wstring_view sep) @@ -142,7 +107,7 @@ auto join(It begin, Sentinel end, wstring_view sep) template auto join(Range&& range, wstring_view sep) - -> join_view join_view, detail::sentinel_t, wchar_t> { return join(std::begin(range), std::end(range), sep); } @@ -160,12 +125,12 @@ auto join(const std::tuple& tuple, basic_string_view sep) } template ::value)> -auto vformat(basic_string_view fmt, +auto vformat(basic_string_view format_str, typename detail::vformat_args::type args) -> std::basic_string { auto buf = basic_memory_buffer(); - detail::vformat_to(buf, fmt, args); - return {buf.data(), buf.size()}; + detail::vformat_to(buf, format_str, args); + return to_string(buf); } template @@ -186,39 +151,40 @@ template , FMT_ENABLE_IF(!std::is_same::value && !std::is_same::value)> -auto format(const S& fmt, T&&... args) -> std::basic_string { - return vformat(detail::to_string_view(fmt), +auto format(const S& format_str, T&&... args) -> std::basic_string { + return vformat(detail::to_string_view(format_str), fmt::make_format_args>(args...)); } -template , - FMT_ENABLE_IF(detail::is_exotic_char::value)> -inline auto vformat(detail::locale_ref loc, const S& fmt, +template , + FMT_ENABLE_IF(detail::is_locale::value&& + detail::is_exotic_char::value)> +inline auto vformat(const Locale& loc, const S& format_str, typename detail::vformat_args::type args) -> std::basic_string { - auto buf = basic_memory_buffer(); - detail::vformat_to(buf, detail::to_string_view(fmt), args, - detail::locale_ref(loc)); - return {buf.data(), buf.size()}; + return detail::vformat(loc, detail::to_string_view(format_str), args); } -template , - FMT_ENABLE_IF(detail::is_exotic_char::value)> -inline auto format(detail::locale_ref loc, const S& fmt, T&&... args) + FMT_ENABLE_IF(detail::is_locale::value&& + detail::is_exotic_char::value)> +inline auto format(const Locale& loc, const S& format_str, T&&... args) -> std::basic_string { - return vformat(loc, detail::to_string_view(fmt), - fmt::make_format_args>(args...)); + return detail::vformat( + loc, detail::to_string_view(format_str), + fmt::make_format_args>(args...)); } template , FMT_ENABLE_IF(detail::is_output_iterator::value&& detail::is_exotic_char::value)> -auto vformat_to(OutputIt out, const S& fmt, +auto vformat_to(OutputIt out, const S& format_str, typename detail::vformat_args::type args) -> OutputIt { auto&& buf = detail::get_buffer(out); - detail::vformat_to(buf, detail::to_string_view(fmt), args); + detail::vformat_to(buf, detail::to_string_view(format_str), args); return detail::get_iterator(buf, out); } @@ -232,38 +198,42 @@ inline auto format_to(OutputIt out, const S& fmt, T&&... args) -> OutputIt { fmt::make_format_args>(args...)); } -template , FMT_ENABLE_IF(detail::is_output_iterator::value&& - detail::is_exotic_char::value)> -inline auto vformat_to(OutputIt out, detail::locale_ref loc, const S& fmt, + detail::is_locale::value&& + detail::is_exotic_char::value)> +inline auto vformat_to(OutputIt out, const Locale& loc, const S& format_str, typename detail::vformat_args::type args) -> OutputIt { auto&& buf = detail::get_buffer(out); - vformat_to(buf, detail::to_string_view(fmt), args, detail::locale_ref(loc)); + vformat_to(buf, detail::to_string_view(format_str), args, + detail::locale_ref(loc)); return detail::get_iterator(buf, out); } -template , bool enable = detail::is_output_iterator::value && + detail::is_locale::value && detail::is_exotic_char::value> -inline auto format_to(OutputIt out, detail::locale_ref loc, const S& fmt, +inline auto format_to(OutputIt out, const Locale& loc, const S& format_str, T&&... args) -> typename std::enable_if::type { - return vformat_to(out, loc, detail::to_string_view(fmt), + return vformat_to(out, loc, detail::to_string_view(format_str), fmt::make_format_args>(args...)); } template ::value&& detail::is_exotic_char::value)> -inline auto vformat_to_n(OutputIt out, size_t n, basic_string_view fmt, +inline auto vformat_to_n(OutputIt out, size_t n, + basic_string_view format_str, typename detail::vformat_args::type args) -> format_to_n_result { using traits = detail::fixed_buffer_traits; auto buf = detail::iterator_buffer(out, n); - detail::vformat_to(buf, fmt, args); + detail::vformat_to(buf, format_str, args); return {buf.out(), buf.count()}; } @@ -321,7 +291,7 @@ inline auto vformat(const text_style& ts, wstring_view fmt, wformat_args args) -> std::wstring { auto buf = wmemory_buffer(); detail::vformat_to(buf, ts, fmt, args); - return {buf.data(), buf.size()}; + return fmt::to_string(buf); } template @@ -342,22 +312,6 @@ FMT_DEPRECATED void print(const text_style& ts, wformat_string fmt, return print(stdout, ts, fmt, args...); } -inline void vprint(std::wostream& os, wstring_view fmt, wformat_args args) { - auto buffer = basic_memory_buffer(); - detail::vformat_to(buffer, fmt, args); - detail::write_buffer(os, buffer); -} - -template -void print(std::wostream& os, wformat_string fmt, T&&... args) { - vprint(os, fmt, fmt::make_format_args>(args...)); -} - -template -void println(std::wostream& os, wformat_string fmt, T&&... args) { - print(os, L"{}\n", fmt::format(fmt, std::forward(args)...)); -} - /// Converts `value` to `std::wstring` using the default format for type `T`. template inline auto to_wstring(const T& value) -> std::wstring { return format(FMT_STRING(L"{}"), value); diff --git a/3rdparty/fmt/src/fmt.cc b/3rdparty/fmt/src/fmt.cc index 2dc4ef2f64d9..fb514ad761fc 100644 --- a/3rdparty/fmt/src/fmt.cc +++ b/3rdparty/fmt/src/fmt.cc @@ -1,11 +1,5 @@ module; -#ifdef _MSVC_LANG -# define FMT_CPLUSPLUS _MSVC_LANG -#else -# define FMT_CPLUSPLUS __cplusplus -#endif - // Put all implementation-provided headers into the global module fragment // to prevent attachment to this module. #ifndef FMT_IMPORT_STD @@ -21,9 +15,7 @@ module; # include # include # include -# if FMT_CPLUSPLUS > 202002L -# include -# endif +# include # include # include # include @@ -135,17 +127,9 @@ extern "C++" { module :private; #endif -#ifdef FMT_ATTACH_TO_GLOBAL_MODULE -extern "C++" { -#endif - #if FMT_HAS_INCLUDE("format.cc") # include "format.cc" #endif #if FMT_OS && FMT_HAS_INCLUDE("os.cc") # include "os.cc" #endif - -#ifdef FMT_ATTACH_TO_GLOBAL_MODULE -} -#endif diff --git a/3rdparty/fmt/src/format.cc b/3rdparty/fmt/src/format.cc index 3ccd8068483c..391d3a248c26 100644 --- a/3rdparty/fmt/src/format.cc +++ b/3rdparty/fmt/src/format.cc @@ -15,8 +15,7 @@ template FMT_API auto dragonbox::to_decimal(float x) noexcept template FMT_API auto dragonbox::to_decimal(double x) noexcept -> dragonbox::decimal_fp; -#if FMT_USE_LOCALE -// DEPRECATED! locale_ref in the detail namespace +#ifndef FMT_STATIC_THOUSANDS_SEPARATOR template FMT_API locale_ref::locale_ref(const std::locale& loc); template FMT_API auto locale_ref::get() const -> std::locale; #endif @@ -27,10 +26,8 @@ template FMT_API auto thousands_sep_impl(locale_ref) -> thousands_sep_result; template FMT_API auto decimal_point_impl(locale_ref) -> char; -// DEPRECATED! template FMT_API void buffer::append(const char*, const char*); -// DEPRECATED! template FMT_API void vformat_to(buffer&, string_view, typename vformat_args<>::type, locale_ref); diff --git a/3rdparty/fmt/src/os.cc b/3rdparty/fmt/src/os.cc index c833a0514186..273664997620 100644 --- a/3rdparty/fmt/src/os.cc +++ b/3rdparty/fmt/src/os.cc @@ -160,7 +160,7 @@ void detail::format_windows_error(detail::buffer& out, int error_code, } void report_windows_error(int error_code, const char* message) noexcept { - do_report_error(detail::format_windows_error, error_code, message); + report_error(detail::format_windows_error, error_code, message); } #endif // _WIN32 @@ -374,25 +374,30 @@ long getpagesize() { } # endif -void ostream::grow(buffer& buf, size_t) { - if (buf.size() == buf.capacity()) static_cast(buf).flush(); +namespace detail { + +void file_buffer::grow(buffer& buf, size_t) { + if (buf.size() == buf.capacity()) static_cast(buf).flush(); } -ostream::ostream(cstring_view path, const detail::ostream_params& params) +file_buffer::file_buffer(cstring_view path, const ostream_params& params) : buffer(grow), file_(path, params.oflag) { set(new char[params.buffer_size], params.buffer_size); } -ostream::ostream(ostream&& other) noexcept +file_buffer::file_buffer(file_buffer&& other) noexcept : buffer(grow, other.data(), other.size(), other.capacity()), file_(std::move(other.file_)) { other.clear(); other.set(nullptr, 0); } -ostream::~ostream() { +file_buffer::~file_buffer() { flush(); delete[] data(); } +} // namespace detail + +ostream::~ostream() = default; #endif // FMT_USE_FCNTL FMT_END_NAMESPACE diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ffdb6d430b0..18c29cf5bd99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,7 +64,7 @@ ### sdks updates -- emsdk: 3.1.63 ==> 3.1.69 +- emsdk: 3.1.63 ==> 3.1.67 ### 3rdparty updates diff --git a/core/base/json.h b/core/base/json.h new file mode 100644 index 000000000000..6de168546d28 --- /dev/null +++ b/core/base/json.h @@ -0,0 +1,4 @@ +#pragma once + +#include "rapidjson/rapidjson.h" +#include "rapidjson/document.h"