From d058c8a2700cc35885326a0f2ca8d7d1e6eb1251 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 30 Jun 2017 11:08:35 +0000 Subject: 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 --- util.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index 95ac2b09b5..904be35167 100644 --- a/util.c +++ b/util.c @@ -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 -- cgit v1.2.3