archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rename some set_* functions to set_table_*

Browse source 
These functions conflict with the planned C-API functions. Since they
deal with the underlying set_table pointers and not Set instances,
this seems like a more accurate name as well.
This commit is contained in:
Jeremy Evans 2025-06-28 17:07:00 -07:00
parent b2fdd26417
commit 08d4f7893e
6 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/set_table.h
View file

@ -39,24 +39,24 @@ set_table *rb_set_init_table_with_size(set_table *tab, const struct st_hash_type
set_table *rb_set_init_numtable(void); set_table *rb_set_init_numtable(void);
#define set_init_numtable_with_size rb_set_init_numtable_with_size #define set_init_numtable_with_size rb_set_init_numtable_with_size
set_table *rb_set_init_numtable_with_size(st_index_t size); set_table *rb_set_init_numtable_with_size(st_index_t size);
#define set_delete rb_set_delete #define set_table_delete rb_set_table_delete
int rb_set_delete(set_table *, st_data_t *); /* returns 0:notfound 1:deleted */ int rb_set_table_delete(set_table *, st_data_t *); /* returns 0:notfound 1:deleted */
#define set_insert rb_set_insert #define set_insert rb_set_insert
int rb_set_insert(set_table *, st_data_t); int rb_set_insert(set_table *, st_data_t);
#define set_lookup rb_set_lookup #define set_table_lookup rb_set_table_lookup
int rb_set_lookup(set_table *, st_data_t); int rb_set_table_lookup(set_table *, st_data_t);
#define set_foreach_with_replace rb_set_foreach_with_replace #define set_foreach_with_replace rb_set_foreach_with_replace
int rb_set_foreach_with_replace(set_table *tab, set_foreach_check_callback_func *func, set_update_callback_func *replace, st_data_t arg); int rb_set_foreach_with_replace(set_table *tab, set_foreach_check_callback_func *func, set_update_callback_func *replace, st_data_t arg);
#define set_foreach rb_set_foreach #define set_table_foreach rb_set_table_foreach
int rb_set_foreach(set_table *, set_foreach_callback_func *, st_data_t); int rb_set_table_foreach(set_table *, set_foreach_callback_func *, st_data_t);
#define set_foreach_check rb_set_foreach_check #define set_foreach_check rb_set_foreach_check
int rb_set_foreach_check(set_table *, set_foreach_check_callback_func *, st_data_t, st_data_t); int rb_set_foreach_check(set_table *, set_foreach_check_callback_func *, st_data_t, st_data_t);
#define set_keys rb_set_keys #define set_keys rb_set_keys
st_index_t rb_set_keys(set_table *table, st_data_t *keys, st_index_t size); st_index_t rb_set_keys(set_table *table, st_data_t *keys, st_index_t size);
#define set_free_table rb_set_free_table #define set_free_table rb_set_free_table
void rb_set_free_table(set_table *); void rb_set_free_table(set_table *);
#define set_clear rb_set_clear #define set_table_clear rb_set_table_clear
void rb_set_clear(set_table *); void rb_set_table_clear(set_table *);
#define set_copy rb_set_copy #define set_copy rb_set_copy
set_table *rb_set_copy(set_table *new_table, set_table *old_table); set_table *rb_set_copy(set_table *new_table, set_table *old_table);
#define set_memsize rb_set_memsize #define set_memsize rb_set_memsize

2
iseq.c
View file

@ -113,7 +113,7 @@ remove_from_constant_cache(ID id, IC ic)
if (rb_id_table_lookup(vm->constant_cache, id, &lookup_result)) { if (rb_id_table_lookup(vm->constant_cache, id, &lookup_result)) {
set_table *ics = (set_table *)lookup_result; set_table *ics = (set_table *)lookup_result;
set_delete(ics, &ic_data); set_table_delete(ics, &ic_data);
if (ics->num_entries == 0 && if (ics->num_entries == 0 &&
// See comment in vm_track_constant_cache on why we need this check // See comment in vm_track_constant_cache on why we need this check

32
set.c
View file

@ -114,7 +114,7 @@ static ID id_set_iter_lev;
#define RSET_SIZE(set) set_table_size(RSET_TABLE(set)) #define RSET_SIZE(set) set_table_size(RSET_TABLE(set))
#define RSET_EMPTY(set) (RSET_SIZE(set) == 0) #define RSET_EMPTY(set) (RSET_SIZE(set) == 0)
#define RSET_SIZE_NUM(set) SIZET2NUM(RSET_SIZE(set)) #define RSET_SIZE_NUM(set) SIZET2NUM(RSET_SIZE(set))
#define RSET_IS_MEMBER(sobj, item) set_lookup(RSET_TABLE(set), (st_data_t)(item)) #define RSET_IS_MEMBER(sobj, item) set_table_lookup(RSET_TABLE(set), (st_data_t)(item))
#define RSET_COMPARE_BY_IDENTITY(set) (RSET_TABLE(set)->type == &identhash) #define RSET_COMPARE_BY_IDENTITY(set) (RSET_TABLE(set)->type == &identhash)
struct set_object { struct set_object {
@ -133,7 +133,7 @@ static void
set_mark(void *ptr) set_mark(void *ptr)
{ {
struct set_object *sobj = ptr; struct set_object *sobj = ptr;
if (sobj->table.entries) set_foreach(&sobj->table, mark_key, 0); if (sobj->table.entries) set_table_foreach(&sobj->table, mark_key, 0);
} }
static void static void
@ -689,7 +689,7 @@ set_i_add(VALUE set, VALUE item)
{ {
rb_check_frozen(set); rb_check_frozen(set);
if (set_iterating_p(set)) { if (set_iterating_p(set)) {
if (!set_lookup(RSET_TABLE(set), (st_data_t)item)) { if (!set_table_lookup(RSET_TABLE(set), (st_data_t)item)) {
no_new_item(); no_new_item();
} }
} }
@ -715,7 +715,7 @@ set_i_add_p(VALUE set, VALUE item)
{ {
rb_check_frozen(set); rb_check_frozen(set);
if (set_iterating_p(set)) { if (set_iterating_p(set)) {
if (!set_lookup(RSET_TABLE(set), (st_data_t)item)) { if (!set_table_lookup(RSET_TABLE(set), (st_data_t)item)) {
no_new_item(); no_new_item();
} }
return Qnil; return Qnil;
@ -736,7 +736,7 @@ static VALUE
set_i_delete(VALUE set, VALUE item) set_i_delete(VALUE set, VALUE item)
{ {
rb_check_frozen(set); rb_check_frozen(set);
if (set_delete(RSET_TABLE(set), (st_data_t *)&item)) { if (set_table_delete(RSET_TABLE(set), (st_data_t *)&item)) {
set_compact_after_delete(set); set_compact_after_delete(set);
} }
return set; return set;
@ -753,7 +753,7 @@ static VALUE
set_i_delete_p(VALUE set, VALUE item) set_i_delete_p(VALUE set, VALUE item)
{ {
rb_check_frozen(set); rb_check_frozen(set);
if (set_delete(RSET_TABLE(set), (st_data_t *)&item)) { if (set_table_delete(RSET_TABLE(set), (st_data_t *)&item)) {
set_compact_after_delete(set); set_compact_after_delete(set);
return set; return set;
} }
@ -986,7 +986,7 @@ set_i_clear(VALUE set)
set_iter(set, set_clear_i, 0); set_iter(set, set_clear_i, 0);
} }
else { else {
set_clear(RSET_TABLE(set)); set_table_clear(RSET_TABLE(set));
set_compact_after_delete(set); set_compact_after_delete(set);
} }
return set; return set;
@ -1002,7 +1002,7 @@ static int
set_intersection_i(st_data_t key, st_data_t tmp) set_intersection_i(st_data_t key, st_data_t tmp)
{ {
struct set_intersection_data *data = (struct set_intersection_data *)tmp; struct set_intersection_data *data = (struct set_intersection_data *)tmp;
if (set_lookup(data->other, key)) { if (set_table_lookup(data->other, key)) {
set_table_insert_wb(data->into, data->set, key, NULL); set_table_insert_wb(data->into, data->set, key, NULL);
} }
@ -1252,7 +1252,7 @@ set_xor_i(st_data_t key, st_data_t data)
VALUE set = (VALUE)data; VALUE set = (VALUE)data;
set_table *table = RSET_TABLE(set); set_table *table = RSET_TABLE(set);
if (set_table_insert_wb(table, set, element, &element)) { if (set_table_insert_wb(table, set, element, &element)) {
set_delete(table, &element); set_table_delete(table, &element);
} }
return ST_CONTINUE; return ST_CONTINUE;
} }
@ -1304,7 +1304,7 @@ set_i_union(VALUE set, VALUE other)
static int static int
set_remove_i(st_data_t key, st_data_t from) set_remove_i(st_data_t key, st_data_t from)
{ {
set_delete((struct set_table *)from, (st_data_t *)&key); set_table_delete((struct set_table *)from, (st_data_t *)&key);
return ST_CONTINUE; return ST_CONTINUE;
} }
@ -1312,7 +1312,7 @@ static VALUE
set_remove_block(RB_BLOCK_CALL_FUNC_ARGLIST(key, set)) set_remove_block(RB_BLOCK_CALL_FUNC_ARGLIST(key, set))
{ {
rb_check_frozen(set); rb_check_frozen(set);
set_delete(RSET_TABLE(set), (st_data_t *)&key); set_table_delete(RSET_TABLE(set), (st_data_t *)&key);
return key; return key;
} }
@ -1414,7 +1414,7 @@ static int
set_keep_if_i(st_data_t key, st_data_t into) set_keep_if_i(st_data_t key, st_data_t into)
{ {
if (!RTEST(rb_yield((VALUE)key))) { if (!RTEST(rb_yield((VALUE)key))) {
set_delete((set_table *)into, &key); set_table_delete((set_table *)into, &key);
} }
return ST_CONTINUE; return ST_CONTINUE;
} }
@ -1486,7 +1486,7 @@ set_i_replace(VALUE set, VALUE other)
// make sure enum is enumerable before calling clear // make sure enum is enumerable before calling clear
enum_method_id(other); enum_method_id(other);
set_clear(RSET_TABLE(set)); set_table_clear(RSET_TABLE(set));
set_merge_enum_into(set, other); set_merge_enum_into(set, other);
} }
@ -1597,7 +1597,7 @@ static int
set_le_i(st_data_t key, st_data_t arg) set_le_i(st_data_t key, st_data_t arg)
{ {
struct set_subset_data *data = (struct set_subset_data *)arg; struct set_subset_data *data = (struct set_subset_data *)arg;
if (set_lookup(data->table, key)) return ST_CONTINUE; if (set_table_lookup(data->table, key)) return ST_CONTINUE;
data->result = Qfalse; data->result = Qfalse;
return ST_STOP; return ST_STOP;
} }
@ -1673,7 +1673,7 @@ static int
set_intersect_i(st_data_t key, st_data_t arg) set_intersect_i(st_data_t key, st_data_t arg)
{ {
VALUE *args = (VALUE *)arg; VALUE *args = (VALUE *)arg;
if (set_lookup((set_table *)args[0], key)) { if (set_table_lookup((set_table *)args[0], key)) {
args[1] = Qtrue; args[1] = Qtrue;
return ST_STOP; return ST_STOP;
} }
@ -1782,7 +1782,7 @@ set_eql_i(st_data_t item, st_data_t arg)
{ {
struct set_equal_data *data = (struct set_equal_data *)arg; struct set_equal_data *data = (struct set_equal_data *)arg;
if (!set_lookup(RSET_TABLE(data->set), item)) { if (!set_table_lookup(RSET_TABLE(data->set), item)) {
data->result = Qfalse; data->result = Qfalse;
return ST_STOP; return ST_STOP;
} }

8
st.c
View file

@ -2488,7 +2488,7 @@ set_table_size(const struct set_table *tbl)
/* Make table TAB empty. */ /* Make table TAB empty. */
void void
set_clear(set_table *tab) set_table_clear(set_table *tab)
{ {
set_make_tab_empty(tab); set_make_tab_empty(tab);
tab->rebuilds_num++; tab->rebuilds_num++;
@ -2857,7 +2857,7 @@ set_find_table_bin_ptr_and_reserve(set_table *tab, st_hash_t *hash_value,
/* Find an entry with KEY in table TAB. Return non-zero if we found /* Find an entry with KEY in table TAB. Return non-zero if we found
it. */ it. */
int int
set_lookup(set_table *tab, st_data_t key) set_table_lookup(set_table *tab, st_data_t key)
{ {
st_index_t bin; st_index_t bin;
st_hash_t hash = set_do_hash(key, tab); st_hash_t hash = set_do_hash(key, tab);
@ -2997,7 +2997,7 @@ set_update_range_for_deleted(set_table *tab, st_index_t n)
/* Delete entry with KEY from table TAB, and return non-zero. If /* Delete entry with KEY from table TAB, and return non-zero. If
there is no entry with KEY in the table, return zero. */ there is no entry with KEY in the table, return zero. */
int int
set_delete(set_table *tab, st_data_t *key) set_table_delete(set_table *tab, st_data_t *key)
{ {
set_table_entry *entry; set_table_entry *entry;
st_index_t bin; st_index_t bin;
@ -3155,7 +3155,7 @@ set_apply_functor(st_data_t k, st_data_t d, int _)
} }
int int
set_foreach(set_table *tab, set_foreach_callback_func *func, st_data_t arg) set_table_foreach(set_table *tab, set_foreach_callback_func *func, st_data_t arg)
{ {
const struct set_functor f = { func, arg }; const struct set_functor f = { func, arg };
return set_general_foreach(tab, set_apply_functor, NULL, (st_data_t)&f, FALSE); return set_general_foreach(tab, set_apply_functor, NULL, (st_data_t)&f, FALSE);

2
vm_insnhelper.c
View file

@ -3038,7 +3038,7 @@ warn_unused_block(const rb_callable_method_entry_t *cme, const rb_iseq_t *iseq,
if (!strict_unused_block) { if (!strict_unused_block) {
key = (st_data_t)cme->def->original_id; key = (st_data_t)cme->def->original_id;
if (set_lookup(dup_check_table, key)) { if (set_table_lookup(dup_check_table, key)) {
return; return;
} }
} }

8
vm_method.c
View file

@ -142,7 +142,7 @@ rb_clear_constant_cache_for_id(ID id)
if (rb_id_table_lookup(vm->constant_cache, id, &lookup_result)) { if (rb_id_table_lookup(vm->constant_cache, id, &lookup_result)) {
set_table *ics = (set_table *)lookup_result; set_table *ics = (set_table *)lookup_result;
set_foreach(ics, rb_clear_constant_cache_for_id_i, (st_data_t) NULL); set_table_foreach(ics, rb_clear_constant_cache_for_id_i, (st_data_t) NULL);
ruby_vm_constant_cache_invalidations += ics->num_entries; ruby_vm_constant_cache_invalidations += ics->num_entries;
} }
@ -549,7 +549,7 @@ rb_vm_delete_cc_refinement(const struct rb_callcache *cc)
rb_vm_t *vm = GET_VM(); rb_vm_t *vm = GET_VM();
st_data_t key = (st_data_t)cc; st_data_t key = (st_data_t)cc;
rb_set_delete(vm->cc_refinement_table, &key); rb_set_table_delete(vm->cc_refinement_table, &key);
} }
void void
@ -559,8 +559,8 @@ rb_clear_all_refinement_method_cache(void)
RB_VM_LOCK_ENTER(); RB_VM_LOCK_ENTER();
{ {
rb_set_foreach(vm->cc_refinement_table, invalidate_cc_refinement, (st_data_t)NULL); rb_set_table_foreach(vm->cc_refinement_table, invalidate_cc_refinement, (st_data_t)NULL);
rb_set_clear(vm->cc_refinement_table); rb_set_table_clear(vm->cc_refinement_table);
rb_set_compact_table(vm->cc_refinement_table); rb_set_compact_table(vm->cc_refinement_table);
} }
RB_VM_LOCK_LEAVE(); RB_VM_LOCK_LEAVE();