Merge branch 'master' of https://github.com/pacien/upem-compil-tpc

3 files changed, 92 insertions, 94 deletions

diff --git a/src/generator.c b/src/generator.c
index bbb2af5..553161a 100644
--- a/src/generator.c
+++ b/src/generator.c
@@ -12,9 +12,8 @@ void gen_prologue() {
   fprintf(output, "section .data\n");
 }
 
-void gen_prologue_continue(int *bss_done) {
-  if (*bss_done != 0)
-    return;
+void gen_prologue_continue(bool *bss_done) {
+  if (!*bss_done) return;
 
   fprintf(output, "format_int db \"%%d\",10,0\n");
   fprintf(output, "format_char db \"%%c\",10,0\n");
@@ -115,8 +114,7 @@ Type gen_function_declaration(const char name[], int return_type) {
   return return_type;
 }
 
-void gen_function_end_declaration(const char name[], int return_type,
-                                  int nb_param) {
+void gen_function_end_declaration(const char name[], Type return_type, int nb_param) {
   fun_add(name, return_type, nb_param);
   fprintf(output, "mov rax,-1\nmov rsp, rbp\npop rbp\nret\n");
 }
@@ -139,7 +137,7 @@ Type gen_function_call(const char name[], int nb_param) {
   return return_type;
 }
 
-void gen_declaration(const char name[], int type, Scope scope) {
+void gen_declaration(const char name[], Type type, Scope scope) {
   switch (scope) {
   case GLOBAL:
     glo_addVar(name, type);
@@ -220,7 +218,7 @@ void gen_readc(const char name[], Scope scope) {
   fprintf(output, "mov rax,globals\nadd rax,%d\ncall readc\n", g_addr);
 }
 
-void gen_print(int type) {
+void gen_print(Type type) {
   // check if the name exists in both tables
   fprintf(output, "pop rax\n");
   switch (type) {
@@ -264,7 +262,7 @@ void gen_ifelse_end(int idx) {
 
 // ----- OPERATORS -----
 
-int gen_assign(const char ident[], Scope scope) {
+static int gen_assign_simple(const char ident[], Scope scope) {
   int l_addr = loc_get_addr(ident);
   int g_addr = glo_get_addr(ident);
 
@@ -290,7 +288,7 @@ int gen_assign(const char ident[], Scope scope) {
   }
 }
 
-int gen_assign_tab(const char ident[], Scope scope) {
+static int gen_assign_tab(const char ident[], Scope scope) {
   int l_addr = loc_get_addr(ident);
   int g_addr = glo_get_addr(ident);
 
@@ -322,6 +320,13 @@ int gen_assign_tab(const char ident[], Scope scope) {
   }
 }
 
+int gen_assign(const char ident[], Scope scope) {
+  switch (loc_lookup(ident)) {
+  case TAB: return gen_assign_tab(ident, scope);
+  default: return gen_assign_simple(ident, scope);
+  }
+}
+
 void gen_or(int left, int right, int idx) {
   check_expected_types(left, INT, TAB);
   check_expected_types(right, INT, TAB);
@@ -430,7 +435,7 @@ void gen_divstar(char op, int left, int right) {
   }
 }
 
-int gen_signed_expr(char op, int type) {
+int gen_signed_expr(char op, Type type) {
   check_expected_types(type, INT, TAB);
   switch (op) {
   case '+':
@@ -446,13 +451,13 @@ int gen_signed_expr(char op, int type) {
   return type;
 }
 
-int gen_negate_expr(int type) {
+int gen_negate_expr(Type type) {
   check_expected_types(type, INT, TAB);
   fprintf(output, ";!F\npop rax\nxor rax,1\npush rax\n");
   return type;
 }
 
-int gen_value(const char ident[], Scope scope) {
+static int gen_value_simple(const char ident[], Scope scope) {
   int l_addr = loc_get_addr(ident);
 
   switch (scope) {
@@ -475,7 +480,8 @@ int gen_value(const char ident[], Scope scope) {
     exit(1);
   }
 }
-int gen_value_tab(const char ident[], Scope scope) {
+
+static int gen_value_tab(const char ident[], Scope scope) {
   int l_addr = loc_get_addr(ident);
   int g_addr = glo_get_addr(ident);
   switch (scope) {
@@ -500,6 +506,14 @@ int gen_value_tab(const char ident[], Scope scope) {
     exit(1);
   }
 }
+
+int gen_value(const char ident[], Scope scope) {
+  switch (loc_lookup(ident)) {
+  case TAB: return gen_value_tab(ident, scope);
+  default: return gen_value_simple(ident, scope);
+  }
+}
+
 int gen_num(int value, Scope scope) {
   fprintf(output, "push %d\n", value);
   return INT;
diff --git a/src/generator.h b/src/generator.h
index 9d6dd65..e1fd714 100644
--- a/src/generator.h
+++ b/src/generator.h
@@ -15,23 +15,23 @@ extern int lineno;
 FILE *output;
 
 void gen_prologue();
-void gen_prologue_continue(int *bss_done);
+void gen_prologue_continue(bool *bss_done);
 void gen_epilogue();
 void gen_const(const char name[], int value, Scope scope);
 
 Type gen_function_declaration(const char name[], int return_type);
 void gen_tab_declaration(const char name[], Scope scope, int size);
-void gen_function_end_declaration(const char name[], int return_type, int nb_param);
+void gen_function_end_declaration(const char name[], Type return_type, int nb_param);
 void gen_function_return(Type expect, Type actual);
 Type gen_function_call(const char name[], int nb_param);
 
-void gen_declaration(const char name[], int type, Scope scope);
+void gen_declaration(const char name[], Type type, Scope scope);
 void gen_check(const char name[], Scope scope);
 
 void gen_reade(const char name[], Scope scope);
 void gen_readc(const char name[], Scope scope);
 
-void gen_print(int type);
+void gen_print(Type type);
 
 void gen_if_label(int idx);
 void gen_if_start(int idx);
@@ -39,7 +39,6 @@ void gen_if_end(int idx);
 void gen_ifelse_end(int idx);
 
 int gen_assign(const char ident[], Scope scope);
-int gen_assign_tab(const char ident[], Scope scope);
 
 void gen_or(int left, int right, int idx);
 void gen_and(int left, int right, int idx);
@@ -48,10 +47,9 @@ void gen_order(const char op[], int left, int right, int idx);
 void gen_addsub(char op, int left, int right);
 void gen_divstar(char op, int left, int right);
 
-int gen_signed_expr(char op, int type);
-int gen_negate_expr(int type);
+int gen_signed_expr(char op, Type type);
+int gen_negate_expr(Type type);
 int gen_value(const char ident[], Scope scope);
-int gen_value_tab(const char ident[], Scope scope);
 
 int gen_num(int value, Scope scope);
 int gen_char(int value, Scope scope);
diff --git a/src/tpc.y b/src/tpc.y
index 74d31c6..a21100d 100644
--- a/src/tpc.y
+++ b/src/tpc.y
@@ -2,11 +2,6 @@
 /*
  * UPEM / Compilation / Projet
  * Pacien TRAN-GIRARD, Adam NAILI
- *
- *      TODO :
- *  ------
- * - arrays
- *
  */
 
 int nb_globals = 0;
@@ -20,14 +15,14 @@ int yylex();
 void yyerror(char *);
 static Scope scope = GLOBAL;
 static Type return_type = VOID_T;
-static int bss_done = 0;
+static bool bss_done = false;
 static int num_label = 0;
 static int num_if = 0;
 static int num_while = 0;
 static int nb_param[255];
 static int num_scope = -1;
 static int offset = 0;
-static int is_array = 0;
+static bool is_array = false;
 static char fname[64];
 %}
 
@@ -81,50 +76,49 @@ DeclVars: