diff options
| author | Koichi Sasada <[email protected]> | 2019-08-01 16:04:40 +0900 |
|---|---|---|
| committer | Koichi Sasada <[email protected]> | 2019-08-01 16:06:43 +0900 |
| commit | 3a6f51ee35da5d49973aba8f7d8128a65a9d8c4a () | |
| tree | 54bf4d2fc854759ffe09a04b8e01f24e015cd056 | |
| parent | e18e7852536a42434b7b25fa08846fe161290d46 (diff) | |
introduce ar_hint_t.
Hash hint for ar_array is 1 byte (unsigned char). This introduce ar_hint_t which represents hint type.
| -rw-r--r-- | hash.c | 19 | ||||
| -rw-r--r-- | internal.h | 12 |
2 files changed, 20 insertions, 11 deletions
@@ -325,7 +325,6 @@ typedef st_index_t st_hash_t; * * as.st points st_table. */ -#define RHASH_AR_TABLE_MAX_SIZE sizeof(VALUE) #define RHASH_AR_TABLE_MAX_BOUND RHASH_AR_TABLE_MAX_SIZE #define RHASH_AR_TABLE_REF(hash, n) (&RHASH_AR_TABLE(hash)->pairs[n]) @@ -353,20 +352,20 @@ ar_do_hash(st_data_t key) return (st_hash_t)rb_any_hash(key); } -static inline unsigned char ar_do_hash_hint(st_hash_t hash_value) { - return (unsigned char)hash_value; } -static inline unsigned char ar_hint(VALUE hash, unsigned int index) { return RHASH(hash)->ar_hint.ary[index]; } static inline void -ar_hint_set_hint(VALUE hash, unsigned int index, unsigned char hint) { RHASH(hash)->ar_hint.ary[index] = hint; } @@ -650,10 +649,10 @@ ar_equal(VALUE x, VALUE y) } static unsigned -ar_find_entry_hint(VALUE hash, unsigned char hint, st_data_t key) { unsigned i, bound = RHASH_AR_TABLE_BOUND(hash); - const unsigned char *hints = RHASH(hash)->ar_hint.ary; /* if table is NULL, then bound also should be 0 */ @@ -695,7 +694,7 @@ ar_find_entry_hint(VALUE hash, unsigned char hint, st_data_t key) static unsigned ar_find_entry(VALUE hash, st_hash_t hash_value, st_data_t key) { - unsigned char hint = ar_do_hash_hint(hash_value); return ar_find_entry_hint(hash, hint, key); } @@ -908,7 +907,7 @@ ar_foreach_check(VALUE hash, int (*func)(ANYARGS), st_data_t arg, enum st_retval retval; st_data_t key; ar_table_pair *pair; - unsigned char hint; for (i = 0; i < bound; i++) { if (ar_cleared_entry(hash, i)) continue; @@ -6214,4 +6213,6 @@ Init_Hash(void) /* for callcc */ ruby_register_rollback_func_for_ensure(hash_foreach_ensure, hash_foreach_ensure_rollback); } @@ -817,7 +817,7 @@ struct RComplex { enum ruby_rhash_flags { RHASH_PROC_DEFAULT = FL_USER2, /* FL 2 */ RHASH_ST_TABLE_FLAG = FL_USER3, /* FL 3 */ - RHASH_AR_TABLE_MAX_SIZE = 8, RHASH_AR_TABLE_SIZE_MASK = (FL_USER4|FL_USER5|FL_USER6|FL_USER7), /* FL 4..7 */ RHASH_AR_TABLE_SIZE_SHIFT = (FL_USHIFT+4), RHASH_AR_TABLE_BOUND_MASK = (FL_USER8|FL_USER9|FL_USER10|FL_USER11), /* FL 8..11 */ @@ -875,6 +875,14 @@ void rb_hash_st_table_set(VALUE hash, st_table *st); #define RHASH_UNSET_TRANSIENT_FLAG(h) ((void)0) #endif struct RHash { struct RBasic basic; union { @@ -883,7 +891,7 @@ struct RHash { } as; const VALUE ifnone; union { - unsigned char ary[sizeof(VALUE)]; VALUE word; } ar_hint; }; |