mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-07 17:41:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Grisu

Browse Source
This commit is contained in:
Victor Zverovich 2019-05-15 08:40:21 -07:00
parent 2a9e8b52de
commit d179ec5f8b
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -647,29 +647,30 @@ template <int GRISU_VERSION> struct grisu_shortest_handler {
return digits::more; return digits::more;
} }
// This implements Grisu3's round_weed. // Decrement the generated number approaching value from above.
digits::result on_digit(char digit, uint64_t divisor, uint64_t remainder, void round(uint64_t d, uint64_t divisor, uint64_t& remainder,
uint64_t error, int exp, bool integral) { uint64_t error) {
buf[size++] = digit;
if (remainder >= error) return digits::more;
if (GRISU_VERSION != 3) {
uint64_t d = integral ? diff : diff * data::POWERS_OF_10_64[-exp];
while (remainder < d && error - remainder >= divisor && while (remainder < d && error - remainder >= divisor &&
(remainder + divisor < d || (remainder + divisor < d ||
d - remainder >= remainder + divisor - d)) { d - remainder >= remainder + divisor - d)) {
--buf[size - 1]; --buf[size - 1];
remainder += divisor; remainder += divisor;
} }
}
// Implements Grisu's round_weed.
digits::result on_digit(char digit, uint64_t divisor, uint64_t remainder,
uint64_t error, int exp, bool integral) {
buf[size++] = digit;
if (remainder >= error) return digits::more;
if (GRISU_VERSION != 3) {
uint64_t d = integral ? diff : diff * data::POWERS_OF_10_64[-exp];
round(d, divisor, remainder, error);
return digits::done; return digits::done;
} }
uint64_t unit = integral ? 1 : data::POWERS_OF_10_64[-exp]; uint64_t unit = integral ? 1 : data::POWERS_OF_10_64[-exp];
uint64_t up = (diff - 1) * unit; // wp_Wup uint64_t up = (diff - 1) * unit; // wp_Wup
while (remainder < up && error - remainder >= divisor && round(up, divisor, remainder, error);
(remainder + divisor < up ||
up - remainder >= remainder + divisor - up)) {
--buf[size - 1];
remainder += divisor;
}
uint64_t down = (diff + 1) * unit; // wp_Wdown uint64_t down = (diff + 1) * unit; // wp_Wdown
if (remainder < down && error - remainder >= divisor && if (remainder < down && error - remainder >= divisor &&
(remainder + divisor < down || (remainder + divisor < down ||