diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | eval.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Tue Feb 14 18:48:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * eval.c (DMETHOD_P): accessing wrong frame. [ruby-dev:28181] + + * eval.c (proc_invoke): preserve FRAME_DMETH flag. + Tue Feb 14 15:13:51 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * ext/zlib/zlib.c: supress warning on test/zlib. [ruby-dev:28323] @@ -843,7 +843,7 @@ struct RVarmap *ruby_dyna_vars; #define DVAR_DONT_RECYCLE FL_USER2 -#define DMETHOD_P() (ruby_frame->prev ? (ruby_frame->prev->flags & FRAME_DMETH) : 0) +#define DMETHOD_P() (ruby_frame->flags & FRAME_DMETH) static struct RVarmap* new_dvar(id, value, prev) @@ -8435,6 +8435,7 @@ proc_invoke(proc, args, self, klass) if (self != Qundef) _block.frame.self = self; if (klass) _block.frame.last_class = klass; _block.frame.argc = RARRAY(tmp)->len; + _block.frame.flags = ruby_frame->flags; if (_block.frame.argc && (ruby_frame->flags & FRAME_DMETH)) { NEWOBJ(scope, struct SCOPE); OBJSETUP(scope, tmp, T_SCOPE); |