diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-07 06:34:40 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-07 06:34:40 +0000 |
commit | 0afe6cb08f97a2fdbfb945f8b5685a5fe79fa184 (patch) | |
tree | 904efa1381756811688e4d0bbd29c04a43891f84 /vm.c | |
parent | 7756f1df188b8a8ef7182d66d0a2f94df27fabe9 (diff) | |
download | ruby-0afe6cb08f97a2fdbfb945f8b5685a5fe79fa184.tar.gz |
* insnhelper.ci (vm_yield_setup_args), vm.c, insns.def:
fix to pass nil as block parameter to yielded block.
[ruby-dev:31147]
* bootstraptest/test_block.rb: add a test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12718 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 17 |
1 files changed, 16 insertions, 1 deletions
@@ -559,7 +559,22 @@ invoke_block(rb_thread_t *th, rb_block_t *block, VALUE self, int argc, VALUE *ar th->cfp->sp[i] = argv[i]; } - opt_pc = vm_yield_setup_args(th, iseq, argc, th->cfp->sp, type == FRAME_MAGIC_LAMBDA); + if (iseq->arg_block == -1) { + opt_pc = vm_yield_setup_args(th, iseq, argc, th->cfp->sp, 0, + type == FRAME_MAGIC_LAMBDA); + } + else { + rb_block_t *blockptr = 0; + if (rb_block_given_p()) { + rb_proc_t *proc; + VALUE procval; + procval = rb_block_proc(); + GetProcPtr(procval, proc); + blockptr = &proc->block; + } + opt_pc = vm_yield_setup_args(th, iseq, argc, th->cfp->sp, + blockptr, type == FRAME_MAGIC_LAMBDA); + } argc = iseq->arg_size; th->cfp->sp += argc; |