ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix using struct cycle check

Browse Source
This commit is contained in:
gingerBill
2019-01-02 23:55:21 +00:00
parent 0546b5c218
commit cda0f4d8f3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_type.cpp
+5 -2
View File
@@ -27,6 +27,9 @@ void populate_using_array_index(CheckerContext *ctx, Ast *node, AstField *field,
} }
void populate_using_entity_scope(CheckerContext *ctx, Ast *node, AstField *field, Type *t) { void populate_using_entity_scope(CheckerContext *ctx, Ast *node, AstField *field, Type *t) {
if (t == nullptr) {
return;
}
t = base_type(type_deref(t)); t = base_type(type_deref(t));
gbString str = nullptr; gbString str = nullptr;
defer (gb_string_free(str)); defer (gb_string_free(str));
@@ -40,7 +43,7 @@ void populate_using_entity_scope(CheckerContext *ctx, Ast *node, AstField *field
GB_ASSERT(f->kind == Entity_Variable); GB_ASSERT(f->kind == Entity_Variable);
String name = f->token.string; String name = f->token.string;
Entity *e = scope_lookup_current(ctx->scope, name); Entity *e = scope_lookup_current(ctx->scope, name);
if (e != nullptr && name != "_" && e != f) { if (e != nullptr && name != "_") {
// TODO(bill): Better type error // TODO(bill): Better type error
if (str != nullptr) { if (str != nullptr) {
error(e->token, "'%.*s' is already declared in '%s'", LIT(name), str); error(e->token, "'%.*s' is already declared in '%s'", LIT(name), str);
@@ -59,7 +62,7 @@ void populate_using_entity_scope(CheckerContext *ctx, Ast *node, AstField *field
Entity *f = t->BitField.fields[i]; Entity *f = t->BitField.fields[i];
String name = f->token.string; String name = f->token.string;
Entity *e = scope_lookup_current(ctx->scope, name); Entity *e = scope_lookup_current(ctx->scope, name);
if (e != nullptr && name != "_" && e != f) { if ((e != nullptr && name != "_") && (e != f)) {
// TODO(bill): Better type error // TODO(bill): Better type error
if (str != nullptr) { if (str != nullptr) {
error(e->token, "'%.*s' is already declared in '%s'", LIT(name), str); error(e->token, "'%.*s' is already declared in '%s'", LIT(name), str);