From f09b6a4c90805a562b2252430f844e85d06f1ee1 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 13 Apr 2020 13:02:30 +0100 Subject: Simplify compiler's `Map` and create a `StringMap` specifically for strings --- src/parser.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/parser.cpp') diff --git a/src/parser.cpp b/src/parser.cpp index b05f7df2f..e0cd60d79 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -4310,7 +4310,7 @@ void destroy_ast_file(AstFile *f) { bool init_parser(Parser *p) { GB_ASSERT(p != nullptr); string_set_init(&p->imported_files, heap_allocator()); - map_init(&p->package_map, heap_allocator()); + string_map_init(&p->package_map, heap_allocator()); array_init(&p->packages, heap_allocator()); array_init(&p->package_imports, heap_allocator()); gb_mutex_init(&p->file_add_mutex); @@ -4336,7 +4336,7 @@ void destroy_parser(Parser *p) { array_free(&p->packages); array_free(&p->package_imports); string_set_destroy(&p->imported_files); - map_destroy(&p->package_map); + string_map_destroy(&p->package_map); gb_mutex_destroy(&p->file_add_mutex); gb_mutex_destroy(&p->file_decl_mutex); } @@ -4346,8 +4346,8 @@ void parser_add_package(Parser *p, AstPackage *pkg) { pkg->id = p->packages.count+1; array_add(&p->packages, pkg); if (pkg->name.len > 0) { - HashKey key = hash_string(pkg->name); - auto found = map_get(&p->package_map, key); + StringHashKey key = string_hash_string(pkg->name); + auto found = string_map_get(&p->package_map, key); if (found) { GB_ASSERT(pkg->files.count > 0); AstFile *f = pkg->files[0]; @@ -4356,7 +4356,7 @@ void parser_add_package(Parser *p, AstPackage *pkg) { TokenPos pos = (*found)->files[0]->package_token.pos; error_line("\tpreviously declared at %.*s(%td:%td)\n", LIT(pos.file), pos.line, pos.column); } else { - map_set(&p->package_map, key, pkg); + string_map_set(&p->package_map, key, pkg); } } } -- cgit v1.2.3