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

Fix up some promotion logic for closures

Browse Source
This commit is contained in:
Bruce Hill 2024-05-12 19:21:44 -04:00
parent ff9f4fe6cf
commit e171d4a98c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compile.c
View File

@ -47,15 +47,18 @@ static bool promote(env_t *env, CORD *code, type_t *actual, type_t *needed)
return promote(env, code, Match(actual, PointerType)->pointed, needed);
}
// Optional promotion:
// Optional and stack ref promotion:
if (actual->tag == PointerType && needed->tag == PointerType)
return true;
if (needed->tag == ClosureType && actual->tag == FunctionType && type_eq(actual, Match(needed, ClosureType)->fn)) {
if (needed->tag == ClosureType && actual->tag == FunctionType) {
*code = CORD_all("(closure_t){", *code, ", NULL}");
return true;
}
if (needed->tag == ClosureType && actual->tag == ClosureType)
return true;
if (needed->tag == FunctionType && actual->tag == FunctionType) {
*code = CORD_all("(", compile_type(env, needed), ")", *code);
return true;

5
types.c
View File

@ -268,7 +268,10 @@ bool can_promote(type_t *actual, type_t *needed)
}
if (needed->tag == ClosureType && actual->tag == FunctionType)
return type_eq(actual, Match(needed, ClosureType)->fn);
return can_promote(actual, Match(needed, ClosureType)->fn);
if (needed->tag == ClosureType && actual->tag == ClosureType)
return can_promote(Match(actual, ClosureType)->fn, Match(needed, ClosureType)->fn);
if (actual->tag == FunctionType && needed->tag == FunctionType) {
for (arg_t *actual_arg = Match(actual, FunctionType)->args, *needed_arg = Match(needed, FunctionType)->args;