ruby-changes:30165
From: nagachika <ko1@a...>
Date: Sun, 28 Jul 2013 22:04:57 +0900 (JST)
Subject: [ruby-changes:30165] nagachika:r42217 (ruby_2_0_0): merge revision(s) 42178: [Backport #8687]
nagachika 2013-07-28 22:04:45 +0900 (Sun, 28 Jul 2013) New Revision: 42217 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42217 Log: merge revision(s) 42178: [Backport #8687] * 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 directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/rational.c branches/ruby_2_0_0/test/test_mathn.rb branches/ruby_2_0_0/version.h Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 42216) +++ ruby_2_0_0/ChangeLog (revision 42217) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Sun Jul 28 22:00:10 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] + Sun Jul 28 21:50:34 2013 Masaki Matsushita <glass.saga@g...> * io.c (io_getpartial): use rb_str_locktmp_ensure(). Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 42216) +++ ruby_2_0_0/version.h (revision 42217) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #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 Index: ruby_2_0_0/test/test_mathn.rb =================================================================== --- ruby_2_0_0/test/test_mathn.rb (revision 42216) +++ ruby_2_0_0/test/test_mathn.rb (revision 42217) @@ -5,8 +5,108 @@ require_relative 'ruby/envutil' https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/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 + + 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: ruby_2_0_0/rational.c =================================================================== --- ruby_2_0_0/rational.c (revision 42216) +++ ruby_2_0_0/rational.c (revision 42217) @@ -1279,6 +1279,10 @@ f_round_common(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/rational.c#L1279 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); Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r42178 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/