1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

object.c: no TypeError at special const clone

Browse Source 
* object.c (rb_obj_clone2): no longer raise a TypeError for
  special constants, and return itself instead.  however, if
  freeze option is false, raise an ArgumentError.  [Feature#12979]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-11-29 15:14:05 +00:00
parent 9e3afec027
commit fe3b21bb8c
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
object.c
View File

@ -346,7 +346,9 @@ rb_obj_clone2(int argc, VALUE *argv, VALUE obj)
} }
if (rb_special_const_p(obj)) { if (rb_special_const_p(obj)) {
rb_raise(rb_eTypeError, "can't clone %s", rb_obj_classname(obj)); if (kwfreeze == Qfalse)
rb_raise(rb_eArgError, "can't unfreeze %s", rb_obj_classname(obj));
return obj;
} }
clone = rb_obj_alloc(rb_obj_class(obj)); clone = rb_obj_alloc(rb_obj_class(obj));
RBASIC(clone)->flags &= (FL_TAINT|FL_PROMOTED0|FL_PROMOTED1); RBASIC(clone)->flags &= (FL_TAINT|FL_PROMOTED0|FL_PROMOTED1);

11
test/ruby/test_object.rb
View File

@ -22,6 +22,7 @@ class TestObject < Test::Unit::TestCase
assert_equal 1, 1.dup assert_equal 1, 1.dup
assert_equal true, true.dup assert_equal true, true.dup
assert_equal nil, nil.dup assert_equal nil, nil.dup
assert_equal false, false.dup
assert_raise(TypeError) do assert_raise(TypeError) do
Object.new.instance_eval { initialize_copy(1) } Object.new.instance_eval { initialize_copy(1) }
@ -37,11 +38,21 @@ class TestObject < Test::Unit::TestCase
assert_equal(true, c.frozen?) assert_equal(true, c.frozen?)
assert_equal(2, c.b) assert_equal(2, c.b)
assert_raise(ArgumentError) {a.clone(freeze: [])}
d = a.clone(freeze: false) d = a.clone(freeze: false)
def d.e; 3; end def d.e; 3; end
assert_equal(false, d.frozen?) assert_equal(false, d.frozen?)
assert_equal(2, d.b) assert_equal(2, d.b)
assert_equal(3, d.e) assert_equal(3, d.e)
assert_equal 1, 1.clone
assert_equal true, true.clone
assert_equal nil, nil.clone
assert_equal false, false.clone
assert_raise(ArgumentError) {1.clone(freeze: false)}
assert_raise(ArgumentError) {true.clone(freeze: false)}
assert_raise(ArgumentError) {nil.clone(freeze: false)}
assert_raise(ArgumentError) {false.clone(freeze: false)}
end end
def test_init_dupclone def test_init_dupclone