zongor
/
undar-lang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Scopes should be working now, need to still fix early return

This commit is contained in:
zongor 2026-05-21 23:19:47 -07:00
parent 99675eb6d3
commit a4a695f84a
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler.c
View File

@ -233,18 +233,23 @@ define_function()
/* get return slot */ /* get return slot */
fn->secondary_type = token_type_to_sym_type(parser.previous.type); fn->secondary_type = token_type_to_sym_type(parser.previous.type);
/* now parse the fn body */ /* now parse the fn body */
expect(TOKEN_LBRACE);
} }
expect(TOKEN_LBRACE);
/* get the size of all the locals for the function in the body */ /* get the size of all the locals for the function in the body */
while(!match(TOKEN_RBRACE)) { while(parser.depth > 0) {
if(is_type() && parser.current.type == TOKEN_IDENTIFIER) if(match(TOKEN_LBRACE)) {
scope_new();
continue;
} else if(match(TOKEN_RBRACE)) {
scope_pop();
continue;
} else if(is_type() && parser.current.type == TOKEN_IDENTIFIER)
size += variable_declaration(fn); size += variable_declaration(fn);
advance(); advance();
} }
fn->size = size; fn->size = size;
scope_pop();
} }
void void
@ -623,7 +628,6 @@ void call() {
emitter.emit_arena_fn_call(parser.call_fn); emitter.emit_arena_fn_call(parser.call_fn);
parser.current_type = parser.call_fn->secondary_type; parser.current_type = parser.call_fn->secondary_type;
advance();
return; return;
} }

6
test/fib.ul
View File

@ -1,3 +1,7 @@
function main() {
print(fib(23) as str);
}
/** /**
* Recursively calculate fibonacci * Recursively calculate fibonacci
*/ */
@ -5,5 +9,3 @@ function fib(nat n) nat {
if (n < 2) { return n; } if (n < 2) { return n; }
return fib(n - 2) + fib(n - 1); return fib(n - 2) + fib(n - 1);
} }
print(fib(23) as str);