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

Merge pull request #6353 from dearblue/array-delete

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2024-09-14 06:11:54 +09:00
committed by GitHub
parent 6e44c0bc91 0955539cf9
commit 3ce96e5c4d
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/array.c
+8 -12
View File
@@ -1551,17 +1551,12 @@ mrb_ary_delete(mrb_state *mrb, mrb_value self)
mrb_get_args(mrb, "o&", &obj, &blk);
struct RArray *ary = RARRAY(self);
mrb_value *val_ptr = ARY_PTR(ary);
size_t len = ARY_LEN(ary);
mrb_bool modified = FALSE;
mrb_value ret = obj;
int ai = mrb_gc_arena_save(mrb);
size_t i = 0;
size_t j = 0;
for (; i < len; i++) {
mrb_value elem = val_ptr[i];
for (; i < ARY_LEN(ary); i++) {
mrb_value elem = ARY_PTR(ary)[i];
if (mrb_equal(mrb, elem, obj)) {
mrb_gc_arena_restore(mrb, ai);
@@ -1571,12 +1566,13 @@ mrb_ary_delete(mrb_state *mrb, mrb_value self)
}
if (i != j) {
if (!modified) {
ary_modify(mrb, ary);
val_ptr = ARY_PTR(ary);
modified = TRUE;
if (j >= ARY_LEN(ary)) {
// Since breaking here will further change the array length,
// there is no choice but to raise an exception or return.
mrb_raise(mrb, E_RUNTIME_ERROR, "array modified during delete");
}
val_ptr[j] = elem;
ary_modify(mrb, ary);
ARY_PTR(ary)[j] = elem;
}
j++;