Improve lexical error message

javacc · Jun 12, 2021 · 31ba95d · 31ba95d
1 parent 8c7c4c6
commit 31ba95d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/main/resources/templates/TokenMgrError.template b/src/main/resources/templates/TokenMgrError.template
@@ -91,7 +91,7 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public :}class ${LEGACY_EXCEPTION_HANDLING?Tok
    * token manager to indicate a lexical error.
    * Parameters :
    *    EOFSeen     : indicates if EOF caused the lexical error
-   *    curLexState : lexical state in which this error occurred
+   *    lexState    : lexical state in which this error occurred
    *    errorLine   : line number when the error occurred
    *    errorColumn : column number when the error occurred
    *    errorAfter  : prefix that was seen before this error occurred
@@ -100,11 +100,12 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public :}class ${LEGACY_EXCEPTION_HANDLING?Tok
    */
   protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {
     char curChar1 = (char)curChar;
-    return("Lexical error at line " +
-          errorLine + ", column " +
-          errorColumn + ".  Encountered: " +
-          (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar1)) + "\"") + " (" + curChar + "), ") +
-          "after : \"" + addEscapes(errorAfter) + "\"");
+    return("Lexical error at line " + //
+          errorLine + ", column " + //
+          errorColumn + ".  Encountered: " + //
+          (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + (int)curChar + "),")) + //
+          (errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
+          (lexState == 0 ? "" : " (in lexical state " + lexState + ")");
   }
 
   /**

diff --git a/src/main/resources/templates/cpp/TokenMgrError.cc.template b/src/main/resources/templates/cpp/TokenMgrError.cc.template
@@ -9,7 +9,7 @@ namespace ${NAMESPACE_OPEN}
    * token manager to indicate a lexical error.
    * Parameters :
    *    EOFSeen     : indicates if EOF caused the lexical error
-   *    curLexState : lexical state in which this error occurred
+   *    lexState    : lexical state in which this error occurred
    *    errorLine   : line number when the error occurred
    *    errorColumn : column number when the error occurred
    *    errorAfter  : prefix that was seen before this error occurred
@@ -21,8 +21,8 @@ namespace ${NAMESPACE_OPEN}
     JJString s;
     stringstream<JJString> ss;
     ss << "Lexical error at line " << errorLine << " column " << errorColumn
-       << ".  Encountered: " << curChar << "(" << (int)curChar
-       << ") after : \"" << errorAfter.c_str() << "\"";
+       << ".  Encountered: '" << curChar << "' (" << (int)curChar
+       << ") after : \"" << errorAfter.c_str() << "\" (in lexical state " << lexState << ")";
     return (JJString)ss.rdbuf()->str();
 \#endif
     return EMPTY;