Minimize `StringMap` structure usage

9 files changed, 146 insertions, 119 deletions

diff --git a/src/check_expr.cpp b/src/check_expr.cpp
index 52efd9a66..ff74a2547 100644
--- a/src/check_expr.cpp
+++ b/src/check_expr.cpp
@@ -234,7 +234,7 @@ gb_internal void check_did_you_mean_type(String const &name, Slice<Entity *> con
 gb_internal void check_did_you_mean_scope(String const &name, Scope *scope, char const *prefix = "") {
 	ERROR_BLOCK();
 
-	DidYouMeanAnswers d = did_you_mean_make(heap_allocator(), scope->elements.entries.count, name);
+	DidYouMeanAnswers d = did_you_mean_make(heap_allocator(), scope->elements.count, name);
 	defer (did_you_mean_destroy(&d));
 
 	rw_mutex_shared_lock(&scope->mutex);
diff --git a/src/check_stmt.cpp b/src/check_stmt.cpp
index a2a688b13..21df1d0ea 100644
--- a/src/check_stmt.cpp
+++ b/src/check_stmt.cpp
@@ -626,7 +626,7 @@ gb_internal bool check_using_stmt_entity(CheckerContext *ctx, AstUsingStmt *us,
 		defer (rw_mutex_unlock(&scope->mutex));
 
 		for (auto const &entry : scope->elements) {
-			String name = entry.key.string;
+			String name = entry.key;
 			Entity *decl = entry.value;
 			if (!is_entity_exported(decl)) continue;
 
@@ -1323,7 +1323,7 @@ gb_internal void check_block_stmt_for_errors(CheckerContext *ctx, Ast *body)  {
 	ast_node(bs, BlockStmt, body);
 	// NOTE(bill, 2020-09-23): This logic is prevent common erros with block statements
 	// e.g. if cond { x := 123; } // this is an error
-	if (bs->scope != nullptr && bs->scope->elements.entries.count > 0) {
+	if (bs->scope != nullptr && bs->scope->elements.count > 0) {
 		if (bs->scope->parent->node != nullptr) {
 			switch (bs->scope->parent->node->kind) {
 			case Ast_IfStmt:
diff --git a/src/checker.cpp b/src/checker.cpp
index 770e0d473..39a132060 100644
--- a/src/checker.cpp
+++ b/src/checker.cpp
@@ -765,7 +765,7 @@ gb_internal AstPackage *get_core_package(CheckerInfo *info, String name) {
 		gb_printf_err("Fullpath: %.*s\n", LIT(path));
 		
 		for (auto const &entry : info->packages) {
-			gb_printf_err("%.*s\n", LIT(entry.key.string));
+			gb_printf_err("%.*s\n", LIT(entry.key));
 		}
 		GB_ASSERT_MSG(found != nullptr, "Missing core package %.*s", LIT(name));
 	}
@@ -3891,16 +3891,16 @@ gb_internal bool correct_single_type_alias(CheckerContext *c, Entity *e) {
 }
 
 gb_internal bool correct_type_alias_in_scope_backwards(CheckerContext *c, Scope *s) {
-	isize n = s->elements.entries.count;
 	bool correction = false;
-	for (isize i = n-1; i >= 0; i--) {
+	u32 n = s->elements.count;
+	for (u32 i = n-1; i < n; i--) {
 		correction |= correct_single_type_alias(c, s->elements.entries[i].value);
 	}
 	return correction;
 }
 gb_internal bool correct_type_alias_in_scope_forwards(CheckerContext *c, Scope *s) {
-	isize n = s->elements.entries.count;
 	bool correction = false;
+	u32 n = s->elements.count;
 	for (isize i = 0; i < n; i++) {
 		correction |= correct_single_type_alias(c, s->elements.entries[i].value);
 	}
@@ -5539,7 +5539,7 @@ gb_internal void check_deferred_procedures(Checker *c) {
 
 gb_internal void check_unique_package_names(Checker *c) {
 	StringMap<AstPackage *> pkgs = {}; // Key: package name
-	string_map_init(&pkgs, 2*c->info.packages.entries.count);
+	string_map_init(&pkgs, 2*c->info.packages.count);
 	defer (string_map_destroy(&pkgs));
 
 	for (auto const &entry : c->info.packages) {
diff --git a/src/common_memory.cpp b/src/common_memory.cpp
index 7d5d1f27a..22b91d8cb 100644
--- a/src/common_memory.cpp
+++ b/src/common_memory.cpp
@@ -509,15 +509,15 @@ gb_internal GB_ALLOCATOR_PROC(heap_allocator_proc) {
 
 
 template <typename T>
-gb_internal void resize_array_raw(T **array, gbAllocator const &a, isize old_count, isize new_count) {
+gb_internal isize resize_array_raw(T **array, gbAllocator const &a, isize old_count, isize new_count) {
 	GB_ASSERT(new_count >= 0);
 	if (new_count == 0) {
 		gb_free(a, *array);
 		*array = nullptr;
-		return;
+		return 0;
 	}
 	if (new_count < old_count) {
-		return;
+		return old_count;
 	}
 	isize old_size = old_count * gb_size_of(T);
 	isize new_size = new_count * gb_size_of(T);
@@ -525,5 +525,6 @@ gb_internal void resize_array_raw(T **array, gbAllocator const &a, isize old_cou
 	auto new_data = cast(T *)gb_resize_align(a, *array, old_size, new_size, alignment);
 	GB_ASSERT(new_data != nullptr);
 	*array = new_data;
+	return new_count;
 }
 
diff --git a/src/docs.cpp b/src/docs.cpp
index b1efa2b46..54bb0c7a2 100644
--- a/src/docs.cpp
+++ b/src/docs.cpp
@@ -210,7 +210,7 @@ gb_internal void print_doc_package(CheckerInfo *info, AstPackage *pkg) {
 	}
 
 	if (pkg->scope != nullptr) {
-		auto entities = array_make<Entity *>(heap_allocator(), 0, pkg->scope->elements.entries.count);
+		auto entities = array_make<Entity *>(heap_allocator(), 0, pkg->scope->elements.count);
 		defer (array_free(&entities));
 		for (auto const &entry : pkg->scope->elements) {
 			Entity *e = entry.value;
@@ -348,7 +348,7 @@ gb_internal void generate_documentation(Checker *c) {
 
 		odin_doc_write(info, output_file_path);
 	} else {
-		auto pkgs = array_make<AstPackage *>(permanent_allocator(), 0, info->packages.entries.count);
+		auto pkgs = array_make<AstPackage *>(permanent_allocator(), 0, info->packages.count);
 		for (auto const &entry : info->packages) {
 			AstPackage *pkg = entry.value;
 			if (build_context.cmd_doc_flags & CmdDocFlag_AllPackages) {
diff --git a/src/docs_writer.cpp b/src/docs_writer.cpp
index 2aefe29eb..ea0946153 100644
--- a/src/docs_writer.cpp
+++ b/src/docs_writer.cpp
@@ -977,7 +977,7 @@ gb_internal OdinDocArray<OdinDocScopeEntry> odin_doc_add_pkg_entries(OdinDocWrit
 	defer (array_free(&entries));
 
 	for (auto const &element : pkg->scope->elements) {
-		String name = element.key.string;
+		String name = element.key;
 		Entity *e = element.value;
 		switch (e->kind) {
 		case Entity_Invalid:
@@ -1016,7 +1016,7 @@ gb_internal OdinDocArray<OdinDocScopeEntry> odin_doc_add_pkg_entries(OdinDocWrit
 
 
 gb_internal void odin_doc_write_docs(OdinDocWriter *w) {
-	auto pkgs = array_make<AstPackage *>(heap_allocator(), 0, w->info->packages.entries.count);
+	auto pkgs = array_make<AstPackage *>(heap_allocator(), 0, w->info->packages.count);
 	defer (array_free(&pkgs));
 	for (auto const &entry : w->info->packages) {
 		AstPackage *pkg = entry.value;
diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp
index 148511028..6cd224324 100644
--- a/src/llvm_backend.cpp
+++ b/src/llvm_backend.cpp
@@ -1035,14 +1035,14 @@ gb_internal void lb_finalize_objc_names(lbProcedure *p) {
 	LLVMSetLinkage(p->value, LLVMInternalLinkage);
 	lb_begin_procedure_body(p);
 	for (auto const &entry : m->objc_classes) {
-		String name = entry.key.string;
+		String name = entry.key;
 		args[0] = lb_const_value(m, t_cstring, exact_value_string(name));
 		lbValue ptr = lb_emit_runtime_call(p, "objc_lookUpClass", args);
 		lb_addr_store(p, entry.value, ptr);
 	}
 
 	for (auto const &entry : m->objc_selectors) {
-		String name = entry.key.string;
+		String name = entry.key;
 		args[0] = lb_const_value(m, t_cstring, exact_value_string(name));
 		lbValue ptr = lb_emit_runtime_call(p, "sel_registerName", args);
 		lb_addr_store(p, entry.value, ptr);
diff --git a/src/llvm_backend_general.cpp b/src/llvm_backend_general.cpp
index c4f6ccc91..e7c9a0985 100644
--- a/src/llvm_backend_general.cpp
+++ b/src/llvm_backend_general.cpp
@@ -130,8 +130,8 @@ gb_internal bool lb_init_generator(lbGenerator *gen, Checker *c) {
 
 	gen->info = &c->info;
 
-	map_init(&gen->modules, gen->info->packages.entries.count*2);
-	map_init(&gen->modules_through_ctx, gen->info->packages.entries.count*2);
+	map_init(&gen->modules, gen->info->packages.count*2);
+	map_init(&gen->modules_through_ctx, gen->info->packages.count*2);
 	map_init(&gen->anonymous_proc_lits, 1024);
 
 
diff --git a/src/string_map.cpp b/src/string_map.cpp
index f7ecc4acc..3bd08d09f 100644
--- a/src/string_map.cpp
+++ b/src/string_map.cpp
@@ -1,3 +1,5 @@
+GB_STATIC_ASSERT(sizeof(MapIndex) == sizeof(u32));
+
 struct StringHashKey {
 	u32    hash;
 	String string;
@@ -9,101 +11,108 @@ struct StringHashKey {
 		return this->string;
 	}
 };
+gb_internal gb_inline u32 string_hash(String const &s) {
+	return fnv32a(s.text, s.len) & 0x7fffffff;
+}
 
 gb_internal gb_inline StringHashKey string_hash_string(String const &s) {
 	StringHashKey hash_key = {};
-	hash_key.hash = fnv32a(s.text, s.len);
+	hash_key.hash = string_hash(s);
 	hash_key.string = s;
 	return hash_key;
 }
 
-
-gb_internal gb_inline bool string_hash_key_equal(StringHashKey const &a, StringHashKey const &b) {
-	if (a.hash == b.hash) {
-		// NOTE(bill): If two string's hashes collide, compare the strings themselves
-		return a.string == b.string;
-	}
-	return false;
-}
-
 template <typename T>
 struct StringMapEntry {
-	StringHashKey key;
+	String        key;
+	u32           hash;
 	MapIndex      next;
 	T             value;
 };
 
 template <typename T>
 struct StringMap {
-	Slice<MapIndex>           hashes;
-	Array<StringMapEntry<T> > entries;
+	MapIndex *         hashes;
+	usize              hashes_count;
+	StringMapEntry<T> *entries;
+	u32                count;
+	u32                entries_capacity;
 };
 
 
-template <typename T> gb_internal void string_map_init             (StringMap<T> *h, isize capacity = 16);
-template <typename T> gb_internal void string_map_destroy          (StringMap<T> *h);
+template <typename T> gb_internal void string_map_init    (StringMap<T> *h, usize capacity = 16);
+template <typename T> gb_internal void string_map_destroy (StringMap<T> *h);
 
-template <typename T> gb_internal T *  string_map_get              (StringMap<T> *h, char const *key);
-template <typename T> gb_internal T *  string_map_get              (StringMap<T> *h, String const &key);
-template <typename T> gb_internal T *  string_map_get              (StringMap<T> *h, StringHashKey const &key);
+template <typename T> gb_internal T *  string_map_get     (StringMap<T> *h, char const *key);
+template <typename T> gb_internal T *  string_map_get     (StringMap<T> *h, String const &key);
+template <typename T> gb_internal T *  string_map_get     (StringMap<T> *h, StringHashKey const &key);
 
-template <typename T> gb_internal T &  string_map_must_get         (StringMap<T> *h, char const *key);
-template <typename T> gb_internal T &  string_map_must_get         (StringMap<T> *h, String const &key);
-template <typename T> gb_internal T &  string_map_must_get         (StringMap<T> *h, StringHashKey const &key);
+template <typename T> gb_internal T &  string_map_must_get(StringMap<T> *h, char const *key);
+template <typename T> gb_internal T &  string_map_must_get(StringMap<T> *h, String const &key);
+template <typename T> gb_internal T &  string_map_must_get(StringMap<T> *h, StringHashKey const &key);
 
-template <typename T> gb_internal void string_map_set              (StringMap<T> *h, char const *key,   T const &value);
-template <typename T> gb_internal void string_map_set              (StringMap<T> *h, String const &key, T const &value);
-template <typename T> gb_internal void string_map_set              (StringMap<T> *h, StringHashKey const &key, T const &value);
+template <typename T> gb_internal void string_map_set     (StringMap<T> *h, char const *key,   T const &value);
+template <typename T> gb_internal void string_map_set     (StringMap<T> *h, String const &key, T const &value);
+template <typename T> gb_internal void string_map_set     (StringMap<T> *h, StringHashKey const &key, T const &value);
 
-// template <typename T> gb_internal void string_map_remove           (StringMap<T> *h, StringHashKey const &key);
-template <typename T> gb_internal void string_map_clear            (StringMap<T> *h);
-template <typename T> gb_internal void string_map_grow             (StringMap<T> *h);
-template <typename T> gb_internal void string_map_reserve          (StringMap<T> *h, isize new_count);
+// template <typename T> gb_internal void string_map_remove  (StringMap<T> *h, StringHashKey const &key);
+template <typename T> gb_internal void string_map_clear   (StringMap<T> *h);
+template <typename T> gb_internal void string_map_grow    (StringMap<T> *h);
+template <typename T> gb_internal void string_map_reserve (StringMap<T> *h, usize new_count);
 
 gb_internal gbAllocator string_map_allocator(void) {
 	return heap_allocator();
 }
 
 template <typename T>
-gb_internal gb_inline void string_map_init(StringMap<T> *h, isize capacity) {
+gb_internal gb_inline void string_map_init(StringMap<T> *h, usize capacity) {
 	capacity = next_pow2_isize(capacity);
-	slice_init(&h->hashes,  string_map_allocator(), capacity);
-	array_init(&h->entries, string_map_allocator(), 0, capacity);
-	for (isize i = 0; i < capacity; i++) {
-		h->hashes.data[i] = MAP_SENTINEL;
-	}
+	string_map_reserve(h, capacity);
 }
 
 template <typename T>
 gb_internal gb_inline void string_map_destroy(StringMap<T> *h) {
-	if (h->entries.allocator.proc == nullptr) {
-		h->entries.allocator = string_map_allocator();
-	}
-	slice_free(&h->hashes, h->entries.allocator);
-	array_free(&h->entries);
+	gb_free(string_map_allocator(), h->hashes);
+	gb_free(string_map_allocator(), h->entries);
 }
 
+
+template <typename T>
+gb_internal void string_map__resize_hashes(StringMap<T> *h, usize count) {
+	h->hashes_count = cast(u32)resize_array_raw(&h->hashes, string_map_allocator(), h->hashes_count, count);
+}
+
+
+template <typename T>
+gb_internal void string_map__reserve_entries(StringMap<T> *h, usize capacity) {
+	h->entries_capacity = cast(u32)resize_array_raw(&h->entries, string_map_allocator(), h->entries_capacity, capacity);
+}
+
+
 template <typename T>
-gb_internal MapIndex string_map__add_entry(StringMap<T> *h, StringHashKey const &key) {
+gb_internal MapIndex string_map__add_entry(StringMap<T> *h, u32 hash, String const &key) {
 	StringMapEntry<T> e = {};
 	e.key = key;
+	e.hash = hash;
 	e.next = MAP_SENTINEL;
-	array_add(&h->entries, e);
-	return cast(MapIndex)(h->entries.count-1);
+	string_map__reserve_entries(h, h->count+1);
+	h->entries[h->count++] = e;
+	return cast(MapIndex)(h->count-1);
 }
 
 template <typename T>
-gb_internal MapFindResult string_map__find(StringMap<T> *h, StringHashKey const &key) {
+gb_internal MapFindResult string_map__find(StringMap<T> *h, u32 hash, String const &key) {
 	MapFindResult fr = {MAP_SENTINEL, MAP_SENTINEL, MAP_SENTINEL};
-	if (h->hashes.count != 0) {
-		fr.hash_index = cast(MapIndex)(key.hash & (h->hashes.count-1));
-		fr.entry_index = h->hashes.data[fr.hash_index];
+	if (h->hashes_count != 0) {
+		fr.hash_index = cast(MapIndex)(hash & (h->hashes_count-1));
+		fr.entry_index = h->hashes[fr.hash_index];
 		while (fr.entry_index != MAP_SENTINEL) {
-			if (string_hash_key_equal(h->entries.data[fr.entry_index].key, key)) {
+			auto *entry = &h->entries[fr.entry_index];
+			if (entry->hash == hash && entry->key == key) {
 				return fr;
 			}
 			fr.entry_prev = fr.entry_index;
-			fr.entry_index = h->entries.data[fr.entry_index].next;
+			fr.entry_index = entry->next;
 		}
 	}
 	return fr;
@@ -112,15 +121,16 @@ gb_internal MapFindResult string_map__find(StringMap<T> *h, StringHashKey const
 template <typename T>
 gb_internal MapFindResult string_map__find_from_entry(StringMap<T> *h, StringMapEntry<T> *e) {
 	MapFindResult fr = {MAP_SENTINEL, MAP_SENTINEL, MAP_SENTINEL};
-	if (h->hashes.count != 0) {
-		fr.hash_index  = cast(MapIndex)(e->key.hash & (h->hashes.count-1));
-		fr.entry_index = h->hashes.data[fr.hash_index];
+	if (h->hashes_count != 0) {
+		fr.hash_index  = cast(MapIndex)(e->hash & (h->hashes_count-1));
+		fr.entry_index = h->hashes[fr.hash_index];
 		while (fr.entry_index != MAP_SENTINEL) {
-			if (&h->entries.data[fr.entry_index] == e) {
+			auto *entry = &h->entries[fr.entry_index];
+			if (entry == e) {
 				return fr;
 			}
 			fr.entry_prev = fr.entry_index;
-			fr.entry_index = h->entries.data[fr.entry_index].next;
+			fr.entry_index = entry->next;
 		}
 	}
 	return fr;
@@ -128,24 +138,24 @@ gb_internal MapFindResult string_map__find_from_entry(StringMap<T> *h, StringMap
 
 template <typename T>
 gb_internal b32 string_map__full(StringMap<T> *h) {
-	return 0.75f * h->hashes.count <= h->entries.count;
+	return 0.75f * h->hashes_count <= h->count;
 }
 
 template <typename T>
 gb_inline void string_map_grow(StringMap<T> *h) {
-	isize new_count = gb_max(h->hashes.count<<1, 16);
+	isize new_count = gb_max(h->hashes_count<<1, 16);
 	string_map_reserve(h, new_count);
 }
 
 
 template <typename T>
 gb_internal void string_map_reset_entries(StringMap<T> *h) {
-	for (isize i = 0; i < h->hashes.count; i++) {
-		h->hashes.data[i] = MAP_SENTINEL;
+	for (u32 i = 0; i < h->hashes_count; i++) {
+		h->hashes[i] = MAP_SENTINEL;
 	}
-	for (isize i = 0; i < h->entries.count; i++) {
+	for (isize i = 0; i < h->count; i++) {
 		MapFindResult fr;
-		StringMapEntry<T> *e = &h->entries.data[i];
+		StringMapEntry<T> *e = &h->entries[i];
 		e->next = MAP_SENTINEL;
 		fr = string_map__find_from_entry(h, e);
 		if (fr.entry_prev == MAP_SENTINEL) {
@@ -157,27 +167,24 @@ gb_internal void string_map_reset_entries(StringMap<T> *h) {
 }
 
 template <typename T>
-gb_internal void string_map_reserve(StringMap<T> *h, isize cap) {
-	if (h->entries.allocator.proc == nullptr) {
-		h->entries.allocator = string_map_allocator();
-	}
-	array_reserve(&h->entries, cap);
-	if (h->entries.count*2 < h->hashes.count) {
+gb_internal void string_map_reserve(StringMap<T> *h, usize cap) {
+	if (h->count*2 < h->hashes_count) {
 		return;
 	}
-	slice_resize(&h->hashes, h->entries.allocator, cap*2);
+	string_map__reserve_entries(h, cap);
+	string_map__resize_hashes(h,   cap*2);
 	string_map_reset_entries(h);
 }
 
 template <typename T>
-gb_internal T *string_map_get(StringMap<T> *h, StringHashKey const &key) {
+gb_internal T *string_map_get(StringMap<T> *h, u32 hash, String const &key) {
 	MapFindResult fr = {MAP_SENTINEL, MAP_SENTINEL, MAP_SENTINEL};
-	if (h->hashes.count != 0) {
-		fr.hash_index = cast(MapIndex)(key.hash & (h->hashes.count-1));
-		fr.entry_index = h->hashes.data[fr.hash_index];
+	if (h->hashes_count != 0) {
+		fr.hash_index = cast(MapIndex)(hash & (h->hashes_count-1));
+		fr.entry_index = h->hashes[fr.hash_index];
 		while (fr.entry_index != MAP_SENTINEL) {
-			auto *entry = &h->entries.data[fr.entry_index];
-			if (string_hash_key_equal(entry->key, key)) {
+			auto *entry = &h->entries[fr.entry_index];
+			if (entry->hash == hash && entry->key == key) {
 				return &entry->value;
 			}
 			fr.entry_prev = fr.entry_index;
@@ -187,52 +194,65 @@ gb_internal T *string_map_get(StringMap<T> *h, StringHashKey const &key) {
 	return nullptr;
 }
 
+
+template <typename T>
+gb_internal gb_inline T *string_map_get(StringMap<T> *h, StringHashKey const &key) {
+	return string_map_get(h, key.hash, key.string);
+}
+
 template <typename T>
 gb_internal gb_inline T *string_map_get(StringMap<T> *h, String const &key) {
-	return string_map_get(h, string_hash_string(key));
+	return string_map_get(h, string_hash(key), key);
 }
 
 template <typename T>
 gb_internal gb_inline T *string_map_get(StringMap<T> *h, char const *key) {
-	return string_map_get(h, string_hash_string(make_string_c(key)));
+	String k = make_string_c(key);
+	return string_map_get(h, string_hash(k), k);
 }
 
 template <typename T>
-gb_internal T &string_map_must_get(StringMap<T> *h, StringHashKey const &key) {
-	isize index = string_map__find(h, key).entry_index;
+gb_internal T &string_map_must_get(StringMap<T> *h, u32 hash, String const &key) {
+	isize index = string_map__find(h, hash, key).entry_index;
 	GB_ASSERT(index != MAP_SENTINEL);
-	return h->entries.data[index].value;
+	return h->entries[index].value;
+}
+
+template <typename T>
+gb_internal T &string_map_must_get(StringMap<T> *h, StringHashKey const &key) {
+	return string_map_must_get(h, key.hash, key.string);
 }
 
 template <typename T>
 gb_internal gb_inline T &string_map_must_get(StringMap<T> *h, String const &key) {
-	return string_map_must_get(h, string_hash_string(key));
+	return string_map_must_get(h, string_hash(key), key);
 }
 
 template <typename T>
 gb_internal gb_inline T &string_map_must_get(StringMap<T> *h, char const *key) {
-	return string_map_must_get(h, string_hash_string(make_string_c(key)));
+	String k = make_string_c(key);
+	return string_map_must_get(h, string_hash(k), k);
 }
 
 template <typename T>
-gb_internal void string_map_set(StringMap<T> *h, StringHashKey const &key, T const &value) {
+gb_internal void string_map_set(StringMap<T> *h, u32 hash, String const &key, T const &value) {
 	MapIndex index;
 	MapFindResult fr;
-	if (h->hashes.count == 0) {
+	if (h->hashes_count == 0) {
 		string_map_grow(h);
 	}
-	fr = string_map__find(h, key);
+	fr = string_map__find(h, hash, key);
 	if (fr.entry_index != MAP_SENTINEL) {
 		index = fr.entry_index;
 	} else {
-		index = string_map__add_entry(h, key);
+		index = string_map__add_entry(h, hash, key);
 		if (fr.entry_prev != MAP_SENTINEL) {
-			h->entries.data[fr.entry_prev].next = index;
+			h->entries[fr.entry_prev].next = index;
 		} else {
-			h->hashes.data[fr.hash_index] = index;
+			h->hashes[fr.hash_index] = index;
 		}
 	}
-	h->entries.data[index].value = value;
+	h->entries[index].value = value;
 
 	if (string_map__full(h)) {
 		string_map_grow(h);
@@ -249,25 +269,31 @@ gb_internal gb_inline void string_map_set(StringMap<T> *h, char const *key, T co
 	string_map_set(h, string_hash_string(make_string_c(key)), value);
 }
 
+template <typename T>
+gb_internal gb_inline void string_map_set(StringMap<T> *h, StringHashKey const &key, T const &value) {
+	string_map_set(h, key.hash, key.string, value);
+}
+
+
 
 // template <typename T>
 // gb_internal void string_map__erase(StringMap<T> *h, MapFindResult const &fr) {
 // 	MapFindResult last;
 // 	if (fr.entry_prev == MAP_SENTINEL) {
-// 		h->hashes.data[fr.hash_index] = h->entries.data[fr.entry_index].next;
+// 		h->hashes[fr.hash_index] = h->entries[fr.entry_index].next;
 // 	} else {
-// 		h->entries.data[fr.entry_prev].next = h->entries.data[fr.entry_index].next;
+// 		h->entries[fr.entry_prev].next = h->entries[fr.entry_index].next;
 // 	}
-// 	if (fr.entry_index == h->entries.count-1) {
+// 	if (fr.entry_index == h->count-1) {
 // 		array_pop(&h->entries);
 // 		return;
 // 	}
-// 	h->entries.data[fr.entry_index] = h->entries.data[h->entries.count-1];
-// 	last = string_map__find(h, h->entries.data[fr.entry_index].key);
+// 	h->entries[fr.entry_index] = h->entries[h->count-1];
+// 	last = string_map__find(h, h->entries[fr.entry_index].key);
 // 	if (last.entry_prev != MAP_SENTINEL) {
-// 		h->entries.data[last.entry_prev].next = fr.entry_index;
+// 		h->entries[last.entry_prev].next = fr.entry_index;
 // 	} else {
-// 		h->hashes.data[last.hash_index] = fr.entry_index;
+// 		h->hashes[last.hash_index] = fr.entry_index;
 // 	}
 // }
 
@@ -281,9 +307,9 @@ gb_internal gb_inline void string_map_set(StringMap<T> *h, char const *key, T co
 
 template <typename T>
 gb_internal gb_inline void string_map_clear(StringMap<T> *h) {
-	array_clear(&h->entries);
-	for (isize i = 0; i < h->hashes.count; i++) {
-		h->hashes.data[i] = MAP_SENTINEL;
+	h->count = 0;
+	for (u32 i = 0; i < h->hashes_count; i++) {
+		h->hashes[i] = MAP_SENTINEL;
 	}
 }
 
@@ -291,20 +317,20 @@ gb_internal gb_inline void string_map_clear(StringMap<T> *h) {
 
 template <typename T>
 gb_internal StringMapEntry<T> *begin(StringMap<T> &m) noexcept {
-	return m.entries.data;
+	return m.entries;
 }
 template <typename T>
 gb_internal StringMapEntry<T> const *begin(StringMap<T> const &m) noexcept {
-	return m.entries.data;
+	return m.entries;
 }
 
 
 template <typename T>
 gb_internal StringMapEntry<T> *end(StringMap<T> &m) {
-	return m.entries.data + m.entries.count;
+	return m.entries + m.count;
 }
 
 template <typename T>
 gb_internal StringMapEntry<T> const *end(StringMap<T> const &m) noexcept {
-	return m.entries.data + m.entries.count;
+	return m.entries + m.count;
 }
\ No newline at end of file