Updating tokens and parser

Author: devfernandoa

analysis/parser.y

@@ -4,6 +4,9 @@
 
 void yyerror(const char* s);
 int yylex(void);
+
+extern int yylex(void);
+extern FILE *yyin;
 %}
 
 %union {
@@ -27,7 +30,6 @@ int yylex(void);
 %token OR AND NOT
 %token ERROR
 
-// Precedence declarations (lowest to highest)
 %nonassoc OR
 %nonassoc AND
 %left EQ NEQ
@@ -216,8 +218,4 @@ type:
   | VOID_TYPE      { $$ = $1; }
   ;
 
-%%
-
-void yyerror(const char* s) {
-    fprintf(stderr, "Error: %s\n", s);
-}
+%%

analysis/tokens.l

@@ -5,6 +5,14 @@
 %}
 
 %%
+
+"=="        { return EQ; }
+"!="        { return NEQ; }
+">="        { return GTE; }
+"<="        { return LTE; }
+">"         { return GT; }
+"<"         { return LT; }
+
 "let"       { return LET; }
 "function"  { return FUNCTION; }
 "if"        { return IF; }
@@ -24,41 +32,43 @@
 "true"      { yylval.boolean = 1; return BOOL; }
 "false"     { yylval.boolean = 0; return BOOL; }
 
-"=="        { return EQ; }
-"!="        { return NEQ; }
-">="        { return GTE; }
-"<="        { return LTE; }
-">"         { return GT; }
-"<"         { return LT; }
-
-"="     { return ASSIGN; }
-"+"     { return PLUS; }
-"-"     { return MINUS; }
-"*"     { return MUL; }
-"/"     { return DIV; }
-"%"     { return MOD; }
+"="         { return ASSIGN; }
+"+"         { return PLUS; }
+"-"         { return MINUS; }
+"*"         { return MUL; }
+"/"         { return DIV; }
+"%"         { return MOD; }
 
-"("     { return LPAREN; }
-")"     { return RPAREN; }
-"{"     { return LBRACE; }
-"}"     { return RBRACE; }
-";"     { return SEMI; }
-":"     { return COLON; }
-","     { return COMMA; }
-".."    { return DOTDOT; }
+"("         { return LPAREN; }
+")"         { return RPAREN; }
+"{"         { return LBRACE; }
+"}"         { return RBRACE; }
+";"         { return SEMI; }
+":"         { return COLON; }
+","         { return COMMA; }
+".."        { return DOTDOT; }
 
-"!("([^)\n]*)")" {
-    yytext[yyleng - 1] = '\0';           // remove final ')'
-    yylval.str = strdup(yytext + 2);     // skip '!("'
-    return BANG_EXPR;
+"!("[^)]*")" { 
+    yylval.str = strdup(yytext+2); 
+    yylval.str[strlen(yylval.str)-1] = '\0'; 
+    return BANG_EXPR; 
 }
 
-"!"[^\n;]*    { yylval.str = strdup(yytext + 1); return BANG_LINE; }
+"!"[^ \t\n\r=;]+ { 
+    yylval.str = strdup(yytext+1); 
+    return BANG_LINE; 
+}
 
 [a-zA-Z_][a-zA-Z0-9_]* { yylval.str = strdup(yytext); return IDENTIFIER; }
 [0-9]+                { yylval.integer = atoi(yytext); return INT; }
 \"([^\"\n]*)\"        { yylval.str = strdup(yytext); return STRING; }
 
-[ \t\r\n]+  ;  // Skip whitespace
+[ \t\r\n]+  ;  /* Skip whitespace */
+
 .           { return ERROR; }
+
 %%
+
+int yywrap() {
+    return 1;
+}