diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | eval.c | 9 |
2 files changed, 15 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Tue Dec 20 22:41:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] + Tue Dec 20 13:11:59 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * ext/syck/rubyext.c: fixed GC problem (backported HEAD 1.55 - 1.62) @@ -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]); } |