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 | |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_float.rb | 2 | ||||
-rw-r--r-- | util.c | 12 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Fri Jun 30 20:07:37 2017 NARUSE, Yui <naruse@ruby-lang.org> + + * util.c (ruby_strtod) Merge latest dtoa.c [Bug #13545] + Apply some part of http://www.netlib.org/fp/dtoa.c with my eyes... + Fri Jun 30 20:00:18 2017 Nobuyoshi Nakada <nobu@ruby-lang.org> * dir.c (is_case_sensitive): use getattrlist() if fgetattrlist() is diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index 7d979a824f..bd3a465db8 100644 --- a/test/ruby/test_float.rb +++ b/test/ruby/test_float.rb @@ -16,6 +16,8 @@ class TestFloat < Test::Unit::TestCase assert_in_delta(13.4 % 1, 0.4, 0.0001) assert_equal(36893488147419111424, 36893488147419107329.0.to_i) + assert_equal(1185151044158398820374743613440, + 1.1851510441583988e+30.to_i) end def nan_test(x,y) @@ -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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.5" #define RUBY_RELEASE_DATE "2017-06-30" -#define RUBY_PATCHLEVEL 320 +#define RUBY_PATCHLEVEL 321 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 6 |