From 0a5b6ee7fba6bc1ce2b6d0a82817ca19afc2afb3 Mon Sep 17 00:00:00 2001
From: Annie <annaslenker@gmail.com>
Date: Tue, 6 May 2025 17:34:00 -0400
Subject: [PATCH] ifs work

---
 src/codegen.c            |  3 ++-
 src/intermediate_code.c  |  2 ++
 tests/programs/fib.alpha | 28 ++++++++++++++++++----------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/codegen.c b/src/codegen.c
index acbf76d..3393217 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -548,7 +548,7 @@ int generateIfTrue(Instruction *inst) {
         return -1;
     }
 
-    fprintf(cg_flag, "\tcmpl\t$0, %d(%%rbp)\t#if true start\n", getAddress(cg));
+    fprintf(cg_flag, "\tcmpb\t$0, %d(%%rbp)\t#if true start\n", getAddress(cg));
     fprintf(cg_flag, "\tjne\t.L%d\t\t#if true end\n", getLabel(inst));
 }
 
@@ -642,6 +642,7 @@ int generateEqualTo(Instruction *inst) {
     fprintf(cg_flag, "\tmovl\t%d(%%rbp), %%eax\t#equal to start\n", getAddress(op1CG));
     fprintf(cg_flag, "\tcmpl\t%d(%%rbp), %%eax\n", getAddress(op2CG));
     fprintf(cg_flag, "\tsete\t%%al\n");
+    fprintf(cg_flag, "\tmovb\t$0, %d(%%rbp)\n", getAddress(cg));
     fprintf(cg_flag, "\tmovb\t%%al, %d(%%rbp)\t#equal to end\n", getAddress(cg));
     return 0;
 }
diff --git a/src/intermediate_code.c b/src/intermediate_code.c
index 2145ea3..4bbac3e 100644
--- a/src/intermediate_code.c
+++ b/src/intermediate_code.c
@@ -627,6 +627,8 @@ int getConst(TNodeOrConst *tnc) {
         return tnc->tnc_union->character;
     } else if (tnc->d == BOOLEAN) {
         return tnc->tnc_union->Boolean;
+    } else if (tnc->d == ADDRESS) {
+        return 0;
     }
     return -1;
 }
diff --git a/tests/programs/fib.alpha b/tests/programs/fib.alpha
index 37a86c8..9105a9a 100644
--- a/tests/programs/fib.alpha
+++ b/tests/programs/fib.alpha
@@ -6,26 +6,34 @@ function entry : string2integer
 function Fib : integer2integer
 
 Fib(i) := {
-        [ Boolean: a ; Boolean: b ; Boolean: c]
-        if( i = 0 ) then {
+        [integer: a; integer: b ; Boolean: d ; integer: c]
+        (*if( i = 0 ) then {
                 return 7;
         } else {
                 i := i;
-        }
+        }*)
         (*b := b | (a & c);
         b := 2 < 3;*)
-        if(i = 1) then {
-	     i := printCharacter('a');
-                return 1;
-        } else {
-                return i + Fib(i - 1);
+	
+	(* `if(i = 1) then { return 1; } else {
+	     return Fib(i - 1) + Fib(i - 2);
         }
+*)
+
+	a := 0;
+	b := 1;
+        while(0 < i) {
+		c := a + b;
+	        a := b;
+		b := c;
+		}
+	return c;
 }
 
 entry (arg) := {
         [ integer: x; integer: y ]
         x := 2;
-        x := Fib(2);
-        y := printInteger(Fib(2));
+(*        x := Fib(2);*)
+        y := printInteger(Fib(3));
         return 1;
 }