From 548a6feac8fb0aab4146c0646bf0dfb13fe488d0 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 20 Dec 2005 13:41:47 +0000 Subject: * eval.c (eval_under_i): evaluate source in caller's frame. [ruby-dev:28076] * eval.c (rb_call_super): use original method name on exception. [ruby-dev:28078] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index d049b7ff6..82a252714 100644 --- a/eval.c +++ b/eval.c @@ -6075,13 +6075,13 @@ rb_call_super(argc, argv) if (ruby_frame->last_class == 0) { rb_name_error(ruby_frame->last_func, "calling `super' from `%s' is prohibited", - rb_id2name(ruby_frame->last_func)); + rb_id2name(ruby_frame->orig_func)); } self = ruby_frame->self; klass = ruby_frame->last_class; if (RCLASS(klass)->super == 0) { - return method_missing(self, ruby_frame->last_func, argc, argv, CSTAT_SUPER); + return method_missing(self, ruby_frame->orig_func, argc, argv, CSTAT_SUPER); } PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT); @@ -6476,6 +6476,11 @@ static VALUE eval_under_i(args) VALUE *args; { + struct FRAME *f = ruby_frame; + + if (f && (f = f->prev) && (f = f->prev)) { + ruby_frame = f; + } return eval(args[0], args[1], Qnil, (char*)args[2], (int)args[3]); } -- cgit