Project

General

Profile

Actions

Feature #18253

open

`ID` in `rb_id_table_foreach_with_replace`

Added by nobu (Nobuyoshi Nakada) 3 months ago. Updated about 2 months ago.

Status:
Assigned
Priority:
Normal
Target version:
-
[ruby-core:105658]

Description

rb_id_table_foreach_with_replace doesn't pass the ID to func and replace.

If this is intensional, func should be rb_id_table_foreach_values_func_t and rb_id_table_update_callback_func_t doesn't need the id argument?

Or should the function pass the ID?

diff --git a/id_table.c b/id_table.c
index b2ba6fae89e..281a0fb50a7 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)
Actions

Also available in: Atom PDF