diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-22 03:03:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-22 03:03:51 +0000 |
| commit | a0f487921e21dff86de25aa79cf1e102fc90ad3e (patch) | |
| tree | 7852848e6b0f0c89d8fe9f8a267831b5636fdd8e | |
| parent | 11fbd724cc14895ad17e015ba5f0ab967ca3b35d (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | vm_insnhelper.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Apr 22 12:03:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <usa@ruby-lang.org> * 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); } } } |