diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-10 12:46:43 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-10 12:46:43 +0000 |
commit | 06dd20f7fe384f69ba4210c929e43a95c215ffa4 (patch) | |
tree | f408cfbb1a38ce6923f83d82261cb88ed5e1926a /insns.def | |
parent | 15fbd05e4e53798ee80cc21af22a53edc3c8229b (diff) |
* insns.def (defineclass): Also raise an error when redeclaring the
superclass of a class as Object and it has another superclass.
[Bug #12367] [ruby-core:75446]
* test/ruby/test_class.rb: test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insns.def')
-rw-r--r-- | insns.def | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -865,10 +865,6 @@ defineclass rb_obj_class(super)); } - if (super == Qnil) { - super = rb_cObject; - } - vm_check_if_namespace(cbase); /* find klass */ @@ -881,7 +877,7 @@ defineclass rb_raise(rb_eTypeError, "%"PRIsVALUE" is not a class", rb_id2str(id)); } - if (super != rb_cObject) { + if (VM_DEFINECLASS_HAS_SUPERCLASS_P(flags)) { VALUE tmp; tmp = rb_class_real(RCLASS_SUPER(klass)); @@ -892,6 +888,9 @@ defineclass } } else { + if (!VM_DEFINECLASS_HAS_SUPERCLASS_P(flags)) { + super = rb_cObject; + } /* new class declaration */ klass = rb_define_class_id(id, super); rb_set_class_path_string(klass, cbase, rb_id2str(id)); |