walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[map] Change bucket_for() to item_for()

This commit is contained in:
Behdad Esfahbod 2022-11-18 16:29:06 -07:00
parent 68a29020c5
commit d012f9a9b3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-map.hh
View File

@ -93,8 +93,8 @@ struct hb_hashmap_t
return minus_1; return minus_1;
}; };
bool operator == (const K &o) { return hb_deref (key) == hb_deref (o); } bool operator == (const K &o) const { return hb_deref (key) == hb_deref (o); }
bool operator == (const item_t &o) { return *this == o.key; } bool operator == (const item_t &o) const { return *this == o.key; }
hb_pair_t<K, V> get_pair() const { return hb_pair_t<K, V> (key, value); } hb_pair_t<K, V> get_pair() const { return hb_pair_t<K, V> (key, value); }
hb_pair_t<const K &, const V &> get_pair_ref() const { return hb_pair_t<const K &, const V &> (key, value); } hb_pair_t<const K &, const V &> get_pair_ref() const { return hb_pair_t<const K &, const V &> (key, value); }
@ -205,8 +205,8 @@ struct hb_hashmap_t
const V& get (K key) const const V& get (K key) const
{ {
if (unlikely (!items)) return item_t::default_value (); if (unlikely (!items)) return item_t::default_value ();
unsigned int i = bucket_for (key); auto &item = item_for (key);
return items[i].is_real () && items[i] == key ? items[i].value : item_t::default_value (); return item.is_real () && item == key ? item.value : item_t::default_value ();
} }
void del (K key) { set_with_hash (key, hb_hash (key), item_t::default_value (), true); } void del (K key) { set_with_hash (key, hb_hash (key), item_t::default_value (), true); }
@ -219,10 +219,10 @@ struct hb_hashmap_t
{ {
if (unlikely (!items)) if (unlikely (!items))
return false; return false;
unsigned int i = bucket_for (key); auto &item = item_for (key);
if (items[i].is_real () && items[i] == key) if (item.is_real () && item == key)
{ {
if (vp) *vp = std::addressof (items[i].value); if (vp) *vp = std::addressof (item.value);
return true; return true;
} }
else else
@ -347,9 +347,9 @@ struct hb_hashmap_t
return true; return true;
} }
unsigned int bucket_for (const K &key) const item_t& item_for (const K &key) const
{ {
return bucket_for_hash (key, hb_hash (key)); return items[bucket_for_hash (key, hb_hash (key))];
} }
unsigned int bucket_for_hash (const K &key, uint32_t hash) const unsigned int bucket_for_hash (const K &key, uint32_t hash) const