id_table fixes

Author: byroot

id_table.c

@@ -373,8 +373,8 @@ rb_managed_id_table_new(size_t capa)
 static enum rb_id_table_iterator_result
 managed_id_table_dup_i(ID id, VALUE val, void *data)
 {
-    struct rb_id_table *new_tbl = (struct rb_id_table *)data;
-    rb_id_table_insert(new_tbl, id, val);
+    VALUE new_table = (VALUE)data;
+    rb_managed_id_table_insert(new_table, id, val);
     return ID_TABLE_CONTINUE;
 }
 
@@ -384,12 +384,9 @@ rb_managed_id_table_dup(VALUE old_table)
     RUBY_ASSERT(RB_TYPE_P(old_table, T_DATA));
     RUBY_ASSERT(rb_typeddata_inherited_p(RTYPEDDATA_TYPE(old_table), &managed_id_table_type));
 
-    struct rb_id_table *new_tbl;
-    VALUE obj = TypedData_Make_Struct(0, struct rb_id_table, &managed_id_table_type, new_tbl);
-    struct rb_id_table *old_tbl = RTYPEDDATA_GET_DATA(old_table);
-    rb_id_table_init(new_tbl, old_tbl->num + 1);
-    rb_id_table_foreach(old_tbl, managed_id_table_dup_i, new_tbl);
-    return obj;
+    VALUE new_table = rb_managed_id_table_new(rb_managed_id_table_size(old_table) + 1);
+    rb_managed_id_table_foreach(old_table, managed_id_table_dup_i, (void *)new_table);
+    return new_table;
 }
 
 int
@@ -485,21 +482,6 @@ rb_marked_id_table_new(size_t capa)
     return obj;
 }
 
-struct marked_id_table_dup_args {
-    struct rb_id_table *tbl;
-    VALUE owner;
-};
-
-static enum rb_id_table_iterator_result
-marked_id_table_dup_i(ID id, VALUE val, void *data)
-{
-    struct marked_id_table_dup_args *args = (struct marked_id_table_dup_args *)data;
-
-    rb_id_table_insert(args->tbl, id, val);
-    RB_OBJ_WRITTEN(args->owner, Qundef, val);
-    return ID_TABLE_CONTINUE;
-}
-
 size_t
 rb_marked_id_table_size(VALUE table)
 {
@@ -509,24 +491,23 @@ rb_marked_id_table_size(VALUE table)
     return rb_id_table_size(RTYPEDDATA_GET_DATA(table));
 }
 
+static enum rb_id_table_iterator_result
+marked_id_table_dup_i(ID id, VALUE val, void *data)
+{
+    VALUE new_table = (VALUE)data;
+    rb_marked_id_table_insert(new_table, id, val);
+    return ID_TABLE_CONTINUE;
+}
+
 VALUE
 rb_marked_id_table_dup(VALUE old_table)
 {
     RUBY_ASSERT(RB_TYPE_P(old_table, T_DATA));
     RUBY_ASSERT(rb_typeddata_inherited_p(RTYPEDDATA_TYPE(old_table), &marked_id_table_type));
 
-    struct rb_id_table *new_tbl;
-    VALUE obj = TypedData_Make_Struct(0, struct rb_id_table, &marked_id_table_type, new_tbl);
-    struct rb_id_table *old_tbl = RTYPEDDATA_GET_DATA(old_table);
-
-    struct marked_id_table_dup_args args = {
-        .tbl = new_tbl,
-        .owner = obj,
-    };
-
-    rb_id_table_init(new_tbl, old_tbl->num + 1);
-    rb_id_table_foreach(old_tbl, marked_id_table_dup_i, (void *)&args);
-    return obj;
+    VALUE new_table = rb_marked_id_table_new(rb_marked_id_table_size(old_table) + 1);
+    rb_marked_id_table_foreach(old_table, marked_id_table_dup_i, (void *)new_table);
+    return new_table;
 }
 
 int