diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-01 13:45:00 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-01 13:45:00 +0000 |
| commit | 90509da4251f84a3a975e764e16a78d8b7c96753 (patch) | |
| tree | 1253b75aef5bff18d27cf619508bfe5068ff0fcc | |
| parent | cdcfcef20f55642d07afc575fa9b6192123e3e7b (diff) | |
* eval.c (rb_call_super): should call method_missing if super is
called from Kernel method.
* eval.c (exec_under): frame during eval should preserve external
information.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | eval.c | 15 | ||||
| -rw-r--r-- | lib/rdoc/parsers/parse_rb.rb | 1 |
3 files changed, 19 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Tue Nov 1 14:20:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * eval.c (rb_call_super): should call method_missing if super is + called from Kernel method. + + * eval.c (exec_under): frame during eval should preserve external + information. + Tue Nov 01 10:50:17 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> * ext/openssl/extconf.rb: should check ERR_peek_last_error(). @@ -6080,6 +6080,9 @@ rb_call_super(argc, argv) 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); + } PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT); result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3); @@ -6439,14 +6442,16 @@ exec_under(func, under, cbase, args) VALUE val = Qnil; /* OK */ int state; int mode; + struct FRAME *f = ruby_frame->prev; PUSH_CLASS(under); PUSH_FRAME(); - ruby_frame->self = _frame.prev->self; - ruby_frame->last_func = _frame.prev->last_func; - ruby_frame->last_class = _frame.prev->last_class; - ruby_frame->argc = _frame.prev->argc; - ruby_frame->argv = _frame.prev->argv; + ruby_frame->self = f->self; + ruby_frame->last_func = f->last_func; + ruby_frame->orig_func = f->orig_func; + ruby_frame->last_class = f->last_class; + ruby_frame->argc = f->argc; + ruby_frame->argv = f->argv; if (cbase) { PUSH_CREF(cbase); } diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb index fd95b2b7c8..6ef3766107 100644 --- a/lib/rdoc/parsers/parse_rb.rb +++ b/lib/rdoc/parsers/parse_rb.rb @@ -436,6 +436,7 @@ class RubyLex def_exception(:SyntaxError, "%s") include RubyToken + include IRB attr_reader :continue attr_reader :lex_state |