Revert to use of javacc-6.1.3 due to regression

1 files changed, 116 insertions, 130 deletions

diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h
index a955d8e..12b58b8 100644
--- a/vhdlparser/CharStream.h
+++ b/vhdlparser/CharStream.h
@@ -1,8 +1,7 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef JAVACC_CHARSTREAM_H_
-#define JAVACC_CHARSTREAM_H_
-
+#ifndef CHARSTREAM_H
+#define CHARSTREAM_H
 #include "JavaCC.h"
 
 #ifndef INITIAL_BUFFER_SIZE
@@ -29,35 +28,17 @@ namespace parser {
 
 
 class CharStream {
-public:
-   void setTabSize(int i) { tabSize = i; }
-   int  getTabSize(int i) { return tabSize; }
-
-private:
-  int getBufcolumn(int pos) {
-    if (trackLineColumn && pos>=0) {
-      return bufcolumn[pos];
-    } else {
-      return -1;
-    }
-  }
-  int getBufline(int pos) {
-    if (trackLineColumn && pos>=0) {
-      return bufline[pos];
-    } else {
-      return -1;
-    }
-  }
-
-public:
-  virtual int getColumn()        { return getBufcolumn(bufpos); }
-  virtual int getLine()          { return getBufline(bufpos); }
-  virtual int getEndColumn()     { return getBufcolumn(bufpos); }
-  virtual int getEndLine()       { return getBufline(bufpos); }
-  virtual int getBeginColumn()   { return getBufcolumn(tokenBegin); }
-  virtual int getBeginLine()     { return getBufline(tokenBegin); }
-
-  virtual bool getTrackLineColumn()         { return trackLineColumn; }
+ public:
+  void setTabSize(int i) { tabSize = i; }
+  int getTabSize(int i) { return tabSize; }
+  virtual int getColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; }
+  virtual int getLine() { return trackLineColumn ? bufline[bufpos] : -1; }
+  virtual int getEndColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; }
+  virtual int getEndLine() { return trackLineColumn ? bufline[bufpos] : -1; }
+  virtual int getBeginColumn() { return trackLineColumn ? bufcolumn[tokenBegin] : -1; }
+  virtual int getBeginLine() { return trackLineColumn ? bufline[tokenBegin] : -1; }
+
+  virtual bool getTrackLineColumn() { return trackLineColumn; }
   virtual void setTrackLineColumn(bool val) { trackLineColumn = val; }
 
 /**
@@ -66,25 +47,25 @@ public:
  * (longer) token. So, they will be used again as the prefix of the next
  * token and it is the implemetation's responsibility to do this right.
  */
-  virtual inline void backup(int amount) {
-    inBuf += amount;
-    bufpos -= amount;
-    if (bufpos < 0) {
-      bufpos += bufsize;
-    }
+virtual inline void backup(int amount) {
+  inBuf += amount;
+  bufpos -= amount;
+  if (bufpos < 0) {
+    bufpos += bufsize;
   }
+}
 
 /**
  * Returns the next character that marks the beginning of the next token.
  * All characters must remain in the buffer between two successive calls
  * to this method to implement backup correctly.
  */
-  virtual inline JJChar BeginToken() {
-    tokenBegin = -1;
-    JJChar c = readChar();
-    tokenBegin = bufpos;
-    return c;
-  }
+virtual inline JAVACC_CHAR_TYPE BeginToken() {
+  tokenBegin = -1;
+  JAVACC_CHAR_TYPE c = readChar();
+  tokenBegin = bufpos;
+  return c;
+}
 
 
 /**
@@ -92,30 +73,31 @@ public:
  * of selecting the input is the responsibility of the class
  * implementing this class.
  */
-  virtual inline JJChar readChar() {
-    if (inBuf > 0) {
-      --inBuf;
-      ++bufpos;
-      if (bufpos == bufsize) {
-        bufpos = 0;
-      }
-      return buffer[bufpos];
-    }
-
+virtual inline JAVACC_CHAR_TYPE readChar() {
+  if (inBuf > 0) {
+    --inBuf;
     ++bufpos;
-    if (bufpos >= maxNextCharInd) {
-      FillBuff();
+    if (bufpos == bufsize) {
+      bufpos = 0;
     }
 
-    JJChar c = buffer[bufpos];
+    return buffer[bufpos];
+  }
+
+  ++bufpos;
+  if (bufpos >= maxNextCharInd) {
+    FillBuff();
+  }
 
-    if (trackLineColumn) {
-      UpdateLineColumn(c);
-    }
+  JAVACC_CHAR_TYPE c = buffer[bufpos];
 
-    return c;
+  if (trackLineColumn) {
+    UpdateLineColumn(c);
   }
 
+  return c;
+}
+
 
   virtual void ExpandBuff(bool wrapAround);
   virtual void FillBuff();
@@ -126,11 +108,12 @@ public:
    * anything that they want to. For example, for efficiency, one might decide
    * to just return NULL, which is a valid implementation.
    */
-  virtual JJString GetImage() {
+  virtual JAVACC_STRING_TYPE GetImage() {
     if (bufpos >= tokenBegin)
-      return JJString(buffer + tokenBegin, bufpos - tokenBegin + 1);
+      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufpos - tokenBegin + 1);
     else
-      return JJString(buffer + tokenBegin, bufsize - tokenBegin).append(buffer, bufpos + 1);
+      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufsize - tokenBegin)
+             .append(buffer, bufpos + 1);
   }
 
   /**
@@ -139,11 +122,12 @@ public:
    * for use in actions in the case of MORE. A simple and inefficient
    * implementation of this is as follows :
    */
-  virtual JJString GetSuffix(int len) {
+  virtual JAVACC_STRING_TYPE GetSuffix(int len) {
     if ((bufpos + 1) >= len) {
-      return JJString(buffer + bufpos - len + 1, len);
+      return JAVACC_STRING_TYPE(buffer + bufpos - len + 1, len);
     }
-    return JJString(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1).append(buffer, bufpos + 1);
+    return JAVACC_STRING_TYPE(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1)
+           .append(buffer, bufpos + 1);
   }
 
   /**
@@ -160,71 +144,74 @@ public:
   }
 
   bool endOfInput() {
-    return inBuf == 0 && bufpos + 1 >= maxNextCharInd && inputStream->endOfInput();
+    return inBuf == 0 && bufpos + 1 >= maxNextCharInd &&
+           inputStream->endOfInput();
   }
 
-  CharStream(const JJChar *buf, int sz, int startline,
+  CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline,
                       int startcolumn, int buffersize) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
-    ReInit(JJString(buf, sz), startline, startcolumn, buffersize);
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
+    ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, buffersize);
   }
 
-  CharStream(const JJChar *buf, int sz, int startline, int startcolumn) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
-    ReInit(JJString(buf, sz), startline, startcolumn, INITIAL_BUFFER_SIZE);
+  CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline, int startcolumn) :
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
+    ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
-  CharStream(const JJString& str, int startline,
+  CharStream(const JAVACC_STRING_TYPE& str, int startline,
                       int startcolumn, int buffersize) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
     ReInit(str, startline, startcolumn, buffersize);
   }
 
-  CharStream(const JJString& str, int startline, int startcolumn) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
+  CharStream(const JAVACC_STRING_TYPE& str, int startline, int startcolumn) :
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0) ,tabSize(1), trackLineColumn(true){
     ReInit(str, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline,
              int startcolumn, int buffersize) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
-    ReInit(input_stream, startline, startcolumn, buffersize);
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
+    ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline, int startcolumn) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
     ReInit(input_stream, 1, 1, INITIAL_BUFFER_SIZE);
   }
 
-  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn, int buffersize);
+  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn,
+                      int buffersize);
 
-  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn) {
+  virtual void ReInit(ReaderStream *input_stream, int startline,
+                      int startcolumn) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
@@ -232,40 +219,39 @@ public:
     ReInit(input_stream, 1, 1, INITIAL_BUFFER_SIZE);
   }
 
-  virtual void ReInit(const JJString& str, int startline,
+  virtual void ReInit(const JAVACC_STRING_TYPE& str, int startline,
                       int startcolumn, int buffersize);
 
-  virtual void ReInit(const JJString& str, int startline,
+  virtual void ReInit(const JAVACC_STRING_TYPE& str, int startline,
                       int startcolumn) {
     ReInit(str, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   virtual void adjustBeginLineColumn(int newLine, int newCol);
 
-protected:
-  virtual void UpdateLineColumn(JJChar c);
-
-  int*               bufline;
-  int*               bufcolumn;
-  JJChar*  	         buffer;
-  int                bufpos;
-  int                bufsize;
-  int                tokenBegin;
-  int                column;
-  int                line;
-  bool               prevCharIsCR;
-  bool               prevCharIsLF;
-  int                available;
-  int                maxNextCharInd;
-  int                inBuf;
-  int                tabSize;
-  bool               trackLineColumn;
-  ReaderStream*      inputStream;
-  bool               deleteStream;
+ protected:
+  virtual void UpdateLineColumn(JAVACC_CHAR_TYPE c);
+
+  int *bufline;
+  int *bufcolumn;
+  ReaderStream *inputStream;
+  bool deleteStream;
+  JAVACC_CHAR_TYPE * buffer;
+  int bufpos;
+  int bufsize;
+  int tokenBegin;
+  int column;
+  int line;
+  bool prevCharIsCR ;
+  bool prevCharIsLF ;
+  int available;
+  int maxNextCharInd;
+  int inBuf ;
+  int tabSize ;
+  bool trackLineColumn;
 };
 
 }
 }
-
 #endif
-/* JavaCC - OriginalChecksum=c5b4b2e72393f865547f405cc9def169 (do not edit this line) */
+/* JavaCC - OriginalChecksum=f8c313c692e78dec0bf9c85d18cb3b56 (do not edit this line) */