diff options
| author | Jeremy Evans <code@jeremyevans.net> | 2019-09-26 17:25:54 -0700 |
|---|---|---|
| committer | Jeremy Evans <code@jeremyevans.net> | 2019-09-26 19:24:58 -0700 |
| commit | 660c7e050f6cb050fd5618f812129c211af29810 (patch) | |
| tree | f02c96afc73682c13bd8bca49a3751c059ea4d45 /include | |
| parent | 0c6f36668a11902903d85ada61a812d297d02de5 (diff) | |
| download | ruby-660c7e050f6cb050fd5618f812129c211af29810.tar.gz | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/ruby.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 18901bbda4..ca238dda64 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1970,8 +1970,9 @@ VALUE rb_each(VALUE); VALUE rb_yield(VALUE); VALUE rb_yield_values(int n, ...); VALUE rb_yield_values2(int n, const VALUE *argv); +VALUE rb_yield_values_kw(int n, const VALUE *argv, int kw_splat); VALUE rb_yield_splat(VALUE); -VALUE rb_yield_block(VALUE, VALUE, int, const VALUE *, VALUE); /* rb_block_call_func */ +VALUE rb_yield_block(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)); /* rb_block_call_func */ #define RB_NO_KEYWORDS 0 #define RB_PASS_KEYWORDS 1 #define RB_PASS_EMPTY_KEYWORDS 2 |