Code cleanup and reformating

5 files changed, 57 insertions, 49 deletions

diff --git a/makefile b/makefile
index 8a6ddb4..d7af548 100644
--- a/makefile
+++ b/makefile
@@ -11,7 +11,7 @@ DOC_DIR := doc
 LEX_SRC := tpc.lex
 YACC_SRC := tpc.y
 PDF_SRC := rapport.md
-ST_SRC := symboltable
+ST_SRC := symbol_table
 
 # INTERMEDIATE
 LEX_GEN := tpc.yy
@@ -41,7 +41,7 @@ test: $(OUT_DIR)/$(FILE_TEST).o
 $(OUT_DIR)/$(FILE_TEST).o: $(OUT_DIR)/$(FILE_TEST).asm
         $(ASM) $(AFLAGS) $< -o $@
 
-$(OUT_DIR)/$(FILE_TEST).asm: $(RES_DIR)/$(FILE_TEST).tpc $(OUT_DIR)/$(COMPIL_BIN) 
+$(OUT_DIR)/$(FILE_TEST).asm: $(RES_DIR)/$(FILE_TEST).tpc $(OUT_DIR)/$(COMPIL_BIN)
         $(OUT_DIR)/$(COMPIL_BIN) < $< > $@
 
 $(OUT_DIR)/$(LEX_GEN).c: $(SRC_DIR)/$(LEX_SRC)
@@ -70,4 +70,3 @@ $(OUT_DIR)/$(COMMIT_LOG):
 
 clean:
         rm -rf $(OUT_DIR)/*
-
diff --git a/src/symboltable.c b/src/symbol_table.c
index d20b0dc..6f84ce4 100644
--- a/src/symboltable.c
+++ b/src/symbol_table.c
@@ -1,4 +1,9 @@
-#include "symboltable.h"
+/**
+  * UPEM / Compilation / Projet
+  * Pacien TRAN-GIRARD, Adam NAILI
+  */
+
+#include "symbol_table.h"
 
 extern int lineno; /* from lexical analyser */
 
@@ -22,7 +27,7 @@ void glo_addVar(const char name[], int type) {
   strcpy(glo_symbol_table.entries[glo_symbol_table.size - 1].name, name);
   glo_symbol_table.entries[glo_symbol_table.size - 1].type = type;
   glo_symbol_table.entries[glo_symbol_table.size - 1].addr =
-      (glo_symbol_table.size - 1) * 8;
+    (glo_symbol_table.size - 1) * 8;
 }
 
 // Verifies that the variable exists and returns the type
@@ -38,6 +43,7 @@ int glo_lookup(const char name[]) {
           lineno);
   return -1;
 }
+
 int glo_get_addr(const char name[]) {
   int count;
 
@@ -83,7 +89,7 @@ void loc_addVar(const char name[], int type) {
   strcpy(loc_symbol_table.entries[loc_symbol_table.size - 1].name, name);
   loc_symbol_table.entries[loc_symbol_table.size - 1].type = type;
   loc_symbol_table.entries[loc_symbol_table.size - 1].addr =
-      (loc_symbol_table.size - 1) * 8;
+    (loc_symbol_table.size - 1) * 8;
 }
 
 int loc_lookup(const char name[]) {
@@ -140,12 +146,18 @@ void loc_clean_table() {
   loc_symbol_table.size = 0;
 }
 
+static char *string_of_type(int type) {
+  switch (type) {
+  case INT: return "INT";
+  case CHAR: return "CHAR";
+  default: return "UNEXPECTED";
+  }
+}
+
 void check_expected_type(int type_to_check, int type_expected) {
   if (type_to_check != type_expected)
     fprintf(stderr, "Expected type : %s -> Got type : %s (near line %d)\n",
-            type_expected == INT ? "INT" : type_expected == CHAR ? "CHAR"
-                                                                 : "UNDEFINED",
-            type_to_check == INT ? "INT" : type_to_check == CHAR ? "CHAR"
-                                                                 : "UNDEFINED",
+            string_of_type(type_to_check),
+            string_of_type(type_to_check),
             lineno);
-}
\ No newline at end of file
+}
diff --git a/src/symboltable.h b/src/symbol_table.h
index ac6db36..9926fec 100644
--- a/src/symboltable.h
+++ b/src/symbol_table.h
@@ -1,4 +1,10 @@
-#ifndef __SYMBOLTABLE_H__
+/**
+ * UPEM / Compilation / Projet
+ * Pacien TRAN-GIRARD, Adam NAILI
+ */
+
+#ifndef __SYMBOL_TABLE_H__
+#define __SYMBOL_TABLE_H__
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,21 +15,18 @@
 #define CHAR 1
 #define MAXSYMBOLS 256
 
-
 typedef struct {
-    char name[MAXNAME];
-    int type;
-    int addr;
+  char name[MAXNAME];
+  int type;
+  int addr;
 } STentry;
 
-
 typedef struct {
-        STentry entries[MAXSYMBOLS];
-        int maxsize;
-        int size;
+  STentry entries[MAXSYMBOLS];
+  int maxsize;
+  int size;
 } SymbolTable;
 
-
 void glo_addVar(const char name[], int type);
 int glo_lookup(const char name[]);
 int glo_get_addr(const char name[]);
@@ -33,4 +36,5 @@ int loc_lookup(const char name[]);
 int loc_get_addr(const char name[]);
 void loc_display_table();
 void check_expected_type(int type_to_check, int type_expected);
-#endif
\ No newline at end of file
+
+#endif
diff --git a/src/tpc.lex b/src/tpc.lex
index 7a0d6b6..bdf6bb5 100644
--- a/src/tpc.lex
+++ b/src/tpc.lex
@@ -1,8 +1,8 @@
 %{
 /**
-  * UPEM / Compilation / Projet
-  * Pacien TRAN-GIRARD, Adam NAILI
-  */
+ * UPEM / Compilation / Projet
+ * Pacien TRAN-GIRARD, Adam NAILI
+ */
 
 #include "tpc.tab.h"
 #define INT 0
@@ -49,4 +49,3 @@ reade                   { return READE; }
 <COMMENT>\n             { lineno++; }
 <COMMENT>.              ;
 %%
-
diff --git a/src/tpc.y b/src/tpc.y
index 94d89fe..b0d3633 100644
--- a/src/tpc.y
+++ b/src/tpc.y
@@ -3,21 +3,16 @@
  * UPEM / Compilation / Projet
  * Pacien TRAN-GIRARD, Adam NAILI
  *
- *
- *
- *
- *
- *
- *      TODO : 
+ *      TODO :
  *  ------
  * - Gérer les globales avec .bss (Il faut donc décaler le début du programme après l'analyse des globales pour savoir combien de place réserver.)
  * - Gestion des tableaux
  * - Tableau des fonctions
- *  
+ *
  */
 
 #include <stdio.h>
-#include "symboltable.h"
+#include "symbol_table.h"
 
 extern int lineno;
 int yylex();
@@ -30,13 +25,13 @@ static int num_if = 0;
 %}
 
 %union {
-    char caractere;
-    int num;
-    char ident[64];
-    int type;
-    char comp[3];
-    char addsub;
-    char divstar;
+  char caractere;
+  int num;
+  char ident[64];
+  int type;
+  char comp[3];
+  char addsub;
+  char divstar;
 }
 %token <caractere> CARACTERE
 %token <num> NUM
@@ -47,7 +42,7 @@ static int num_if = 0;
 %token OR AND CONST IF ELSE WHILE RETURN VOID PRINT READC READE
 %token <type> TYPE
 
-%type <num> Exp EB TB FB M E T F 
+%type <num> Exp EB TB FB M E T F
 %type <ident> LValue
 
 %left ','
@@ -66,17 +61,17 @@ Prog:{printf("extern printf\n");
                         printf("mov rsi, rax\n");
                         printf("mov rdi, format_int\n");
                         printf("mov rax, 0\n");
-                  printf("call printf WRT ..plt\n");    
+                  printf("call printf WRT ..plt\n");
                         printf("pop rsi\n");
                         printf("pop rbp\n");
                         printf("ret\n");
-                        printf("\n_start:\n");  
+                        printf("\n_start:\n");
       printf("push rbp\nmov rbp, rsp\n\n");
                         }