From 558c8588ee2aa772442837be16a7ed19a36cc753 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Tue, 5 Mar 2024 12:55:38 -0500 Subject: Fix default values for structs --- structs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'structs.c') diff --git a/structs.c b/structs.c index 970fc8ca..0ec08e5c 100644 --- a/structs.c +++ b/structs.c @@ -90,7 +90,7 @@ static CORD compile_equals_method(env_t *env, ast_t *ast) "_t *y, const TypeInfo *info) {\n" "(void)info;\n"); for (arg_ast_t *field = def->fields; field; field = field->next) { - type_t *field_type = parse_type_ast(env, field->type); + type_t *field_type = get_arg_ast_type(env, field); switch (field_type->tag) { case BoolType: case IntType: case NumType: case PointerType: case FunctionType: eq_func = CORD_all(eq_func, "if (x->", field->name, " != y->", field->name, ") return no;\n"); @@ -133,9 +133,10 @@ void compile_struct_def(env_t *env, ast_t *ast) CORD_appendf(&env->code->typecode, "struct %s_s {\n", def->name); for (arg_ast_t *field = def->fields; field; field = field->next) { - CORD type = compile_type_ast(field->type); - CORD_appendf(&env->code->typecode, "%r %s%s;\n", type, field->name, - CORD_cmp(type, "Bool_t") ? "" : ":1"); + type_t *field_t = get_arg_ast_type(env, field); + CORD type_code = compile_type(field_t); + CORD_appendf(&env->code->typecode, "%r %s%s;\n", type_code, field->name, + CORD_cmp(type_code, "Bool_t") ? "" : ":1"); } CORD_appendf(&env->code->typecode, "};\n"); -- cgit v1.2.3