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

ID in rb_id_table_foreach_with_replace [Feature #18253]

Browse Source 
Pass the `ID` from `rb_id_table_foreach_with_replace` to callback
functions.
This commit is contained in:
Nobuyoshi Nakada 2021-12-22 14:29:05 +09:00 committed by Aaron Patterson
parent 87784fdeb2
commit 530e485265
Notes: git 2022-01-25 08:41:08 +09:00 
Merged: https://github.com/ruby/ruby/pull/5458
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
id_table.c
View File

@ -274,12 +274,14 @@ rb_id_table_foreach_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_fu
for (i=0; i<capa; i++) {
if (ITEM_KEY_ISSET(tbl, i)) {
enum rb_id_table_iterator_result ret = (*func)((ID)0, tbl->items[i].val, data);
assert(ITEM_GET_KEY(tbl, i));
const id_key_t key = ITEM_GET_KEY(tbl, i);
ID id = key2id(key);
enum rb_id_table_iterator_result ret = (*func)(id, tbl->items[i].val, data);
assert(key != 0);
if (ret == ID_TABLE_REPLACE) {
VALUE val = tbl->items[i].val;
ret = (*replace)(NULL, &val, data, TRUE);
ret = (*replace)(&id, &val, data, TRUE);
tbl->items[i].val = val;
}
else if (ret == ID_TABLE_STOP)