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

Lambda fixes/improvements

Browse Source
This commit is contained in:
Bruce Hill 2024-03-09 14:09:18 -05:00
parent dfd38cdb69
commit 1627a913a4
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compile.c
View File

@ -575,8 +575,7 @@ CORD compile(env_t *env, ast_t *ast)
env = fresh_scope(env);
for (ast_list_t *stmt = stmts; stmt; stmt = stmt->next) {
bind_statement(env, stmt->ast);
code = CORD_cat(code, compile_statement(env, stmt->ast));
code = CORD_cat(code, "\n");
code = CORD_all(code, compile_statement(env, stmt->ast), "\n");
}
return CORD_cat(code, "}");
}
@ -743,10 +742,14 @@ CORD compile(env_t *env, ast_t *ast)
}
code = CORD_cat(code, "void *$userdata)");
CORD body = compile(body_scope, lambda->body);
if (CORD_fetch(body, 0) != '{')
body = CORD_all("{\n", body, "\n}");
env->code->funcs = CORD_all(env->code->funcs, code, " ", body);
CORD body = CORD_EMPTY;
for (ast_list_t *stmt = Match(lambda->body, Block)->statements; stmt; stmt = stmt->next) {
if (stmt->next || ret_t->tag == VoidType || ret_t->tag == AbortType)
body = CORD_all(body, compile_statement(body_scope, stmt->ast), "\n");
else
body = CORD_all(body, compile_statement(body_scope, FakeAST(Return, stmt->ast)), "\n");
}
env->code->funcs = CORD_all(env->code->funcs, code, " {\n", body, "\n}");
return CORD_all("(closure_t){", name, ", NULL}");
}
case MethodCall: {

3
test/lambdas.tm
View File

@ -4,3 +4,6 @@
>> add_one
>> add_one(10)
= 11
>> shout := func(msg:Text) say("{msg:upper()}!")
>> shout("hello")