diff options
-rw-r--r-- | test/ruby/test_float.rb | 2 | ||||
-rw-r--r-- | util.c | 12 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index dfe636045d..7be9894a4b 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) @@ -2109,7 +2109,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 @@ -2149,17 +2149,19 @@ break2: for (; c >= '0' && c <= '9'; c = *++s) { have_dig: nz++; - if (nd > 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; } @@ -2247,7 +2249,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.4.2" #define RUBY_RELEASE_DATE "2017-07-10" -#define RUBY_PATCHLEVEL 138 +#define RUBY_PATCHLEVEL 139 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 7 |