1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* eval.c (rb_yield_0): should check args_args before lambda

Browse Source 
argument check.  [ruby-dev:29029]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-07-19 13:52:03 +00:00
parent f724560996
commit cb3e51e712
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jul 19 19:40:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_yield_0): should check args_args before lambda
argument check. [ruby-dev:29029]
Tue Jul 18 23:53:59 2006 NAKAMURA Usaku <usa@ruby-lang.org> Tue Jul 18 23:53:59 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* process.c (rb_f_system): shouldn't block SIGCHLD if it's not * process.c (rb_f_system): shouldn't block SIGCHLD if it's not

5
eval.c
View File

@ -4710,7 +4710,7 @@ rb_yield_0(VALUE val, VALUE self, VALUE klass /* OK */, int flags)
int old_vmode; int old_vmode;
struct FRAME frame; struct FRAME frame;
NODE *cnode = ruby_current_node; NODE *cnode = ruby_current_node;
int ary_args = flags & YIELD_ARY_ARGS, lambda; int ary_args, lambda;
int state, broken = 0; int state, broken = 0;
rb_need_block(); rb_need_block();
@ -4744,6 +4744,7 @@ rb_yield_0(VALUE val, VALUE self, VALUE klass /* OK */, int flags)
node = block->body; node = block->body;
var = block->var; var = block->var;
lambda = block->flags & BLOCK_LAMBDA; lambda = block->flags & BLOCK_LAMBDA;
ary_args = flags & YIELD_ARY_ARGS;
if (var) { if (var) {
PUSH_TAG(PROT_NONE); PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) { if ((state = EXEC_TAG()) == 0) {
@ -4819,7 +4820,7 @@ rb_yield_0(VALUE val, VALUE self, VALUE klass /* OK */, int flags)
POP_TAG(); POP_TAG();
if (state) goto pop_state; if (state) goto pop_state;
} }
else if (lambda && RARRAY(val)->len != 0 && else if (lambda && ary_args && RARRAY(val)->len != 0 &&
(!node || nd_type(node) != NODE_IFUNC || (!node || nd_type(node) != NODE_IFUNC ||
node->nd_cfnc != bmcall)) { node->nd_cfnc != bmcall)) {
rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)", rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",