From 834308d8ceeeae14102b5afc1e5a05995e45f46d Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 29 Sep 2018 13:07:46 +0100 Subject: Fix `using import` override "bug" --- src/check_decl.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/check_decl.cpp') diff --git a/src/check_decl.cpp b/src/check_decl.cpp index 4267a65fd..de0aa572d 100644 --- a/src/check_decl.cpp +++ b/src/check_decl.cpp @@ -299,7 +299,16 @@ void override_entity_in_scope(Entity *original_entity, Entity *new_entity) { Scope *found_scope = nullptr; Entity *found_entity = nullptr; scope_lookup_parent(original_entity->scope, original_name, &found_scope, &found_entity); - GB_ASSERT(found_entity == original_entity); + + // IMPORTANT TODO(bill) + // Date: 2018-09-29 + // This assert fails on `using import` if the name of the alias is the same. What should be the expected behaviour? + // Namespace collision or override? Overridding is the current behaviour + // + // using import "foo" + // bar :: foo.bar; + + // GB_ASSERT_MSG(found_entity == original_entity, "%.*s == %.*s", LIT(found_entity->token.string), LIT(new_entity->token.string)); map_set(&found_scope->elements, hash_string(original_name), new_entity); } -- cgit v1.2.3