Various VHDL related fixes

1 files changed, 8 insertions, 21 deletions

diff --git a/vhdlparser/VhdlParserTokenManager.h b/vhdlparser/VhdlParserTokenManager.h
index f24c8e3..304cff3 100644
--- a/vhdlparser/VhdlParserTokenManager.h
+++ b/vhdlparser/VhdlParserTokenManager.h
@@ -1,10 +1,8 @@
 #ifndef VHDLPARSERTOKENMANAGER_H
 #define VHDLPARSERTOKENMANAGER_H
-#include "stdio.h"
 #include "JavaCC.h"
 #include "CharStream.h"
 #include "Token.h"
-#include "ErrorHandler.h"
 #include "TokenManager.h"
 #include "VhdlParserConstants.h"
 #include "VhdlParser.h"
@@ -117,27 +115,16 @@ void  TokenLexicalActions(Token *matchedToken);
   public: virtual ~VhdlParserTokenManager();
   void ReInit(JAVACC_CHARSTREAM *stream, int lexState = 0, VhdlParser *parserArg = NULL);
   void SwitchTo(int lexState);
-  void clear();
   const JAVACC_SIMPLE_STRING jjKindsForBitVector(int i, unsigned long long vec);
   const JAVACC_SIMPLE_STRING jjKindsForStateVector(int lexState, int vec[], int start, int end);
-  JAVACC_CHARSTREAM*        input_stream;
-  int                       jjrounds[75];
-  int                       jjstateSet[2 * 75];
-  JAVACC_STRING_TYPE        jjimage;
-  JAVACC_STRING_TYPE        image;
-  int                       jjimageLen;
-  int                       lengthOfMatch;
-  JAVACC_CHAR_TYPE          curChar;
-  TokenManagerErrorHandler* errorHandler;
-  bool                      errorHandlerCreated;
-
-public: 
-  void setErrorHandler(TokenManagerErrorHandler *eh) {
-      if (errorHandlerCreated && errorHandler != NULL) delete errorHandler;
-      errorHandler = eh;
-      errorHandlerCreated = false;
-    }
-    
+    JAVACC_CHARSTREAM  *input_stream;
+    int jjrounds[75];
+    int jjstateSet[2 * 75];
+    JAVACC_STRING_TYPE jjimage;
+    JAVACC_STRING_TYPE image;
+    int jjimageLen;
+    int lengthOfMatch;
+    JAVACC_CHAR_TYPE curChar;
 };
 }
 }