3 files changed, 117 insertions, 42 deletions

diff --git a/src/symboltable.c b/src/symboltable.c
index 3f22b44..cdbd442 100644
--- a/src/symboltable.c
+++ b/src/symboltable.c
@@ -2,55 +2,92 @@
 
 extern int lineno; /* from lexical analyser */
 
-SymbolTable symbol_table = {{{{0},0}},MAXSYMBOLS,0};
+SymbolTable glo_symbol_table = {{{{0},0}},MAXSYMBOLS,0};
+SymbolTable loc_symbol_table = {{{{0},0}},MAXSYMBOLS,0};
 
-void addVar(const char name[], int type) {
+void glo_addVar(const char name[], int type) {
   int count;
-  for (count = 0; count < symbol_table.size; count++) {
-    if (!strcmp(symbol_table.entries[count].name, name)) {
-      printf("semantic error, redefinition of variable %s near line %d\n", name,
+  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);
       return;
     }
   }
-  if (++symbol_table.size > symbol_table.maxsize) {
-    printf("too many variables near line %d\n", lineno);
+  if (++glo_symbol_table.size > glo_symbol_table.maxsize) {
+    fprintf(stderr,"too many variables near line %d\n", lineno);
     exit(1);
   }
-  strcpy(symbol_table.entries[symbol_table.size - 1].name, name);
-  symbol_table.entries[symbol_table.size - 1].type = 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;
 }
 
-void lookup(const char name[]) {
+//Verifies that the variable exists and returns the type
+int glo_lookup(const char name[]) {
   int count;
 
-  for (count = 0; count < symbol_table.size; count++) {
-    if (!strcmp(symbol_table.entries[count].name, name)) {
-      return;
+  for (count = 0; count < glo_symbol_table.size; count++) {
+    if (!strcmp(glo_symbol_table.entries[count].name, name)) {
+      return glo_symbol_table.entries[count].type;
     }
   }
-  printf("No definition of the variable %s near line %d\n", name,
+  fprintf(stderr,"No definition of the variable %s near line %d\n", name,
            lineno);
+  return -1;
 }
 
-void display_table(){
+
+void glo_display_table(){
     int count;
-    for (count=0;count<symbol_table.size;count++) {
-        if(symbol_table.entries[count].type == INT)
-            printf("entier: %s, pos: %d     \n", symbol_table.entries[count].name, symbol_table.entries[count].addr);
+    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", symbol_table.entries[count].name, symbol_table.entries[count].addr);
+            printf("caractere: %s, pos: %d       \n", glo_symbol_table.entries[count].name, glo_symbol_table.entries[count].addr);
     }
     printf("\n");
 }
 
-int get_type(const char name[]){
-        int count;
 
-  for (count = 0; count < symbol_table.size; count++) {
-    if (!strcmp(symbol_table.entries[count].name, name)) {
-      return symbol_table.entries[count].type;
+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);
+      return;
     }
   }
+  if (++glo_symbol_table.size > glo_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;
+}
+
+
+int loc_lookup(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].type;
+    }
+  }
+  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");
 }
\ No newline at end of file
diff --git a/src/symboltable.h b/src/symboltable.h
index 02e47a4..bd7a373 100644
--- a/src/symboltable.h
+++ b/src/symboltable.h
@@ -24,8 +24,10 @@ typedef struct {
 } SymbolTable;
 
 
-void addVar(const char name[], int type);
-void lookup(const char name[]);
-void display_table();
-int get_type(const char name[]);
+void glo_addVar(const char name[], int type);
+int glo_lookup(const char name[]);
+void glo_display_table();
+void loc_addVar(const char name[], int type);
+int loc_lookup(const char name[]);
+void loc_display_table();
 #endif
\ No newline at end of file
diff --git a/src/tpc.y b/src/tpc.y
index 3b902be..e7b5249 100644
--- a/src/tpc.y
+++ b/src/tpc.y
@@ -11,6 +11,9 @@ extern int lineno;
 int yylex();
 void yyerror(char *);
 
+#define GLOBAL 0
+#define LOCAL 1
+static int status = GLOBAL;
 %}
 
 %union {
@@ -31,15 +34,48 @@ void yyerror(char *);
 %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 LValue
+%type <num> Exp EB TB FB M E T F 
+%type <ident> LValue
 
 %left ','
 %precedence ')'
 %precedence ELSE
 
 %%
-Prog:
-     DeclConsts DeclVars DeclFoncts {display_table();}
+Prog:{printf("section .data\n");
+                        printf("format_entier db \"%%d \n\", 10,0");
+                        printf("section .bss\nsection .text\nglobal _start\n");
+                        printf("print:\n");
+                        printf("push rbp\n");
+                        printf("mov rbp, rsp\n");
+                        
+                        printf("push rax\n");
+                        printf("push rcx\n");
+                        printf("push rdx\n");
+                        printf("push rdi\n");
+                        printf("push rsi\n");
+                        printf("push r8\n");
+                        
+                        printf("mov r8, rdx \n");
+                        printf("mov rcx, rcx\n");
+                        printf("mov rdx, rbx\n");
+                  printf("  mov rdi, format_entier\n");
+                  printf("  mov rax, 0\n");
+                  printf("  call printf WRT ..plt\n");  
+        
+                        printf("pop r8\n");
+                        printf("pop rsi\n");
+                        printf("pop rdi\n");
+                        printf("pop rdx\n");
+                        printf("pop rcx\n");
+                        printf("pop rax\n");
+                        
+                        printf("pop rbp\n");
+                        printf("ret\n");        
+                        }
+     DeclConsts DeclVars DeclFoncts {
+                
+        glo_display_table();}
   ;
 DeclConsts:
      DeclConsts CONST ListConst ';'
@@ -62,8 +98,8 @@ DeclVars:
   |
   ;
 Declarateurs:
-     Declarateurs ',' Declarateur   {addVar($<ident>3, $<type>0);}
-  |  Declarateur                    {addVar($<ident>1, $<type>0);}
+     Declarateurs ',' Declarateur   {glo_addVar($<ident>3, $<type>0);}
+  |  Declarateur                    {glo_addVar($<ident>1, $<type>0);}
   ;
 Declarateur:
      IDENT
@@ -74,7 +110,7 @@ DeclFoncts:
   |  DeclFonct
   ;
 DeclFonct:
-     EnTeteFonct Corps
+     EnTeteFonct {status = LOCAL;} Corps {status = GLOBAL;}
   ;
 EnTeteFonct:
      TYPE IDENT '(' Parametres ')'
@@ -85,8 +121,8 @@ Parametres:
   |  ListTypVar
   ;
 ListTypVar:
-     ListTypVar ',' TYPE IDENT    {addVar($<ident>4, $<type>3);}
-  |  TYPE IDENT                   {addVar($<ident>2, $<type>1);}
+     ListTypVar ',' TYPE IDENT    {glo_addVar($<ident>4, $<type>3);}
+  |  TYPE IDENT                   {glo_addVar($<ident>2, $<type>1);}
   ;
 Corps:
      '{' DeclConsts DeclVars SuiteInstr '}'
@@ -99,8 +135,8 @@ Instr:
   |  ';'
   |  RETURN Exp ';'
   |  RETURN ';'
-  |  READE '(' IDENT ')' ';'      {lookup($<ident>3);}
+  |  READE '(' IDENT ')' ';'      {glo_lookup($<ident>3);}