summaryrefslogtreecommitdiff
path: root/hash.c
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2019-09-26 17:25:54 -0700
committerJeremy Evans <code@jeremyevans.net>2019-09-26 19:24:58 -0700
commit660c7e050f6cb050fd5618f812129c211af29810 (patch)
treef02c96afc73682c13bd8bca49a3751c059ea4d45 /hash.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
Notes: Merged: https://github.com/ruby/ruby/pull/2493
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hash.c b/hash.c
index 8b84a14484..d00a09db5b 100644
--- a/hash.c
+++ b/hash.c
@@ -4471,7 +4471,7 @@ rb_hash_gt(VALUE hash, VALUE other)
}
static VALUE
-hash_proc_call(VALUE key, VALUE hash, int argc, const VALUE *argv, VALUE passed_proc)
+hash_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(key, hash))
{
rb_check_arity(argc, 1, 1);
return rb_hash_aref(hash, *argv);