Feature #18253


`ID` in `rb_id_table_foreach_with_replace`

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

Target version:


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)

Updated by nobu (Nobuyoshi Nakada) about 2 months ago

A patch to remove unused arguments.

diff --git c/gc.c i/gc.c
index fdd4ac5eb38..595ce038cbc 100644
--- c/gc.c
+++ i/gc.c
@@ -9757,7 +9757,7 @@ gc_ref_update_imemo(rb_objspace_t *objspace, VALUE obj)

 static enum rb_id_table_iterator_result
-check_id_table_move(ID id, VALUE value, void *data)
+check_id_table_move(VALUE value, void *data)
     rb_objspace_t *objspace = (rb_objspace_t *)data;

@@ -9822,7 +9822,7 @@ update_m_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl)

 static enum rb_id_table_iterator_result
-update_cc_tbl_i(ID id, VALUE ccs_ptr, void *data)
+update_cc_tbl_i(VALUE ccs_ptr, void *data)
     rb_objspace_t *objspace = (rb_objspace_t *)data;
     struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
@@ -9855,7 +9855,7 @@ update_cc_tbl(rb_objspace_t *objspace, VALUE klass)

 static enum rb_id_table_iterator_result
-update_cvc_tbl_i(ID id, VALUE cvc_entry, void *data)
+update_cvc_tbl_i(VALUE cvc_entry, void *data)
     struct rb_cvar_class_tbl_entry *entry;

diff --git c/id_table.c i/id_table.c
index b2ba6fae89e..365ad9c1da3 100644
--- c/id_table.c
+++ i/id_table.c
@@ -268,13 +268,13 @@ rb_id_table_delete(struct rb_id_table *tbl, ID id)

-rb_id_table_foreach_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, rb_id_table_update_callback_func_t *replace, void *data)
+rb_id_table_foreach_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, rb_id_table_update_callback_func_t *replace, void *data)
     int i, capa = tbl->capa;

     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);
+            enum rb_id_table_iterator_result ret = (*func)(tbl->items[i].val, data);
             assert(ITEM_GET_KEY(tbl, i));

             if (ret == ID_TABLE_REPLACE) {
diff --git c/id_table.h i/id_table.h
index f3dc681d176..f353184311e 100644
--- c/id_table.h
+++ i/id_table.h
@@ -30,7 +30,7 @@ typedef enum rb_id_table_iterator_result rb_id_table_update_callback_func_t(ID *
 typedef enum rb_id_table_iterator_result rb_id_table_foreach_func_t(ID id, VALUE val, void *data);
 typedef enum rb_id_table_iterator_result rb_id_table_foreach_values_func_t(VALUE val, void *data);
 void rb_id_table_foreach(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, void *data);
-void rb_id_table_foreach_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, rb_id_table_update_callback_func_t *replace, void *data);
+void rb_id_table_foreach_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, rb_id_table_update_callback_func_t *replace, void *data);
 void rb_id_table_foreach_values(struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data);

 #endif /* RUBY_ID_TABLE_H */

Updated by tenderlovemaking (Aaron Patterson) 3 days ago

  • Assignee changed from tenderlovemaking (Aaron Patterson) to nobu (Nobuyoshi Nakada)

I don't think this was intentional. Nobu, can you apply the patch? (Or I can)

Actions #3

Updated by hsbt (Hiroshi SHIBATA) 3 days ago

  • Tracker changed from Misc to Feature

Updated by nobu (Nobuyoshi Nakada) 3 days ago

Which patch, passing the ID, or removing ID argument?


Also available in: Atom PDF