diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-20 13:41:47 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-20 13:41:47 +0000 |
commit | f1f2012312cc98b9acf2ca4116698e7e0705779e (patch) | |
tree | 327429d2fe23d3e7dcbbd8511b16e80af0ddcae1 /eval.c | |
parent | 534d30887d1fab63dadc0b392cda32d6f319e3b9 (diff) |
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -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]); } |