1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract RHASH_IDENTHASH_P

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-02-26 23:47:45 +09:00
parent fdf1fa5f5f
commit c1279a3da5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hash.c
View File

@ -394,6 +394,8 @@ const struct st_hash_type rb_hashtype_ident = {
rb_ident_hash, rb_ident_hash,
}; };
#define RHASH_IDENTHASH_P(hash) (RHASH_TYPE(hash) == &identhash)
typedef st_index_t st_hash_t; typedef st_index_t st_hash_t;
/* /*
@ -2956,7 +2958,7 @@ rb_hash_aset(VALUE hash, VALUE key, VALUE val)
rb_hash_modify(hash); rb_hash_modify(hash);
if (RHASH_TYPE(hash) == &identhash || rb_obj_class(key) != rb_cString) { if (RHASH_IDENTHASH_P(hash) || rb_obj_class(key) != rb_cString) {
RHASH_UPDATE_ITER(hash, iter_p, key, hash_aset, val); RHASH_UPDATE_ITER(hash, iter_p, key, hash_aset, val);
} }
else { else {
@ -4162,7 +4164,7 @@ rb_hash_assoc(VALUE hash, VALUE key)
if (RHASH_EMPTY_P(hash)) return Qnil; if (RHASH_EMPTY_P(hash)) return Qnil;
if (RHASH_ST_TABLE_P(hash) && RHASH_ST_TABLE(hash)->type != &identhash) { if (RHASH_ST_TABLE_P(hash) && !RHASH_IDENTHASH_P(hash)) {
VALUE value = Qundef; VALUE value = Qundef;
st_table assoctable = *RHASH_ST_TABLE(hash); st_table assoctable = *RHASH_ST_TABLE(hash);
assoctable.type = &(struct st_hash_type){ assoctable.type = &(struct st_hash_type){
@ -4439,7 +4441,7 @@ rb_hash_compare_by_id(VALUE hash)
VALUE VALUE
rb_hash_compare_by_id_p(VALUE hash) rb_hash_compare_by_id_p(VALUE hash)
{ {
return RBOOL(RHASH_ST_TABLE_P(hash) && RHASH_ST_TABLE(hash)->type == &identhash); return RBOOL(RHASH_IDENTHASH_P(hash));
} }
VALUE VALUE