Revert "Optimize handling of integer constants" (#2147)

This reverts commit 2797588be1.
This commit is contained in:
Victor Zverovich 2021-02-25 05:58:58 -08:00
parent 640acba850
commit 578874033a
2 changed files with 8 additions and 8 deletions

View File

@ -244,6 +244,11 @@ const typename basic_data<T>::digit_pair basic_data<T>::digits[] = {
{'9', '0'}, {'9', '1'}, {'9', '2'}, {'9', '3'}, {'9', '4'}, {'9', '5'},
{'9', '6'}, {'9', '7'}, {'9', '8'}, {'9', '9'}};
#define FMT_POWERS_OF_10(factor) \
factor * 10, (factor)*100, (factor)*1000, (factor)*10000, (factor)*100000, \
(factor)*1000000, (factor)*10000000, (factor)*100000000, \
(factor)*1000000000
template <typename T>
const uint64_t basic_data<T>::powers_of_10_64[] = {
1, FMT_POWERS_OF_10(1), FMT_POWERS_OF_10(1000000000ULL),
@ -258,7 +263,8 @@ const uint64_t basic_data<T>::zero_or_powers_of_10_64[] = {
10000000000000000000ULL};
template <typename T>
constexpr uint32_t basic_data<T>::zero_or_powers_of_10_32_new[];
const uint32_t basic_data<T>::zero_or_powers_of_10_32_new[] = {
0, 0, FMT_POWERS_OF_10(1)};
template <typename T>
const uint64_t basic_data<T>::zero_or_powers_of_10_64_new[] = {

View File

@ -1023,16 +1023,10 @@ template <typename T> struct FMT_EXTERN_TEMPLATE_API divtest_table_entry {
T max_quotient;
};
#define FMT_POWERS_OF_10(factor) \
factor * 10u, (factor)*100u, (factor)*1000u, (factor)*10000u, \
(factor)*100000u, (factor)*1000000u, (factor)*10000000u, \
(factor)*100000000u, (factor)*1000000000u
// Static data is placed in this class template for the header-only config.
template <typename T = void> struct FMT_EXTERN_TEMPLATE_API basic_data {
static const uint64_t powers_of_10_64[];
static constexpr uint32_t zero_or_powers_of_10_32_new[] = {
0, 0, FMT_POWERS_OF_10(1)};
static const uint32_t zero_or_powers_of_10_32_new[];
static const uint64_t zero_or_powers_of_10_64_new[];
static const uint64_t grisu_pow10_significands[];
static const int16_t grisu_pow10_exponents[];