diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | rational.c | 4 | ||||
-rw-r--r-- | test/test_mathn.rb | 102 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 112 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sun Jul 28 22:00:10 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * rational.c (f_round_common): Rational is expected to be returned by + Rational#*, but mathn.rb breaks that assumption. [ruby-core:56177] + [Bug #8687] + Sun Jul 28 21:50:34 2013 Masaki Matsushita <glass.saga@gmail.com> * io.c (io_getpartial): use rb_str_locktmp_ensure(). diff --git a/rational.c b/rational.c index 4129da2c81..dd5d24dc69 100644 --- a/rational.c +++ b/rational.c @@ -1279,6 +1279,10 @@ f_round_common(int argc, VALUE *argv, VALUE self, VALUE (*func)(VALUE)) return self; } + if (!k_rational_p(s)) { + s = f_rational_new_bang1(CLASS_OF(self), s); + } + s = (*func)(s); s = f_div(f_rational_new_bang1(CLASS_OF(self), s), b); diff --git a/test/test_mathn.rb b/test/test_mathn.rb index 7f2b294bba..b4adf93894 100644 --- a/test/test_mathn.rb +++ b/test/test_mathn.rb @@ -5,8 +5,108 @@ require_relative 'ruby/envutil' class TestMathn < Test::Unit::TestCase def test_power assert_in_out_err ['-r', 'mathn', '-e', 'a=1**2;!a'], "", [], [], '[ruby-core:25740]' - assert_in_out_err ['-r', 'mathn', '-e', 'a=(1<<126)**2;!a'], "", [], [], '[ruby-core:25740]' + assert_in_out_err ['-r', 'mathn', '-e', 'a=(1 << 126)**2;!a'], "", [], [], '[ruby-core:25740]' assert_in_out_err ['-r', 'mathn/complex', '-e', 'a=Complex(0,1)**4;!a'], "", [], [], '[ruby-core:44170]' assert_in_out_err ['-r', 'mathn/complex', '-e', 'a=Complex(0,1)**5;!a'], "", [], [], '[ruby-core:44170]' end + + def test_floor + assert_separately(%w[-rmathn], <<-EOS) + assert_equal( 2, ( 13/5).floor) + assert_equal( 2, ( 5/2).floor) + assert_equal( 2, ( 12/5).floor) + assert_equal(-3, (-12/5).floor) + assert_equal(-3, ( -5/2).floor) + assert_equal(-3, (-13/5).floor) + + assert_equal( 2, ( 13/5).floor(0)) + assert_equal( 2, ( 5/2).floor(0)) + assert_equal( 2, ( 12/5).floor(0)) + assert_equal(-3, (-12/5).floor(0)) + assert_equal(-3, ( -5/2).floor(0)) + assert_equal(-3, (-13/5).floor(0)) + + assert_equal(( 13/5), ( 13/5).floor(2)) + assert_equal(( 5/2), ( 5/2).floor(2)) + assert_equal(( 12/5), ( 12/5).floor(2)) + assert_equal((-12/5), (-12/5).floor(2)) + assert_equal(( -5/2), ( -5/2).floor(2)) + assert_equal((-13/5), (-13/5).floor(2)) + EOS + end + + def test_ceil + assert_separately(%w[-rmathn], <<-EOS) + assert_equal( 3, ( 13/5).ceil) + assert_equal( 3, ( 5/2).ceil) + assert_equal( 3, ( 12/5).ceil) + assert_equal(-2, (-12/5).ceil) + assert_equal(-2, ( -5/2).ceil) + assert_equal(-2, (-13/5).ceil) + + assert_equal( 3, ( 13/5).ceil(0)) + assert_equal( 3, ( 5/2).ceil(0)) + assert_equal( 3, ( 12/5).ceil(0)) + assert_equal(-2, (-12/5).ceil(0)) + assert_equal(-2, ( -5/2).ceil(0)) + assert_equal(-2, (-13/5).ceil(0)) + + assert_equal(( 13/5), ( 13/5).ceil(2)) + assert_equal(( 5/2), ( 5/2).ceil(2)) + assert_equal(( 12/5), ( 12/5).ceil(2)) + assert_equal((-12/5), (-12/5).ceil(2)) + assert_equal(( -5/2), ( -5/2).ceil(2)) + assert_equal((-13/5), (-13/5).ceil(2)) + EOS + end + + def test_truncate + assert_separately(%w[-rmathn], <<-EOS) + assert_equal( 2, ( 13/5).truncate) + assert_equal( 2, ( 5/2).truncate) + assert_equal( 2, ( 12/5).truncate) + assert_equal(-2, (-12/5).truncate) + assert_equal(-2, ( -5/2).truncate) + assert_equal(-2, (-13/5).truncate) + + assert_equal( 2, ( 13/5).truncate(0)) + assert_equal( 2, ( 5/2).truncate(0)) + assert_equal( 2, ( 12/5).truncate(0)) + assert_equal(-2, (-12/5).truncate(0)) + assert_equal(-2, ( -5/2).truncate(0)) + assert_equal(-2, (-13/5).truncate(0)) + + assert_equal(( 13/5), ( 13/5).truncate(2)) + assert_equal(( 5/2), ( 5/2).truncate(2)) + assert_equal(( 12/5), ( 12/5).truncate(2)) + assert_equal((-12/5), (-12/5).truncate(2)) + assert_equal(( -5/2), ( -5/2).truncate(2)) + assert_equal((-13/5), (-13/5).truncate(2)) + EOS + end + + def test_round + assert_separately(%w[-rmathn], <<-EOS) + assert_equal( 3, ( 13/5).round) + assert_equal( 3, ( 5/2).round) + assert_equal( 2, ( 12/5).round) + assert_equal(-2, (-12/5).round) + assert_equal(-3, ( -5/2).round) + assert_equal(-3, (-13/5).round) + + assert_equal( 3, ( 13/5).round(0)) + assert_equal( 3, ( 5/2).round(0)) + assert_equal( 2, ( 12/5).round(0)) + assert_equal(-2, (-12/5).round(0)) + assert_equal(-3, ( -5/2).round(0)) + assert_equal(-3, (-13/5).round(0)) + + assert_equal(( 13/5), ( 13/5).round(2)) + assert_equal(( 5/2), ( 5/2).round(2)) + assert_equal(( 12/5), ( 12/5).round(2)) + assert_equal((-12/5), (-12/5).round(2)) + assert_equal(( -5/2), ( -5/2).round(2)) + assert_equal((-13/5), (-13/5).round(2)) + EOS + end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-07-28" -#define RUBY_PATCHLEVEL 282 +#define RUBY_PATCHLEVEL 283 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 7 |