summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--rational.c4
-rw-r--r--test/test_mathn.rb102
3 files changed, 111 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6422417..2d01e4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 26 11:42:07 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]
+
Fri Jul 26 01:37:45 2013 NARUSE, Yui <naruse@ruby-lang.org>
* include/ruby/ruby.h: check defined(USE_RGENGC_LOGGING_WB_UNPROTECT)
diff --git a/rational.c b/rational.c
index 86c33b5..6cd31e1 100644
--- a/rational.c
+++ b/rational.c
@@ -1285,6 +1285,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 135f66f..e9a2c4c 100644
--- a/test/test_mathn.rb
+++ b/test/test_mathn.rb
@@ -5,7 +5,7 @@ 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
@@ -15,4 +15,104 @@ class TestMathn < Test::Unit::TestCase
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