mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-25 15:21:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use built-in FP formatter for any precision

Browse Source
This commit is contained in:
Victor Zverovich 2020-09-11 07:19:37 -07:00
parent efe3694f15
commit 58a044be5d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -864,8 +864,7 @@ FMT_ALWAYS_INLINE digits::result grisu_gen_digits(fp value, uint64_t error,
FMT_ASSERT(false, "invalid number of digits"); FMT_ASSERT(false, "invalid number of digits");
} }
--exp; --exp;
uint64_t remainder = auto remainder = (static_cast<uint64_t>(integral) << -one.e) + fractional;
(static_cast<uint64_t>(integral) << -one.e) + fractional;
result = handler.on_digit(static_cast<char>('0' + digit), result = handler.on_digit(static_cast<char>('0' + digit),
data::powers_of_10_64[exp] << -one.e, remainder, data::powers_of_10_64[exp] << -one.e, remainder,
error, exp, true); error, exp, true);
@ -875,8 +874,7 @@ FMT_ALWAYS_INLINE digits::result grisu_gen_digits(fp value, uint64_t error,
for (;;) { for (;;) {
fractional *= 10; fractional *= 10;
error *= 10; error *= 10;
char digit = char digit = static_cast<char>('0' + (fractional >> -one.e));
static_cast<char>('0' + static_cast<char>(fractional >> -one.e));
fractional &= one.f - 1; fractional &= one.f - 1;
--exp; --exp;
result = handler.on_digit(digit, one.f, fractional, error, exp, false); result = handler.on_digit(digit, one.f, fractional, error, exp, false);
@ -913,6 +911,7 @@ struct fixed_handler {
uint64_t error, int, bool integral) { uint64_t error, int, bool integral) {
FMT_ASSERT(remainder < divisor, ""); FMT_ASSERT(remainder < divisor, "");
buf[size++] = digit; buf[size++] = digit;
if (!integral && error >= remainder) return digits::error;
if (size < precision) return digits::more; if (size < precision) return digits::more;
if (!integral) { if (!integral) {
// Check if error * 2 < divisor with overflow prevention. // Check if error * 2 < divisor with overflow prevention.
@ -1152,7 +1151,6 @@ int format_float(T value, int precision, float_specs specs, buffer<char>& buf) {
} }
buf.try_resize(to_unsigned(handler.size)); buf.try_resize(to_unsigned(handler.size));
} else { } else {
if (precision > 17) return snprintf_float(value, precision, specs, buf);
fp normalized = normalize(fp(value)); fp normalized = normalize(fp(value));
const auto cached_pow = get_cached_power( const auto cached_pow = get_cached_power(
min_exp - (normalized.e + fp::significand_size), cached_exp10); min_exp - (normalized.e + fp::significand_size), cached_exp10);
@ -1160,7 +1158,7 @@ int format_float(T value, int precision, float_specs specs, buffer<char>& buf) {
fixed_handler handler{buf.data(), 0, precision, -cached_exp10, fixed}; fixed_handler handler{buf.data(), 0, precision, -cached_exp10, fixed};
if (grisu_gen_digits(normalized, 1, exp, handler) == digits::error) { if (grisu_gen_digits(normalized, 1, exp, handler) == digits::error) {
exp += handler.size - cached_exp10 - 1; exp += handler.size - cached_exp10 - 1;
fallback_format(value, handler.size, buf, exp); fallback_format(value, handler.precision, buf, exp);
return exp; return exp;
} }
int num_digits = handler.size; int num_digits = handler.size;