From c87f5a8871edf6880b894a00b180c554ffd46d0a Mon Sep 17 00:00:00 2001 From: Kimplul Date: Sun, 23 Mar 2025 22:29:11 +0200 Subject: start sketching out type system --- src/analyze.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'src/analyze.c') diff --git a/src/analyze.c b/src/analyze.c index c33a901..0c06096 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -189,7 +189,7 @@ static int analyze_var(struct state *state, struct scope *scope, return -1; node->t = var_type(node); - return scope_add_var(scope, node); + return scope_add_symbol(scope, node); } static int analyze_let(struct state *state, struct scope *scope, @@ -478,7 +478,7 @@ static int analyze_err_branch(struct state *state, struct scope *scope, struct a struct ast *var = gen_var(strdup(err_branch_id(node)), NULL, node->loc); struct type *err_type = tgen_err(node->loc); var->t = err_type; - scope_add_var(branch_scope, var); + scope_add_symbol(branch_scope, var); return analyze(state, branch_scope, err_branch_body(node)); } @@ -607,9 +607,30 @@ static int analyze_type_list(struct state *state, struct scope *scope, int analyze_root(struct scope *scope, struct ast *root) { foreach_node(node, root) { - assert(node->k == AST_PROC_DEF); - if (scope_add_proc(scope, node)) - return -1; + switch (node->k) { + case AST_PROC_DEF: + if (scope_add_symbol(scope, node)) + return -1; + break; + + case AST_STRUCT_DEF: + if (scope_add_type(scope, node)) + return -1; + break; + + case AST_STRUCT_CONT: + if (scope_add_chain(scope, node)) + return -1; + break; + + case AST_TRAIT_DEF: + if (scope_add_trait(scope, node)) + return -1; + break; + + default: + abort(); + } } foreach_node(node, root) { -- cgit v1.2.3