Revert to use of javacc-6.1.3 due to regression

1 files changed, 15 insertions, 22 deletions

diff --git a/vhdlparser/Token.cc b/vhdlparser/Token.cc
index d47dc68..d6fdebd 100644
--- a/vhdlparser/Token.cc
+++ b/vhdlparser/Token.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. Token.cc Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. Token.cc Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
 #include "Token.h"
 
@@ -18,46 +18,42 @@ namespace parser {
    * override this method as appropriate.
    */
   void * Token::getValue() {
-    return nullptr;
+    return NULL;
   }
 
   /**
    * No-argument constructor
    */
-  Token::Token() :
-  	beginLine(0), beginColumn(0), endLine(0), endColumn(0)
-  {
-    this->next = nullptr;
-    this->specialToken = nullptr;
+  Token::Token() {
+    this->next = NULL;
+    this->specialToken = NULL;
   }
 
   /**
    * Constructs a new token for the specified Image.
    */
-  Token::Token(int kind) :
-  	beginLine(0), beginColumn(0), endLine(0), endColumn(0) 
+  Token::Token(int kind)
   {
     this->kind = kind;
-    this->next = nullptr;
-    this->specialToken = nullptr;
+    this->next = NULL;
+    this->specialToken = NULL;
   }
 
   /**
    * Constructs a new token for the specified Image and Kind.
    */
-  Token::Token(int kind, const JJString& image)
-  	: beginLine(0), beginColumn(0), endLine(0), endColumn(0) 
+  Token::Token(int kind, JAVACC_STRING_TYPE image)
   {
     this->kind = kind;
     this->image = image;
-    this->next = nullptr;
-    this->specialToken = nullptr;
+    this->next = NULL;
+    this->specialToken = NULL;
   }
 
   /**
    * Returns the image.
    */
-  const JJString& Token::toString()
+  JAVACC_STRING_TYPE Token::toString()
   {
     return image;
   }
@@ -74,7 +70,7 @@ namespace parser {
    * to the following switch statement. Then you can cast matchedToken
    * variable to the appropriate type and use sit in your lexical actions.
    */
-  Token *Token::newToken(int ofKind, const JJString& image)
+  Token *Token::newToken(int ofKind, JAVACC_STRING_TYPE image)
   {
     switch(ofKind)
     {
@@ -84,16 +80,13 @@ namespace parser {
 
   Token *Token::newToken(int ofKind)
   {
-    return newToken(ofKind, JJString());
+    return newToken(ofKind, JAVACC_STRING_TYPE((JAVACC_CHAR_TYPE*)""));
   }
 
   Token::~Token() {
     if (specialToken) delete specialToken;
-    this->kind = 0;
-    this->next = nullptr;
-    this->specialToken = nullptr;
   }
 
 }
 }
-/* JavaCC - OriginalChecksum=01131f3b3906a670aa8fee6224233701 (do not edit this line) */
+/* JavaCC - OriginalChecksum=ad49760663454c3609232308a7bb7379 (do not edit this line) */