Basic implementation of the symbol table

4 files changed, 40 insertions, 17 deletions

diff --git a/src/symboltable.c b/src/symboltable.c
index 852d1b8..3f22b44 100644
--- a/src/symboltable.c
+++ b/src/symboltable.c
@@ -28,8 +28,29 @@ void lookup(const char name[]) {
     if (!strcmp(symbol_table.entries[count].name, name)) {
       return;
     }
-    printf("No definition of the variable %s near line %d\n", name,
-           lineno);
   }
+  printf("No definition of the variable %s near line %d\n", name,
+           lineno);
+}
+
+void 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);
+        else
+            printf("caractere: %s, pos: %d       \n", symbol_table.entries[count].name, 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;
+    }
+  }
+  return -1;
+}
\ No newline at end of file
diff --git a/src/symboltable.h b/src/symboltable.h
index cc828fa..02e47a4 100644
--- a/src/symboltable.h
+++ b/src/symboltable.h
@@ -13,6 +13,7 @@
 typedef struct {
     char name[MAXNAME];
     int type;
+    int addr;
 } STentry;
 
 
@@ -26,5 +27,5 @@ typedef struct {
 void addVar(const char name[], int type);
 void lookup(const char name[]);
 void display_table();
-
+int get_type(const char name[]);
 #endif
\ No newline at end of file
diff --git a/src/tpc.lex b/src/tpc.lex
index 5137d39..7a0d6b6 100644
--- a/src/tpc.lex
+++ b/src/tpc.lex
@@ -5,7 +5,8 @@
   */
 
 #include "tpc.tab.h"
-
+#define INT 0
+#define CHAR 1
 int lineno = 1;
 %}
 
@@ -22,8 +23,8 @@ int lineno = 1;
 "+"|-                   { yylval.addsub=yytext[0]; return ADDSUB; }
 "<"|"<="|">"|">="       { strcpy(yylval.comp, yytext); return ORDER; }
 ==|!=                   { strcpy(yylval.comp, yytext); return EQ; }
-entier                  { strcpy(yylval.type, yytext); return TYPE; }
-caractere               { strcpy(yylval.type, yytext); return TYPE; }
+entier                  { yylval.type = INT; return TYPE; }
+caractere               { yylval.type = CHAR; return TYPE; }
 void                    { return VOID; }
 const                   { return CONST; }
 if                      { return IF; }
diff --git a/src/tpc.y b/src/tpc.y
index f1a51ff..3b902be 100644
--- a/src/tpc.y
+++ b/src/tpc.y
@@ -17,7 +17,7 @@ void yyerror(char *);
     char caractere;
     int num;
     char ident[64];
-    char type[32];
+    int type;
     char comp[3];
     char addsub;
     char divstar;
@@ -39,7 +39,7 @@ void yyerror(char *);
 
 %%
 Prog:
-     DeclConsts DeclVars DeclFoncts
+     DeclConsts DeclVars DeclFoncts {display_table();}
   ;
 DeclConsts:
      DeclConsts CONST ListConst ';'
@@ -62,8 +62,8 @@ DeclVars:
   |
   ;
 Declarateurs:
-     Declarateurs ',' Declarateur
-  |  Declarateur
+     Declarateurs ',' Declarateur   {addVar($<ident>3, $<type>0);}
+  |  Declarateur                    {addVar($<ident>1, $<type>0);}
   ;
 Declarateur:
      IDENT
@@ -85,8 +85,8 @@ Parametres:
   |  ListTypVar
   ;
 ListTypVar:
-     ListTypVar ',' TYPE IDENT
-  |  TYPE IDENT
+     ListTypVar ',' TYPE IDENT    {addVar($<ident>4, $<type>3);}
+  |  TYPE IDENT                   {addVar($<ident>2, $<type>1);}
   ;
 Corps:
      '{' DeclConsts DeclVars SuiteInstr '}'
@@ -99,8 +99,8 @@ Instr:
   |  ';'
   |  RETURN Exp ';'
   |  RETURN ';'
-  |  READE '(' IDENT ')' ';'
-  |  READC '(' IDENT ')' ';'
+  |  READE '(' IDENT ')' ';'      {lookup($<ident>3);}
+  |  READC '(' IDENT ')' ';'      {lookup($<ident>3);}
   |  PRINT '(' Exp ')' ';'
   |  IF '(' Exp ')' Instr
   |  IF '(' Exp ')' Instr ELSE Instr
@@ -139,14 +139,14 @@ F:
      ADDSUB F                   {$$ = $2;} //on fait remonter le type
   |  '!' F                      {$$ = $2;} 
   |  '(' Exp ')'                {$$ = $2;}
-  |  LValue                     //Il faut trouver le type de LValue
+  |  LValue                     {$$ = $1;}
   |  NUM                        {$$ = INT;} // on stocke les types pour l'analyse sémantique
   |  CARACTERE                  {$$ = CHAR;}
   |  IDENT '(' Arguments  ')'   {$$ = INT;} //tableau d'entiers uniquement
   ;
 LValue:
-     IDENT                      {lookup($<ident>1);}
-  |  IDENT  '[' Exp  ']'        {lookup($<ident>1);}
+     IDENT                      {lookup($<ident>1);get_type($<ident>1);}
+  |  IDENT  '[' Exp  ']'        {lookup($<ident>1);get_type($<ident>1);}
   ;
 Arguments:
      ListExp