From 640420f7044405cec4b1e6486caca4def5f80a45 Mon Sep 17 00:00:00 2001 From: mrkn Date: Mon, 29 Aug 2011 01:07:15 +0000 Subject: * numeric.c (bit_coerce): A Fixnum and a Bignum are only permitted for bitwise arithmetic with a Fixnum. #1792 * test/ruby/test_fixnum.rb: add tests for the above change. * bignum.c (bit_coerce): A Fixnum and a Bignum are only permitted for bitwise arithmetic with a Bignum. #1792 * test/ruby/test_bignum.rb: add tests for the above change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_bignum.rb | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'test/ruby/test_bignum.rb') diff --git a/test/ruby/test_bignum.rb b/test/ruby/test_bignum.rb index 264c68bcf7..af729a9de6 100644 --- a/test/ruby/test_bignum.rb +++ b/test/ruby/test_bignum.rb @@ -118,6 +118,8 @@ class TestBignum < Test::Unit::TestCase T32P = T32 - 1 # 4294967295 T64 = 2**64 # 18446744073709551616 T64P = T64 - 1 # 18446744073709551615 + T1024 = 2**1024 + T1024P = T1024 - 1 def test_big_2comp assert_equal("-4294967296", (~T32P).to_s) @@ -321,6 +323,48 @@ class TestBignum < Test::Unit::TestCase assert_equal(T64 + T32, T32 ^ T64) end + class DummyNumeric < Numeric + def to_int + 1 + end + end + + def test_and_with_float + assert_raise(TypeError) { T1024 & 1.5 } + end + + def test_and_with_rational + assert_raise(TypeError, "#1792") { T1024 & Rational(3, 2) } + end + + def test_and_with_nonintegral_numeric + assert_raise(TypeError, "#1792") { T1024 & DummyNumeric.new } + end + + def test_or_with_float + assert_raise(TypeError) { T1024 | 1.5 } + end + + def test_or_with_rational + assert_raise(TypeError, "#1792") { T1024 | Rational(3, 2) } + end + + def test_or_with_nonintegral_numeric + assert_raise(TypeError, "#1792") { T1024 | DummyNumeric.new } + end + + def test_xor_with_float + assert_raise(TypeError) { T1024 ^ 1.5 } + end + + def test_xor_with_rational + assert_raise(TypeError, "#1792") { T1024 ^ Rational(3, 2) } + end + + def test_xor_with_nonintegral_numeric + assert_raise(TypeError, "#1792") { T1024 ^ DummyNumeric.new } + end + def test_shift2 assert_equal(2**33, (2**32) << 1) assert_equal(2**31, (2**32) << -1) -- cgit v1.2.3