6 files changed, 172 insertions, 64 deletions

diff --git a/res/nani.tpc b/res/nani.tpc
new file mode 100644
index 0000000..dbb3731
--- /dev/null
+++ b/res/nani.tpc
@@ -0,0 +1 @@
+/*Programme correct avec le compilateur mais qui ne devrait pas*/
diff --git a/res/test-table-symboles.tpc b/res/test-table-symboles.tpc
index 3c12144..b2cc31e 100644
--- a/res/test-table-symboles.tpc
+++ b/res/test-table-symboles.tpc
@@ -1,10 +1,11 @@
 /* test-table-symboles.tpc */
 
 /* Test file for simplified translator of a declaration of variables in C */
-    entier r1,b,s,c,r2 ;
-        caractere letter, digit, punct;
+entier r1,b,s,c,r2 ;
+caractere letter, digit, punct; 
 
 entier main(void)  {
+
    r1=12;
    r2=24;
    b=r1+r2;
diff --git a/res/test_add.tpc b/res/test_add.tpc
new file mode 100644
index 0000000..01e0403
--- /dev/null
+++ b/res/test_add.tpc
@@ -0,0 +1,11 @@
+/* test-table-symboles.tpc */
+
+/* Test file for simplified translator of a declaration of variables in C */
+
+entier main(void)  {
+        entier a,b,res;
+        a = 2;
+        b = 3;
+        res = a - b;
+        print(res);
+}
diff --git a/src/symboltable.c b/src/symboltable.c
index cdbd442..5c63d3f 100644
--- a/src/symboltable.c
+++ b/src/symboltable.c
@@ -2,28 +2,30 @@
 
 extern int lineno; /* from lexical analyser */
 
-SymbolTable glo_symbol_table = {{{{0},0}},MAXSYMBOLS,0};
-SymbolTable loc_symbol_table = {{{{0},0}},MAXSYMBOLS,0};
+SymbolTable glo_symbol_table = {{{{0}, 0}}, MAXSYMBOLS, 0};
+SymbolTable loc_symbol_table = {{{{0}, 0}}, MAXSYMBOLS, 0};
 
 void glo_addVar(const char name[], int type) {
   int count;
   for (count = 0; count < glo_symbol_table.size; count++) {
     if (!strcmp(glo_symbol_table.entries[count].name, name)) {
-      fprintf(stderr,"semantic error, redefinition of variable %s near line %d\n", name,
-             lineno);
+      fprintf(stderr,
+              "semantic error, redefinition of variable %s near line %d\n",
+              name, lineno);
       return;
     }
   }
   if (++glo_symbol_table.size > glo_symbol_table.maxsize) {
-    fprintf(stderr,"too many variables near line %d\n", lineno);
+    fprintf(stderr, "too many variables near line %d\n", lineno);
     exit(1);
   }
   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.entries[glo_symbol_table.size - 1].addr =
+      (glo_symbol_table.size - 1) * 8;
 }
 
-//Verifies that the variable exists and returns the type
+// Verifies that the variable exists and returns the type
 int glo_lookup(const char name[]) {
   int count;
 
@@ -32,43 +34,58 @@ int glo_lookup(const char name[]) {
       return glo_symbol_table.entries[count].type;
     }
   }
-  fprintf(stderr,"No definition of the variable %s near line %d\n", name,
-           lineno);
+  fprintf(stderr, "No definition of the variable %s near line %d\n", name,
+          lineno);
   return -1;
 }
+int glo_get_addr(const char name[]) {
+  int count;
 
-
-void glo_display_table(){
-    int count;
-    for (count=0;count<glo_symbol_table.size;count++) {
-        if(glo_symbol_table.entries[count].type == INT)
-            printf("entier: %s, pos: %d     \n", glo_symbol_table.entries[count].name, glo_symbol_table.entries[count].addr);
-        else
-            printf("caractere: %s, pos: %d       \n", glo_symbol_table.entries[count].name, glo_symbol_table.entries[count].addr);
+  for (count = 0; count < glo_symbol_table.size; count++) {
+    if (!strcmp(glo_symbol_table.entries[count].name, name)) {
+      return glo_symbol_table.entries[count].addr;
     }
-    printf("\n");
+  }
+  fprintf(stderr, "No definition of the variable %s near line %d\n", name,
+          lineno);
+  return -1;
 }
 
+void glo_display_table() {
+  int count;
+  for (count = 0; count < glo_symbol_table.size; count++) {
+    if (glo_symbol_table.entries[count].type == INT)
+      printf(";entier: %s, pos: %d     \n",
+             glo_symbol_table.entries[count].name,
+             glo_symbol_table.entries[count].addr);
+    else
+      printf(";caractere: %s, pos: %d       \n",
+             glo_symbol_table.entries[count].name,
+             glo_symbol_table.entries[count].addr);
+  }
+  printf("\n");
+}
 
 void loc_addVar(const char name[], int type) {
   int count;
   for (count = 0; count < loc_symbol_table.size; count++) {
     if (!strcmp(loc_symbol_table.entries[count].name, name)) {
-      fprintf(stderr,"semantic error, redefinition of variable %s near line %d\n", name,
-             lineno);
+      fprintf(stderr,
+              "semantic error, redefinition of variable %s near line %d\n",
+              name, lineno);
       return;
     }
   }
-  if (++glo_symbol_table.size > glo_symbol_table.maxsize) {
-    fprintf(stderr,"too many variables near line %d\n", lineno);
+  if (++loc_symbol_table.size > loc_symbol_table.maxsize) {
+    fprintf(stderr, "too many variables near line %d\n", lineno);
     exit(1);
   }
-  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;
+  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;
 }
 
-
 int loc_lookup(const char name[]) {
   int count;
 
@@ -77,17 +94,52 @@ int loc_lookup(const char name[]) {
       return loc_symbol_table.entries[count].type;
     }
   }
-  fprintf(stderr,"No definition of the variable %s near line %d\n", name,
-           lineno);
+  fprintf(stderr, "No definition of the variable %s near line %d\n", name,
+          lineno);
   return -1;
 }
-void loc_display_table(){
-    int count;
-    for (count=0;count<loc_symbol_table.size;count++) {
-        if(loc_symbol_table.entries[count].type == INT)
-            printf("entier: %s, pos: %d     \n", loc_symbol_table.entries[count].name, loc_symbol_table.entries[count].addr);
-        else
-            printf("caractere: %s, pos: %d       \n", loc_symbol_table.entries[count].name, loc_symbol_table.entries[count].addr);
+
+int loc_get_addr(const char name[]) {
+  int count;
+
+  for (count = 0; count < loc_symbol_table.size; count++) {
+    if (!strcmp(loc_symbol_table.entries[count].name, name)) {
+      return loc_symbol_table.entries[count].addr;
     }
-    printf("\n");
+  }
+  fprintf(stderr, "No definition of the variable %s near line %d\n", name,
+          lineno);
+  return -1;
+}
+void loc_display_table() {
+  int count;
+  for (count = 0; count < loc_symbol_table.size; count++) {
+    if (loc_symbol_table.entries[count].type == INT)
+      printf(";entier: %s, pos: %d     \n",
+             loc_symbol_table.entries[count].name,
+             loc_symbol_table.entries[count].addr);
+    else
+      printf(";caractere: %s, pos: %d       \n",
+             loc_symbol_table.entries[count].name,
+             loc_symbol_table.entries[count].addr);
+  }
+  printf("\n");
+}
+
+void loc_clean_table() {
+  int i;
+  for (i = 0; i < loc_symbol_table.size; i++) {
+    printf("pop eax\n");
+  }
+  loc_symbol_table.size = 0;
+}
+
+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",
+            lineno);
 }
\ No newline at end of file
diff --git a/src/symboltable.h b/src/symboltable.h
index bd7a373..ac6db36 100644
--- a/src/symboltable.h
+++ b/src/symboltable.h
@@ -26,8 +26,11 @@ typedef struct {
 
 void glo_addVar(const char name[], int type);
 int glo_lookup(const char name[]);
+int glo_get_addr(const char name[]);