1 files changed, 20 insertions, 26 deletions
diff --git a/src/tpc.lex b/src/tpc.lex
index eaeea89..8b824c0 100644
--- a/src/tpc.lex
+++ b/src/tpc.lex
@@ -14,37 +14,31 @@ int lineno = 1;
 %%
 [ \t\r]+                ;
-\n                      { lineno++;}
+\n                      { lineno++; }
-"/*"                    { BEGIN COMMENT;}
+"/*"                    { BEGIN COMMENT; }
-&&                      { return AND; }
+"&&"                    { return AND; }
 "||"                    { return OR; }
-"*"|"/"|%               { yylval.divstar=yytext[0]; return DIVSTAR; }
+"*"|"/"|%               { return DIVSTAR; }
-"+"|-                   { yylval.addsub=yytext[0]; return ADDSUB; }
+"+"|-                   { return ADDSUB; }
-"<"|"<="|">"|>=         { strcpy(yylval.comp, yytext); return ORDER; }
+"<"|"<="|">"|">="       { return ORDER; }
-==|!=                   { strcpy(yylval.comp, yytext); return EQ; }
+==|!=                   { return EQ; }
-int                     { strcpy(yylval.type, yytext); return TYPE; }
+int                     { return TYPE; }
-float                   { strcpy(yylval.type, yytext); return TYPE; }
+char                    { return TYPE; }
-double                  { strcpy(yylval.type, yytext); return TYPE; }
-char                    { strcpy(yylval.type, yytext); return TYPE; }
 void                    { return VOID; }
 const                   { return CONST; }
-if                      { return IF;}
+if                      { return IF; }
-else                    { return ELSE;}
+else                    { return ELSE; }
 while                   { return WHILE; }
 return                  { return RETURN; }
-[a-zA-Z_][a-zA-Z0-9_]*  { strcpy(yylval.ident, yytext); return IDENT; }
+print                   { return PRINT; }
-[0-9]+                  { sscanf(yytext, "%d", &(yylval.num)); return NUM; }
+readc                   { return READC; }
-'\\?.'                  { if (strlen(yytext)==3)
+reade                   { return READE; }
-                            yylval.caractere=yytext[1];
+[a-zA-Z_][a-zA-Z0-9_]*  { return IDENT; }
-                          else switch(yytext[2]) {
+[0-9]+                  { return NUM; }
-                            case 'n': yylval.caractere='\n'; break;
+'\\?.'                  { return CARACTERE; }
-                            case 't': yylval.caractere='\t'; break;
+.                       { return yytext[0]; }
-                            case '\'': yylval.caractere='\''; break;
+<COMMENT>"*/"           { BEGIN INITIAL; }
-                            }
+<COMMENT>\n             { lineno++; }
-                          return CARACTERE; }
-.                       { return yytext[0];}
-<COMMENT>"*/"           { BEGIN INITIAL;}
-<COMMENT>\n             { lineno++;}
 <COMMENT>.              ;
 %%

diff --git a/src/tpc.lex b/src/tpc.lex index eaeea89..8b824c0 100644 --- a/src/tpc.lex +++ b/src/tpc.lex
@@ -14,37 +14,31 @@ int lineno = 1;
14		14
15	%%	15	%%
16	[ \t\r]+ ;	16	[ \t\r]+ ;
17	\n { lineno++;}	17	\n { lineno++; }
18	"/*" { BEGIN COMMENT;}	18	"/*" { BEGIN COMMENT; }
19	&& { return AND; }	19	"&&" { return AND; }
20	"\|\|" { return OR; }	20	"\|\|" { return OR; }
21	"*"\|"/"\|% { yylval.divstar=yytext[0]; return DIVSTAR; }	21	"*"\|"/"\|% { return DIVSTAR; }
22	"+"\|- { yylval.addsub=yytext[0]; return ADDSUB; }	22	"+"\|- { return ADDSUB; }
23	"<"\|"<="\|">"\|>= { strcpy(yylval.comp, yytext); return ORDER; }	23	"<"\|"<="\|">"\|">=" { return ORDER; }
24	==\|!= { strcpy(yylval.comp, yytext); return EQ; }	24	==\|!= { return EQ; }
25	int { strcpy(yylval.type, yytext); return TYPE; }	25	int { return TYPE; }
26	float { strcpy(yylval.type, yytext); return TYPE; }	26	char { return TYPE; }
27	double { strcpy(yylval.type, yytext); return TYPE; }
28	char { strcpy(yylval.type, yytext); return TYPE; }
29	void { return VOID; }	27	void { return VOID; }
30	const { return CONST; }	28	const { return CONST; }
31	if { return IF;}	29	if { return IF; }
32	else { return ELSE;}	30	else { return ELSE; }
33	while { return WHILE; }	31	while { return WHILE; }
34	return { return RETURN; }	32	return { return RETURN; }
35	[a-zA-Z_][a-zA-Z0-9_]* { strcpy(yylval.ident, yytext); return IDENT; }	33	print { return PRINT; }
36	[0-9]+ { sscanf(yytext, "%d", &(yylval.num)); return NUM; }	34	readc { return READC; }
37	'\\?.' { if (strlen(yytext)==3)	35	reade { return READE; }
38	yylval.caractere=yytext[1];	36	[a-zA-Z_][a-zA-Z0-9_]* { return IDENT; }
39	else switch(yytext[2]) {	37	[0-9]+ { return NUM; }
40	case 'n': yylval.caractere='\n'; break;	38	'\\?.' { return CARACTERE; }
41	case 't': yylval.caractere='\t'; break;	39	. { return yytext[0]; }
42	case '\'': yylval.caractere='\''; break;	40	<COMMENT>"*/" { BEGIN INITIAL; }
43	}	41	<COMMENT>\n { lineno++; }
44	return CARACTERE; }
45	. { return yytext[0];}
46	<COMMENT>"*/" { BEGIN INITIAL;}
47	<COMMENT>\n { lineno++;}
48	<COMMENT>. ;	42	<COMMENT>. ;
49	%%	43	%%
50		44