Added a check for new Spin2 keywords in syntax errors

Author: totalspectrum

Changelog.txt

@@ -1,5 +1,6 @@
 Version 7.6.0
 - Added new Spin2_v52 keywords
+- Added a warning for  missing {Spin2_vXX} comment (very incomplete)
 - Fixed spin2 \ interaction with ABORT
 - Fixed initialization of packed structures
 - Fixed some incorrect file names in zip files

frontends/lexer.c

@@ -56,6 +56,7 @@ struct preprocess gl_pp;
 
 // used for error messages
 AST *last_ast;
+AST *prev_last_ast;
 
 // accumulated comments
 static AST *comment_chain;
@@ -1030,6 +1031,7 @@ parseSpinIdentifier(LexStream *L, AST **ast_ptr, const char *prefix)
             if (sym->kind == SYM_TYPEDEF) {
                 ast = (AST *)sym->v.ptr;
                 *ast_ptr = ast;
+                prev_last_ast = last_ast;
                 last_ast = AstIdentifier(idstr);
                 return SP_TYPENAME;
             }
@@ -1044,6 +1046,7 @@ parseSpinIdentifier(LexStream *L, AST **ast_ptr, const char *prefix)
                         open_obj = NULL;
                         if (typ->kind == AST_TYPEDEF) {
                             *ast_ptr = typ;
+                            prev_last_ast = last_ast;
                             last_ast = AstIdentifier(idstr);
                             return SP_TYPENAME;
                         }
@@ -1082,6 +1085,22 @@ parseSpinIdentifier(LexStream *L, AST **ast_ptr, const char *prefix)
     return SP_IDENTIFIER;
 }
 
+/* helper function for syntax errors; see if a string might be
+   a reserved keyword in some version of Spin2
+*/
+bool Spin2NewKeyword(LexStream *L, const char *idstr) {
+    Symbol *sym;
+
+    if (L->language != LANG_SPIN_SPIN2)
+        return false;
+    sym = FindSymbol(&spin2SoftReservedWords, idstr);
+    if (!sym) {
+        return false;
+    }
+    /* could do a more sophisticated check here... */
+    return true;
+}
+
 /* parse the rest of the line as a string */
 static void
 parseLineAsString(LexStream *L, AST **ast_ptr)
@@ -2012,6 +2031,7 @@ getSpinToken(LexStream *L, AST **ast_ptr)
         case BACKTICK_STATE_ESCAPE_PREFIX:
             lexungetc(L, c);
             L->backtick_state = BACKTICK_STATE_PREFIX_COMMA_DONE;
+            prev_last_ast = last_ast;
             *ast_ptr = last_ast = NULL;
             return ',';
         case BACKTICK_STATE_PREFIX_COMMA_DONE:
@@ -2020,6 +2040,7 @@ getSpinToken(LexStream *L, AST **ast_ptr)
             parseBacktickInBacktick(L, &ast);
             c = SP_IDENTIFIER;
             L->backtick_state = BACKTICK_STATE_ESCAPE_PARAMS;
+            prev_last_ast = last_ast;
             *ast_ptr = last_ast = ast;
             return c;
         case BACKTICK_STATE_ESCAPE_PARAMS:
@@ -2030,28 +2051,33 @@ getSpinToken(LexStream *L, AST **ast_ptr)
             if (c == ')') {
                 // done with the backtick escape
                 L->backtick_state = BACKTICK_STATE_INSERT_COMMA;
+                prev_last_ast = last_ast;
                 *ast_ptr = last_ast = NULL;
                 return c;
             }
             break;
         case BACKTICK_STATE_INSERT_COMMA:
             if (c == ')') {
                 L->backtick_state = BACKTICK_STATE_NONE;
+                prev_last_ast = last_ast;
                 *ast_ptr = last_ast = NULL;
                 return c;
             }
             lexungetc(L, c);
+            prev_last_ast = last_ast;
             *ast_ptr = last_ast = NULL;
             L->backtick_state = BACKTICK_STATE_STRING;
             return ',';
         case BACKTICK_STATE_STRING:
             if (c == ')') {
                 L->backtick_state = BACKTICK_STATE_NONE;
+                prev_last_ast = last_ast;
                 *ast_ptr = last_ast = NULL;
                 return c;
             }
             lexungetc(L, c);
             c = parseBacktickString(L, &ast, 0);
+            prev_last_ast = last_ast;
             *ast_ptr = last_ast = ast;
             return c;
         case BACKTICK_STATE_NONE:
@@ -2072,6 +2098,7 @@ getSpinToken(LexStream *L, AST **ast_ptr)
 
 //    printf("L->linecounter=%d\n", L->lineCounter);
     if (c >= 127) {
+        prev_last_ast = last_ast;
         *ast_ptr = last_ast = ast;
         return c;
     } else if (safe_isdigit(c) || (c == '.' && safe_isdigit(lexpeekc(L)))) {
@@ -2256,6 +2283,7 @@ getSpinToken(LexStream *L, AST **ast_ptr)
     } else if (c == ')') {
         PopExprState(L);
     }
+    prev_last_ast = last_ast;
     *ast_ptr = last_ast = ast;
 
     if (c != SP_TYPENAME && c != SP_IDENTIFIER && c != '.')
@@ -5260,3 +5288,4 @@ cgramyylex(CGRAMYYSTYPE *yval)
         return 0;
     return c;
 }
+

frontends/spin/spin.y

@@ -23,8 +23,9 @@
 
     extern int gl_errors;
 
-    extern AST *last_ast;
-    
+    extern AST *last_ast, *prev_last_ast;
+    extern bool Spin2NewKeyword(LexStream *L, const char *ident);
+
 AST *
 SpinRetType(AST *funcdef)
 {
@@ -2998,6 +2999,7 @@ spinyyerror(const char *msg)
 {
     extern int saved_spinyychar;
     int yychar = saved_spinyychar;
+    const char *new_keyword = NULL;
 
     SETCOLOR(PRINT_ERROR);
     ERRORHEADER(current->Lptr->fileName, current->Lptr->lineCounter, "error");
@@ -3012,6 +3014,9 @@ spinyyerror(const char *msg)
         if (!strncmp(msg, "unexpected identifier", strlen("unexpected identifier")) && last_ast && last_ast->kind == AST_IDENTIFIER) {
             fprintf(stderr, "unexpected identifier `%s'", last_ast->d.string);
             msg += strlen("unexpected identifier");
+            if (Spin2NewKeyword(current->Lptr, last_ast->d.string)) {
+                new_keyword = last_ast->d.string;
+            }
         }
         // if we get a stray character in source, sometimes bison tries to treat it as a token for
         // error purposes, resulting in $undefined as the token
@@ -3028,7 +3033,18 @@ spinyyerror(const char *msg)
             msg++;
         }
     }
-    fprintf(stderr, "\n");     
+    fprintf(stderr, "\n");
     gl_errors++;
     RESETCOLOR();
+    if (!new_keyword && prev_last_ast && prev_last_ast->kind == AST_IDENTIFIER) {
+        if (Spin2NewKeyword(current->Lptr, prev_last_ast->d.string)) {
+            new_keyword = prev_last_ast->d.string;
+        }
+    }
+    if (new_keyword) {
+        SETCOLOR(PRINT_WARNING);
+        ERRORHEADER(current->Lptr->fileName, current->Lptr->lineCounter, "note");
+        fprintf(stderr, "`%s' is a keyword in some Spin2 versions; did you forget a {Spin2_vXX} comment?\n", new_keyword);
+        RESETCOLOR();
+    }
 }