Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-20 11:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
blueloveTH 2023-10-13 11:46:42 +08:00
parent f766be85aa
commit 67a0ecae92
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
include/pocketpy/namedict.h
View File

@ -123,18 +123,6 @@ struct LargeNameDict {
Item* _items; Item* _items;
#define HASH_PROBE_0(key, ok, i) \
ok = false; \
i = _hash(key, _mask, _hash_seed); \
for(int _j=0; _j<_capacity; _j++) { \
if(!_items[i].first.empty()){ \
if(_items[i].first == (key)) { ok = true; break; } \
}else{ \
if(_items[i].second == 0) break; \
} \
i = (i + 1) & _mask; \
}
#define HASH_PROBE_1(key, ok, i) \ #define HASH_PROBE_1(key, ok, i) \
ok = false; \ ok = false; \
i = _hash(key, _mask, _hash_seed); \ i = _hash(key, _mask, _hash_seed); \
@ -143,13 +131,11 @@ while(!_items[i].first.empty()) { \
i = (i + 1) & _mask; \ i = (i + 1) & _mask; \
} }
#define NAMEDICT_ALLOC() \ #define HASH_PROBE_0 HASH_PROBE_1
_items = (Item*)malloc(_capacity * sizeof(Item)); \
memset(_items, 0, _capacity * sizeof(Item)); \
LargeNameDict(float load_factor=kInstAttrLoadFactor): _is_small(false), _load_factor(load_factor), _size(0), _hash_seed(kHashSeeds[0]) { LargeNameDict(float load_factor=kInstAttrLoadFactor): _is_small(false), _load_factor(load_factor), _size(0), _hash_seed(kHashSeeds[0]) {
_set_capacity(kInitialCapacity); _set_capacity(kInitialCapacity);
NAMEDICT_ALLOC() _alloc_items();
} }
~LargeNameDict(){ free(_items); } ~LargeNameDict(){ free(_items); }
@ -163,6 +149,11 @@ while(!_items[i].first.empty()) { \
_mask = val - 1; _mask = val - 1;
} }
void _alloc_items(){
_items = (Item*)malloc(_capacity * sizeof(Item));
memset(_items, 0, _capacity * sizeof(Item));
}
void set(StrName key, T val){ void set(StrName key, T val){
bool ok; uint16_t i; bool ok; uint16_t i;
HASH_PROBE_1(key, ok, i); HASH_PROBE_1(key, ok, i);
@ -183,7 +174,7 @@ while(!_items[i].first.empty()) { \
if(resize){ if(resize){
_set_capacity(_capacity * 2); _set_capacity(_capacity * 2);
} }
NAMEDICT_ALLOC() _alloc_items();
for(uint16_t i=0; i<old_capacity; i++){ for(uint16_t i=0; i<old_capacity; i++){
if(old_items[i].first.empty()) continue; if(old_items[i].first.empty()) continue;
bool ok; uint16_t j; bool ok; uint16_t j;
@ -224,8 +215,18 @@ while(!_items[i].first.empty()) { \
HASH_PROBE_0(key, ok, i); HASH_PROBE_0(key, ok, i);
if(!ok) return false; if(!ok) return false;
_items[i].first = StrName(); _items[i].first = StrName();
// _items[i].second = PY_DELETED_SLOT; // do not change .second if it is not zero, it means the slot is occupied by a deleted item _items[i].second = nullptr;
_size--; _size--;
// tidy
uint16_t pre_z = i;
uint16_t z = (i + 1) & _mask;
while(!_items[z].first.empty()){
uint16_t h = _hash(_items[z].first, _mask, _hash_seed);
if(h != i) break;
std::swap(_items[pre_z], _items[z]);
pre_z = z;
z = (z + 1) & _mask;
}
return true; return true;
} }
@ -253,8 +254,8 @@ while(!_items[i].first.empty()) { \
} }
_size = 0; _size = 0;
} }
#undef HASH_PROBE #undef HASH_PROBE_0
#undef NAMEDICT_ALLOC #undef HASH_PROBE_1
#undef _hash #undef _hash
}; };