diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-06-03 13:57:06 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-06-03 13:57:06 +0000 |
commit | 45c7ea552d0293aa217bbb496d4238754ba701d2 (patch) | |
tree | bbdbc9c60213451f3d76137b9a8cc61ab78a8c54 /eval.c | |
parent | 7db609e8bd2fcf604fe79a56bb026278c1b681c2 (diff) |
* eval.c (rb_call_super): should search superclass method based on
orig_func, not last_func.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 18 |
1 files changed, 8 insertions, 10 deletions
@@ -5178,24 +5178,22 @@ rb_call_super(argc, argv) } self = ruby_frame->self; - klass = CLASS_OF(self); - k = ruby_frame->last_class; - if (BUILTIN_TYPE(k) == T_MODULE) { - while (!(BUILTIN_TYPE(klass) == T_ICLASS && RBASIC(klass)->klass == k)) { - klass = RCLASS(klass)->super; - if (!klass) { + klass = ruby_frame->last_class; + if (BUILTIN_TYPE(klass) == T_MODULE) { + k = CLASS_OF(self); + while (!(BUILTIN_TYPE(k) == T_ICLASS && RBASIC(k)->klass == klass)) { + k = RCLASS(k)->super; + if (!k) { rb_raise(rb_eTypeError, "%s is not included in %s", - rb_class2name(k), + rb_class2name(klass), rb_class2name(CLASS_OF(self))); } } - } - else { klass = k; } PUSH_ITER(ruby_iter->iter?ITER_PRE:ITER_NOT); - result = rb_call(RCLASS(klass)->super, self, ruby_frame->last_func, argc, argv, 3); + result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3); POP_ITER(); return result; |