diff options
| author | Jeremy Evans <code@jeremyevans.net> | 2019-09-03 14:49:03 -0700 |
|---|---|---|
| committer | Jeremy Evans <code@jeremyevans.net> | 2019-09-05 17:47:12 -0700 |
| commit | 7fc874bf4cbdd87b3d6fe05dc5959175f3fe94b8 (patch) | |
| tree | 27580932f0b126936b3f4fd3c6a6998727c29ce6 /vm_insnhelper.c | |
| parent | e3cb3e11af4323aba002a84044375180dd24248c (diff) | |
Add rb_funcall_with_block_kw
This is needed for C functions to call methods with keyword arguments.
This is a copy of rb_funcall_with_block with an extra argument for
the keyword flag.
There isn't a clean way to implement this that doesn't involve
changing a lot of function signatures, because rb_call doesn't
support a way to mark that the call has keyword arguments. So hack
this in using a CALL_PUBLIC_KW call_type, which we switch for
CALL_PUBLIC later in the call stack.
We do need to modify rm_vm_call0 to take an argument for whether
keyword arguments are used, since the call_type is no longer
available at that point. Use the passed in value to set the
appropriate keyword flag in both calling and ci_entry.
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 2d10b58d00..de5a192e8b 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1576,7 +1576,7 @@ rb_eql_opt(VALUE obj1, VALUE obj2) return opt_eql_func(obj1, obj2, &ci, &cc); } -extern VALUE rb_vm_call0(rb_execution_context_t *ec, VALUE, ID, int, const VALUE*, const rb_callable_method_entry_t *); +extern VALUE rb_vm_call0(rb_execution_context_t *ec, VALUE, ID, int, const VALUE*, const rb_callable_method_entry_t *, int kw_splat); static VALUE check_match(rb_execution_context_t *ec, VALUE pattern, VALUE target, enum vm_check_match_type type) @@ -1593,7 +1593,7 @@ check_match(rb_execution_context_t *ec, VALUE pattern, VALUE target, enum vm_che const rb_callable_method_entry_t *me = rb_callable_method_entry_with_refinements(CLASS_OF(pattern), idEqq, NULL); if (me) { - return rb_vm_call0(ec, pattern, idEqq, 1, &target, me); + return rb_vm_call0(ec, pattern, idEqq, 1, &target, me, VM_NO_KEYWORDS); } else { /* fallback to funcall (e.g. method_missing) */ |