Revert to use of javacc-6.1.3 due to regression

1 files changed, 9 insertions, 12 deletions

diff --git a/vhdlparser/Token.h b/vhdlparser/Token.h
index 3575005..a1ac519 100644
--- a/vhdlparser/Token.h
+++ b/vhdlparser/Token.h
@@ -1,8 +1,7 @@
-/* Generated By:JavaCC: Do not edit this line. Token.h Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. Token.h Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
-#ifndef JAVACC_TOKEN_H
-#define JAVACC_TOKEN_H
-
+#ifndef TOKEN_H
+#define TOKEN_H
 #include "JavaCC.h"
 
 
@@ -36,7 +35,7 @@ class Token
   /**
    * The string image of the token.
    */
-  JJString image;
+  JAVACC_STRING_TYPE image;
 
   /**
    * A reference to the next regular (non-special) token from the input
@@ -85,15 +84,14 @@ class Token
   /**
    * Constructs a new token for the specified Image and Kind.
    */
-  Token(int kind, const JJString& image);
-
-  virtual ~Token();
+  Token(int kind, JAVACC_STRING_TYPE image);
 
   /**
    * Returns the image.
    */
-  const JJString& toString();
+  JAVACC_STRING_TYPE toString();
 
+  public: virtual ~Token();
 
   /**
    * Returns a new Token void *, by default. However, if you want, you
@@ -107,13 +105,12 @@ class Token
    * to the following switch statement. Then you can cast matchedToken
    * variable to the appropriate type and use sit in your lexical actions.
    */
-  static Token *newToken(int ofKind, const JJString& image);
+  static Token *newToken(int ofKind, JAVACC_STRING_TYPE image);
 
   static Token *newToken(int ofKind);
 };
 
 }
 }
-
 #endif
-/* JavaCC - OriginalChecksum=8c237423e3d9695c3bfcf539bcf92375 (do not edit this line) */
+/* JavaCC - OriginalChecksum=d80e40280c93973eed89266ba3cfbdca (do not edit this line) */