scarlett/compiler-the-translators
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the else jump It was falling through

Browse Source
This commit is contained in:
Meyer Simon
2025-05-02 12:02:07 -04:00
parent 60ffb33c58
commit b762127879
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/grammar.y
View File

@ -566,10 +566,17 @@ compound_statement:
emit_label(label_gen()); emit_label(label_gen());
emit_backpatch(S_Pop(TrueList), getLabel(current)); emit_backpatch(S_Pop(TrueList), getLabel(current));
} sblock ELSE { } sblock ELSE {
// NOTE we are not going back to
int l = label_gen();
emit_backpatch(S_Pop(FalseList), l);
S_Push(FalseList, S_Init(), 0);
emit_goto(0);
S_Push(S_Peek(FalseList), current, 1);
emit_label(l);
} sblock {
int l = label_gen(); int l = label_gen();
emit_backpatch(S_Pop(FalseList), l); emit_backpatch(S_Pop(FalseList), l);
emit_label(l); emit_label(l);
} sblock {
if ($8 == undefined && $11 != undefined) { if ($8 == undefined && $11 != undefined) {
$$ = $11; $$ = $11;
} else if ($8 != undefined && $11 == undefined) { } else if ($8 != undefined && $11 == undefined) {
@ -681,16 +688,18 @@ ablock:
argument_list: argument_list:
expression{ expression{
TableNode* arg = CreateEntry(cur, getAdInfoType((TableNode*)$1), getTypeEntry((TableNode*)$1), arg_var_gen(), NULL); TableNode* arg = CreateEntry(cur, getAdInfoType((TableNode*)$1), getTypeEntry((TableNode*)$1), arg_var_gen(), NULL);
// this emits params for function and arrays TODO: fix // ----------------------------------------------------------------------------
// this is emitting the param withthe wrong TableNode
// We need to fiture out how to get the right one.
Stack * t = S_Peek(stack); Stack * t = S_Peek(stack);
if(t==NULL){ if(t==NULL){
t = S_Init(); t = S_Init();
S_Push(stack, t, 1); S_Push(stack, t, 1);
} }
emit_parameter(tn_or_const(NODE,arg)); emit_parameter(tn_or_const(NODE,$1));
S_Push(t, current, 1); S_Push(t, current, 1);
emit_detach(); emit_detach();
//printdebug("[ARGUMENT_LIST] argument list is %d", $$); // ----------------------------------------------------------------------------
} }
COMMA argument_list COMMA argument_list
{$$ = $4 + 1;} {$$ = $4 + 1;}
@ -699,7 +708,7 @@ argument_list:
{ {
TableNode* arg = CreateEntry(cur, getAdInfoType((TableNode*)$1), getTypeEntry((TableNode*)$1), arg_var_gen(), NULL); TableNode* arg = CreateEntry(cur, getAdInfoType((TableNode*)$1), getTypeEntry((TableNode*)$1), arg_var_gen(), NULL);
emit_parameter(tn_or_const(NODE,arg)); emit_parameter(tn_or_const(NODE,$1));
$$ = 1; $$ = 1;
printdebug("[ARGUMENT_LIST] argument list is %d", $$); printdebug("[ARGUMENT_LIST] argument list is %d", $$);
} }

7
tests/sprint3/test/sp3_if_else.alpha
View File

@ -13,14 +13,13 @@ bar (r,s) := {
entry (arg) := { entry (arg) := {
[ integer: result ; rec: w] [ integer: result ; rec: w]
if ( result = result ) then { if ( result = result ) then {
result := result + 8; if ( result < w.y ) then {
if ( result < w.y ) then {
result := 8; result := 8;
} else { } else {
result := 9; result := 9;
} }(* *)
} else { } else {
result := bar('c', 7); result := 1; (* bar('c', 7); *)
} }
return 0; return 0;
} }