From b8697fb4ed34d0da0fa0888b57e6edcc37a0ce81 Mon Sep 17 00:00:00 2001 From: Ginger Bill Date: Thu, 13 Jul 2017 16:20:07 +0100 Subject: Change precedence order for types e.g. ^T(x) == ^(T(x)) --- src/checker.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/checker.cpp') diff --git a/src/checker.cpp b/src/checker.cpp index e2133144f..d7882414a 100644 --- a/src/checker.cpp +++ b/src/checker.cpp @@ -979,7 +979,7 @@ void add_type_and_value(CheckerInfo *i, AstNode *expression, AddressingMode mode void add_entity_definition(CheckerInfo *i, AstNode *identifier, Entity *entity) { GB_ASSERT(identifier != nullptr); if (identifier->kind == AstNode_Ident) { - if (identifier->Ident.token.string == "_") { + if (is_blank_ident(identifier)) { return; } HashKey key = hash_node(identifier); @@ -994,7 +994,7 @@ bool add_entity(Checker *c, Scope *scope, AstNode *identifier, Entity *entity) { return false; } String name = entity->token.string; - if (name != "_") { + if (!is_blank_ident(name)) { Entity *ie = scope_insert_entity(scope, entity); if (ie) { TokenPos pos = ie->token.pos; @@ -2202,7 +2202,7 @@ void check_import_entities(Checker *c, Map *file_scopes) { } } else { String import_name = path_to_entity_name(id->import_name.string, id->fullpath); - if (import_name == "_") { + if (is_blank_ident(import_name)) { error(token, "File name, %.*s, cannot be as an import name as it is not a valid identifier", LIT(id->import_name.string)); } else { GB_ASSERT(id->import_name.pos.line != 0); @@ -2254,7 +2254,7 @@ void check_import_entities(Checker *c, Map *file_scopes) { String library_name = path_to_entity_name(fl->library_name.string, file_str); - if (library_name == "_") { + if (is_blank_ident(library_name)) { error(spec, "File name, %.*s, cannot be as a library name as it is not a valid identifier", LIT(fl->library_name.string)); } else { GB_ASSERT(fl->library_name.pos.line != 0); -- cgit v1.2.3