diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-12-22 14:29:05 +0900 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2022-01-24 15:40:47 -0800 |
| commit | 530e485265dac6e2aea1d587a4a79a314cc772cf (patch) | |
| tree | e909e78345ab0cc3856d62cfed84850bfff2b248 /id_table.c | |
| parent | 87784fdeb2340574d11887474f6e2d9b0d5d3bc3 (diff) | |
`ID` in `rb_id_table_foreach_with_replace` [Feature #18253]
Pass the `ID` from `rb_id_table_foreach_with_replace` to callback
functions.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/5458
Diffstat (limited to 'id_table.c')
| -rw-r--r-- | id_table.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/id_table.c b/id_table.c index b2ba6fae89..281a0fb50a 100644 --- a/id_table.c +++ b/id_table.c @@ -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) |