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

Should use the proper constant

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-12-07 11:45:03 +00:00
parent a610b1f0d1
commit 1e9eb83928
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hash.c
View File

@ -340,13 +340,13 @@ clear_entry(li_table_entry* entry)
{ {
SET_KEY(entry, Qundef); SET_KEY(entry, Qundef);
SET_RECORD(entry, Qundef); SET_RECORD(entry, Qundef);
SET_HASH(entry, 0); SET_HASH(entry, RESERVED_HASH_VAL);
} }
static inline int static inline int
empty_entry(li_table_entry *entry) empty_entry(li_table_entry *entry)
{ {
return entry->hash == 0; return entry->hash == RESERVED_HASH_VAL;
} }
#define RHASH_ARRAY_SIZE(h) (HASH_ASSERT(RHASH_ARRAY_P(h)), \ #define RHASH_ARRAY_SIZE(h) (HASH_ASSERT(RHASH_ARRAY_P(h)), \
@ -414,7 +414,7 @@ hash_verify_(VALUE hash, const char *file, int line)
h = cur_entry->hash; h = cur_entry->hash;
k = cur_entry->key; k = cur_entry->key;
v = cur_entry->record; v = cur_entry->record;
HASH_ASSERT(h != 0); HASH_ASSERT(h != RESERVED_HASH_VAL);
HASH_ASSERT(k != Qundef); HASH_ASSERT(k != Qundef);
HASH_ASSERT(v != Qundef); HASH_ASSERT(v != Qundef);
n++; n++;
@ -610,7 +610,7 @@ linear_try_convert_table(VALUE hash)
for (i = 0; i < RHASH_ARRAY_MAX_BOUND; i++) { for (i = 0; i < RHASH_ARRAY_MAX_BOUND; i++) {
entry = RHASH_ARRAY_REF(hash, i); entry = RHASH_ARRAY_REF(hash, i);
HASH_ASSERT(entry->hash != 0); HASH_ASSERT(entry->hash != RESERVED_HASH_VAL);
st_add_direct_with_hash(new_tab, entry->key, entry->record, entry->hash); st_add_direct_with_hash(new_tab, entry->key, entry->record, entry->hash);
} }
@ -782,7 +782,8 @@ linear_foreach_check(VALUE hash, int (*func)(ANYARGS), st_data_t arg,
switch (retval) { switch (retval) {
case ST_CHECK: { case ST_CHECK: {
if (cur_entry->key == never && cur_entry->hash == 0) break; if (cur_entry->key == never && cur_entry->hash == RESERVED_HASH_VAL)
break;
ret = find_entry(hash, hash_value, key); ret = find_entry(hash, hash_value, key);
if (ret == RHASH_ARRAY_MAX_BOUND) { if (ret == RHASH_ARRAY_MAX_BOUND) {
retval = (*func)(0, 0, arg, 1); retval = (*func)(0, 0, arg, 1);