diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-27 02:10:53 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-27 02:10:53 +0000 |
commit | 180c744b3b4043b2491031a4af9c8cbe4c0ae2ab (patch) | |
tree | 0937ce3610db86e888ef38a9c6ef7b52ab91d90c /test/ruby | |
parent | 909bc583a4f5c5c09fd47b89f44005d66b8bc674 (diff) | |
download | ruby-180c744b3b4043b2491031a4af9c8cbe4c0ae2ab.tar.gz |
* numeric.c (rb_float_new_in_heap), include/ruby/ruby.h:
make all Float objects frozen.
[ruby-dev:46081] [ruby-trunk - Feature #6936]
Most part of patch by NARUSE, Yui <naruse@ruby-lang.org>.
* class.c (singleton_class_of): raise TypeError when
trying to define a singleton method on Float objects.
* vm.c (vm_define_method): ditto.
* test/ruby/marshaltestlib.rb: catch up above changes.
* test/ruby/test_class.rb: ditto.
* test/test_pp.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37341 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r-- | test/ruby/marshaltestlib.rb | 24 | ||||
-rw-r--r-- | test/ruby/test_class.rb | 8 |
2 files changed, 2 insertions, 30 deletions
diff --git a/test/ruby/marshaltestlib.rb b/test/ruby/marshaltestlib.rb index 39471aac64..d9d06325fe 100644 --- a/test/ruby/marshaltestlib.rb +++ b/test/ruby/marshaltestlib.rb @@ -207,30 +207,6 @@ module MarshalTestLib marshal_equal(NegativeZero) {|o| 1.0/o} end - def test_float_ivar - o1 = 1.23 - o1.instance_eval { @iv = 1 } - marshal_equal(o1) {|o| o.instance_eval { @iv }} - end - - def test_float_ivar_self - o1 = 5.5 - o1.instance_eval { @iv = o1 } - marshal_equal(o1) {|o| o.instance_eval { @iv }} - end - - def test_float_extend - o1 = 0.0/0.0 - o1.extend(Mod1) - marshal_equal(o1) { |o| - (class << self; self; end).ancestors - } - o1.extend(Mod2) - marshal_equal(o1) { |o| - (class << self; self; end).ancestors - } - end - class MyRange < Range; def initialize(v, *args) super(*args); @v = v; end end def test_range marshal_equal(1..2) diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb index 8b2328e289..a3384fa083 100644 --- a/test/ruby/test_class.rb +++ b/test/ruby/test_class.rb @@ -187,12 +187,8 @@ class TestClass < Test::Unit::TestCase def test_singleton_class assert_raise(TypeError) { 1.extend(Module.new) } - if 1.0.equal? 1.0 # flonum? - assert_raise(TypeError) { 1.0.extend(Module.new) } - else - assert_nothing_raised { 1.0.extend(Module.new) } - end - assert_nothing_raised { (2.0**1000).extend(Module.new) } + assert_raise(TypeError) { 1.0.extend(Module.new) } + assert_raise(TypeError) { (2.0**1000).extend(Module.new) } assert_raise(TypeError) { :foo.extend(Module.new) } assert_in_out_err([], <<-INPUT, %w(:foo :foo true true), []) |