path: root/enumerator.c
diff options
authorJeremy Evans <>2019-09-26 17:25:54 -0700
committerJeremy Evans <>2019-09-26 19:24:58 -0700
commit660c7e050f6cb050fd5618f812129c211af29810 (patch)
treef02c96afc73682c13bd8bca49a3751c059ea4d45 /enumerator.c
parent0c6f36668a11902903d85ada61a812d297d02de5 (diff)
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
Notes: Merged:
Diffstat (limited to 'enumerator.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/enumerator.c b/enumerator.c
index 6332219..9eb530c 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -1320,7 +1320,7 @@ yielder_yield(VALUE obj, VALUE args)
struct yielder *ptr = yielder_ptr(obj);
- return rb_proc_call(ptr->proc, args);
+ return rb_proc_call_kw(ptr->proc, args, RB_PASS_CALLED_KEYWORDS);
/* :nodoc: */
@@ -1357,7 +1357,7 @@ yielder_to_proc(VALUE obj)
static VALUE
yielder_yield_i(RB_BLOCK_CALL_FUNC_ARGLIST(obj, memo))
- return rb_yield_values2(argc, argv);
+ return rb_yield_values_kw(argc, argv, RB_PASS_CALLED_KEYWORDS);
static VALUE