1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add mid argument to exec_recursive

Browse Source
This commit is contained in:
John Hawthorn 2022-06-08 15:21:42 -07:00
parent 44b3daa0d7
commit f4747958e5
Notes: git 2022-06-11 06:48:42 +09:00 
Merged: https://github.com/ruby/ruby/pull/6004
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
thread.c
View File

@ -5070,10 +5070,9 @@ exec_recursive_i(RB_BLOCK_CALL_FUNC_ARGLIST(tag, data))
*/ */
static VALUE static VALUE
exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE arg, int outer) exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE arg, int outer, ID mid)
{ {
VALUE result = Qundef; VALUE result = Qundef;
const ID mid = rb_frame_last_func();
const VALUE sym = mid ? ID2SYM(mid) : ID2SYM(idNULL); const VALUE sym = mid ? ID2SYM(mid) : ID2SYM(idNULL);
struct exec_recursive_params p; struct exec_recursive_params p;
int outermost; int outermost;
@ -5138,7 +5137,7 @@ exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE
VALUE VALUE
rb_exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE arg) rb_exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE arg)
{ {
return exec_recursive(func, obj, 0, arg, 0); return exec_recursive(func, obj, 0, arg, 0, rb_frame_last_func());
} }
/* /*
@ -5149,7 +5148,7 @@ rb_exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE arg)
VALUE VALUE
rb_exec_recursive_paired(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE paired_obj, VALUE arg) rb_exec_recursive_paired(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE paired_obj, VALUE arg)
{ {
return exec_recursive(func, obj, rb_memory_id(paired_obj), arg, 0); return exec_recursive(func, obj, rb_memory_id(paired_obj), arg, 0, rb_frame_last_func());
} }
/* /*
@ -5161,7 +5160,7 @@ rb_exec_recursive_paired(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pai
VALUE VALUE
rb_exec_recursive_outer(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE arg) rb_exec_recursive_outer(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE arg)
{ {
return exec_recursive(func, obj, 0, arg, 1); return exec_recursive(func, obj, 0, arg, 1, rb_frame_last_func());
} }
/* /*
@ -5173,7 +5172,7 @@ rb_exec_recursive_outer(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE arg)
VALUE VALUE
rb_exec_recursive_paired_outer(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE paired_obj, VALUE arg) rb_exec_recursive_paired_outer(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE paired_obj, VALUE arg)
{ {
return exec_recursive(func, obj, rb_memory_id(paired_obj), arg, 1); return exec_recursive(func, obj, rb_memory_id(paired_obj), arg, 1, rb_frame_last_func());
} }
/* /*