diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-10 16:33:51 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-10 16:33:51 +0000 |
commit | ed4139e39bb3ceda2985b2ea2ebd9a91479d25da (patch) | |
tree | 5d3dd4ee2335a7dc1fc437e8dd8fc01e4b22774d /vm_insnhelper.c | |
parent | 8b7a284b65cdc1ebb71cff34db473af1b17390d1 (diff) |
* include/ruby/intern.h, proc.c: revert rb_proc_call() and
create rb_proc_call_with_block() instaed.
* include/ruby/ruby.h, eval_jump.c, thread.c, vm_insnhelper.c:
rb_blockptr should not be exposed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r-- | vm_insnhelper.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index b7dbbd2fe4..05555427dc 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -655,8 +655,7 @@ vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, const rb_block_t *blockptr) { NODE *ifunc = (NODE *) block->iseq; - VALUE val; - VALUE arg; + VALUE val, arg, blockarg; int lambda = block_proc_is_lambda(block->proc); if (lambda) { @@ -669,11 +668,18 @@ vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, arg = argv[0]; } + if (blockptr) { + blockarg = vm_make_proc(th, th->cfp, blockptr); + } + else { + blockarg = Qnil; + } + vm_push_frame(th, 0, FRAME_MAGIC_IFUNC, self, (VALUE)block->dfp, 0, th->cfp->sp, block->lfp, 1); - val = (*ifunc->nd_cfnc) (arg, ifunc->nd_tval, argc, argv, blockptr); + val = (*ifunc->nd_cfnc) (arg, ifunc->nd_tval, argc, argv, blockarg); th->cfp++; return val; |