fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 02:37:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move data to functions

Browse Source
This commit is contained in:
Victor Zverovich
2021-04-27 17:06:29 -07:00
parent ab7c33ede0
commit 84a36b99bf
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/fmt/format-inl.h
View File

@ -225,10 +225,6 @@ template <> FMT_FUNC int count_digits<4>(detail::fallback_uintptr n) {
#if __cplusplus < 201703L #if __cplusplus < 201703L
template <typename T> template <typename T>
constexpr const uint32_t basic_data<T>::zero_or_powers_of_10_32[];
template <typename T>
constexpr const uint64_t basic_data<T>::zero_or_powers_of_10_64[];
template <typename T>
constexpr const typename basic_data<T>::digit_pair basic_data<T>::digits[]; constexpr const typename basic_data<T>::digit_pair basic_data<T>::digits[];
template <typename T> constexpr const char basic_data<T>::hex_digits[]; template <typename T> constexpr const char basic_data<T>::hex_digits[];
template <typename T> constexpr const char basic_data<T>::signs[]; template <typename T> constexpr const char basic_data<T>::signs[];

16
include/fmt/format.h
View File

@ -911,13 +911,6 @@ using uint64_or_128_t = conditional_t<num_bits<T>() <= 64, uint64_t, uint128_t>;
// Static data is placed in this class template for the header-only config. // Static data is placed in this class template for the header-only config.
template <typename T = void> struct basic_data { template <typename T = void> struct basic_data {
static constexpr const uint32_t zero_or_powers_of_10_32[] = {
0, 0, FMT_POWERS_OF_10(1U)};
static constexpr const uint64_t zero_or_powers_of_10_64[] = {
0, 0, FMT_POWERS_OF_10(1U), FMT_POWERS_OF_10(1000000000ULL),
10000000000000000000ULL};
// log10(2) = 0x0.4d104d427de7fbcc... // log10(2) = 0x0.4d104d427de7fbcc...
static const uint64_t log10_2_significand = 0x4d104d427de7fbcc; static const uint64_t log10_2_significand = 0x4d104d427de7fbcc;
@ -993,7 +986,10 @@ FMT_CONSTEXPR20 inline int count_digits(uint64_t n) {
#ifdef FMT_BUILTIN_CLZLL #ifdef FMT_BUILTIN_CLZLL
// https://github.com/fmtlib/format-benchmark/blob/master/digits10 // https://github.com/fmtlib/format-benchmark/blob/master/digits10
auto t = bsr2log10(FMT_BUILTIN_CLZLL(n | 1) ^ 63); auto t = bsr2log10(FMT_BUILTIN_CLZLL(n | 1) ^ 63);
return t - (n < data::zero_or_powers_of_10_64[t]); constexpr const uint64_t zero_or_powers_of_10[] = {
0, 0, FMT_POWERS_OF_10(1U), FMT_POWERS_OF_10(1000000000ULL),
10000000000000000000ULL};
return t - (n < zero_or_powers_of_10[t]);
#else #else
return count_digits_fallback(n); return count_digits_fallback(n);
#endif #endif
@ -1029,7 +1025,9 @@ FMT_CONSTEXPR20 inline int count_digits(uint32_t n) {
return count_digits_fallback(n); return count_digits_fallback(n);
} }
auto t = bsr2log10(FMT_BUILTIN_CLZ(n | 1) ^ 31); auto t = bsr2log10(FMT_BUILTIN_CLZ(n | 1) ^ 31);
return t - (n < data::zero_or_powers_of_10_32[t]); constexpr const uint32_t zero_or_powers_of_10[] = {0, 0,
FMT_POWERS_OF_10(1U)};
return t - (n < zero_or_powers_of_10[t]);
} }
#endif #endif