mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 03:32:29 +00:00
Code Activity

Some changes to hashlib to make for better stl compatibility

Browse source
This commit is contained in:
Clifford Wolf 2014-12-28 22:26:09 +01:00
parent 2ad131764f
commit dede5353b1
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
kernel/hashlib.h
View file

@ -200,13 +200,13 @@ class dict
} }
} }
void do_erase(const K &key, int hash) int do_erase(const K &key, int hash)
{ {
int last_index = -1; int last_index = -1;
int index = hashtable.empty() ? -1 : hashtable[hash]; int index = hashtable.empty() ? -1 : hashtable[hash];
while (1) { while (1) {
if (index < 0) if (index < 0)
return; return 0;
if (ops.cmp(entries[index].udata.first, key)) { if (ops.cmp(entries[index].udata.first, key)) {
if (last_index < 0) if (last_index < 0)
hashtable[hash] = entries[index].get_next(); hashtable[hash] = entries[index].get_next();
@ -219,7 +219,7 @@ class dict
clear(); clear();
else if (index == begin_n) else if (index == begin_n)
do begin_n--; while (begin_n >= 0 && entries[begin_n].is_free()); do begin_n--; while (begin_n >= 0 && entries[begin_n].is_free());
return; return 1;
} }
last_index = index; last_index = index;
index = entries[index].get_next(); index = entries[index].get_next();
@ -355,16 +355,17 @@ public:
return std::pair<iterator, bool>(iterator(this, i), true); return std::pair<iterator, bool>(iterator(this, i), true);
} }
void erase(const K &key) int erase(const K &key)
{ {
int hash = mkhash(key); int hash = mkhash(key);
do_erase(key, hash); return do_erase(key, hash);
} }
void erase(const iterator it) iterator erase(iterator it)
{ {
int hash = mkhash(it->first); int hash = mkhash(it->first);
do_erase(it->first, hash); do_erase(it->first, hash);
return ++it;
} }
int count(const K &key) const int count(const K &key) const
@ -538,13 +539,13 @@ class pool
} }
} }
void do_erase(const K &key, int hash) int do_erase(const K &key, int hash)
{ {
int last_index = -1; int last_index = -1;
int index = hashtable.empty() ? -1 : hashtable[hash]; int index = hashtable.empty() ? -1 : hashtable[hash];
while (1) { while (1) {
if (index < 0) if (index < 0)
return; return 0;
if (ops.cmp(entries[index].key, key)) { if (ops.cmp(entries[index].key, key)) {
if (last_index < 0) if (last_index < 0)
hashtable[hash] = entries[index].get_next(); hashtable[hash] = entries[index].get_next();
@ -557,7 +558,7 @@ class pool
clear(); clear();
else if (index == begin_n) else if (index == begin_n)
do begin_n--; while (begin_n >= 0 && entries[begin_n].is_free()); do begin_n--; while (begin_n >= 0 && entries[begin_n].is_free());
return; return 1;
} }
last_index = index; last_index = index;
index = entries[index].get_next(); index = entries[index].get_next();
@ -693,16 +694,17 @@ public:
return std::pair<iterator, bool>(iterator(this, i), true); return std::pair<iterator, bool>(iterator(this, i), true);
} }
void erase(const K &key) int erase(const K &key)
{ {
int hash = mkhash(key); int hash = mkhash(key);
do_erase(key, hash); return do_erase(key, hash);
} }
void erase(const iterator it) iterator erase(iterator it)
{ {
int hash = mkhash(*it); int hash = mkhash(*it);
do_erase(*it, hash); do_erase(*it, hash);
return ++it;
} }
int count(const K &key) const int count(const K &key) const