Various VHDL fixes

1 files changed, 8 insertions, 17 deletions

diff --git a/vhdlparser/JavaCC.h b/vhdlparser/JavaCC.h
index b97c20d..224b2b5 100644
--- a/vhdlparser/JavaCC.h
+++ b/vhdlparser/JavaCC.h
@@ -1,13 +1,11 @@
-/* Generated By:JavaCC: Do not edit this line. JavaCC.h Version 6.0 */
+/* Generated By:JavaCC: Do not edit this line. JavaCC.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef __JAVACC_H
-#define __JAVACC_H
+#ifndef JAVACC_H_
+#define JAVACC_H_
 #include <stdio.h>
-#include <string.h>
+#include <string>
 #include <memory.h>
 #include <assert.h>
-#include <cstring>
-
 #include "vhdlstring.h"
 
 #ifndef JAVACC_CHAR_TYPE
@@ -18,24 +16,17 @@
 #define JAVACC_STRING_TYPE VhdlString
 #endif
 
-#define finally  // TODO(Sreeni): Get rid of when we fix jjtree
-
 #define JAVACC_SIMPLE_STRING VhdlString
 
-JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
-
-
 typedef JAVACC_STRING_TYPE StringBuffer;
 typedef JAVACC_STRING_TYPE String;
 
 // Abstraction on stream classes to read a block of data into a buffer.
 class ReaderStream {
- public:
+public:
   // Read block of data into a buffer and return the actual number read.
-  virtual size_t read(JAVACC_CHAR_TYPE *, int, size_t) {
-    return 0;
-  }
-  virtual bool endOfInput() { return true; }
+  virtual size_t read(JAVACC_CHAR_TYPE * /*bufptr*/, int /*offset*/, size_t /*len*/) { return 0; }
+  virtual bool   endOfInput() { return true; }
   virtual ~ReaderStream() {}
 };
 
@@ -49,4 +40,4 @@ const JAVACC_CHAR_TYPE EMPTY[] = { 0 };
 #endif
 
 #endif
-/* JavaCC - OriginalChecksum=775c677272b259e2a33aac80851ba9f1 (do not edit this line) */
+/* JavaCC - OriginalChecksum=eb066370c81bb58bb68713327da9719f (do not edit this line) */