iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Squashed 'external/fmt/' changes from 093b39ca5..353bd895a

Browse Source 
353bd895a Add FMT_EXPORT on ranges.h customization points (#4476)
953cffa70 Replace memset with constexpr fill_n in bigint::align (#4471)
571c02d47 Add xchar support for std::byte formatter (#4480)
f4345467f Fix compilation on clang-21 / libc++-21 (#4477)
1ef834807 Properly constrain `detail::copy` optimization (#4474)
a5dccffa5 Add double and float support to scan test
4a149f513 Test non-SSO constexpr string formatting
067bc479b Avoid redundant work when processing UTF-8 strings (#4475)
730fd4d9a Remove redundant tests
5860688d7 Enable constexpr support for fmt::format (fmtlib#3403) (#4456)
46be88bc1 Cleanup FP formatting
cc8891490 Export fmt::dynamic_format_arg_store in fmt module (#4459)
fc0c76a07 Handle large precision
6332a3852 Bump ossf/scorecard-action from 2.4.0 to 2.4.2 (#4462)
02de29e00 Remove a reference to a compromised account
6d51c78c1 Cleanup FP formatting
0f4e9d0bd Cleanup FP formatting
d9d50495a Optimize the default FP formatting
befbc5fdb Fix ADL lookup for memory_buffer
8aa1d6a9f Minor cleanup
6d79757a3 Interpret precision as display width (#4443)
1ff0b7f5e Cleanup warning suppression
ea985e84f Remove some implicit conversions (#4447)
f7033da09 Avoid include locale inline if C++20 modules are enabled (#4451)
b723c021d Give useful error when misusing fmt::ptr. (#4453)
3ba3c390f Clarify that formatting of pointers is disallowed
ab161a71c Fix some typos in comments (#4448)
b5266fd3b Remove some redundant `const`s (#4445)
9b0ebd443 Cleanup base-test
7af94e559 Remove old gcc workaround
2924fcf8f Cleanup base-test
102752ad4 Update docs
a6cd72c9e Cleanup base-test
07885271a Minor cleanup
4999416e5 Fix reference_wrapper ambiguity with format_as (#4434)
55a8f6a4b Change component prefix for NSIS compatibility (#4442)
eb9a95d42 Clarify that formatting of pointers is disallowed
d5c33e4f4 Make template parameter order consistent
a2225f288 Remove unused include
b43b2f953 Cleanup standard formatters
1312b4a16 Cleanup standard formatters
4404dc05d Consolidate implementation details
7bb6fcb32 Bump version
59259a5fd Make a doc directory if it doesn't exist
542ea7c40 Clarify that Formatter parameter is deprecated
40626af88 Update version
7fdd6846b Bump version
6caff7ed9 Cleanup test
71a548387 Update changelog
448929d49 Update and apply clang-format
26d87edab Bump github/codeql-action from 3.28.13 to 3.28.16 (#4432)
505ee058f Update changelog
ccab41719 Update changelog
ec1349d34 Update changelog
0ed2a65a8 Clarify why we use __builtin_strlen instead of strlen
e22c94307 Update changelog
b252bad3c Update changelog
268083123 Cleanun string_view
8978ab09b Avoiding __builtin_strlen (#4429)
c936e2e44 Implement debug format for error_code
a7d7b894c Implement the s specifier for error_code
e98155a6f Remove redundant specializations
41b3bed4d Clarify why we don't use qualified names
67d9e4932 Update changelog
9db5e4df2 Don't specialize std::is_floating_point
906eaf2dd Make specifier order consistent
9f6c12c3d Remove deprecated localtime from docs
2d0518b5f Fix cmake error in pedantic mode (#4426)
c81cbed2b Simplify test
c7925241c Remove `core.h` from README (#4422)
c70913835 Add support for incomplete types
db405954c Remove `fmt/core.h` from docs (#4421)
0a917ee2f Minor comment tweak
969d4aef6 Update doc image
8061c7c8c Cleanup duration formatter
7b59df411 Remove redundant member
b8192d233 Fix build error with MSVC v141 (#4413)
e814b5fab Reduce template parametrization
ed0d216f7 Fix localization and formatting of timezone names
bd9554a29 Fix formatting of timezone names
f086dc0d2 Fix timezone handling in tm
f10b6dd81 Improve chrono formatting
f470b9c56 Cleanup chrono tests and set consistent TZ
b28214487 Fix handling of %Z
6d69f0c5f Improve chorno tests
da776c9a6 Test timezone
64db979e3 Added a missing FMT_STRING in fmt::println() (#4407)
5f2e61fdd Cleanup chrono detail
b3d45e1d3 Remove fmt_detail
5f6fb96df Bump github/codeql-action from 3.28.8 to 3.28.13 (#4403)
5199e0f88 Fix a flush issue on libstdc++
2f5843057 Move buffering tests to os-test
d5d32c1e8 Bazel support: Update platforms to 0.0.11 (#4400)
204661287 Improve local_time test
e1ab38336 Report an error when timezone is not available
b9e0e94a0 Enable more chrono tests on Windows
a81842428 Update changelog
f53055efe Revert "Workaround an ABI issue in spdlog"
b2dfcb2b8 Fix local_time test
7ac97cbd1 Enable some local_time tests and make them deterministic
17898794a Use fmt::local_time
443a8ef34 Deprecate fmt::localtime
3607e92dc Bump version
43e31614c Test ambiguous time
989826ce5 Update changelog
9d6e24c64 Fix handling of long with FMT_BUILTIN_TYPES=0
0843317e0 Update changelog
784eac839 Workaround an ABI issue in spdlog
6fdf225a3 Always inline value ctors in optimized gcc mode only
332da79bf Always inline value ctors
7b273fbb5 Minor cleanup
191c504b1 Cleanup build config
d13fb6092 Cleanup build config
dd780fde4 Add clang-3.4
37e647471 Fix dynamic named arg format spec handling (#4361)
77c0fc07d Switch to supported ubuntu image
9212ff6ca Apply coding conventions and use constexpr
864bdf963 Report error on duplicate named arg names (#4367)
b776cf66f Optimize `text_style` using bit packing (#4363)
bdbf957b9 Bump msys2/setup-msys2 from 2.25.0 to 2.27.0
577fd3be8 Fix TU-local entity exposition error in GCC 15
faac8b1fa Remove exports in std.h
123913715 Update version
8c1059b92 Update changelog
4e5aafbf4 Bump version
db30fb3b8 Update changelog
3401ce2be Fix ABI compatibility
7f7695524 Fix conflict with std::ignore (#4356)
251320fcb Add .vs folder to .gitignore (#4355)
94ab51cb8 Simplify implementation of `operator""_cf` (#4349)
0ca42e836 Workaround an MSVC v140 bug
ed27df576 Replace forward slashes by backslashes in BMI path for MSVC. (#4344)
d42a068db Apply coding conventions
f2cec917d Move is_compiled_string to public API (#4342)
d5b866e24 fix gcc 8.3 compile errors (#4336)
5676e408f Bump github/codeql-action from 3.27.0 to 3.28.8 (#4337)
71d24b564 Bump actions/upload-artifact from 4.4.0 to 4.6.0 (#4339)
c9267da4d Fix typo in `FMT_HAS_BUILTIN` check
373855c1b Clarify difference in FP representation
52eeeb52a Make exponent threshold depend on representation (#3649)
9cf9f38ed Update version
4946bdb72 Update changelog
01a5b56f0 Fix error of unitialized variable FMT_HEADERS
cb6fdf219 Restore constraint on map formatter (#4326)
f841ae61e Fix #4303: avoid instantiating formatter<const T> (#4325)
a3d05d70c Silence a constexpr warning when compiling with MSVC and /W4 (#4322)
41539c29f Workaround a bug in gcc 6 (#4318)
aabe63910 Tweak changelog
f90090be2 Update changelog
9ff9c695d Bump version
06ad1224e Update changelog
5f0572acd Workaround a compilation error on gcc 9.4
898d43857 Fix formatting into std::ostreambuf_iterator using a compiled format (#4312)
937b7c5c1 Add args() accessor back to fmt::format_context (#4310)
01914f038 Reduce size of basic_specs
c43da3570 Workaround an ICE when using modules with gcc 14.2 and earlier
8303d140a Update version
b0b3dc5ff Bump version
586ea06f0 Rename set_fill to copy_fill_from
5750f434f Update changelog
bfbdc2be9 Add parameter to the fallback to_sys function.
87e007267 Update changelog
d57040f94 Prefix components
21aa0956d Restore ABI compatibility
3f864a450 Address MSVC C4127 warning when formatting non unicode `tm` (#4299)

git-subtree-dir: external/fmt
git-subtree-split: 353bd895a2bf9d0b1bc5977dc002fb6e0cdb0960
This commit is contained in:
irisz64
2025-06-26 22:16:38 +02:00
parent 5ff285a9ed
commit fca3b644b3
44 changed files with 2166 additions and 1597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
include/fmt/base.h
View File

@@ -21,7 +21,7 @@
#endif
// The fmt library version in the form major * 10000 + minor * 100 + patch.
#define FMT_VERSION 110101
#define FMT_VERSION 110201
// Detect compiler versions.
#if defined(__clang__) && !defined(__ibmxl__)
@@ -96,9 +96,9 @@
// Detect C++14 relaxed constexpr.
#ifdef FMT_USE_CONSTEXPR
// Use the provided definition.
#elif FMT_GCC_VERSION >= 600 && FMT_CPLUSPLUS >= 201402L
// GCC only allows throw in constexpr since version 6:
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67371.
#elif FMT_GCC_VERSION >= 702 && FMT_CPLUSPLUS >= 201402L
// GCC only allows constexpr member functions in non-literal types since 7.2:
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66297.
# define FMT_USE_CONSTEXPR 1
#elif FMT_ICC_VERSION
# define FMT_USE_CONSTEXPR 0 // https://github.com/fmtlib/fmt/issues/1628
@@ -209,20 +209,6 @@
# define FMT_DEPRECATED /* deprecated */
#endif
#ifdef FMT_ALWAYS_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.
#ifdef NDEBUG
# define FMT_INLINE FMT_ALWAYS_INLINE
#else
# define FMT_INLINE inline
#endif
#if FMT_GCC_VERSION || FMT_CLANG_VERSION
# define FMT_VISIBILITY(value) __attribute__((visibility(value)))
#else
@@ -249,6 +235,28 @@
# define FMT_MSC_WARNING(...)
#endif
// Enable minimal optimizations for more compact code in debug mode.
FMT_PRAGMA_GCC(push_options)
#if !defined(__OPTIMIZE__) && !defined(__CUDACC__) && !defined(FMT_MODULE)
FMT_PRAGMA_GCC(optimize("Og"))
# define FMT_GCC_OPTIMIZED
#endif
FMT_PRAGMA_CLANG(diagnostic push)
#ifdef FMT_ALWAYS_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.
#if defined(NDEBUG) || defined(FMT_GCC_OPTIMIZED)
# define FMT_INLINE FMT_ALWAYS_INLINE
#else
# define FMT_INLINE inline
#endif
#ifndef FMT_BEGIN_NAMESPACE
# define FMT_BEGIN_NAMESPACE \
namespace fmt { \
@@ -294,15 +302,8 @@
#endif
#define FMT_APPLY_VARIADIC(expr) \
using ignore = int[]; \
(void)ignore { 0, (expr, 0)... }
// Enable minimal optimizations for more compact code in debug mode.
FMT_PRAGMA_GCC(push_options)
#if !defined(__OPTIMIZE__) && !defined(__CUDACC__)
FMT_PRAGMA_GCC(optimize("Og"))
#endif
FMT_PRAGMA_CLANG(diagnostic push)
using unused = int[]; \
(void)unused { 0, (expr, 0)... }
FMT_BEGIN_NAMESPACE
@@ -325,8 +326,8 @@ using underlying_t = typename std::underlying_type<T>::type;
template <typename T> using decay_t = typename std::decay<T>::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.
#if (FMT_GCC_VERSION && FMT_GCC_VERSION < 500) || FMT_MSC_VERSION
// A workaround for gcc 4.9 & MSVC v141 to make void_t work in a SFINAE context.
template <typename...> struct void_t_impl {
using type = void;
};
@@ -466,8 +467,7 @@ template <typename T> constexpr const char* narrow(const T*) { return nullptr; }
constexpr FMT_ALWAYS_INLINE const char* narrow(const char* s) { return s; }
template <typename Char>
FMT_CONSTEXPR auto compare(const Char* s1, const Char* s2, std::size_t n)
-> int {
FMT_CONSTEXPR auto compare(const Char* s1, const Char* s2, size_t n) -> int {
if (!is_constant_evaluated() && sizeof(Char) == 1) return memcmp(s1, s2, n);
for (; n != 0; ++s1, ++s2, --n) {
if (*s1 < *s2) return -1;
@@ -526,20 +526,20 @@ template <typename Char> class basic_string_view {
constexpr basic_string_view() noexcept : data_(nullptr), size_(0) {}
/// Constructs a string reference object from a C string and a size.
/// Constructs a string view object from a C string and a size.
constexpr basic_string_view(const Char* s, size_t count) noexcept
: data_(s), size_(count) {}
constexpr basic_string_view(nullptr_t) = delete;
/// Constructs a string reference object from a C string.
/// Constructs a string view 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<Char, char>::value) {
size_ = __builtin_strlen(detail::narrow(s));
#if FMT_HAS_BUILTIN(__builtin_strlen) || FMT_GCC_VERSION || FMT_CLANG_VERSION
if (std::is_same<Char, char>::value && !detail::is_constant_evaluated()) {
size_ = __builtin_strlen(detail::narrow(s)); // strlen is not constexpr.
return;
}
#endif
@@ -548,7 +548,7 @@ template <typename Char> class basic_string_view {
size_ = len;
}
/// Constructs a string reference from a `std::basic_string` or a
/// Constructs a string view from a `std::basic_string` or a
/// `std::basic_string_view` object.
template <typename S,
FMT_ENABLE_IF(detail::is_std_string_like<S>::value&& std::is_same<
@@ -585,7 +585,6 @@ template <typename Char> class basic_string_view {
return starts_with(basic_string_view<Char>(s));
}
// 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_));
@@ -616,7 +615,7 @@ template <typename Char> class basic_string_view {
using string_view = basic_string_view<char>;
/// Specifies if `T` is an extended character type. Can be specialized by users.
// DEPRECATED! Will be merged with is_char and moved to detail.
template <typename T> struct is_xchar : std::false_type {};
template <> struct is_xchar<wchar_t> : std::true_type {};
template <> struct is_xchar<char16_t> : std::true_type {};
@@ -625,7 +624,7 @@ template <> struct is_xchar<char32_t> : std::true_type {};
template <> struct is_xchar<char8_t> : std::true_type {};
#endif
// DEPRECATED! Will be replaced with an alias to prevent specializations.
// Specifies if `T` is a character (code unit) type.
template <typename T> struct is_char : is_xchar<T> {};
template <> struct is_char<char> : std::true_type {};
@@ -739,13 +738,15 @@ class basic_specs {
max_fill_size = 4
};
size_t data_ = 1 << fill_size_shift;
unsigned data_ = 1 << fill_size_shift;
static_assert(sizeof(basic_specs::data_) * CHAR_BIT >= 18, "");
// 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);
data_ = (data_ & ~fill_size_mask) |
(static_cast<unsigned>(size) << fill_size_shift);
}
public:
@@ -843,7 +844,7 @@ class basic_specs {
fill_data_[i & 3] = static_cast<char>(s[i]);
}
FMT_CONSTEXPR void set_fill(const basic_specs& specs) {
FMT_CONSTEXPR void copy_fill_from(const basic_specs& specs) {
set_fill_size(specs.fill_size());
for (size_t i = 0; i < max_fill_size; ++i)
fill_data_[i] = specs.fill_data_[i];
@@ -1030,6 +1031,11 @@ enum {
struct view {};
template <typename T, typename Enable = std::true_type>
struct is_view : std::false_type {};
template <typename T>
struct is_view<T, bool_constant<sizeof(T) != 0>> : std::is_base_of<view, T> {};
template <typename Char, typename T> struct named_arg;
template <typename T> struct is_named_arg : std::false_type {};
template <typename T> struct is_static_named_arg : std::false_type {};
@@ -1062,6 +1068,16 @@ template <typename Char> struct named_arg_info {
int id;
};
// named_args is non-const to suppress a bogus -Wmaybe-uninitialized in gcc 13.
template <typename Char>
FMT_CONSTEXPR void check_for_duplicate(named_arg_info<Char>* named_args,
int named_arg_index,
basic_string_view<Char> arg_name) {
for (int i = 0; i < named_arg_index; ++i) {
if (named_args[i].name == arg_name) report_error("duplicate named arg");
}
}
template <typename Char, typename T, FMT_ENABLE_IF(!is_named_arg<T>::value)>
void init_named_arg(named_arg_info<Char>*, int& arg_index, int&, const T&) {
++arg_index;
@@ -1069,6 +1085,7 @@ void init_named_arg(named_arg_info<Char>*, int& arg_index, int&, const T&) {
template <typename Char, typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
void init_named_arg(named_arg_info<Char>* named_args, int& arg_index,
int& named_arg_index, const T& arg) {
check_for_duplicate<Char>(named_args, named_arg_index, arg.name);
named_args[named_arg_index++] = {arg.name, arg_index++};
}
@@ -1082,12 +1099,13 @@ template <typename T, typename Char,
FMT_ENABLE_IF(is_static_named_arg<T>::value)>
FMT_CONSTEXPR void init_static_named_arg(named_arg_info<Char>* named_args,
int& arg_index, int& named_arg_index) {
check_for_duplicate<Char>(named_args, named_arg_index, T::name);
named_args[named_arg_index++] = {T::name, arg_index++};
}
// 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) };
enum { long_short = sizeof(long) == sizeof(int) && FMT_BUILTIN_TYPES };
using long_type = conditional_t<long_short, int, long long>;
using ulong_type = conditional_t<long_short, unsigned, unsigned long long>;
@@ -1119,7 +1137,7 @@ using use_formatter =
bool_constant<(std::is_class<T>::value || std::is_enum<T>::value ||
std::is_union<T>::value || std::is_array<T>::value) &&
!has_to_string_view<T>::value && !is_named_arg<T>::value &&
!use_format_as<T>::value && !use_format_as_member<T>::value>;
!use_format_as<T>::value && !use_format_as_member<U>::value>;
template <typename Char, typename T, typename U = remove_const_t<T>>
auto has_formatter_impl(T* p, buffered_context<Char>* ctx = nullptr)
@@ -1660,12 +1678,12 @@ template <typename... T> struct arg_pack {};
template <typename Char, int NUM_ARGS, int NUM_NAMED_ARGS, bool DYNAMIC_NAMES>
class format_string_checker {
private:
type types_[max_of(1, NUM_ARGS)];
named_arg_info<Char> named_args_[max_of(1, NUM_NAMED_ARGS)];
type types_[max_of<size_t>(1, NUM_ARGS)];
named_arg_info<Char> named_args_[max_of<size_t>(1, NUM_NAMED_ARGS)];
compile_parse_context<Char> context_;
using parse_func = auto (*)(parse_context<Char>&) -> const Char*;
parse_func parse_funcs_[max_of(1, NUM_ARGS)];
parse_func parse_funcs_[max_of<size_t>(1, NUM_ARGS)];
public:
template <typename... T>
@@ -1704,7 +1722,17 @@ class format_string_checker {
-> const Char* {
context_.advance_to(begin);
if (id >= 0 && id < NUM_ARGS) return parse_funcs_[id](context_);
while (begin != end && *begin != '}') ++begin;
// If id is out of range, it means we do not know the type and cannot parse
// the format at compile time. Instead, skip over content until we finish
// the format spec, accounting for any nested replacements.
for (int bracket_count = 0;
begin != end && (bracket_count > 0 || *begin != '}'); ++begin) {
if (*begin == '{')
++bracket_count;
else if (*begin == '}')
--bracket_count;
}
return begin;
}
@@ -2004,6 +2032,17 @@ struct has_back_insert_iterator_container_append<
.append(std::declval<InputIt>(),
std::declval<InputIt>()))>> : std::true_type {};
template <typename OutputIt, typename InputIt, typename = void>
struct has_back_insert_iterator_container_insert_at_end : std::false_type {};
template <typename OutputIt, typename InputIt>
struct has_back_insert_iterator_container_insert_at_end<
OutputIt, InputIt,
void_t<decltype(get_container(std::declval<OutputIt>())
.insert(get_container(std::declval<OutputIt>()).end(),
std::declval<InputIt>(),
std::declval<InputIt>()))>> : std::true_type {};
// An optimized version of std::copy with the output value type (T).
template <typename T, typename InputIt, typename OutputIt,
FMT_ENABLE_IF(is_back_insert_iterator<OutputIt>::value&&
@@ -2018,6 +2057,8 @@ FMT_CONSTEXPR20 auto copy(InputIt begin, InputIt end, OutputIt out)
template <typename T, typename InputIt, typename OutputIt,
FMT_ENABLE_IF(is_back_insert_iterator<OutputIt>::value &&
!has_back_insert_iterator_container_append<
OutputIt, InputIt>::value &&
has_back_insert_iterator_container_insert_at_end<
OutputIt, InputIt>::value)>
FMT_CONSTEXPR20 auto copy(InputIt begin, InputIt end, OutputIt out)
-> OutputIt {
@@ -2027,7 +2068,11 @@ FMT_CONSTEXPR20 auto copy(InputIt begin, InputIt end, OutputIt out)
}
template <typename T, typename InputIt, typename OutputIt,
FMT_ENABLE_IF(!is_back_insert_iterator<OutputIt>::value)>
FMT_ENABLE_IF(!(is_back_insert_iterator<OutputIt>::value &&
(has_back_insert_iterator_container_append<
OutputIt, InputIt>::value ||
has_back_insert_iterator_container_insert_at_end<
OutputIt, InputIt>::value)))>
FMT_CONSTEXPR auto copy(InputIt begin, InputIt end, OutputIt out) -> OutputIt {
while (begin != end) *out++ = static_cast<T>(*begin++);
return out;
@@ -2234,6 +2279,7 @@ template <typename Context> class value {
}
// Formats an argument of a custom type, such as a user-defined class.
// DEPRECATED! Formatter template parameter will be removed.
template <typename T, typename Formatter>
static void format_custom(void* arg, parse_context<char_type>& parse_ctx,
Context& ctx) {
@@ -2261,28 +2307,27 @@ template <> struct is_output_iterator<appender, char> : std::true_type {};
template <typename It, typename T>
struct is_output_iterator<
It, T,
void_t<decltype(*std::declval<decay_t<It>&>()++ = std::declval<T>())>>
: std::true_type {};
enable_if_t<std::is_assignable<decltype(*std::declval<decay_t<It>&>()++),
T>::value>> : 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 <locale> include.
struct locale_ref {
class locale_ref {
#if FMT_USE_LOCALE
private:
const void* locale_; // A type-erased pointer to std::locale.
public:
constexpr locale_ref() : locale_(nullptr) {}
template <typename Locale, FMT_ENABLE_IF(sizeof(Locale::collate) != 0)>
locale_ref(const Locale& loc);
template <typename Locale> locale_ref(const Locale& loc);
inline explicit operator bool() const noexcept { return locale_ != nullptr; }
#endif // FMT_USE_LOCALE
public:
template <typename Locale> auto get() const -> Locale;
};
@@ -2310,8 +2355,9 @@ template <typename Context, int NUM_ARGS, int NUM_NAMED_ARGS,
unsigned long long DESC>
struct named_arg_store {
// args_[0].named_args points to named_args to avoid bloating format_args.
arg_t<Context, NUM_ARGS> args[1 + NUM_ARGS];
named_arg_info<typename Context::char_type> named_args[NUM_NAMED_ARGS];
arg_t<Context, NUM_ARGS> args[1u + NUM_ARGS];
named_arg_info<typename Context::char_type>
named_args[static_cast<size_t>(NUM_NAMED_ARGS)];
template <typename... T>
FMT_CONSTEXPR FMT_ALWAYS_INLINE named_arg_store(T&... values)
@@ -2344,7 +2390,7 @@ struct format_arg_store {
// +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning.
using type =
conditional_t<NUM_NAMED_ARGS == 0,
arg_t<Context, NUM_ARGS>[max_of(1, NUM_ARGS)],
arg_t<Context, NUM_ARGS>[max_of<size_t>(1, NUM_ARGS)],
named_arg_store<Context, NUM_ARGS, NUM_NAMED_ARGS, DESC>>;
type args;
};
@@ -2656,6 +2702,7 @@ class context {
FMT_CONSTEXPR auto arg_id(string_view name) const -> int {
return args_.get_id(name);
}
auto args() const -> const format_args& { return args_; }
// Returns an iterator to the beginning of the output range.
FMT_CONSTEXPR auto out() const -> iterator { return out_; }
@@ -2701,7 +2748,7 @@ template <typename... T> struct fstring {
template <size_t N>
FMT_CONSTEVAL FMT_ALWAYS_INLINE fstring(const char (&s)[N]) : str(s, N - 1) {
using namespace detail;
static_assert(count<(std::is_base_of<view, remove_reference_t<T>>::value &&
static_assert(count<(is_view<remove_cvref_t<T>>::value &&
std::is_reference<T>::value)...>() == 0,
"passing views as lvalues is disallowed");
if (FMT_USE_CONSTEVAL) parse_format_string<char>(s, checker(s, arg_pack()));
@@ -2728,9 +2775,9 @@ template <typename... T> struct fstring {
std::is_same<typename S::char_type, char>::value)>
FMT_ALWAYS_INLINE fstring(const S&) : str(S()) {
FMT_CONSTEXPR auto sv = string_view(S());
FMT_CONSTEXPR int ignore =
FMT_CONSTEXPR int unused =
(parse_format_string(sv, checker(sv, arg_pack())), 0);
detail::ignore_unused(ignore);
detail::ignore_unused(unused);
}
fstring(runtime_format_string<> fmt) : str(fmt.str) {}