ruby-changes:30126
From: nobu <ko1@a...>
Date: Fri, 26 Jul 2013 11:42:37 +0900 (JST)
Subject: [ruby-changes:30126] nobu:r42178 (trunk): rational.c: ensure to be Rational
nobu 2013-07-26 11:42:26 +0900 (Fri, 26 Jul 2013) New Revision: 42178 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42178 Log: rational.c: ensure to be Rational * rational.c (f_round_common): Rational is expected to be returned by Rational#*, but mathn.rb breaks that assumption. [ruby-core:56177] [Bug #8687] Modified files: trunk/ChangeLog trunk/rational.c trunk/test/test_mathn.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 42177) +++ ChangeLog (revision 42178) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Fri Jul 26 11:42:07 2013 Nobuyoshi Nakada <nobu@r...> + + * rational.c (f_round_common): Rational is expected to be returned by + Rational#*, but mathn.rb breaks that assumption. [ruby-core:56177] + [Bug #8687] + Fri Jul 26 01:37:45 2013 NARUSE, Yui <naruse@r...> * include/ruby/ruby.h: check defined(USE_RGENGC_LOGGING_WB_UNPROTECT) Index: test/test_mathn.rb =================================================================== --- test/test_mathn.rb (revision 42177) +++ test/test_mathn.rb (revision 42178) @@ -5,7 +5,7 @@ require_relative 'ruby/envutil' https://github.com/ruby/ruby/blob/trunk/test/test_mathn.rb#L5 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 @@ -15,4 +15,104 @@ class TestMathn < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/test_mathn.rb#L15 1.quo(2); puts :OK EOS 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 Index: rational.c =================================================================== --- rational.c (revision 42177) +++ rational.c (revision 42178) @@ -1285,6 +1285,10 @@ f_round_common(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/rational.c#L1285 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); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/