From 4f46d8a69a58486de19d5a8aadbb8b994a1b866b Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 5 Jul 2004 00:03:50 +0000 Subject: [PATCH] * 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/trunk@6581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ++++++- eval.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe8d63386c..9648b5bb3f 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:20:17 Hirokazu Yamamoto * lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close @@ -94,7 +99,7 @@ Sat Jul 3 22:25:27 2004 NAKAMURA, Hiroshi * map Ruby's anonymous Struct to common SOAP Struct in SOAP Object Model. it caused error. - + * add WSDL simpleType support to restrict lexical value space. Sat Jul 3 17:19:44 2004 WATANABE Hirofumi diff --git a/eval.c b/eval.c index c81cd19305..8dfd682494 100644 --- a/eval.c +++ b/eval.c @@ -11470,7 +11470,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); } /* @@ -12513,7 +12513,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;