diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-01 08:31:24 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-01 08:31:24 +0000 |
commit | 43284b6bf8324a762808537d5cd2c0774b662a84 (patch) | |
tree | 1bc00e36f49d5dd744264261004d72eeed14cf2e /insns.def | |
parent | d9acd1965dfe9a241315c7e94c9942f6df1ed3fd (diff) |
* insns.def (defineclass), vm_insnhelper.c (vm_get_cvar_base): see
also inherited constants for classes without superclass and
modules. [ruby-core:37698] [Bug #3423]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insns.def')
-rw-r--r-- | insns.def | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -895,6 +895,7 @@ defineclass (VALUE val) { VALUE klass; + int newclass = 1; switch ((int)define_type) { case 0: /* scoped: class Foo::Bar */ @@ -903,15 +904,16 @@ defineclass if (super == Qnil) { super = rb_cObject; + newclass = 0; } vm_check_if_namespace(cbase); /* find klass */ rb_autoload_load(cbase, id); - if (rb_const_defined_at(cbase, id)) { + if (vm_const_defined_at(cbase, id, newclass)) { /* already exist */ - klass = define_type == 0 ? rb_public_const_get(cbase, id) : rb_const_get_at(cbase, id); + klass = define_type == 0 ? rb_public_const_get(cbase, id) : rb_const_get_from(cbase, id); if (TYPE(klass) != T_CLASS) { rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id)); } @@ -947,8 +949,8 @@ defineclass vm_check_if_namespace(cbase); /* find klass */ - if (rb_const_defined_at(cbase, id)) { - klass = define_type == 2 ? rb_public_const_get(cbase, id) : rb_const_get_at(cbase, id); + if (vm_const_defined_at(cbase, id, 0)) { + klass = define_type == 2 ? rb_public_const_get(cbase, id) : rb_const_get_from(cbase, id); /* already exist */ if (TYPE(klass) != T_MODULE) { rb_raise(rb_eTypeError, "%s is not a module", rb_id2name(id)); |