Revert to use of javacc-6.1.3 due to regression

1 files changed, 15 insertions, 18 deletions

diff --git a/vhdlparser/TokenMgrError.h b/vhdlparser/TokenMgrError.h
index 90c7530..32905ec 100644
--- a/vhdlparser/TokenMgrError.h
+++ b/vhdlparser/TokenMgrError.h
@@ -1,15 +1,14 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef JAVACC_TOKENMGRERROR_H
-#define JAVACC_TOKENMGRERROR_H
-
+#ifndef _TOKENMGRERROR_H
+#define _TOKENMGRERROR_H
 #include "JavaCC.h"
 
 
 namespace vhdl {
 namespace parser {
 
-enum LexerErrors {
+ enum LexerErrors {
   /**
    * Lexical error occurred.
    */
@@ -29,10 +28,11 @@ enum LexerErrors {
    * Detected (and bailed out of) an infinite loop in the token manager.
    */
   LOOP_DETECTED = 3,
-};
+  };
 
-class TokenMgrError {
-public:
+class TokenMgrError
+{
+  public:
   /*
    * Ordinals for various reasons why an Error of this type can be thrown.
    */
@@ -55,10 +55,9 @@ public:
    *    curchar     : the offending character
    * Note: You can customize the lexical error message by modifying this method.
    */
-    JJString LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar);
+    JAVACC_STRING_TYPE LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar);
 
-private:
-   JJString message;
+  private: JAVACC_STRING_TYPE message;
 
   /**
    * You can also modify the body of this method to customize your error messages.
@@ -69,25 +68,23 @@ private:
    *
    * from this method for such cases in the release version of your parser.
    */
-public:
-  JJString getMessage() ;
+  JAVACC_STRING_TYPE getMessage() ;
 
   /*
    * Constructors of various flavors follow.
    */
 
   /** No arg constructor. */
-  TokenMgrError() ;
+  public: TokenMgrError() ;
 
   /** Constructor with message and reason. */
-  TokenMgrError(const JJString& message, int reason) ;
+  public: TokenMgrError(JAVACC_STRING_TYPE message, int reason) ;
 
   /** Full Constructor. */
-  TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar, int reason) ;
+  public: TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) ;
 };
 
 }
 }
-
 #endif
-/* JavaCC - OriginalChecksum=4ab4cdcdef6a3feec22fd9c00ba86e07 (do not edit this line) */
+/* JavaCC - OriginalChecksum=a97a71ddb969ae96c94e5d370217e1a8 (do not edit this line) */