cleaned up symbol resolution in types and other bugs

diff --git a/bin/onyx b/bin/onyx
index 231b7cdc33e74eea79963732e1d12c41c12ea6d1..103331557d8606a71c9f755c7b028f404ef16f21 100755 (executable)
Binary files a/bin/onyx and b/bin/onyx differ

diff --git a/onyx.exe b/onyx.exe
index 23f07482c2992ac3af58dae53a1d30e3e9af7e5c..fdc65b7e6bf6986b950b1a453766041c423afeef 100644 (file)
Binary files a/onyx.exe and b/onyx.exe differ

diff --git a/src/onyxchecker.c b/src/onyxchecker.c
index 0de1b0d998b3749928d3b6ddb2a6af09ece39b34..59f2d0c7f930a41f3a20f652cc683df0221be424 100644 (file)
--- a/src/onyxchecker.c
+++ b/src/onyxchecker.c
@@ -655,9 +655,10 @@ CheckStatus check_binop_assignment(AstBinaryOp* binop, b32 assignment_is_ok) {
     }
 
     if (binop->right->type == NULL) {
-        onyx_report_error(binop->token->pos,
-                "Unable to resolve type for symbol '%b'.",
-                binop->right->token->text, binop->right->token->length);
+        // nocheckin
+        // onyx_report_error(binop->token->pos,
+        //         "Unable to resolve type for symbol '%b'.",
+        //         binop->right->token->text, binop->right->token->length);
         return Check_Error;
     }
 
@@ -829,16 +830,18 @@ CheckStatus check_binaryop(AstBinaryOp** pbinop, b32 assignment_is_ok) {
     if (binop_is_assignment(binop->operation)) return check_binop_assignment(binop, assignment_is_ok);
     
     if (binop->left->type == NULL) {
-        onyx_report_error(binop->left->token->pos,
-                "Unable to resolve type for symbol '%b'.",
-                binop->left->token->text, binop->left->token->length);
+        // nocheckin
+        // onyx_report_error(binop->left->token->pos,
+        //         "Unable to resolve type for symbol '%b'.",
+        //         binop->left->token->text, binop->left->token->length);
         return Check_Error;
     }
 
     if (binop->right->type == NULL) {
-        onyx_report_error(binop->right->token->pos,
-                "Unable to resolve type for symbol '%b'.",
-                binop->right->token->text, binop->right->token->length);
+        // nocheckin
+        // onyx_report_error(binop->right->token->pos,
+        //         "Unable to resolve type for symbol '%b'.",
+        //         binop->right->token->text, binop->right->token->length);
         return Check_Error;
     }
 
@@ -1798,23 +1801,22 @@ CheckStatus check_type(AstType* type) {
 }
 
 CheckStatus check_static_if(AstStaticIf* static_if) {
-    CHECK(expression, &static_if->cond);
-
-    if (static_if->cond->flags & Ast_Flag_Comptime) {
-        AstNumLit* condition_value = (AstNumLit *) static_if->cond;
-        assert(condition_value->kind == Ast_Kind_NumLit); // This should be right, right?
-
-        if (condition_value->value.i) {
-            bh_arr_each(Entity *, ent, static_if->true_entities) {
-                entity_heap_insert_existing(&context.entities, *ent);
-            }
-        }
+    CheckStatus result = check_expression(&static_if->cond);
 
-    } else {
+    if (result > Check_Errors_Start || !(static_if->cond->flags & Ast_Flag_Comptime)) {
         onyx_report_error(static_if->token->pos, "Expected this condition to be compile time known.");
         return Check_Error;
     }
 
+    AstNumLit* condition_value = (AstNumLit *) static_if->cond;
+    assert(condition_value->kind == Ast_Kind_NumLit); // This should be right, right?
+
+    if (condition_value->value.i) {
+        bh_arr_each(Entity *, ent, static_if->true_entities) {
+            entity_heap_insert_existing(&context.entities, *ent);
+        }
+    }
+
     return Check_Complete;
 }
 

diff --git a/src/onyxentities.c b/src/onyxentities.c
index 40945214aba505caa3e4e2d9529638af005f0f3d..52a96acf5eed5c746934132fc85e839da7f141f6 100644 (file)
--- a/src/onyxentities.c
+++ b/src/onyxentities.c
@@ -225,7 +225,8 @@ void add_entities_for_node(bh_arr(Entity *) *target_arr, AstNode* node, Scope* s
         }
         
         case Ast_Kind_Use_Package: {
-            ent.state = Entity_State_Comptime_Resolve_Symbols;
+            // nocheckin
+            // ent.state = Entity_State_Comptime_Resolve_Symbols;
             ent.type = Entity_Type_Use_Package;
             ent.use_package = (AstUsePackage *) node;
             ENTITY_INSERT(ent);

diff --git a/src/onyxsymres.c b/src/onyxsymres.c
index 3c914c13c2e703736a2538bc154693f8d8a6aeb3..f9e196e85dc3ce734d1b853b2d25d1f88d335cb1 100644 (file)
--- a/src/onyxsymres.c
+++ b/src/onyxsymres.c
@@ -11,7 +11,21 @@ static AstFunction* curr_function = NULL;
 bh_arr(AstBlock *)  block_stack   = NULL;
 static b32 report_unresolved_symbols = 1;
 
-AstType* symres_type(AstType* type);
+#define SYMRES(kind, ...) do { \
+    SymresStatus ss = symres_ ## kind (__VA_ARGS__); \
+    if (ss > Symres_Errors_Start) return ss;         \
+    } while (0)
+
+typedef enum SymresStatus {
+    Symres_Success,
+    Symres_Complete,
+
+    Symres_Errors_Start,
+    Symres_Yield,
+    Symres_Error,
+} SymresStatus;
+
+static void symres_type(AstType** type);
 static void symres_local(AstLocal** local, b32 add_to_block_locals);
 static void symres_call(AstCall* call);
 static void symres_size_of(AstSizeOf* so);
@@ -62,202 +76,160 @@ static void symres_symbol(AstNode** symbol_node) {
     }
 }
 
-AstType* symres_type(AstType* type) {
-    if (type == NULL) return NULL;
-
-    if (type->kind == Ast_Kind_Type_Alias) {
-        ((AstTypeAlias *) type)->to = symres_type(((AstTypeAlias *) type)->to);
-        return type;
-    }
+static void symres_struct_type(AstStructType* s_node) {
+    if (s_node->flags & Ast_Flag_Type_Is_Resolved) return;
 
-    if (type->kind == Ast_Kind_Symbol) {
-        symres_symbol((AstNode **) &type);
-        return type;
-    }
+    s_node->flags |= Ast_Flag_Type_Is_Resolved;
+    
+    {
+        bh_table(i32) mem_set;
+        bh_table_init(global_heap_allocator, mem_set, bh_arr_length(s_node->members));
 
-    if (type->kind == Ast_Kind_Field_Access) {
-        AstFieldAccess* field = (AstFieldAccess *) type;
-        symres_field_access(&field);
+        bh_arr_each(AstStructMember *, member, s_node->members) {
+            token_toggle_end((*member)->token);
 
-        if (!node_is_type((AstNode *) field))
-            onyx_report_error(type->token->pos, "field access did not result in a type");
+            if (bh_table_has(i32, mem_set, (*member)->token->text)) {
+                onyx_report_error((*member)->token->pos,
+                        "Duplicate struct member '%s'.",
+                        (*member)->token->text);
 
-        return (AstType *) field;
-    }
+                token_toggle_end((*member)->token);
+                return;
+            }
 
-    // NOTE: Already resolved
-    if (type->kind == Ast_Kind_Basic_Type) return type;
+            bh_table_put(i32, mem_set, (*member)->token->text, 1);
+            token_toggle_end((*member)->token);
+        }
 
-    if (type->kind == Ast_Kind_Pointer_Type) {
-        ((AstPointerType *) type)->elem = symres_type(((AstPointerType *) type)->elem);
-        return type;
+        bh_table_free(mem_set);
     }
 
-    if (type->kind == Ast_Kind_Function_Type) {
-        AstFunctionType* ftype = (AstFunctionType *) type;
-
-        ftype->return_type = symres_type(ftype->return_type);
-
-        if (ftype->param_count > 0)
-            fori (i, 0, (i64) ftype->param_count) {
-                ftype->params[i] = symres_type(ftype->params[i]);
-            }
+    if (s_node->scope) {
+        // FIX: This is probably wrong for the long term.
+        s_node->scope->parent = curr_scope;
 
-        return type;
+        scope_enter(s_node->scope);
     }
 
-    if (type->kind == Ast_Kind_Struct_Type) {
-        AstStructType* s_node = (AstStructType *) type;
-        if (s_node->flags & Ast_Flag_Type_Is_Resolved) return type;
+    fori (i, 0, bh_arr_length(s_node->members)) {
+        AstStructMember *member = s_node->members[i];
 
-        s_node->flags |= Ast_Flag_Type_Is_Resolved;
-        
-        {
-            bh_table(i32) mem_set;
-            bh_table_init(global_heap_allocator, mem_set, bh_arr_length(s_node->members));
-
-            bh_arr_each(AstStructMember *, member, s_node->members) {
-                token_toggle_end((*member)->token);
-
-                if (bh_table_has(i32, mem_set, (*member)->token->text)) {
-                    onyx_report_error((*member)->token->pos,
-                            "Duplicate struct member '%s'.",
-                            (*member)->token->text);
+        if (member->type_node) {
+            symres_type(&member->type_node);
 
-                    token_toggle_end((*member)->token);
-                    return type;
-                }
-
-                bh_table_put(i32, mem_set, (*member)->token->text, 1);
-                token_toggle_end((*member)->token);
+            if (!node_is_type((AstNode *) member->type_node)) {
+                onyx_report_error(member->token->pos, "Member type is not a type.");
+                goto struct_symres_done;
             }
 
-            bh_table_free(mem_set);
-        }
+            if (member->flags & Ast_Flag_Struct_Mem_Used) {
+                AstType *used = (AstType *) member->type_node;
 
-        if (s_node->scope) {
-            // FIX: This is probably wrong for the long term.
-            s_node->scope->parent = curr_scope;
-
-            scope_enter(s_node->scope);
-        }
-
-        fori (i, 0, bh_arr_length(s_node->members)) {
-            AstStructMember *member = s_node->members[i];
-
-            if (member->type_node) {
-                member->type_node = symres_type(member->type_node);
-
-                if (!node_is_type((AstNode *) member->type_node)) {
-                    onyx_report_error(member->token->pos, "Member type is not a type.");
-                    goto struct_symres_done;
+                while (used->kind == Ast_Kind_Type_Alias) {
+                    used = ((AstTypeAlias *) used)->to;
                 }
 
-                if (member->flags & Ast_Flag_Struct_Mem_Used) {
-                    AstType *used = (AstType *) member->type_node;
-
-                    while (used->kind == Ast_Kind_Type_Alias) {
-                        used = ((AstTypeAlias *) used)->to;
-                    }
+                b32 use_works = (used->kind == Ast_Kind_Struct_Type || used->kind == Ast_Kind_Poly_Call_Type);
 
-                    b32 use_works = (used->kind == Ast_Kind_Struct_Type || used->kind == Ast_Kind_Poly_Call_Type);
-
-                    if (used->kind == Ast_Kind_Type_Raw_Alias) {
-                        AstTypeRawAlias* alias = (AstTypeRawAlias *) used;
-                        use_works = (alias->to->kind == Type_Kind_Struct);
-                    }
+                if (used->kind == Ast_Kind_Type_Raw_Alias) {
+                    AstTypeRawAlias* alias = (AstTypeRawAlias *) used;
+                    use_works = (alias->to->kind == Type_Kind_Struct);
+                }
 
-                    if (!use_works) {
-                        onyx_report_error(member->token->pos,
-                                "Can only 'use' members of struct type, got '%s'.",
-                                onyx_ast_node_kind_string(used->kind));
-                        goto struct_symres_done;
-                    }
+                if (!use_works) {
+                    onyx_report_error(member->token->pos,
+                            "Can only 'use' members of struct type, got '%s'.",
+                            onyx_ast_node_kind_string(used->kind));
+                    goto struct_symres_done;
                 }
             }
         }
+    }
 
 struct_symres_done:
-        if (s_node->scope) scope_leave();
-        return type;
-    }
+    if (s_node->scope) scope_leave();
+}
 
-    if (type->kind == Ast_Kind_Array_Type) {
-        AstArrayType* a_node = (AstArrayType *) type;
+static void symres_type(AstType** type) {
+    if (!type || !*type) return;
 
-        if (a_node->count_expr) symres_expression(&a_node->count_expr);
-        a_node->elem = symres_type(a_node->elem);
+    switch ((*type)->kind) {
+        case Ast_Kind_Symbol:     symres_symbol((AstNode **) type); break;
+        case Ast_Kind_Basic_Type: break;
+        case Ast_Kind_Type_Alias: symres_type(&((AstTypeAlias *) *type)->to); break;
+        case Ast_Kind_Field_Access: {
+            symres_field_access((AstFieldAccess **) type);
 
-        return type;
-    }
+            if (!node_is_type((AstNode *) *type))
+                onyx_report_error((*type)->token->pos, "Field access did not result in a type.");
+            break;
+        }
 
-    if (type->kind == Ast_Kind_Enum_Type) {
-       // symres_enum((AstEnumType *) type);
-       return type;
-    }
+        case Ast_Kind_Pointer_Type: symres_type(&((AstPointerType *) *type)->elem); break;
+        case Ast_Kind_Slice_Type:   symres_type(&((AstSliceType *) *type)->elem); break;
+        case Ast_Kind_DynArr_Type:  symres_type(&((AstDynArrType *) *type)->elem); break;
+        case Ast_Kind_VarArg_Type:  symres_type(&((AstVarArgType *) *type)->elem); break;
 
-    if (type->kind == Ast_Kind_Slice_Type) {
-        AstSliceType* s_node = (AstSliceType *) type;
-        s_node->elem = symres_type(s_node->elem);
+        case Ast_Kind_Function_Type: {
+            AstFunctionType* ftype = (AstFunctionType *) *type;
 
-        return type;
-    }
+            symres_type(&ftype->return_type);
 
-    if (type->kind == Ast_Kind_DynArr_Type) {
-        AstDynArrType* da_node = (AstDynArrType *) type;
-        da_node->elem = symres_type(da_node->elem);
+            if (ftype->param_count > 0) {
+                fori (i, 0, (i64) ftype->param_count) {
+                    symres_type(&ftype->params[i]);
+                }
+            }
+            break;
+        }
 
-        return type;
-    }
+        case Ast_Kind_Struct_Type: symres_struct_type((AstStructType *) *type); break;
+        case Ast_Kind_Array_Type: {
+            AstArrayType* a_node = (AstArrayType *) *type;
 
-    if (type->kind == Ast_Kind_VarArg_Type) {
-        AstVarArgType* va_node = (AstVarArgType *) type;
-        va_node->elem = symres_type(va_node->elem);
+            if (a_node->count_expr) symres_expression(&a_node->count_expr);
+            symres_type(&a_node->elem);
+            break;
+        }
 
-        return type;
-    }
+        case Ast_Kind_Enum_Type: break;
 
-    if (type->kind == Ast_Kind_Poly_Struct_Type) {
-        AstPolyStructType* pst_node = (AstPolyStructType *) type;
-        pst_node->scope = scope_create(context.ast_alloc, curr_scope, pst_node->token->pos);
+        case Ast_Kind_Poly_Struct_Type: {
+            AstPolyStructType* pst_node = (AstPolyStructType *) *type;
+            pst_node->scope = scope_create(context.ast_alloc, curr_scope, pst_node->token->pos);
 
-        bh_arr_each(AstPolyStructParam, param, pst_node->poly_params) {
-            param->type_node = symres_type(param->type_node);
-            param->type      = type_build_from_ast(context.ast_alloc, param->type_node);
+            bh_arr_each(AstPolyStructParam, param, pst_node->poly_params) {
+                symres_type(&param->type_node);
+                param->type = type_build_from_ast(context.ast_alloc, param->type_node);
+            }
+            break;
         }
 
-        return type;
-    }
-
-    if (type->kind == Ast_Kind_Poly_Call_Type) {
-        AstPolyCallType* pc_node = (AstPolyCallType *) type;
+        case Ast_Kind_Poly_Call_Type: {
+            AstPolyCallType* pc_node = (AstPolyCallType *) *type;
 
-        pc_node->callee = symres_type(pc_node->callee);
+            symres_type(&pc_node->callee);
 
-        bh_arr_each(AstNode *, param, pc_node->params) {
-            if (node_is_type(*param)) {
-                *param = (AstNode *) symres_type((AstType *) *param);
-            } else {
-                symres_expression((AstTyped **) param);
+            bh_arr_each(AstNode *, param, pc_node->params) {
+                if (node_is_type(*param)) {
+                    symres_type((AstType **) param);
+                } else {
+                    symres_expression((AstTyped **) param);
+                }
             }
+            break;
         }
 
-        return type;
-    }
-
-    if (type->kind == Ast_Kind_Type_Compound) {
-        AstCompoundType* ctype = (AstCompoundType *) type;
+        case Ast_Kind_Type_Compound: {
+            AstCompoundType* ctype = (AstCompoundType *) *type;
 
-        bh_arr_each(AstType *, type, ctype->types) {
-            *type = symres_type(*type);
+            bh_arr_each(AstType *, type, ctype->types) symres_type(type);
         }
     }
-
-    return type;
 }
 
 static void symres_local(AstLocal** local, b32 add_to_block_locals) {
-    (*local)->type_node = symres_type((*local)->type_node);
+    symres_type(&(*local)->type_node);
 
     // NOTE: This is a little gross, but it is allows for finer control
     // over when locals are in scope in a block, which reduces the number
@@ -288,13 +260,13 @@ static void symres_call(AstCall* call) {
 }
 
 static void symres_size_of(AstSizeOf* so) {
-    so->type_node = symres_type(so->type_node);
-    so->so_ast_type = symres_type(so->so_ast_type);
+    symres_type(&so->type_node);
+    symres_type(&so->so_ast_type);
 }
 
 static void symres_align_of(AstAlignOf* ao) {
-    ao->type_node = symres_type(ao->type_node);
-    ao->ao_ast_type = symres_type(ao->ao_ast_type);
+    symres_type(&ao->type_node);
+    symres_type(&ao->ao_ast_type);
 }
 
 static void symres_field_access(AstFieldAccess** fa) {
@@ -360,7 +332,7 @@ static void symres_method_call(AstBinaryOp** mcall) {
 
 static void symres_unaryop(AstUnaryOp** unaryop) {
     if ((*unaryop)->operation == Unary_Op_Cast) {
-        (*unaryop)->type_node = symres_type((*unaryop)->type_node);
+        symres_type(&(*unaryop)->type_node);
     }
 
     symres_expression(&(*unaryop)->expr);
@@ -368,7 +340,7 @@ static void symres_unaryop(AstUnaryOp** unaryop) {
 
 static void symres_struct_literal(AstStructLiteral* sl) {
     if (sl->stnode != NULL) symres_expression(&sl->stnode);
-    sl->stnode = (AstTyped *) symres_type((AstType *) sl->stnode);
+    symres_type((AstType **) &sl->stnode);
     if (sl->stnode == NULL || sl->stnode->kind == Ast_Kind_Error || sl->stnode->kind == Ast_Kind_Symbol) return;
 
     sl->type_node = (AstType *) sl->stnode;
@@ -381,7 +353,7 @@ static void symres_struct_literal(AstStructLiteral* sl) {
 static void symres_array_literal(AstArrayLiteral* al) {
     if (al->atnode != NULL) symres_expression(&al->atnode);
 
-    al->atnode = (AstTyped *) symres_type((AstType *) al->atnode);
+    symres_type((AstType **) &al->atnode);
     if (al->atnode == NULL || al->atnode->kind == Ast_Kind_Error || al->atnode->kind == Ast_Kind_Symbol) return;
 
     al->type_node = (AstType *) al->atnode;
@@ -399,7 +371,7 @@ static void symres_array_literal(AstArrayLiteral* al) {
 
 static void symres_expression(AstTyped** expr) {
     if (node_is_type((AstNode *) *expr)) {
-        *((AstType **) expr) = symres_type((AstType *) *expr);
+        symres_type((AstType **) expr);
         return;
     }
 
@@ -427,7 +399,8 @@ static void symres_expression(AstTyped** expr) {
             symres_expression(&((AstRangeLiteral *)(*expr))->low);
             symres_expression(&((AstRangeLiteral *)(*expr))->high);
 
-            (*expr)->type_node = symres_type(builtin_range_type);
+            symres_type(&builtin_range_type);
+            (*expr)->type_node = builtin_range_type;
 
             // NOTE: This is a weird place to put this so maybe put it somewhere else eventually
             //                                                  - brendanfh   2020/09/04
@@ -436,11 +409,12 @@ static void symres_expression(AstTyped** expr) {
 
         case Ast_Kind_Function:
         case Ast_Kind_NumLit:
-            (*expr)->type_node = symres_type((*expr)->type_node);
+            symres_type(&(*expr)->type_node);
             break;
 
         case Ast_Kind_StrLit:
-            (*expr)->type_node = symres_type(builtin_string_type);
+            symres_type(&builtin_string_type);
+            (*expr)->type_node = builtin_string_type;
             break;
 
         case Ast_Kind_Slice:
@@ -732,14 +706,14 @@ void symres_function_header(AstFunction* func) {
         }
     }
 
-    func->return_type = symres_type(func->return_type);
+    symres_type(&func->return_type);
     if (!node_is_type((AstNode *) func->return_type)) {
         onyx_report_error(func->token->pos, "Return type is not a type.");
     }
 
     bh_arr_each(AstParam, param, func->params) {
         if (param->local->type_node != NULL) {
-            param->local->type_node = symres_type(param->local->type_node);
+            symres_type(&param->local->type_node);
         }
     }
 }
@@ -807,7 +781,7 @@ void symres_function(AstFunction* func) {
 }
 
 static void symres_global(AstGlobal* global) {
-    global->type_node = symres_type(global->type_node);
+    symres_type(&global->type_node);
 }
 
 static void symres_overloaded_function(AstOverloadedFunction* ofunc) {
@@ -904,7 +878,7 @@ static void symres_enum(AstEnumType* enum_node) {
 }
 
 static void symres_memres_type(AstMemRes** memres) {
-    (*memres)->type_node = symres_type((*memres)->type_node);
+    symres_type(&(*memres)->type_node);
 }
 
 static void symres_memres(AstMemRes** memres) {
@@ -938,7 +912,7 @@ static void symres_polyproc(AstPolyProc* pp) {
     bh_arr_each(AstPolyParam, param, pp->poly_params) {
         if (param->kind != PPK_Baked_Value) continue;
 
-        param->type_expr = symres_type(param->type_expr);
+        symres_type(&param->type_expr);
     }
 
     // CLEANUP: This was copied from symres_function_header.
@@ -1000,7 +974,7 @@ void symres_entity(Entity* ent) {
 
         case Entity_Type_Overloaded_Function:     symres_overloaded_function(ent->overloaded_function); break;
         case Entity_Type_Expression:              symres_expression(&ent->expr); break;
-        case Entity_Type_Type_Alias:              ent->type_alias = symres_type(ent->type_alias); break;
+        case Entity_Type_Type_Alias:              symres_type(&ent->type_alias); break;
         case Entity_Type_Enum:                    symres_enum(ent->enum_type); break;
         case Entity_Type_Memory_Reservation_Type: symres_memres_type(&ent->mem_res); break;
         case Entity_Type_Memory_Reservation:      symres_memres(&ent->mem_res); break;