diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 11:08:35 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 11:08:35 +0000 |
commit | d058c8a2700cc35885326a0f2ca8d7d1e6eb1251 (patch) | |
tree | 4d4279fca4a44b6f18adcc3b5ca1663941c23ff3 /util.c | |
parent | 1f106a915e154e8d2de285e60ed8b8fd59842496 (diff) |
merge revision(s) 58796: [Backport #13545]
Merge latest dtoa.c [Bug #13545]
Apply some part of http://www.netlib.org/fp/dtoa.c with my eyes...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -2100,7 +2100,7 @@ break2: for (nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++) if (nd < 9) y = 10*y + c - '0'; - else if (nd < 16) + else if (nd < DBL_DIG + 2) z = 10*z + c - '0'; nd0 = nd; #ifdef USE_LOCALE @@ -2140,17 +2140,19 @@ break2: for (; c >= '0' && c <= '9'; c = *++s) { have_dig: nz++; - if (nf > DBL_DIG * 4) continue; + if (nd > DBL_DIG * 4) { + continue; + } if (c -= '0') { nf += nz; for (i = 1; i < nz; i++) if (nd++ < 9) y *= 10; - else if (nd <= DBL_DIG + 1) + else if (nd <= DBL_DIG + 2) z *= 10; if (nd++ < 9) y = 10*y + c; - else if (nd <= DBL_DIG + 1) + else if (nd <= DBL_DIG + 2) z = 10*z + c; nz = 0; } @@ -2238,7 +2240,7 @@ ret0: if (!nd0) nd0 = nd; - k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1; + k = nd < DBL_DIG + 2 ? nd : DBL_DIG + 2; dval(rv) = y; if (k > 9) { #ifdef SET_INEXACT |