diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | include/ruby/intern.h | 1 | ||||
| -rw-r--r-- | numeric.c | 13 | ||||
| -rw-r--r-- | test/ruby/test_float.rb | 2 |
4 files changed, 19 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Wed Mar 23 08:07:33 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * numeric.c (flo_round): fix inaccurate results. + Wed Mar 23 00:12:16 2011 Tajima Akio <artonx@yahoo.co.jp> * win32/win32.c: wait process real termination after reading diff --git a/include/ruby/intern.h b/include/ruby/intern.h index f330aa509a..9c736821a3 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -126,6 +126,7 @@ VALUE rb_big_plus(VALUE, VALUE); VALUE rb_big_minus(VALUE, VALUE); VALUE rb_big_mul(VALUE, VALUE); VALUE rb_big_div(VALUE, VALUE); +VALUE rb_big_idiv(VALUE, VALUE); VALUE rb_big_modulo(VALUE, VALUE); VALUE rb_big_divmod(VALUE, VALUE); VALUE rb_big_pow(VALUE, VALUE); @@ -97,6 +97,9 @@ round(double x) } #endif +static VALUE fix_mul(VALUE x, VALUE y); +static VALUE int_pow(long x, unsigned long y); + static ID id_coerce, id_to_i, id_eq; VALUE rb_cNumeric; @@ -1492,7 +1495,15 @@ flo_round(int argc, VALUE *argv, VALUE num) if (ndigits < 0) number = 0; } else { - if (ndigits < 0) number /= f; + if (ndigits < 0) { + if (fabs(number) < f) return INT2FIX(0); + if (!FIXABLE(number)) { + VALUE f10 = int_pow(10, -ndigits); + num = rb_big_idiv(rb_dbl2big(number), f10); + return FIXNUM_P(num) ? fix_mul(num, f10) : rb_big_mul(num, f10); + } + number /= f; + } else number *= f; number = round(number); if (ndigits < 0) number *= f; diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index 85faf63355..2e879bdd2f 100644 --- a/test/ruby/test_float.rb +++ b/test/ruby/test_float.rb @@ -320,6 +320,8 @@ class TestFloat < Test::Unit::TestCase assert_equal(1.110, 1.111.round(2)) assert_equal(11110.0, 11111.1.round(-1)) assert_equal(11100.0, 11111.1.round(-2)) + + assert_equal(10**300, 1.1e300.round(-300)) end VS = [ |