diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-22 07:28:00 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-22 07:28:00 +0000 |
| commit | b31a4e2f7179a0a1bcf020cf58f2e34bf359153d (patch) | |
| tree | 4622008d818e3118bf286515dc2c2f80022b828f | |
| parent | d4a1a2ab7354bec3d1fe42a9de4bc1fb9fe06413 (diff) | |
| download | ruby-b31a4e2f7179a0a1bcf020cf58f2e34bf359153d.tar.gz ruby-b31a4e2f7179a0a1bcf020cf58f2e34bf359153d.tar.xz ruby-b31a4e2f7179a0a1bcf020cf58f2e34bf359153d.zip | |
* vm_insnhelper.c (vm_yield_setup_args): should not drop arguments
corresponding to default paramters.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | vm_insnhelper.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Oct 22 16:27:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm_insnhelper.c (vm_yield_setup_args): should not drop arguments + corresponding to default paramters. + Wed Oct 22 14:59:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * parse.y (f_larglist): should not allow semicolon separated local diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 553883c03..2e862492f 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -728,12 +728,13 @@ vm_yield_setup_args(rb_thread_t * const th, const rb_iseq_t *iseq, } if (iseq->arg_rest == -1) { - if (m < argc) { + const int arg_size = iseq->arg_size; + if (arg_size < argc) { /* * yield 1, 2 * => {|a|} # truncate */ - th->mark_stack_len = argc = m; + th->mark_stack_len = argc = arg_size; } } else { |