Make the lexer more reentrant, and piss off yyerror.

3 files changed, 90 insertions, 94 deletions

diff --git a/LuaSL/src/LuaSL_LSL_tree.c b/LuaSL/src/LuaSL_LSL_tree.c
index 2b4d882..65ccbc8 100644
--- a/LuaSL/src/LuaSL_LSL_tree.c
+++ b/LuaSL/src/LuaSL_LSL_tree.c
@@ -411,6 +411,7 @@ int main(int argc, char **argv)
         char buffer[PATH_MAX];
         char fileName[PATH_MAX];
         LuaSL_yyparseParam param;
+        LuaSL_yyparseExtra extra;
         int file;
         int count;
         boolean badArgs = FALSE;
@@ -499,7 +500,8 @@ int main(int argc, char **argv)
 
         param.ast = NULL;
         param.lval = calloc(1, sizeof(LSL_Leaf));
-        if (yylex_init(&(param.scanner)))
+        memset(&extra, 0, sizeof(extra));
+        if (yylex_init_extra(&extra, &(param.scanner)))
             return 1;
 
 #ifdef LUASL_DEBUG
@@ -561,8 +563,8 @@ int main(int argc, char **argv)
                     sprintf(buffer, "diff %s %s", fileName, outName);
                     count = system(buffer);
                     printf("Return value of %s is %d\n", buffer, count);
-                    if (0 != count}
-                        printf(stderr, "%s says they are different!\n", buffer);
+                    if (0 != count)
+                        fprintf(stderr, "%s says they are different!\n", buffer);
                     
                 }
                 else
diff --git a/LuaSL/src/LuaSL_LSL_tree.h b/LuaSL/src/LuaSL_LSL_tree.h
index bb29399..533237a 100644
--- a/LuaSL/src/LuaSL_LSL_tree.h
+++ b/LuaSL/src/LuaSL_LSL_tree.h
@@ -168,6 +168,13 @@ struct _LSL_Script
     LSL_Identifier      *variables;
 };
 
+typedef struct
+{
+    char *ignorableText;
+    int column;
+    int line;
+} LuaSL_yyparseExtra;
+
 
 // define the type for flex and lemon3
 #define YYSTYPE LSL_Leaf
@@ -177,7 +184,6 @@ struct _LSL_Script
     #include "LuaSL_lexer.h"
 #endif
 
-
 typedef struct
 {
         yyscan_t scanner;
@@ -200,8 +206,6 @@ LSL_Leaf *addOperation(LSL_Leaf *left, LSL_Leaf *lval, LSL_Leaf *right);
 LSL_Leaf *addParenthesis(LSL_Leaf *lval, LSL_Leaf *expr, LSL_Leaf *rval);
 LSL_Leaf *addStatement(LSL_Leaf *lval, LSL_Type type, LSL_Leaf *expr);
 
-int yyerror(const char *msg);
-
 void *ParseAlloc(void *(*mallocProc)(size_t));
 void ParseTrace(FILE *TraceFILE, char *zTracePrompt);
 void Parse(void *yyp, int yymajor, LSL_Leaf *yyminor, LuaSL_yyparseParam *param);
diff --git a/LuaSL/src/LuaSL_lexer.l b/LuaSL/src/LuaSL_lexer.l
index 50f2624..b4a1444 100644
--- a/LuaSL/src/LuaSL_lexer.l
+++ b/LuaSL/src/LuaSL_lexer.l
@@ -4,7 +4,7 @@
 #include "LuaSL_LSL_tree.h"
 #include <stdio.h>
 
-int common(YYSTYPE *lval, char *text, boolean checkIgnorable, int type);
+int common(YYSTYPE *lval, char *text, LuaSL_yyparseExtra *extra, boolean checkIgnorable, int type);
 
 %}
 
@@ -13,6 +13,7 @@ int common(YYSTYPE *lval, char *text, boolean checkIgnorable, int type);
 %option noreject noyymore
 %option backup debug perf-report perf-report verbose warn
 %option align full
+%option extra-type="LuaSL_yyparseExtra *"
 
 HEX         [[:xdigit:]]
 INTEGER     [[:digit:]]+
@@ -27,138 +28,127 @@ IDENTIFIER  [[:alpha:]](_|[[:alpha:]]|[[:digit:]])*
  /* The order here is important, in mysterious ways. The more specific the lower in case of ambiguities like "floats contain integers". I think, not tested that well yet. */
 
  /* Ignorables. */
-[[:space:]]+    %{ common(yylval, yytext, FALSE, LSL_SPACE); %}
+[[:space:]]+    %{ common(yylval, yytext, yyextra, FALSE, LSL_SPACE); %}
  /* Yes I know this will have problems with huge comments, just being simple to get it to work for now. */
-"/*"([^"*/"]*)"*/"   %{ common(yylval, yytext, FALSE, LSL_COMMENT); %}
-"//"[^\n]*      %{ common(yylval, yytext, FALSE, LSL_COMMENT_LINE); %}
+"/*"([^"*/"]*)"*/"   %{ common(yylval, yytext, yyextra, FALSE, LSL_COMMENT); %}
+"//"[^\n]*      %{ common(yylval, yytext, yyextra, FALSE, LSL_COMMENT_LINE); %}
 
  /* Operations. */
-"&&"            { return common(yylval, yytext, TRUE, LSL_BOOL_AND); }
-"||"            { return common(yylval, yytext, TRUE, LSL_BOOL_OR); }
-"|"             { return common(yylval, yytext, TRUE, LSL_BIT_OR); }
-"^"             { return common(yylval, yytext, TRUE, LSL_BIT_XOR); }
-"&"             { return common(yylval, yytext, TRUE, LSL_BIT_AND); }
-"!="            { return common(yylval, yytext, TRUE, LSL_NOT_EQUAL); }
-"=="            { return common(yylval, yytext, TRUE, LSL_EQUAL); }
-">="            { return common(yylval, yytext, TRUE, LSL_GREATER_EQUAL); }
-"<="            { return common(yylval, yytext, TRUE, LSL_LESS_EQUAL); }
-">"             { return common(yylval, yytext, TRUE, LSL_GREATER_THAN); }
-"<"             { return common(yylval, yytext, TRUE, LSL_LESS_THAN); }
-">>"            { return common(yylval, yytext, TRUE, LSL_RIGHT_SHIFT); }
-"<<"            { return common(yylval, yytext, TRUE, LSL_LEFT_SHIFT); }
-"+"             { return common(yylval, yytext, TRUE, LSL_ADD); }
-"-"             { return common(yylval, yytext, TRUE, LSL_SUBTRACT); }
-"*"             { return common(yylval, yytext, TRUE, LSL_MULTIPLY); }
-"%"             { return common(yylval, yytext, TRUE, LSL_MODULO); }
-"/"             { return common(yylval, yytext, TRUE, LSL_DIVIDE); }
-"!"             { return common(yylval, yytext, TRUE, LSL_BOOL_NOT); }
-"~"             { return common(yylval, yytext, TRUE, LSL_BIT_NOT); }
-"["             { return common(yylval, yytext, TRUE, LSL_BRACKET_OPEN); }
-"]"             { return common(yylval, yytext, TRUE, LSL_BRACKET_CLOSE); }
-"("             { return common(yylval, yytext, TRUE, LSL_PARENTHESIS_OPEN); }
-")"             { return common(yylval, yytext, TRUE, LSL_PARENTHESIS_CLOSE); }
-"+="            { return common(yylval, yytext, TRUE, LSL_ASSIGNMENT_ADD); }
-"-="            { return common(yylval, yytext, TRUE, LSL_ASSIGNMENT_SUBTRACT); }
-"*="            { return common(yylval, yytext, TRUE, LSL_ASSIGNMENT_MULTIPLY); }
-"%="            { return common(yylval, yytext, TRUE, LSL_ASSIGNMENT_MODULO); }
-"/="            { return common(yylval, yytext, TRUE, LSL_ASSIGNMENT_DIVIDE); }
-"="             { return common(yylval, yytext, TRUE, LSL_ASSIGNMENT_PLAIN); }
-"."             { return common(yylval, yytext, TRUE, LSL_DOT); }
-"--"            { return common(yylval, yytext, TRUE, LSL_DECREMENT_PRE); }
-"++"            { return common(yylval, yytext, TRUE, LSL_INCREMENT_PRE); }
-","             { return common(yylval, yytext, TRUE, LSL_COMMA); }
+"&&"            { return common(yylval, yytext, yyextra, TRUE, LSL_BOOL_AND); }
+"||"            { return common(yylval, yytext, yyextra, TRUE, LSL_BOOL_OR); }
+"|"             { return common(yylval, yytext, yyextra, TRUE, LSL_BIT_OR); }
+"^"             { return common(yylval, yytext, yyextra, TRUE, LSL_BIT_XOR); }
+"&"             { return common(yylval, yytext, yyextra, TRUE, LSL_BIT_AND); }
+"!="            { return common(yylval, yytext, yyextra, TRUE, LSL_NOT_EQUAL); }
+"=="            { return common(yylval, yytext, yyextra, TRUE, LSL_EQUAL); }
+">="            { return common(yylval, yytext, yyextra, TRUE, LSL_GREATER_EQUAL); }
+"<="            { return common(yylval, yytext, yyextra, TRUE, LSL_LESS_EQUAL); }
+">"             { return common(yylval, yytext, yyextra, TRUE, LSL_GREATER_THAN); }
+"<"             { return common(yylval, yytext, yyextra, TRUE, LSL_LESS_THAN); }
+">>"            { return common(yylval, yytext, yyextra, TRUE, LSL_RIGHT_SHIFT); }
+"<<"            { return common(yylval, yytext, yyextra, TRUE, LSL_LEFT_SHIFT); }
+"+"             { return common(yylval, yytext, yyextra, TRUE, LSL_ADD); }
+"-"             { return common(yylval, yytext, yyextra, TRUE, LSL_SUBTRACT); }
+"*"             { return common(yylval, yytext, yyextra, TRUE, LSL_MULTIPLY); }
+"%"             { return common(yylval, yytext, yyextra, TRUE, LSL_MODULO); }
+"/"             { return common(yylval, yytext, yyextra, TRUE, LSL_DIVIDE); }
+"!"             { return common(yylval, yytext, yyextra, TRUE, LSL_BOOL_NOT); }
+"~"             { return common(yylval, yytext, yyextra, TRUE, LSL_BIT_NOT); }
+"["             { return common(yylval, yytext, yyextra, TRUE, LSL_BRACKET_OPEN); }
+"]"             { return common(yylval, yytext, yyextra, TRUE, LSL_BRACKET_CLOSE); }
+"("             { return common(yylval, yytext, yyextra, TRUE, LSL_PARENTHESIS_OPEN); }
+")"             { return common(yylval, yytext, yyextra, TRUE, LSL_PARENTHESIS_CLOSE); }
+"+="            { return common(yylval, yytext, yyextra, TRUE, LSL_ASSIGNMENT_ADD); }
+"-="            { return common(yylval, yytext, yyextra, TRUE, LSL_ASSIGNMENT_SUBTRACT); }
+"*="            { return common(yylval, yytext, yyextra, TRUE, LSL_ASSIGNMENT_MULTIPLY); }
+"%="            { return common(yylval, yytext, yyextra, TRUE, LSL_ASSIGNMENT_MODULO); }
+"/="            { return common(yylval, yytext, yyextra, TRUE, LSL_ASSIGNMENT_DIVIDE); }
+"="             { return common(yylval, yytext, yyextra, TRUE, LSL_ASSIGNMENT_PLAIN); }
+"."             { return common(yylval, yytext, yyextra, TRUE, LSL_DOT); }
+"--"            { return common(yylval, yytext, yyextra, TRUE, LSL_DECREMENT_PRE); }
+"++"            { return common(yylval, yytext, yyextra, TRUE, LSL_INCREMENT_PRE); }
+","             { return common(yylval, yytext, yyextra, TRUE, LSL_COMMA); }
 
  /* Types. */
-{INTEGER}       %{ yylval->value.integerValue = atoi(yytext); return common(yylval, yytext, TRUE, LSL_INTEGER); %}
-{FLOAT}         %{ yylval->value.floatValue = atof(yytext); return common(yylval, yytext, TRUE, LSL_FLOAT); %}
+{INTEGER}       %{ yylval->value.integerValue = atoi(yytext); return common(yylval, yytext, yyextra, TRUE, LSL_INTEGER); %}
+{FLOAT}         %{ yylval->value.floatValue = atof(yytext); return common(yylval, yytext, yyextra, TRUE, LSL_FLOAT); %}
 
  /* Type keywords. */
-"float"         %{ return common(yylval, yytext, TRUE, LSL_TYPE_FLOAT); %}
-"integer"       %{ return common(yylval, yytext, TRUE, LSL_TYPE_INTEGER); %}
-"key"           %{ return common(yylval, yytext, TRUE, LSL_TYPE_KEY); %}
-"list"          %{ return common(yylval, yytext, TRUE, LSL_TYPE_LIST); %}
-"quaternion"    %{ return common(yylval, yytext, TRUE, LSL_TYPE_ROTATION); %}
-"rotation"      %{ return common(yylval, yytext, TRUE, LSL_TYPE_ROTATION); %}
-"string"        %{ return common(yylval, yytext, TRUE, LSL_TYPE_STRING); %}
-"vector"        %{ return common(yylval, yytext, TRUE, LSL_TYPE_VECTOR); %}
+"float"         %{ return common(yylval, yytext, yyextra, TRUE, LSL_TYPE_FLOAT); %}
+"integer"       %{ return common(yylval, yytext, yyextra, TRUE, LSL_TYPE_INTEGER); %}
+"key"           %{ return common(yylval, yytext, yyextra, TRUE, LSL_TYPE_KEY); %}
+"list"          %{ return common(yylval, yytext, yyextra, TRUE, LSL_TYPE_LIST); %}
+"quaternion"    %{ return common(yylval, yytext, yyextra, TRUE, LSL_TYPE_ROTATION); %}
+"rotation"      %{ return common(yylval, yytext, yyextra, TRUE, LSL_TYPE_ROTATION); %}
+"string"        %{ return common(yylval, yytext, yyextra, TRUE, LSL_TYPE_STRING); %}
+"vector"        %{ return common(yylval, yytext, yyextra, TRUE, LSL_TYPE_VECTOR); %}
 
  /* Statement keywords. */
-"do"            %{ return common(yylval, yytext, TRUE, LSL_DO); %}
-"for"           %{ return common(yylval, yytext, TRUE, LSL_FOR); %}
-"else"          %{ return common(yylval, yytext, TRUE, LSL_ELSE); %}
-"if"            %{ return common(yylval, yytext, TRUE, LSL_IF); %}
-"jump"          %{ return common(yylval, yytext, TRUE, LSL_JUMP); %}
-"return"        %{ return common(yylval, yytext, TRUE, LSL_RETURN); %}
-"state"         %{ return common(yylval, yytext, TRUE, LSL_STATE_CHANGE); %}
-"while"         %{ return common(yylval, yytext, TRUE, LSL_WHILE); %}
+"do"            %{ return common(yylval, yytext, yyextra, TRUE, LSL_DO); %}
+"for"           %{ return common(yylval, yytext, yyextra, TRUE, LSL_FOR); %}
+"else"          %{ return common(yylval, yytext, yyextra, TRUE, LSL_ELSE); %}
+"if"            %{ return common(yylval, yytext, yyextra, TRUE, LSL_IF); %}
+"jump"          %{ return common(yylval, yytext, yyextra, TRUE, LSL_JUMP); %}
+"return"        %{ return common(yylval, yytext, yyextra, TRUE, LSL_RETURN); %}
+"state"         %{ return common(yylval, yytext, yyextra, TRUE, LSL_STATE_CHANGE); %}
+"while"         %{ return common(yylval, yytext, yyextra, TRUE, LSL_WHILE); %}
 
-{IDENTIFIER}    %{ /* yylval->value.identifierValue = strdup(yytext); */ common(yylval, yytext, TRUE, LSL_IDENTIFIER); %}
+{IDENTIFIER}    %{ /* yylval->value.identifierValue = strdup(yytext); */ common(yylval, yytext, yyextra, TRUE, LSL_IDENTIFIER); %}
 
  /* Other symbols. */
-"@"             %{ return common(yylval, yytext, TRUE, LSL_LABEL); %}
-"{"             %{ return common(yylval, yytext, TRUE, LSL_BLOCK_OPEN); %}
-"}"             %{ return common(yylval, yytext, TRUE, LSL_BLOCK_CLOSE); %}
-";"             %{ return common(yylval, yytext, TRUE, LSL_STATEMENT); %}
+"@"             %{ return common(yylval, yytext, yyextra, TRUE, LSL_LABEL); %}
+"{"             %{ return common(yylval, yytext, yyextra, TRUE, LSL_BLOCK_OPEN); %}
+"}"             %{ return common(yylval, yytext, yyextra, TRUE, LSL_BLOCK_CLOSE); %}
+";"             %{ return common(yylval, yytext, yyextra, TRUE, LSL_STATEMENT); %}
 
-<<EOF>>         { return common(yylval, yytext, TRUE, LSL_SCRIPT); }
+<<EOF>>         { return common(yylval, yytext, yyextra, TRUE, LSL_SCRIPT); }
 
  /* Everything else */
-.               %{ printf(" unexpected character.\n"); yylval->value.unknownValue = strdup(yytext); common(yylval, yytext, TRUE, LSL_UNKNOWN); %}
+.               %{ printf(" unexpected character.\n"); yylval->value.unknownValue = strdup(yytext); common(yylval, yytext, yyextra, TRUE, LSL_UNKNOWN); %}
 
 %%
 
-// TODO - this is not reentrant, should make it so.
-static char *ignorableText = NULL;
-static int column = 0;
-static int line = 0;
-
-int common(YYSTYPE *lval, char *text, boolean checkIgnorable, int type)
+int common(YYSTYPE *lval, char *text, LuaSL_yyparseExtra *extra, boolean checkIgnorable, int type)
 {
     int i;
 
     for (i = 0; text[i] != '\0'; i++)
         if (text[i] == '\n')
         {
-            column = 0;
-            line++;
+            extra->column = 0;
+            extra->line++;
         }
         else if (text[i] == '\t')
-            column += 8 - (column % 8);
+            extra->column += 8 - (extra->column % 8);
         else
-            column++;
+            extra->column++;
 
     lval->token = tokens[type - lowestToken];
-    lval->line = line;
-    lval->column = column;
+    lval->line = extra->line;
+    lval->column = extra->column;
 
     if (checkIgnorable)
     {
-        lval->ignorableText = ignorableText;
-        ignorableText = NULL;
+        lval->ignorableText = extra->ignorableText;
+        extra->ignorableText = NULL;
     }
     else
     {
-        if (ignorableText)
+        if (extra->ignorableText)
         {
-            int lenI = strlen(ignorableText);
+            int lenI = strlen(extra->ignorableText);
             int lenT = strlen(text);
 
-            ignorableText = realloc(ignorableText, lenI + lenT + 1);
-            sprintf(&ignorableText[lenI], "%s", text);
+            extra->ignorableText = realloc(extra->ignorableText, lenI + lenT + 1);
+            sprintf(&(extra->ignorableText[lenI]), "%s", text);
         }
         else
-            ignorableText = strdup(text);
+            extra->ignorableText = strdup(text);
     }
 
     return type;
 }
 
-int yyerror(const char *msg)
-{
-    fprintf(stderr, "Parser error on line %d, column %d: %s\n", line, column, msg);
-    return 0;
-}
-
 int yywrap(yyscan_t yyscanner)
 {
 #ifdef FLEX_SCANNER