From 1ae90f48b7ecf7b8a92a5bfe7eb4e0eeee9a4437 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 5 Jul 2004 00:03:50 +0000 Subject: * eval.c (rb_thread_yield, rb_f_catch): 4th argument to rb_yield_0() is a set of bit flags. [ruby-dev:23859] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0f9ac00c0..e9a182273a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jul 5 09:02:52 2004 Nobuyoshi Nakada + + * eval.c (rb_thread_yield, rb_f_catch): 4th argument to rb_yield_0() + is a set of bit flags. [ruby-dev:23859] + Mon Jul 5 01:27:32 Hirokazu Yamamoto * lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close diff --git a/eval.c b/eval.c index d3b534f333..45c3d503d8 100644 --- a/eval.c +++ b/eval.c @@ -11409,7 +11409,7 @@ rb_thread_yield(arg, th) rb_dvar_push('~', Qnil); ruby_block->dyna_vars = ruby_dyna_vars; - return rb_yield_0(arg, 0, 0, Qtrue, Qtrue); + return rb_yield_0(arg, 0, 0, YIELD_LAMBDA_CALL, Qtrue); } /* @@ -12452,7 +12452,7 @@ rb_f_catch(dmy, tag) tag = ID2SYM(rb_to_id(tag)); PUSH_TAG(tag); if ((state = EXEC_TAG()) == 0) { - val = rb_yield_0(tag, 0, 0, Qfalse, Qfalse); + val = rb_yield_0(tag, 0, 0, 0, Qfalse); } else if (state == TAG_THROW && tag == prot_tag->dst) { val = prot_tag->retval; -- cgit v1.2.3