aboutsummaryrefslogtreecommitdiff
path: root/src/checker.c
diff options
context:
space:
mode:
authorGinger Bill <bill@gingerbill.org>2017-05-10 22:51:35 +0100
committerGinger Bill <bill@gingerbill.org>2017-05-10 22:51:35 +0100
commit87f1a62ca4280105eb845e5bae3acd8b8a0a0810 (patch)
treebf791a7d0a593f75165f73bb45a4e718fbda9b67 /src/checker.c
parentc6d531df9597253ee95593c56e61039fe4e40ba2 (diff)
Fix alignment for normal structures to match LLVM
Diffstat (limited to 'src/checker.c')
-rw-r--r--src/checker.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/checker.c b/src/checker.c
index fae2eef2d..cd6de9bb9 100644
--- a/src/checker.c
+++ b/src/checker.c
@@ -1797,7 +1797,6 @@ void check_import_entities(Checker *c, MapScope *file_scopes) {
}
}
-
if (!previously_added) {
array_add(&parent_scope->imported, scope);
} else {
@@ -1813,19 +1812,21 @@ void check_import_entities(Checker *c, MapScope *file_scopes) {
if (e->scope == parent_scope) {
continue;
}
+
+
if (!is_entity_kind_exported(e->kind)) {
continue;
}
if (id->is_import) {
if (is_entity_exported(e)) {
// TODO(bill): Should these entities be imported but cause an error when used?
- bool ok = add_entity(c, parent_scope, NULL, e);
+ bool ok = add_entity(c, parent_scope, e->identifier, e);
if (ok) {
map_bool_set(&parent_scope->implicit, hash_pointer(e), true);
}
}
} else {
- add_entity(c, parent_scope, NULL, e);
+ add_entity(c, parent_scope, e->identifier, e);
}
}
} else {