ruby-changes:30274
From: usa <ko1@a...>
Date: Fri, 2 Aug 2013 20:30:53 +0900 (JST)
Subject: [ruby-changes:30274] usa:r42326 (ruby_1_9_3): merge revision(s) 42178: [Backport #8687]
usa 2013-08-02 20:30:41 +0900 (Fri, 02 Aug 2013) New Revision: 42326 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42326 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_1_9_3/ Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/rational.c branches/ruby_1_9_3/test/test_mathn.rb branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 42325) +++ ruby_1_9_3/ChangeLog (revision 42326) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1 +Fri Aug 2 20:03:39 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] + Wed Jul 17 11:00:21 2013 Tadayoshi Funaba <tadf@d...> * ext/date/date_core.c: [ruby-core:46058]. Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 42325) +++ ruby_1_9_3/version.h (revision 42326) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1 #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 455 +#define RUBY_PATCHLEVEL 456 -#define RUBY_RELEASE_DATE "2013-07-17" +#define RUBY_RELEASE_DATE "2013-08-02" #define RUBY_RELEASE_YEAR 2013 -#define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_MONTH 8 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" Index: ruby_1_9_3/test/test_mathn.rb =================================================================== --- ruby_1_9_3/test/test_mathn.rb (revision 42325) +++ ruby_1_9_3/test/test_mathn.rb (revision 42326) @@ -5,6 +5,102 @@ require_relative 'ruby/envutil' https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/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]' + end + + def assert_separated_equal(options, expected, actual, message = nil) + assert_in_out_err([*options, '-e', "p((#{actual})==(#{expected}))"], "", ["true"], [], message) + end + + def test_floor + assert_separated_equal(%w[-rmathn], " 2", "( 13/5).floor") + assert_separated_equal(%w[-rmathn], " 2", "( 5/2).floor") + assert_separated_equal(%w[-rmathn], " 2", "( 12/5).floor") + assert_separated_equal(%w[-rmathn], "-3", "(-12/5).floor") + assert_separated_equal(%w[-rmathn], "-3", "( -5/2).floor") + assert_separated_equal(%w[-rmathn], "-3", "(-13/5).floor") + + assert_separated_equal(%w[-rmathn], " 2", "( 13/5).floor(0)") + assert_separated_equal(%w[-rmathn], " 2", "( 5/2).floor(0)") + assert_separated_equal(%w[-rmathn], " 2", "( 12/5).floor(0)") + assert_separated_equal(%w[-rmathn], "-3", "(-12/5).floor(0)") + assert_separated_equal(%w[-rmathn], "-3", "( -5/2).floor(0)") + assert_separated_equal(%w[-rmathn], "-3", "(-13/5).floor(0)") + + assert_separated_equal(%w[-rmathn], "( 13/5)", "( 13/5).floor(2)") + assert_separated_equal(%w[-rmathn], "( 5/2)", "( 5/2).floor(2)") + assert_separated_equal(%w[-rmathn], "( 12/5)", "( 12/5).floor(2)") + assert_separated_equal(%w[-rmathn], "(-12/5)", "(-12/5).floor(2)") + assert_separated_equal(%w[-rmathn], "( -5/2)", "( -5/2).floor(2)") + assert_separated_equal(%w[-rmathn], "(-13/5)", "(-13/5).floor(2)") + end + + def test_ceil + assert_separated_equal(%w[-rmathn], " 3", "( 13/5).ceil") + assert_separated_equal(%w[-rmathn], " 3", "( 5/2).ceil") + assert_separated_equal(%w[-rmathn], " 3", "( 12/5).ceil") + assert_separated_equal(%w[-rmathn], "-2", "(-12/5).ceil") + assert_separated_equal(%w[-rmathn], "-2", "( -5/2).ceil") + assert_separated_equal(%w[-rmathn], "-2", "(-13/5).ceil") + + assert_separated_equal(%w[-rmathn], " 3", "( 13/5).ceil(0)") + assert_separated_equal(%w[-rmathn], " 3", "( 5/2).ceil(0)") + assert_separated_equal(%w[-rmathn], " 3", "( 12/5).ceil(0)") + assert_separated_equal(%w[-rmathn], "-2", "(-12/5).ceil(0)") + assert_separated_equal(%w[-rmathn], "-2", "( -5/2).ceil(0)") + assert_separated_equal(%w[-rmathn], "-2", "(-13/5).ceil(0)") + + assert_separated_equal(%w[-rmathn], "( 13/5)", "( 13/5).ceil(2)") + assert_separated_equal(%w[-rmathn], "( 5/2)", "( 5/2).ceil(2)") + assert_separated_equal(%w[-rmathn], "( 12/5)", "( 12/5).ceil(2)") + assert_separated_equal(%w[-rmathn], "(-12/5)", "(-12/5).ceil(2)") + assert_separated_equal(%w[-rmathn], "( -5/2)", "( -5/2).ceil(2)") + assert_separated_equal(%w[-rmathn], "(-13/5)", "(-13/5).ceil(2)") + end + + def test_truncate + assert_separated_equal(%w[-rmathn], " 2", "( 13/5).truncate") + assert_separated_equal(%w[-rmathn], " 2", "( 5/2).truncate") + assert_separated_equal(%w[-rmathn], " 2", "( 12/5).truncate") + assert_separated_equal(%w[-rmathn], "-2", "(-12/5).truncate") + assert_separated_equal(%w[-rmathn], "-2", "( -5/2).truncate") + assert_separated_equal(%w[-rmathn], "-2", "(-13/5).truncate") + + assert_separated_equal(%w[-rmathn], " 2", "( 13/5).truncate(0)") + assert_separated_equal(%w[-rmathn], " 2", "( 5/2).truncate(0)") + assert_separated_equal(%w[-rmathn], " 2", "( 12/5).truncate(0)") + assert_separated_equal(%w[-rmathn], "-2", "(-12/5).truncate(0)") + assert_separated_equal(%w[-rmathn], "-2", "( -5/2).truncate(0)") + assert_separated_equal(%w[-rmathn], "-2", "(-13/5).truncate(0)") + + assert_separated_equal(%w[-rmathn], "( 13/5)", "( 13/5).truncate(2)") + assert_separated_equal(%w[-rmathn], "( 5/2)", "( 5/2).truncate(2)") + assert_separated_equal(%w[-rmathn], "( 12/5)", "( 12/5).truncate(2)") + assert_separated_equal(%w[-rmathn], "(-12/5)", "(-12/5).truncate(2)") + assert_separated_equal(%w[-rmathn], "( -5/2)", "( -5/2).truncate(2)") + assert_separated_equal(%w[-rmathn], "(-13/5)", "(-13/5).truncate(2)") + end + + def test_round + assert_separated_equal(%w[-rmathn], " 3", "( 13/5).round") + assert_separated_equal(%w[-rmathn], " 3", "( 5/2).round") + assert_separated_equal(%w[-rmathn], " 2", "( 12/5).round") + assert_separated_equal(%w[-rmathn], "-2", "(-12/5).round") + assert_separated_equal(%w[-rmathn], "-3", "( -5/2).round") + assert_separated_equal(%w[-rmathn], "-3", "(-13/5).round") + + assert_separated_equal(%w[-rmathn], " 3", "( 13/5).round(0)") + assert_separated_equal(%w[-rmathn], " 3", "( 5/2).round(0)") + assert_separated_equal(%w[-rmathn], " 2", "( 12/5).round(0)") + assert_separated_equal(%w[-rmathn], "-2", "(-12/5).round(0)") + assert_separated_equal(%w[-rmathn], "-3", "( -5/2).round(0)") + assert_separated_equal(%w[-rmathn], "-3", "(-13/5).round(0)") + + assert_separated_equal(%w[-rmathn], "( 13/5)", "( 13/5).round(2)") + assert_separated_equal(%w[-rmathn], "( 5/2)", "( 5/2).round(2)") + assert_separated_equal(%w[-rmathn], "( 12/5)", "( 12/5).round(2)") + assert_separated_equal(%w[-rmathn], "(-12/5)", "(-12/5).round(2)") + assert_separated_equal(%w[-rmathn], "( -5/2)", "( -5/2).round(2)") + assert_separated_equal(%w[-rmathn], "(-13/5)", "(-13/5).round(2)") end end Index: ruby_1_9_3/rational.c =================================================================== --- ruby_1_9_3/rational.c (revision 42325) +++ ruby_1_9_3/rational.c (revision 42326) @@ -1230,6 +1230,10 @@ f_round_common(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/rational.c#L1230 b = f_expt10(n); s = f_mul(self, b); + 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_1_9_3 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r42178 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/