diff options
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -1164,26 +1164,26 @@ check_block_handler(rb_execution_context_t *ec) } static VALUE -vm_yield_with_cref(rb_execution_context_t *ec, int argc, const VALUE *argv, const rb_cref_t *cref, int is_lambda) +vm_yield_with_cref(rb_execution_context_t *ec, int argc, const VALUE *argv, int kw_splat, const rb_cref_t *cref, int is_lambda) { return invoke_block_from_c_bh(ec, check_block_handler(ec), - argc, argv, VM_NO_KEYWORDS, VM_BLOCK_HANDLER_NONE, + argc, argv, kw_splat, VM_BLOCK_HANDLER_NONE, cref, is_lambda, FALSE); } static VALUE -vm_yield(rb_execution_context_t *ec, int argc, const VALUE *argv) +vm_yield(rb_execution_context_t *ec, int argc, const VALUE *argv, int kw_splat) { return invoke_block_from_c_bh(ec, check_block_handler(ec), - argc, argv, VM_NO_KEYWORDS, VM_BLOCK_HANDLER_NONE, + argc, argv, kw_splat, VM_BLOCK_HANDLER_NONE, NULL, FALSE, FALSE); } static VALUE -vm_yield_with_block(rb_execution_context_t *ec, int argc, const VALUE *argv, VALUE block_handler) +vm_yield_with_block(rb_execution_context_t *ec, int argc, const VALUE *argv, VALUE block_handler, int kw_splat) { return invoke_block_from_c_bh(ec, check_block_handler(ec), - argc, argv, VM_NO_KEYWORDS, block_handler, + argc, argv, kw_splat, block_handler, NULL, FALSE, FALSE); } @@ -1213,6 +1213,10 @@ invoke_block_from_c_proc(rb_execution_context_t *ec, const rb_proc_t *proc, case block_type_iseq: return invoke_iseq_block_from_c(ec, &block->as.captured, self, argc, argv, kw_splat, passed_block_handler, NULL, is_lambda, me); case block_type_ifunc: + if (kw_splat == 1 && RHASH_EMPTY_P(argv[argc-1])) { + argc--; + kw_splat = 2; + } return vm_yield_with_cfunc(ec, &block->as.captured, self, argc, argv, kw_splat, passed_block_handler, me); case block_type_symbol: return vm_yield_with_symbol(ec, block->as.symbol, argc, argv, kw_splat, passed_block_handler); |