mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-07 16:18:52 +00:00
Use TypeSet instead of PtrSet<Type *>
This commit is contained in:
+4
-4
@@ -1446,8 +1446,8 @@ gb_internal void check_type_switch_stmt(CheckerContext *ctx, Ast *node, u32 mod_
|
|||||||
|
|
||||||
|
|
||||||
Ast *nil_seen = nullptr;
|
Ast *nil_seen = nullptr;
|
||||||
PtrSet<Type *> seen = {};
|
TypeSet seen = {};
|
||||||
defer (ptr_set_destroy(&seen));
|
defer (type_set_destroy(&seen));
|
||||||
|
|
||||||
for (Ast *stmt : bs->stmts) {
|
for (Ast *stmt : bs->stmts) {
|
||||||
if (stmt->kind != Ast_CaseClause) {
|
if (stmt->kind != Ast_CaseClause) {
|
||||||
@@ -1515,7 +1515,7 @@ gb_internal void check_type_switch_stmt(CheckerContext *ctx, Ast *node, u32 mod_
|
|||||||
GB_PANIC("Unknown type to type switch statement");
|
GB_PANIC("Unknown type to type switch statement");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type_ptr_set_update(&seen, y.type)) {
|
if (type_set_update(&seen, y.type)) {
|
||||||
TokenPos pos = cc->token.pos;
|
TokenPos pos = cc->token.pos;
|
||||||
gbString expr_str = expr_to_string(y.expr);
|
gbString expr_str = expr_to_string(y.expr);
|
||||||
error(y.expr,
|
error(y.expr,
|
||||||
@@ -1569,7 +1569,7 @@ gb_internal void check_type_switch_stmt(CheckerContext *ctx, Ast *node, u32 mod_
|
|||||||
auto unhandled = array_make<Type *>(temporary_allocator(), 0, variants.count);
|
auto unhandled = array_make<Type *>(temporary_allocator(), 0, variants.count);
|
||||||
|
|
||||||
for (Type *t : variants) {
|
for (Type *t : variants) {
|
||||||
if (!type_ptr_set_exists(&seen, t)) {
|
if (!type_set_exists(&seen, t)) {
|
||||||
array_add(&unhandled, t);
|
array_add(&unhandled, t);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -856,40 +856,6 @@ gb_internal void type_path_pop(TypePath *tp) {
|
|||||||
#define FAILURE_SIZE 0
|
#define FAILURE_SIZE 0
|
||||||
#define FAILURE_ALIGNMENT 0
|
#define FAILURE_ALIGNMENT 0
|
||||||
|
|
||||||
gb_internal bool type_ptr_set_exists(PtrSet<Type *> *s, Type *t);
|
|
||||||
|
|
||||||
gb_internal bool type_ptr_set_update(PtrSet<Type *> *s, Type *t) {
|
|
||||||
if (t == nullptr) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (type_ptr_set_exists(s, t)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
ptr_set_add(s, t);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
gb_internal bool type_ptr_set_exists(PtrSet<Type *> *s, Type *t) {
|
|
||||||
if (t == nullptr) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
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 (Type *f : *s) {
|
|
||||||
if (are_types_identical(t, f)) {
|
|
||||||
ptr_set_add(s, t);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
gb_internal Type *base_type(Type *t) {
|
gb_internal Type *base_type(Type *t) {
|
||||||
for (;;) {
|
for (;;) {
|
||||||
if (t == nullptr) {
|
if (t == nullptr) {
|
||||||
|
|||||||
Reference in New Issue
Block a user