Revert to use of javacc-6.1.3 due to regression

1 files changed, 13 insertions, 13 deletions

diff --git a/vhdlparser/TokenMgrError.cc b/vhdlparser/TokenMgrError.cc
index 3560805..d6c43ee 100644
--- a/vhdlparser/TokenMgrError.cc
+++ b/vhdlparser/TokenMgrError.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "TokenMgrError.h"
 
@@ -14,17 +14,17 @@ namespace parser {
    *    errorLine   : line number when the error occurred
    *    errorColumn : column number when the error occurred
    *    errorAfter  : prefix that was seen before this error occurred
-   *    curJJChar     : the offending character
+   *    curJAVACC_CHAR_TYPE     : the offending character
    * Note: You can customize the lexical error message by modifying this method.
    */
-    JJString TokenMgrError::LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar) {
+    JAVACC_STRING_TYPE TokenMgrError::LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar) {
 #if 0
-    JJString s;
-    stringstream<JJString> ss;
+    JAVACC_STRING_TYPE s;
+    stringstream<JAVACC_STRING_TYPE> ss;
     ss << "Lexical error at line " << errorLine << " column " << errorColumn
        << ".  Encountered: " << curChar << "(" << (int)curChar
        << ") after : \"" << errorAfter.c_str() << "\"";
-    return (JJString)ss.rdbuf()->str();
+    return (JAVACC_STRING_TYPE)ss.rdbuf()->str();
 #endif
     return EMPTY;
   }
@@ -38,7 +38,7 @@ namespace parser {
    *
    * from this method for such cases in the release version of your parser.
    */
-  JJString TokenMgrError::getMessage() {
+  JAVACC_STRING_TYPE TokenMgrError::getMessage() {
     return message;
   }
 
@@ -51,12 +51,12 @@ namespace parser {
   }
 
   /** Constructor with message and reason. */
-  TokenMgrError::TokenMgrError(const JJString& message, int reason) {
+  TokenMgrError::TokenMgrError(JAVACC_STRING_TYPE message, int reason) {
     errorCode = reason;
   }
 
   /** Full Constructor. */
-  TokenMgrError::TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar, int reason) {
+  TokenMgrError::TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) {
     message = LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar);
    errorCode = reason;
   }
@@ -73,10 +73,10 @@ char hexChar(int i) {
  * Replaces unprintable characters by their escaped (or unicode escaped)
  * equivalents in the given string
  */
-JJSimpleString addUnicodeEscapes(const JJString& str) {
-  JJSimpleString retval;
+JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) {
+  JAVACC_SIMPLE_STRING retval;
   for (size_t i = 0; i < str.size(); i++) {
-    JJChar ch = str[i];
+    JAVACC_CHAR_TYPE ch = str[i];
     switch (ch)
     {
       case '\b':
@@ -115,4 +115,4 @@ JJSimpleString addUnicodeEscapes(const JJString& str) {
 
 }
 }
-/* JavaCC - OriginalChecksum=ed66d80b94c73435ce2644e44f7b4d49 (do not edit this line) */
+/* JavaCC - OriginalChecksum=c94a22f5e55a710d715f7e0d07db2460 (do not edit this line) */