mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2025-12-29 01:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify MapFindResult types

Browse Source
This commit is contained in:
gingerBill
2021-11-05 17:24:19 +00:00
parent 0af69f8cda
commit 26e3daf5ad
5 changed files with 107 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/string_set.cpp
View File

@@ -1,17 +1,11 @@
struct StringSetFindResult {
isize hash_index;
isize entry_prev;
isize entry_index;
};
struct StringSetEntry {
u64 hash;
isize next;
String value;
u32 hash;
MapIndex next;
String value;
};
struct StringSet {
Array<isize> hashes;
Array<MapIndex> hashes;
Array<StringSetEntry> entries;
};
@@ -36,22 +30,22 @@ gb_inline void string_set_destroy(StringSet *s) {
array_free(&s->hashes);
}
gb_internal isize string_set__add_entry(StringSet *s, StringHashKey const &key) {
gb_internal MapIndex string_set__add_entry(StringSet *s, StringHashKey const &key) {
StringSetEntry e = {};
e.hash = key.hash;
e.next = -1;
e.next = MAP_SENTINEL;
e.value = key.string;
array_add(&s->entries, e);
return s->entries.count-1;
return cast(MapIndex)(s->entries.count-1);
}
gb_internal StringSetFindResult string_set__find(StringSet *s, StringHashKey const &key) {
StringSetFindResult fr = {-1, -1, -1};
gb_internal MapFindResult string_set__find(StringSet *s, StringHashKey const &key) {
MapFindResult fr = {MAP_SENTINEL, MAP_SENTINEL, MAP_SENTINEL};
if (s->hashes.count > 0) {
// fr.hash_index = u128_to_i64(key.key % u128_from_i64(s->hashes.count));
fr.hash_index = key.hash % s->hashes.count;
fr.hash_index = cast(MapIndex)(((u64)key.hash) % s->hashes.count);
fr.entry_index = s->hashes[fr.hash_index];
while (fr.entry_index >= 0) {
while (fr.entry_index != MAP_SENTINEL) {
auto const &entry = s->entries[fr.entry_index];
if (entry.hash == key.hash && entry.value == key.string) {
return fr;
@@ -79,21 +73,21 @@ void string_set_rehash(StringSet *s, isize new_count) {
array_resize(&ns.hashes, new_count);
array_reserve(&ns.entries, s->entries.count);
for (i = 0; i < new_count; i++) {
ns.hashes[i] = -1;
ns.hashes[i] = MAP_SENTINEL;
}
for (i = 0; i < s->entries.count; i++) {
StringSetEntry *e = &s->entries[i];
StringSetFindResult fr;
MapFindResult fr;
if (ns.hashes.count == 0) {
string_set_grow(&ns);
}
StringHashKey key = {e->hash, e->value};
fr = string_set__find(&ns, key);
j = string_set__add_entry(&ns, key);
if (fr.entry_prev < 0) {
ns.hashes[fr.hash_index] = j;
if (fr.entry_prev == MAP_SENTINEL) {
ns.hashes[fr.hash_index] = cast(MapIndex)j;
} else {
ns.entries[fr.entry_prev].next = j;
ns.entries[fr.entry_prev].next = cast(MapIndex)j;
}
ns.entries[j].next = fr.entry_index;
ns.entries[j].value = e->value;
@@ -108,22 +102,22 @@ void string_set_rehash(StringSet *s, isize new_count) {
gb_inline bool string_set_exists(StringSet *s, String const &str) {
StringHashKey key = string_hash_string(str);
isize index = string_set__find(s, key).entry_index;
return index >= 0;
return index != MAP_SENTINEL;
}
void string_set_add(StringSet *s, String const &str) {
isize index;
StringSetFindResult fr;
MapIndex index;
MapFindResult fr;
StringHashKey key = string_hash_string(str);
if (s->hashes.count == 0) {
string_set_grow(s);
}
fr = string_set__find(s, key);
if (fr.entry_index >= 0) {
if (fr.entry_index != MAP_SENTINEL) {
index = fr.entry_index;
} else {
index = string_set__add_entry(s, key);
if (fr.entry_prev >= 0) {
if (fr.entry_prev != MAP_SENTINEL) {
s->entries[fr.entry_prev].next = index;
} else {
s->hashes[fr.hash_index] = index;
@@ -137,9 +131,9 @@ void string_set_add(StringSet *s, String const &str) {
}
void string_set__erase(StringSet *s, StringSetFindResult fr) {
StringSetFindResult last;
if (fr.entry_prev < 0) {
void string_set__erase(StringSet *s, MapFindResult fr) {
MapFindResult last;
if (fr.entry_prev == MAP_SENTINEL) {
s->hashes[fr.hash_index] = s->entries[fr.entry_index].next;
} else {
s->entries[fr.entry_prev].next = s->entries[fr.entry_index].next;
@@ -152,7 +146,7 @@ void string_set__erase(StringSet *s, StringSetFindResult fr) {
*entry = s->entries[s->entries.count-1];
StringHashKey key = {entry->hash, entry->value};
last = string_set__find(s, key);
if (last.entry_prev >= 0) {
if (last.entry_prev != MAP_SENTINEL) {
s->entries[last.entry_prev].next = fr.entry_index;
} else {
s->hashes[last.hash_index] = fr.entry_index;
@@ -161,13 +155,15 @@ void string_set__erase(StringSet *s, StringSetFindResult fr) {
void string_set_remove(StringSet *s, String const &str) {
StringHashKey key = string_hash_string(str);
StringSetFindResult fr = string_set__find(s, key);
if (fr.entry_index >= 0) {
MapFindResult fr = string_set__find(s, key);
if (fr.entry_index != MAP_SENTINEL) {
string_set__erase(s, fr);
}
}
gb_inline void string_set_clear(StringSet *s) {
array_clear(&s->hashes);
array_clear(&s->entries);
for_array(i, s->hashes) {
s->hashes.data[i] = MAP_SENTINEL;
}
}