From e963fc4d6a2b8fc63f46bb57b2c727999ce39e29 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 5 Nov 2021 12:51:28 +0000 Subject: [PATCH] Change map index types to `u32` from `isize` --- src/map.cpp | 27 +++++++++++++-------------- src/ptr_set.cpp | 9 ++++----- src/string_map.cpp | 29 ++++++++++++++--------------- 3 files changed, 31 insertions(+), 34 deletions(-) diff --git a/src/map.cpp b/src/map.cpp index 86def4f1b..cc91e51d4 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -8,7 +8,7 @@ #define MAP_UTIL_STUFF // NOTE(bill): This util stuff is the same for every `Map` -typedef isize MapIndex; +typedef u32 MapIndex; struct MapFindResult { MapIndex hash_index; @@ -58,13 +58,13 @@ gb_inline bool operator!=(HashKey a, HashKey b) { return !hash_key_equal(a, b); template struct MapEntry { HashKey key; - isize next; + MapIndex next; T value; }; template struct Map { - Slice hashes; + Slice hashes; Array > entries; }; @@ -109,12 +109,12 @@ gb_inline void map_destroy(Map *h) { } template -gb_internal isize map__add_entry(Map *h, HashKey const &key) { +gb_internal MapIndex map__add_entry(Map *h, HashKey const &key) { MapEntry e = {}; e.key = key; e.next = MAP_SENTINEL; array_add(&h->entries, e); - return h->entries.count-1; + return cast(MapIndex)(h->entries.count-1); } template @@ -123,7 +123,7 @@ gb_internal MapFindResult map__find(Map *h, HashKey const &key) { if (h->hashes.count == 0) { return fr; } - fr.hash_index = key.key & (h->hashes.count-1); + fr.hash_index = cast(MapIndex)(key.key & (h->hashes.count-1)); fr.entry_index = h->hashes.data[fr.hash_index]; while (fr.entry_index != MAP_SENTINEL) { if (hash_key_equal(h->entries.data[fr.entry_index].key, key)) { @@ -141,7 +141,7 @@ gb_internal MapFindResult map__find_from_entry(Map *h, MapEntry *e) { if (h->hashes.count == 0) { return fr; } - fr.hash_index = e->key.key & (h->hashes.count-1); + fr.hash_index = cast(MapIndex)(e->key.key & (h->hashes.count-1)); fr.entry_index = h->hashes.data[fr.hash_index]; while (fr.entry_index != MAP_SENTINEL) { if (&h->entries.data[fr.entry_index] == e) { @@ -166,19 +166,18 @@ gb_inline void map_grow(Map *h) { template void map_reset_entries(Map *h) { - isize i; - for (i = 0; i < h->hashes.count; i++) { + for (isize i = 0; i < h->hashes.count; i++) { h->hashes.data[i] = MAP_SENTINEL; } - for (i = 0; i < h->entries.count; i++) { + for (isize i = 0; i < h->entries.count; i++) { MapFindResult fr; MapEntry *e = &h->entries.data[i]; e->next = MAP_SENTINEL; fr = map__find_from_entry(h, e); if (fr.entry_prev == MAP_SENTINEL) { - h->hashes[fr.hash_index] = i; + h->hashes[fr.hash_index] = cast(MapIndex)i; } else { - h->entries[fr.entry_prev].next = i; + h->entries[fr.entry_prev].next = cast(MapIndex)i; } } } @@ -217,7 +216,7 @@ T &map_must_get(Map *h, HashKey const &key) { template void map_set(Map *h, HashKey const &key, T const &value) { - isize index; + MapIndex index; MapFindResult fr; if (h->hashes.count == 0) { map_grow(h); @@ -327,7 +326,7 @@ void multi_map_get_all(Map *h, HashKey const &key, T *items) { template void multi_map_insert(Map *h, HashKey const &key, T const &value) { MapFindResult fr; - isize i; + MapIndex i; if (h->hashes.count == 0) { map_grow(h); } diff --git a/src/ptr_set.cpp b/src/ptr_set.cpp index a17ab7e1c..0ca1921e8 100644 --- a/src/ptr_set.cpp +++ b/src/ptr_set.cpp @@ -111,19 +111,18 @@ gb_inline void ptr_set_grow(PtrSet *s) { template void ptr_set_reset_entries(PtrSet *s) { - PtrSetIndex i; - for (i = 0; i < cast(PtrSetIndex)s->hashes.count; i++) { + for (isize i = 0; i < s->hashes.count; i++) { s->hashes.data[i] = PTR_SET_SENTINEL; } - for (i = 0; i < cast(PtrSetIndex)s->entries.count; i++) { + for (isize i = 0; i < s->entries.count; i++) { PtrSetFindResult fr; PtrSetEntry *e = &s->entries.data[i]; e->next = PTR_SET_SENTINEL; fr = ptr_set__find_from_entry(s, e); if (fr.entry_prev == PTR_SET_SENTINEL) { - s->hashes[fr.hash_index] = i; + s->hashes[fr.hash_index] = cast(PtrSetIndex)i; } else { - s->entries[fr.entry_prev].next = i; + s->entries[fr.entry_prev].next = cast(PtrSetIndex)i; } } } diff --git a/src/string_map.cpp b/src/string_map.cpp index 2d0da8c66..448af624d 100644 --- a/src/string_map.cpp +++ b/src/string_map.cpp @@ -1,6 +1,6 @@ // NOTE(bill): This util stuff is the same for every `Map` -typedef isize StringMapIndex; +typedef u32 StringMapIndex; struct StringMapFindResult { StringMapIndex hash_index; @@ -40,14 +40,14 @@ bool operator!=(StringHashKey const &a, StringHashKey const &b) { return !string template struct StringMapEntry { - StringHashKey key; - isize next; - T value; + StringHashKey key; + StringMapIndex next; + T value; }; template struct StringMap { - Slice hashes; + Slice hashes; Array > entries; }; @@ -90,19 +90,19 @@ gb_inline void string_map_destroy(StringMap *h) { } template -gb_internal isize string_map__add_entry(StringMap *h, StringHashKey const &key) { +gb_internal StringMapIndex string_map__add_entry(StringMap *h, StringHashKey const &key) { StringMapEntry e = {}; e.key = key; e.next = STRING_MAP_SENTINEL; array_add(&h->entries, e); - return h->entries.count-1; + return cast(StringMapIndex)(h->entries.count-1); } template gb_internal StringMapFindResult string_map__find(StringMap *h, StringHashKey const &key) { StringMapFindResult fr = {STRING_MAP_SENTINEL, STRING_MAP_SENTINEL, STRING_MAP_SENTINEL}; if (h->hashes.count != 0) { - fr.hash_index = key.hash & (h->hashes.count-1); + fr.hash_index = cast(StringMapIndex)(key.hash & (h->hashes.count-1)); fr.entry_index = h->hashes.data[fr.hash_index]; while (fr.entry_index != STRING_MAP_SENTINEL) { if (string_hash_key_equal(h->entries.data[fr.entry_index].key, key)) { @@ -119,7 +119,7 @@ template gb_internal StringMapFindResult string_map__find_from_entry(StringMap *h, StringMapEntry *e) { StringMapFindResult fr = {STRING_MAP_SENTINEL, STRING_MAP_SENTINEL, STRING_MAP_SENTINEL}; if (h->hashes.count != 0) { - fr.hash_index = e->key.hash & (h->hashes.count-1); + fr.hash_index = cast(StringMapIndex)(e->key.hash & (h->hashes.count-1)); fr.entry_index = h->hashes.data[fr.hash_index]; while (fr.entry_index != STRING_MAP_SENTINEL) { if (&h->entries.data[fr.entry_index] == e) { @@ -146,19 +146,18 @@ gb_inline void string_map_grow(StringMap *h) { template void string_map_reset_entries(StringMap *h) { - isize i; - for (i = 0; i < h->hashes.count; i++) { + for (isize i = 0; i < h->hashes.count; i++) { h->hashes.data[i] = STRING_MAP_SENTINEL; } - for (i = 0; i < h->entries.count; i++) { + for (isize i = 0; i < h->entries.count; i++) { StringMapFindResult fr; StringMapEntry *e = &h->entries.data[i]; e->next = STRING_MAP_SENTINEL; fr = string_map__find_from_entry(h, e); if (fr.entry_prev == STRING_MAP_SENTINEL) { - h->hashes[fr.hash_index] = i; + h->hashes[fr.hash_index] = cast(StringMapIndex)i; } else { - h->entries[fr.entry_prev].next = i; + h->entries[fr.entry_prev].next = cast(StringMapIndex)i; } } } @@ -217,7 +216,7 @@ gb_inline T &string_map_must_get(StringMap *h, char const *key) { template void string_map_set(StringMap *h, StringHashKey const &key, T const &value) { - isize index; + StringMapIndex index; StringMapFindResult fr; if (h->hashes.count == 0) { string_map_grow(h);