Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Cleaner None-handling

Browse Source
This commit is contained in:
Bruce Hill 2024-11-24 16:49:26 -05:00
parent 52de4258e9
commit a38161179b
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compile.c
View File

@ -2064,10 +2064,22 @@ CORD compile(env_t *env, ast_t *ast)
}
}
bool lhs_is_optional_num = (lhs_t->tag == OptionalType && Match(lhs_t, OptionalType)->type->tag == NumType);
type_t *non_optional_lhs = lhs_t;
if (lhs_t->tag == OptionalType) non_optional_lhs = Match(lhs_t, OptionalType)->type;
type_t *non_optional_rhs = rhs_t;
if (rhs_t->tag == OptionalType) non_optional_rhs = Match(rhs_t, OptionalType)->type;
if (!non_optional_lhs && !non_optional_rhs)
code_err(ast, "Both of these values do not specify a type");
else if (!non_optional_lhs)
non_optional_lhs = non_optional_rhs;
else if (!non_optional_rhs)
non_optional_rhs = non_optional_lhs;
bool lhs_is_optional_num = (lhs_t->tag == OptionalType && non_optional_lhs->tag == NumType);
if (lhs_is_optional_num)
lhs_t = Match(lhs_t, OptionalType)->type;
bool rhs_is_optional_num = (rhs_t->tag == OptionalType && Match(rhs_t, OptionalType)->type->tag == NumType);
bool rhs_is_optional_num = (rhs_t->tag == OptionalType && non_optional_rhs->tag == NumType);
if (rhs_is_optional_num)
rhs_t = Match(rhs_t, OptionalType)->type;

2
typecheck.c
View File

@ -998,6 +998,8 @@ type_t *get_type(env_t *env, ast_t *ast)
if (type_eq(rhs_ptr->pointed, lhs_ptr->pointed))
return Type(PointerType, .pointed=lhs_ptr->pointed);
}
} else if (rhs_t->tag == OptionalType) {
return type_or_type(lhs_t, rhs_t);
}
code_err(ast, "I can't figure out the type of this `or` expression between a %T and a %T", lhs_t, rhs_t);
}