4 files changed, 116 insertions, 94 deletions

diff --git a/src/generator.c b/src/generator.c
index 88f32d7..8329aee 100644
--- a/src/generator.c
+++ b/src/generator.c
@@ -4,41 +4,40 @@
  */
 
 #include "generator.h"
-#include <stdio.h>
 #include "symbol_table.h"
 
 // ----- GLOBAL FUNCTIONS -----
 
 void gen_prologue() {
-  printf("extern printf\n");
-  printf("section .data\n");
-  printf("format_int db \"%%d\",10,0\n\n");
-  printf("section .bss\n");
+  fprintf(output, "extern printf\n");
+  fprintf(output, "section .data\n");
+  fprintf(output, "format_int db \"%%d\",10,0\n\n");
+  fprintf(output, "section .bss\n");
 }
 void gen_prologue_continue(){
-  printf("globals: resq %d\n", nb_globals);
-  printf("section .text\n\nglobal _start\n");
-  printf("print: ;print needs an argument in rax\n");
-  printf("push rbp\n");
-  printf("mov rbp, rsp\n");
-  printf("push rsi\n");
-  printf("mov rsi, rax\n");
-  printf("mov rdi, format_int\n");
-  printf("mov rax, 0\n");
-  printf("call printf WRT ..plt\n");
-  printf("pop rsi\n");
-  printf("pop rbp\n");
-  printf("ret\n");
-  printf("\n_start:\n");
-  printf("push rbp\nmov rbp, rsp\n\n");
+  fprintf(output, "globals: resq %d\n", nb_globals);
+  fprintf(output, "section .text\n\nglobal _start\n");
+  fprintf(output, "print: ;print needs an argument in rax\n");
+  fprintf(output, "push rbp\n");
+  fprintf(output, "mov rbp, rsp\n");
+  fprintf(output, "push rsi\n");
+  fprintf(output, "mov rsi, rax\n");
+  fprintf(output, "mov rdi, format_int\n");
+  fprintf(output, "mov rax, 0\n");
+  fprintf(output, "call printf WRT ..plt\n");
+  fprintf(output, "pop rsi\n");
+  fprintf(output, "pop rbp\n");
+  fprintf(output, "ret\n");
+  fprintf(output, "\n_start:\n");
+  fprintf(output, "push rbp\nmov rbp, rsp\n\n");
 }
 void gen_const_declaration() {
-  printf("mov rax,60 \n");
-  printf("mov rdi,0 \n");
-  printf("syscall \n");
-  printf(";global table\n");
+  fprintf(output, "mov rax,60 \n");
+  fprintf(output, "mov rdi,0 \n");
+  fprintf(output, "syscall \n");
+  fprintf(output, ";global table\n");
   glo_display_table();
-  printf(";local table\n");
+  fprintf(output, ";local table\n");
   loc_display_table();
 }
 
@@ -50,7 +49,7 @@ void gen_declaration(const char name[], int type, Scope scope) {
     break;
   case LOCAL:
     loc_addVar(name, type);
-    printf("push 0\n");
+    fprintf(output, "push 0\n");
     break;
   }
 
@@ -70,32 +69,32 @@ void gen_read(const char name[], Scope scope) {
 }
 
 void gen_print() {
-  printf("pop rax\n");
-  printf("call print\n");
+  fprintf(output, "pop rax\n");
+  fprintf(output, "call print\n");
 }
 
 // ----- CONDITIONAL BRANCHING ------
 
 void gen_if_label(int idx) {
-  printf(".end_if%d:\n", idx);
-  printf(";ENDIF\n\n");
+  fprintf(output, ".end_if%d:\n", idx);
+  fprintf(output, ";ENDIF\n\n");
 }
 
 void gen_if_start(int idx) {
-  printf("\n;BEGINIF\n");
-  printf("pop rax\n");
-  printf("cmp rax,0\n");
-  printf("jz .end_if%d\n", idx);
+  fprintf(output, "\n;BEGINIF\n");
+  fprintf(output, "pop rax\n");
+  fprintf(output, "cmp rax,0\n");
+  fprintf(output, "jz .end_if%d\n", idx);
 }
 
 void gen_if_end(int idx) {
-  printf("jmp .end_ifelse%d\n", idx);
-  printf(".end_if%d:\n", idx);
+  fprintf(output, "jmp .end_ifelse%d\n", idx);
+  fprintf(output, ".end_if%d:\n", idx);
 }
 
 void gen_ifelse_end(int idx) {
-  printf(".end_ifelse%d:\n", idx);
-  printf("ENDIF\n\n");
+  fprintf(output, ".end_ifelse%d:\n", idx);
+  fprintf(output, "ENDIF\n\n");
 }
 
 // ----- OPERATORS -----
@@ -105,10 +104,10 @@ int gen_assign(const char ident[], Scope scope) {
 
   switch (scope) {
   case GLOBAL:
-    printf(instr_fmt, glo_get_addr(ident), ident);
+    fprintf(output, instr_fmt, glo_get_addr(ident), ident);
     return glo_lookup(ident);
   case LOCAL:
-    printf(instr_fmt, loc_get_addr(ident), ident);
+    fprintf(output, instr_fmt, loc_get_addr(ident), ident);
     return loc_lookup(ident);
   default:
     exit(1);
@@ -119,72 +118,72 @@ void gen_or(int left, int right, int idx) {
   check_expected_type(left, INT);
   check_expected_type(right, INT);
 
-  printf(";a OR c\n");
-  printf("pop rax\n");
-  printf("cmp rax,1\n");
-  printf("je .true%d\n", idx);
-  printf("pop rcx\n");
-  printf("cmp rcx,1\n");
-  printf("jz .true%d\n", idx);
-  printf("push 0\n");
-  printf("jmp .false%d\n", idx);
-  printf(".true%d:\n", idx);
-  printf("push 1\n");
-  printf(".false%d:", idx);
+  fprintf(output, ";a OR c\n");
+  fprintf(output, "pop rax\n");
+  fprintf(output, "cmp rax,1\n");
+  fprintf(output, "je .true%d\n", idx);
+  fprintf(output, "pop rcx\n");
+  fprintf(output, "cmp rcx,1\n");
+  fprintf(output, "jz .true%d\n", idx);
+  fprintf(output, "push 0\n");
+  fprintf(output, "jmp .false%d\n", idx);
+  fprintf(output, ".true%d:\n", idx);
+  fprintf(output, "push 1\n");
+  fprintf(output, ".false%d:", idx);
 }
 
 void gen_and(int left, int right, int idx) {
   check_expected_type(left, INT);
   check_expected_type(right, INT);
 
-  printf(";a AND c\n");
-  printf("pop rax\n");
-  printf("cmp rax,0\n");
-  printf("jz .false%d\n", idx);
-  printf("pop rcx\n");
-  printf("cmp rcx,0\n");
-  printf("jz .false%d\n", idx);
-  printf("push 1\n");
-  printf("jmp .true%d\n", idx);
-  printf(".false%d:\n", idx);
-  printf("push 0\n");
-  printf(".true%d:", idx);
+  fprintf(output, ";a AND c\n");
+  fprintf(output, "pop rax\n");
+  fprintf(output, "cmp rax,0\n");
+  fprintf(output, "jz .false%d\n", idx);
+  fprintf(output, "pop rcx\n");
+  fprintf(output, "cmp rcx,0\n");
+  fprintf(output, "jz .false%d\n", idx);
+  fprintf(output, "push 1\n");
+  fprintf(output, "jmp .true%d\n", idx);
+  fprintf(output, ".false%d:\n", idx);
+  fprintf(output, "push 0\n");
+  fprintf(output, ".true%d:", idx);
 }
 
 void gen_eq(const char op[], int left, int right, int idx) {
   check_expected_type(left, INT);
   check_expected_type(right, INT);
 
-  printf(";a EQ c\npop rax\npop rcx\ncmp rax,rcx\n");
+  fprintf(output, ";a EQ c\npop rax\npop rcx\ncmp rax,rcx\n");
 
   if (!strcmp(op, "=="))
-    printf("je .true%d\n", idx);
+    fprintf(output, "je .true%d\n", idx);
   else if (!strcmp(op, "!="))
-    printf("jne .true%d\n", idx);
+    fprintf(output, "jne .true%d\n", idx);
   else
     exit(1); // TODO: error on unexpected op
 
-  printf("push 0\njmp .false%d\n.true%d:\npush 1\n.false%d:", idx, idx, idx);
+  fprintf(output, "push 0\njmp .false%d\n.true%d:\npush 1\n.false%d:", idx, idx, idx);
 }
 
 void gen_order(const char op[], int left, int right, int idx) {
   check_expected_type(left, INT);
   check_expected_type(right, INT);
 
-  printf(";a ORDER c\npop rcx\npop rax\ncmp rax,rcx\n");
+  fprintf(output, ";a ORDER c\npop rcx\npop rax\ncmp rax,rcx\n");
 
   if (!strcmp(op, "<"))
-    printf("jl .true%d\n", idx);
+    fprintf(output, "jl .true%d\n", idx);
   else if (!strcmp(op, "<="))
-    printf("jle .true%d\n", idx);
+    fprintf(output, "jle .true%d\n", idx);
   else if(!strcmp(op, ">"))
-    printf("jg .true%d\n", idx);
+    fprintf(output, "jg .true%d\n", idx);
   else if(!strcmp(op, "<="))
-    printf("jge .true%d\n", idx);
+    fprintf(output, "jge .true%d\n", idx);