aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGinger Bill <bill@gingerbill.org>2017-09-11 22:49:26 +0100
committerGinger Bill <bill@gingerbill.org>2017-09-11 22:49:26 +0100
commitcbcf4b6071a55a8e80c41647e81715cf8505bdf8 (patch)
tree1f0c3a382460bd20e7790b31afe5ac46b9a99b39 /src
parente6e0aba8c31f5c9ccec7d0113d63f5104df74ea1 (diff)
Fix issue #94
Diffstat (limited to 'src')
-rw-r--r--src/checker.cpp17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/checker.cpp b/src/checker.cpp
index 7a4e1f2ce..ed9da4fee 100644
--- a/src/checker.cpp
+++ b/src/checker.cpp
@@ -264,11 +264,6 @@ i32 is_scope_an_ancestor(Scope *parent, Scope *child) {
}
-struct DelayedDecl {
- Scope * parent;
- AstNode *decl;
-};
-
struct EntityGraphNode;
typedef PtrSet<EntityGraphNode *> EntityGraphNodeSet;
@@ -1617,7 +1612,7 @@ void init_preload(Checker *c) {
bool check_arity_match(Checker *c, AstNodeValueDecl *vd, bool is_global = false);
void check_collect_entities(Checker *c, Array<AstNode *> nodes);
void check_collect_entities_from_when_stmt(Checker *c, AstNodeWhenStmt *ws);
-void check_delayed_file_import_entities(Checker *c, AstNode *decl);
+void check_delayed_file_import_entity(Checker *c, AstNode *decl);
bool check_is_entity_overloaded(Entity *e) {
if (e->kind != Entity_Procedure) {
@@ -1966,7 +1961,7 @@ void check_collect_entities(Checker *c, Array<AstNode *> nodes) {
continue;
}
if (c->context.allow_file_when_statement) {
- check_delayed_file_import_entities(c, decl);
+ check_delayed_file_import_entity(c, decl);
}
case_end;
@@ -1978,7 +1973,7 @@ void check_collect_entities(Checker *c, Array<AstNode *> nodes) {
continue;
}
if (c->context.allow_file_when_statement) {
- check_delayed_file_import_entities(c, decl);
+ check_delayed_file_import_entity(c, decl);
}
case_end;
@@ -1990,7 +1985,7 @@ void check_collect_entities(Checker *c, Array<AstNode *> nodes) {
continue;
}
if (c->context.allow_file_when_statement) {
- check_delayed_file_import_entities(c, decl);
+ check_delayed_file_import_entity(c, decl);
}
case_end;
@@ -2410,7 +2405,7 @@ Array<Scope *> find_import_path(Map<Scope *> *file_scopes, Scope *start, Scope *
return empty_path;
}
-void check_delayed_file_import_entities(Checker *c, AstNode *decl) {
+void check_delayed_file_import_entity(Checker *c, AstNode *decl) {
GB_ASSERT(c->context.allow_file_when_statement);
Scope *parent_scope = c->context.scope;
@@ -2636,7 +2631,7 @@ void check_import_entities(Checker *c) {
c->context.allow_file_when_statement = true;
for_array(i, f->decls) {
- check_delayed_file_import_entities(c, f->decls[i]);
+ check_delayed_file_import_entity(c, f->decls[i]);
}
}
}