mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-01 16:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #complete switch with pointer case doesn't compile #416

Browse Source
This commit is contained in:
gingerBill
2019-10-05 10:22:41 +01:00
parent dae514a2c9
commit 7fa2d25eea
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/check_stmt.cpp
View File

@@ -1205,7 +1205,7 @@ void check_type_switch_stmt(CheckerContext *ctx, Ast *node, u32 mod_flags) {
GB_PANIC("Unknown type to type switch statement");
}
if (ptr_set_exists(&seen, y.type)) {
if (type_ptr_set_exists(&seen, y.type)) {
TokenPos pos = cc->token.pos;
gbString expr_str = expr_to_string(y.expr);
error(y.expr,
@@ -1257,7 +1257,7 @@ void check_type_switch_stmt(CheckerContext *ctx, Ast *node, u32 mod_flags) {
for_array(i, variants) {
Type *t = variants[i];
if (!ptr_set_exists(&seen, t)) {
if (!type_ptr_set_exists(&seen, t)) {
array_add(&unhandled, t);
}
}

19
src/types.cpp
View File

@@ -551,8 +551,27 @@ i64 type_offset_of (Type *t, i32 index);
gbString type_to_string (Type *type);
void init_map_internal_types(Type *type);
Type * bit_set_to_int(Type *t);
bool are_types_identical(Type *x, Type *y);
bool type_ptr_set_exists(PtrSet<Type *> *s, Type *t) {
if (ptr_set_exists(s, t)) {
return true;
}
// TODO(bill, 2019-10-05): This is very slow and it's probably a lot
// faster to cache types correctly
for_array(i, s->entries) {
Type *f = s->entries[i].ptr;
if (are_types_identical(t, f)) {
ptr_set_add(s, t);
return true;
}
}
return false;
}
Type *base_type(Type *t) {
for (;;) {
if (t == nullptr) {