From 660c7e050f6cb050fd5618f812129c211af29810 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Thu, 26 Sep 2019 17:25:54 -0700 Subject: Fix more keyword separation issues This fixes instance_exec and similar methods. It also fixes Enumerator::Yielder#yield, rb_yield_block, and a couple of cases with Proc#{<<,>>}. This support requires the addition of rb_yield_values_kw, similar to rb_yield_values2, for passing the keyword flag. Unlike earlier attempts at this, this does not modify the rb_block_call_func type or add a separate function type. The functions of type rb_block_call_func are called by Ruby with a separate VM frame, and we can get the keyword flag information from the VM frame flags, so it doesn't need to be passed as a function argument. These changes require the following VM functions accept a keyword flag: * vm_yield_with_cref * vm_yield * vm_yield_with_block --- ext/-test-/iter/yield.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/-test-/iter/yield.c') diff --git a/ext/-test-/iter/yield.c b/ext/-test-/iter/yield.c index 3cd408a928..0f6f3e87eb 100644 --- a/ext/-test-/iter/yield.c +++ b/ext/-test-/iter/yield.c @@ -4,7 +4,7 @@ static VALUE yield_block(int argc, VALUE *argv, VALUE self) { rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS); - return rb_block_call(self, rb_to_id(argv[0]), argc-1, argv+1, rb_yield_block, 0); + return rb_block_call_kw(self, rb_to_id(argv[0]), argc-1, argv+1, rb_yield_block, 0, RB_PASS_CALLED_KEYWORDS); } void -- cgit v1.2.3