admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

prefer using mrb_yield to call block arguments

Browse Source
This commit is contained in:
leviongit
2024-09-04 20:44:51 +02:00
parent 4671459e73
commit 020cfa9283
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/array.c
+11 -5
View File
@@ -320,7 +320,8 @@ mrb_ary_init(mrb_state *mrb, mrb_value ary)
val = obj;
}
else {
val = mrb_funcall_id(mrb, blk, MRB_SYM(call), 1, mrb_fixnum_value(i));
mrb_assert(mrb_proc_p(blk));
val = mrb_yield(mrb, blk, mrb_fixnum_value(i));
}
mrb_ary_set(mrb, ary, i, val);
mrb_gc_arena_restore(mrb, ai); // for mrb_funcall
@@ -1168,7 +1169,8 @@ mrb_ary_index_m(mrb_state *mrb, mrb_value self)
}
else {
for (mrb_int i = 0; i < RARRAY_LEN(self); i++) {
mrb_value eq = mrb_funcall_id(mrb, blk, MRB_SYM(call), 1, RARRAY_PTR(self)[i]);
mrb_assert(mrb_proc_p(blk));
mrb_value eq = mrb_yield(mrb, blk, RARRAY_PTR(self)[i]);
if (mrb_test(eq)) {
return mrb_int_value(mrb, i);
}
@@ -1208,7 +1210,8 @@ mrb_ary_rindex_m(mrb_state *mrb, mrb_value self)
}
}
else {
mrb_value eq = mrb_funcall_id(mrb, blk, MRB_SYM(call), 1, RARRAY_PTR(self)[i]);
mrb_assert(mrb_proc_p(blk));
mrb_value eq = mrb_yield(mrb, blk, RARRAY_PTR(self)[i]);
if (mrb_test(eq)) return mrb_int_value(mrb, i);
}
mrb_int len = RARRAY_LEN(self);
@@ -1581,7 +1584,8 @@ mrb_ary_delete(mrb_state *mrb, mrb_value self)
if (i == j) {
if (mrb_nil_p(blk)) return mrb_nil_value();
return mrb_funcall_id(mrb, blk, MRB_SYM(call), 1, obj);
mrb_assert(mrb_proc_p(blk));
return mrb_yield(mrb, blk, obj);
}
ARY_SET_LEN(ary, j);
@@ -1604,7 +1608,9 @@ sort_cmp(mrb_state *mrb, mrb_value ary, mrb_value *p, mrb_int a, mrb_int b, mrb_
if (cmp == -2) cmp_failed(mrb, a, b);
}
else {
mrb_value c = mrb_funcall_id(mrb, blk, MRB_SYM(call), 2, p[a], p[b]);
mrb_assert(mrb_proc_p(blk));
mrb_value args[2] = {p[a], p[b]};
mrb_value c = mrb_yield_argv(mrb, blk, 2, args);
if (mrb_nil_p(c) || !mrb_fixnum_p(c)) {
cmp_failed(mrb, a, b);
}