Revert to use of javacc-6.1.3 due to regression

1 files changed, 11 insertions, 11 deletions

diff --git a/vhdlparser/CharStream.cc b/vhdlparser/CharStream.cc
index 05003ef..bcc83ba 100644
--- a/vhdlparser/CharStream.cc
+++ b/vhdlparser/CharStream.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "CharStream.h"
 
@@ -12,8 +12,8 @@ void ArrayCopy(T* src, int src_offset, T* dest, int dest_offset, int len) {
 
 class StringReaderStream : public ReaderStream {
  public:
-  StringReaderStream(const JJString& str) : str_(str), cur_(0), max_(str.size()) {}
-  virtual size_t read(JJChar *bufptr, int offset, size_t len) {
+  StringReaderStream(const JAVACC_STRING_TYPE& str) : str_(str), cur_(0), max_(str.size()) {}
+  virtual size_t read(JAVACC_CHAR_TYPE *bufptr, int offset, size_t len) {
     size_t count = str_.copy(bufptr + offset, len > max_ ? max_ : len, cur_);
     cur_ += count;
     max_ -= count;
@@ -25,7 +25,7 @@ class StringReaderStream : public ReaderStream {
   }
 
  private:
-  const JJString str_;
+  const JAVACC_STRING_TYPE str_;
   size_t cur_;
   size_t max_;
 };
@@ -33,7 +33,7 @@ class StringReaderStream : public ReaderStream {
 
 namespace vhdl {
 namespace parser {
-void CharStream::ReInit(const JJString& str, int startline,
+void CharStream::ReInit(const JAVACC_STRING_TYPE& str, int startline,
                         int startcolumn, int buffersize) {
   StringReaderStream *stream = new StringReaderStream(str);
   ReInit(stream, startline, startcolumn, buffersize);
@@ -46,12 +46,12 @@ void CharStream::ReInit(ReaderStream *input_stream, int startline,
    delete inputStream;
   }
 
-  if (buffer) {
+  if (buffer != NULL) {
     DeleteBuffers();
   }
 
   available = bufsize = buffersize;
-  buffer = new JJChar[buffersize];
+  buffer = new JAVACC_CHAR_TYPE[buffersize];
   bufline = new int[buffersize];
   bufcolumn = new int[buffersize];
 
@@ -111,7 +111,7 @@ void CharStream::adjustBeginLineColumn(int newLine, int newCol) {
 }
 
 void CharStream::ExpandBuff(bool wrapAround) {
-  JJChar *newbuffer = new JJChar[bufsize + 2048];
+  JAVACC_CHAR_TYPE *newbuffer = new JAVACC_CHAR_TYPE[bufsize + 2048];
   int *newbufline = new int[bufsize + 2048];
   int *newbufcolumn = new int[bufsize + 2048];
 
@@ -160,7 +160,7 @@ void CharStream::FillBuff() {
     }
   }
 
-  size_t i = inputStream->read(buffer, maxNextCharInd, available - maxNextCharInd);
+  int i = inputStream->read(buffer, maxNextCharInd, available - maxNextCharInd);
   if (i > 0) {
     maxNextCharInd += i;
   } else {
@@ -172,7 +172,7 @@ void CharStream::FillBuff() {
   }
 }
 
-void CharStream::UpdateLineColumn(JJChar c) {
+void CharStream::UpdateLineColumn(JAVACC_CHAR_TYPE c) {
   column++;
   if (prevCharIsLF) {
     prevCharIsLF = false;
@@ -209,4 +209,4 @@ void CharStream::UpdateLineColumn(JJChar c) {
 
 }
 }
-/* JavaCC - OriginalChecksum=0ba78d6c493d812eba61de6fa794fd15 (do not edit this line) */
+/* JavaCC - OriginalChecksum=eff57228f86b403d970758af731465ce (do not edit this line) */