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

Remove multiple messages for cyclic type errors.

Browse Source
This commit is contained in:
Ginger Bill
2016-12-05 00:22:30 +00:00
parent 8ec9811d7a
commit 88aa74bbb9
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/demo.odin
+3 -3
View File
@@ -1,4 +1,3 @@
// #import "game.odin";
#import "fmt.odin"; #import "fmt.odin";
A :: type struct { A :: type struct {
@@ -11,8 +10,9 @@ C :: type struct {
a: A; a: A;
}; };
main :: proc() { main :: proc() {
fmt.println(123); fmt.println(size_of(A));
fmt.println(size_of(B));
fmt.println(size_of(C));
} }
src/checker/types.c
+12 -4
View File
@@ -153,6 +153,7 @@ typedef struct Type {
TYPE_KINDS TYPE_KINDS
#undef TYPE_KIND #undef TYPE_KIND
}; };
bool failure;
} Type; } Type;
// NOTE(bill): Internal sizes of certain types // NOTE(bill): Internal sizes of certain types
@@ -1073,10 +1074,11 @@ TypePath *type_path_push(TypePath *tp, Type *t) {
// NOTE(bill): This will only print if the path count > 1 // NOTE(bill): This will only print if the path count > 1
error(e->token, "\t%.*s", LIT(t->Named.name)); error(e->token, "\t%.*s", LIT(t->Named.name));
tp->failure = true; tp->failure = true;
t->failure = true;
// NOTE(bill): Just quit immediately // NOTE(bill): Just quit immediately
// TODO(bill): Try and solve this gracefully // TODO(bill): Try and solve this gracefully
gb_exit(1); // gb_exit(1);
} }
} }
@@ -1113,12 +1115,12 @@ i64 align_formula(i64 size, i64 align) {
} }
i64 type_size_of(BaseTypeSizes s, gbAllocator allocator, Type *t) { i64 type_size_of(BaseTypeSizes s, gbAllocator allocator, Type *t) {
i64 align; i64 size;
TypePath path = {0}; TypePath path = {0};
type_path_init(&path); type_path_init(&path);
align = type_size_of_internal(s, allocator, t, &path); size = type_size_of_internal(s, allocator, t, &path);
type_path_free(&path); type_path_free(&path);
return align; return size;
} }
i64 type_align_of(BaseTypeSizes s, gbAllocator allocator, Type *t) { i64 type_align_of(BaseTypeSizes s, gbAllocator allocator, Type *t) {
@@ -1132,6 +1134,9 @@ i64 type_align_of(BaseTypeSizes s, gbAllocator allocator, Type *t) {
i64 type_align_of_internal(BaseTypeSizes s, gbAllocator allocator, Type *t, TypePath *path) { i64 type_align_of_internal(BaseTypeSizes s, gbAllocator allocator, Type *t, TypePath *path) {
if (t->failure) {
return FAILURE_ALIGNMENT;
}
t = base_type(t); t = base_type(t);
switch (t->kind) { switch (t->kind) {
@@ -1297,6 +1302,9 @@ bool type_set_offsets(BaseTypeSizes s, gbAllocator allocator, Type *t) {
} }
i64 type_size_of_internal(BaseTypeSizes s, gbAllocator allocator, Type *t, TypePath *path) { i64 type_size_of_internal(BaseTypeSizes s, gbAllocator allocator, Type *t, TypePath *path) {
if (t->failure) {
return FAILURE_SIZE;
}
t = base_type(t); t = base_type(t);
switch (t->kind) { switch (t->kind) {
case Type_Basic: { case Type_Basic: {