From a0f487921e21dff86de25aa79cf1e102fc90ad3e Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 22 Apr 2008 03:03:51 +0000 Subject: * vm_insnhelper.c (vm_get_ev_const): search from the base klass if it is given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm_insnhelper.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0d39010d2..3269669c69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Apr 22 12:03:50 2008 Nobuyoshi Nakada + + * vm_insnhelper.c (vm_get_ev_const): search from the base klass if it + is given. + Tue Apr 22 09:58:13 2008 NAKAMURA Usaku * ext/win32ole/win32ole.c: avoid warnings. diff --git a/vm_insnhelper.c b/vm_insnhelper.c index dd72601668..c411cf287a 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1045,10 +1045,10 @@ vm_get_ev_const(rb_thread_t *th, rb_iseq_t *iseq, else { vm_check_if_namespace(klass); if (is_defined) { - return rb_const_defined(klass, id); + return rb_const_defined_from(klass, id); } else { - return rb_const_get(klass, id); + return rb_const_get_from(klass, id); } } } -- cgit v1.2.3