diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:05:24 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:05:24 +0000 |
commit | 45ba4645614ab888fc74e66714b4fc7447e07083 (patch) | |
tree | 07f283bfd4c1bdab630bb215ec20a95c3951cabc /vm.c | |
parent | aadbcc5b8210a6d5988494957ecedc1b8b71fc97 (diff) |
merges r29335 from trunk into ruby_1_9_2.
--
* string.c (sym_call), vm.c (invoke_block_from_c),
vm_insnhelper.c (vm_yield_with_cfunc): pass given block.
[ruby-core:32075]
* vm_eval.c (rb_funcall_passing_block): new function to call
method with passing given block.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -549,6 +549,7 @@ invoke_block_from_c(rb_thread_t *th, const rb_block_t *block, iseq->local_size - arg_size); ncfp->me = th->passed_me; th->passed_me = 0; + th->passed_block = blockptr; if (cref) { th->cfp->dfp[-1] = (VALUE)cref; |