kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Adjust reserved hash values

Browse source 
The reserved hash values in hash.c must be consistend with st.c.
[ruby-core:90356] [Bug #15389]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-12-07 12:03:16 +00:00
parent 1e9eb83928
commit d60738f6f1
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hash.c
View file

@ -311,14 +311,16 @@ static const struct st_hash_type identhash = {
#define PTR_EQUAL(ptr, hash_val, key_) \
((ptr)->hash == (hash_val) && EQUAL((key_), (ptr)->key))
#define RESERVED_HASH_VAL ((st_hash_t) 0)
#define RESERVED_HASH_SUBSTITUTION_VAL (~(st_hash_t) 0)
#define RESERVED_HASH_VAL (~(st_hash_t) 0)
#define RESERVED_HASH_SUBSTITUTION_VAL ((st_hash_t) 0)
#define SET_KEY(entry, _key) (entry)->key = (_key)
#define SET_HASH(entry, _hash) (entry)->hash = (_hash)
#define SET_RECORD(entry, _value) (entry)->record = (_value)
typedef st_data_t st_hash_t;
extern const st_hash_t st_reserved_hash_val;
extern const st_hash_t st_reserved_hash_substitution_val;
static inline st_hash_t
do_hash(st_data_t key)
@ -5792,6 +5794,9 @@ Init_Hash(void)
#undef rb_intern
#define rb_intern(str) rb_intern_const(str)
RUBY_ASSERT(RESERVED_HASH_VAL == st_reserved_hash_val);
RUBY_ASSERT(RESERVED_HASH_SUBSTITUTION_VAL == st_reserved_hash_substitution_val);
id_hash = rb_intern("hash");
id_yield = rb_intern("yield");
id_default = rb_intern("default");

3
st.c
View file

@ -315,6 +315,9 @@ static const struct st_features features[] = {
#define RESERVED_HASH_VAL (~(st_hash_t) 0)
#define RESERVED_HASH_SUBSTITUTION_VAL ((st_hash_t) 0)
const st_hash_t st_reserved_hash_val = RESERVED_HASH_VAL;
const st_hash_t st_reserved_hash_substitution_val = RESERVED_HASH_SUBSTITUTION_VAL;
/* Return hash value of KEY for table TAB. */
static inline st_hash_t
do_hash(st_data_t key, st_table *tab)

9
test/ruby/test_hash.rb
View file

@ -1712,6 +1712,15 @@ class TestHash < Test::Unit::TestCase
assert_equal(0, 1_000_000.times.count{a=Object.new.hash; b=Object.new.hash; 0 + a + b != 0 + b + a}, bug14218)
end
def test_reserved_hash_val
s = Struct.new(:hash)
h = {}
keys = [*0..8]
keys.each {|i| h[s.new(i)]=true}
msg = proc {h.inspect}
assert_equal(keys, h.keys.map(&:hash), msg)
end
class TestSubHash < TestHash
class SubHash < Hash
def reject(*)