2 files changed, 23 insertions, 47 deletions

diff --git a/src/tpc.lex b/src/tpc.lex
index eaeea89..63d4391 100644
--- a/src/tpc.lex
+++ b/src/tpc.lex
@@ -14,37 +14,30 @@ int lineno = 1;
 
 %%
 [ \t\r]+                ;
-\n                      { lineno++;}
-"/*"                    { BEGIN COMMENT;}
+\n                      { lineno++; }
+"/*"                    { BEGIN COMMENT; }
 &&                      { return AND; }
 "||"                    { return OR; }
-"*"|"/"|%               { yylval.divstar=yytext[0]; return DIVSTAR; }
-"+"|-                   { yylval.addsub=yytext[0]; return ADDSUB; }
-"<"|"<="|">"|>=         { strcpy(yylval.comp, yytext); return ORDER; }
-==|!=                   { strcpy(yylval.comp, yytext); return EQ; }
-int                     { strcpy(yylval.type, yytext); return TYPE; }
-float                   { strcpy(yylval.type, yytext); return TYPE; }
-double                  { strcpy(yylval.type, yytext); return TYPE; }
-char                    { strcpy(yylval.type, yytext); return TYPE; }
+"*"|"/"|%               { return DIVSTAR; }
+"+"|-                   { return ADDSUB; }
+"<"|"<="|">"|>=         { return ORDER; }
+==|!=                   { return EQ; }
+int                     { return TYPE; }
+float                   { return TYPE; }
+double                  { return TYPE; }
+char                    { return TYPE; }
 void                    { return VOID; }
 const                   { return CONST; }
-if                      { return IF;}
-else                    { return ELSE;}
+if                      { return IF; }
+else                    { return ELSE; }
 while                   { return WHILE; }
 return                  { return RETURN; }
-[a-zA-Z_][a-zA-Z0-9_]*  { strcpy(yylval.ident, yytext); return IDENT; }
-[0-9]+                  { sscanf(yytext, "%d", &(yylval.num)); return NUM; }
-'\\?.'                  { if (strlen(yytext)==3)
-                            yylval.caractere=yytext[1];
-                          else switch(yytext[2]) {
-                            case 'n': yylval.caractere='\n'; break;
-                            case 't': yylval.caractere='\t'; break;
-                            case '\'': yylval.caractere='\''; break;
-                            }
-                          return CARACTERE; }
-.                       { return yytext[0];}
-<COMMENT>"*/"           { BEGIN INITIAL;}
-<COMMENT>\n             { lineno++;}
+[a-zA-Z_][a-zA-Z0-9_]*  { return IDENT; }
+[0-9]+                  { return NUM; }
+'\\?.'                  { return CARACTERE; }
+.                       { return yytext[0]; }
+<COMMENT>"*/"           { BEGIN INITIAL; }
+<COMMENT>\n             { lineno++; }
 <COMMENT>.              ;
 %%
 
diff --git a/src/tpc.y b/src/tpc.y
index 11635f9..31452fe 100644
--- a/src/tpc.y
+++ b/src/tpc.y
@@ -12,24 +12,8 @@ void yyerror(char *);
 
 %}
 
-%union {
-  char caractere;
-  int num;
-  char ident[64];
-  char type[16];
-  char comp[3];
-  char addsub;
-  char divstar;
-}
-
-%token <caractere> CARACTERE
-%token <num> NUM
-%token <ident> IDENT
-%token <comp> ORDER EQ
-%token <addsub> ADDSUB
-%token <divstar> DIVSTAR
-%token OR AND CONST IF WHILE RETURN VOID
-%token <type> TYPE
+%token CARACTERE NUM IDENT ORDER EQ ADDSUB DIVSTAR
+%token OR AND CONST IF WHILE RETURN VOID TYPE
 
 %left ','
 %precedence ')'
@@ -127,12 +111,11 @@ ListExp      : ListExp ',' ListExp
              ;
 %%
 
-void yyerror(char *s){
-  fprintf(stderr, "Line no%d: %s\n", lineno, s);
+void yyerror(char *msg){
+  fprintf(stderr, "%s at line %d\n", msg, lineno);
 }
 
 int main(int argc, char **argv) {
-  yyparse();
-  return 0;
+  return yyparse();
 }