Vhdl fixes

author: Dimitri van Heesch <dimitri@stack.nl> 2014-08-11 08:26:44 (GMT)
committer: Dimitri van Heesch <dimitri@stack.nl> 2014-08-11 08:26:44 (GMT)
commit: 3b8fea2f1f7f2e6a83a35626e6dec9d114a78c9e (patch)
tree: ee911a840e38f46d7388237c019866efa191e15d /vhdlparser
parent: 7506404e646f1fcc5a26ca6fca91a7f65154f05a (diff)
download: Doxygen-3b8fea2f1f7f2e6a83a35626e6dec9d114a78c9e.zip
Doxygen-3b8fea2f1f7f2e6a83a35626e6dec9d114a78c9e.tar.gz
Doxygen-3b8fea2f1f7f2e6a83a35626e6dec9d114a78c9e.tar.bz2
12 files changed, 5636 insertions, 5361 deletions
diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h
index 9f0d38c..fba0a0e 100644
--- a/vhdlparser/ErrorHandler.h
+++ b/vhdlparser/ErrorHandler.h
@@ -1,15 +1,20 @@
 /* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.0 */
-/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,BUILD_PARSER=true,BUILD_TOKEN_MANAGER=true */
 #ifndef ERRORHANDLER_H
 #define ERRORHANDLER_H
-#include <string>
+//#include <string>
 #include "JavaCC.h"
 #include "Token.h"
 
 namespace vhdl {
 namespace parser {
-class VhdlParser;
+
+//JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
+
+  class VhdlParser;
   class ErrorHandler {
+    friend class VhdlParserTokenManager;
+    friend class VhdlParser;
     protected:
       int error_count;
     public:
@@ -18,26 +23,56 @@ class VhdlParser;
       // expectedKind - token kind that the parser was trying to consume.
       // expectedToken - the image of the token - tokenImages[expectedKind].
       // actual - the actual token that the parser got instead.
-      virtual void handleUnexpectedToken(int, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser *) {
+      virtual void handleUnexpectedToken(int , JAVACC_STRING_TYPE , Token *, VhdlParser *) {
         error_count++;
-        fprintf(stderr, "Expecting %s at: %d:%d but got %s\n", addUnicodeEscapes(expectedToken).c_str(), actual->beginLine, actual->beginColumn, addUnicodeEscapes(actual->image).c_str());
+    //    fprintf(stderr, "Expecting %s at: %d:%d but got %s\n", addUnicodeEscapes(expectedToken).c_str(), actual->beginLine, actual->beginColumn, addUnicodeEscapes(actual->image).c_str());
       }
       // Called when the parser cannot continue parsing.
       // last - the last token successfully parsed.
       // unexpected - the token at which the error occurs.
       // production - the production in which this error occurrs.
-      virtual void handleParseError(Token *, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *) {
+      virtual void handleParseError(Token *, Token *, JAVACC_SIMPLE_STRING , VhdlParser *) {
         error_count++;
-        fprintf(stderr, "Encountered: %s at: %d:%d while parsing: %s\n", addUnicodeEscapes(unexpected->image).c_str(), unexpected->beginLine, unexpected->beginColumn, production.c_str());
+  //     fprintf(stderr, "Encountered: %s at: %d:%d while parsing: %s\n", addUnicodeEscapes(unexpected->image).c_str(), unexpected->beginLine, unexpected->beginColumn, production.c_str());
       }
       virtual int getErrorCount() {
         return error_count;
       }
+      virtual void handleOtherError(JAVACC_STRING_TYPE message, VhdlParser *) {
+        fprintf(stderr, "Error: %s\n", (char*)message.c_str());
+      }
       virtual ~ErrorHandler() {}
       ErrorHandler() { error_count = 0; }
   };
+
+  class VhdlParserTokenManager;
+  class TokenManagerErrorHandler {
+    friend class VhdlParserTokenManager;
+    protected:
+      int error_count;
+    public:
+       // Returns a detailed message for the Error when it is thrown by the
+       // token manager to indicate a lexical error.
+       // Parameters :
+       //    EOFSeen     : indicates if EOF caused the lexical error
+       //    curLexState : lexical state in which this error occurred
+       //    errorLine   : line number when the error occurred
+       //    errorColumn : column number when the error occurred
+       //    errorAfter  : prefix that was seen before this error occurred
+       //    curchar     : the offending character
+       //
+       virtual void lexicalError(bool EOFSeen, int /*lexState*/, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, VhdlParserTokenManager*) {
+        // by default, we just print an error message and return.
+        fprintf(stderr, "Lexical error at: %d:%d. Encountered: %c after: %s.\n", errorLine, errorColumn, curChar, (EOFSeen? "EOF" : (const char*)errorAfter.c_str()));
+      }
+       virtual void lexicalError(JAVACC_STRING_TYPE errorMessage, VhdlParserTokenManager* ) {
+        fprintf(stderr, "%s\n", (char*)errorMessage.c_str());
+      }
+      virtual ~TokenManagerErrorHandler() {}
+  };
+
 }
 }
 
 #endif
-/* JavaCC - OriginalChecksum=282223c3bcb53b7ff385aed35944d185 (do not edit this line) */
+/* JavaCC - OriginalChecksum=685d19cb4cd943b60089f599e45f23ad (do not edit this line) */
diff --git a/vhdlparser/JavaCC.h b/vhdlparser/JavaCC.h
index 9504168..b97c20d 100644
--- a/vhdlparser/JavaCC.h
+++ b/vhdlparser/JavaCC.h
@@ -3,7 +3,7 @@
 #ifndef __JAVACC_H
 #define __JAVACC_H
 #include <stdio.h>
-#include <string>
+#include <string.h>
 #include <memory.h>
 #include <assert.h>
 #include <cstring>
@@ -24,6 +24,7 @@
 
 JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
 
+
 typedef JAVACC_STRING_TYPE StringBuffer;
 typedef JAVACC_STRING_TYPE String;
 
diff --git a/vhdlparser/JavaCC.h.in b/vhdlparser/JavaCC.h.in
index 9504168..b97c20d 100644
--- a/vhdlparser/JavaCC.h.in
+++ b/vhdlparser/JavaCC.h.in
@@ -3,7 +3,7 @@
 #ifndef __JAVACC_H
 #define __JAVACC_H
 #include <stdio.h>
-#include <string>
+#include <string.h>
 #include <memory.h>
 #include <assert.h>
 #include <cstring>
@@ -24,6 +24,7 @@
 
 JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
 
+
 typedef JAVACC_STRING_TYPE StringBuffer;
 typedef JAVACC_STRING_TYPE String;
 
diff --git a/vhdlparser/TokenMgrError.cc b/vhdlparser/TokenMgrError.cc
index 0be1213..9093e6e 100644
--- a/vhdlparser/TokenMgrError.cc
+++ b/vhdlparser/TokenMgrError.cc
@@ -61,11 +61,8 @@ namespace parser {
    errorCode = reason;
   }
 
-}
-}
-
 // i < 16 - guaranteed
-static char hexChar(int i) {
+char hexChar(int i) {
   if (i < 10) {
     return i - '0';
   }
@@ -118,4 +115,7 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) {
   }
   return retval;
 }
-/* JavaCC - OriginalChecksum=7f80e3c4eac120168f5e81d4ddb72e4b (do not edit this line) */
+
+}
+}
+/* JavaCC - OriginalChecksum=2bf63f131c8e60fd30c70d0b4f660016 (do not edit this line) */
diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index 6555320..47ecf49 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -3,17 +3,17 @@
 namespace vhdl {
 namespace parser {
   unsigned int jj_la1_0[] = {
-0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x48202000,0x10040000,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x48002000,0x200000,0x0,0x48202000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10040000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x10000000,0x0,0x20000000,0x0,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0xa0010000,0xa0010001,0x0,0x0,0x0,0x20000000,0x68010000,0x0,0x0,0x400000,0x0,0x0,0x40002000,0x200000,0x0,0x0,0x40202000,0x0,0x0,0x0,0x0,0x4000,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x8000,0x8000,0x0,0x400,0x0,0x0,0x0,0x0,0x48202000,0x48602000,0x10040000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x8000000,0x0,0x28000000,0x4000,0x0,0x40000000,0x0,0x40000000,0x40000000,0x2000000,0x4000000,0x0,0x0,0x80010000,0x0,0x0,0x0,0x0,0x400,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x40002000,0x0,0x40002000,0x0,0x0,0x0,0x0,0x48002000,0x200000,0x0,0x0,0x48202000,0x0,0x0,0x0,0x20000000,0x0,0x0,0x40002000,0x200000,0x0,0x40202000,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x10040000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40002000,0x200000,0x0,0x40202000,0x0,0x0,0x0,0x0,0x0,0x0,0x10040000,0x4000,0x0,0x0,0x20800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x1000,0x0,0x40002000,0x200000,0x0,0x40202000,0x0,0x200000,0x200000,0x80000000,0x80000000,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x48602000,0x10040000,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x90404000,0x20080000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x90404000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x40000000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x40020000,0x40020001,0x0,0x0,0x0,0x40000000,0xd0020000,0x0,0x0,0x800000,0x0,0x0,0x80004000,0x400000,0x0,0x0,0x80404000,0x0,0x0,0x0,0x0,0x8000,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x10000000,0x0,0x50000000,0x8000,0x0,0x80000000,0x0,0x80000000,0x80000000,0x4000000,0x8000000,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x800,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80004000,0x0,0x80004000,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x0,0x90404000,0x0,0x0,0x0,0x40000000,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x8000,0x0,0x0,0x41000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x2000,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90404000,0x20080000,0x20080000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
   unsigned int jj_la1_1[] = {
-0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x92c04,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000,0x0,0x0,0x800,0x82400,0x804,0x10000,0x92c04,0x8000,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000,0x800,0x800000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x800,0x0,0x2000000,0x2000000,0x0,0x200000,0x2000080,0x2000080,0x0,0x8,0x0,0x80,0x9012480,0x0,0x0,0x0,0x80,0x0,0x82400,0x4,0x10000,0x0,0x92404,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x0,0x0,0x800000,0x0,0x0,0x0,0x92c04,0x92c04,0x0,0x0,0x40800,0x0,0x0,0x0,0x0,0x0,0x20,0x10,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x400,0x0,0x0,0x0,0x4500000,0x0,0x0,0x800,0x0,0x0,0x0,0x800,0x0,0x0,0x4500000,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x20000,0x200000,0x0,0x0,0x82400,0x10000,0x92400,0x0,0x0,0x8000,0x8000,0x82400,0x4,0x10000,0x0,0x92404,0x0,0x0,0x0,0x80,0x0,0x0,0x82400,0x0,0x10000,0x92400,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x10040900,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x82000,0x800000,0x882400,0x0,0x10000,0x892400,0x2000,0x0,0x80000,0x80000,0x0,0x82000,0x10040900,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x882400,0x0,0x10000,0x892400,0x0,0x82000,0x82000,0x2000000,0x0,0x0,0x2000000,0x8000,0x8000,0x8000,0x0,0x0,0x92c04,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x10,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x100000,0x0,0x0,0x0,0x100000,0x0,0x10,0x82000,0x80000,0x80000,0x0,0x800000,0x0,0x0,0x82000,};
+0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x1000,0x104800,0x1008,0x20000,0x125808,0x10000,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x1000,0x1000000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x20000,0x1000,0x0,0x4000000,0x4000000,0x0,0x400000,0x4000101,0x4000101,0x0,0x10,0x0,0x100,0x12024900,0x0,0x0,0x0,0x100,0x0,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x81000,0x0,0x0,0x0,0x0,0x0,0x40,0x20,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x800,0x0,0x0,0x0,0x8a00000,0x0,0x0,0x1000,0x1,0x0,0x0,0x1000,0x0,0x0,0x8a00000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x40000,0x400000,0x0,0x0,0x104800,0x20000,0x124800,0x0,0x0,0x10000,0x10000,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x0,0x0,0x100,0x0,0x0,0x104800,0x0,0x20000,0x124800,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x20081200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x104000,0x1000000,0x1104800,0x0,0x20000,0x1124800,0x4000,0x0,0x100000,0x100000,0x0,0x104000,0x20081200,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x1104800,0x0,0x20000,0x1124800,0x0,0x104000,0x104000,0x4000001,0x1,0x0,0x4000001,0x10000,0x10000,0x10000,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x20,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x0,0x20,0x104000,0x100000,0x100000,0x0,0x1000000,0x0,0x0,0x104000,};
   unsigned int jj_la1_2[] = {
-0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x88000,0x14000,0x0,0x10000000,0x0,0x0,0x0,0x100000,0x0,0x0,0x0,0x2000,0x0,0x0,0x88000,0x0,0x0,0x88000,0x0,0x2000,0x2000,0x0,0x0,0x0,0x0,0x14000,0x0,0x0,0x0,0x200,0x0,0x2000,0x0,0x0,0x0,0x2000,0x0,0x2000,0x200000,0x4000,0x4000,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x800000,0x800,0x800,0x0,0x0,0x0,0x80,0x8800,0x0,0x0,0x0,0x0,0x0,0x88000,0x0,0x0,0x800,0x88800,0x0,0x0,0x2000,0x0,0x200,0x4000,0x14000,0x0,0x0,0x0,0x0,0x0,0x0,0x104,0x104,0x0,0x19,0x80,0x80,0x0,0x0,0x88000,0x88000,0x14000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x19,0x0,0x0,0x0,0x200,0x800,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x800,0x10,0x0,0x0,0x0,0x8,0x400,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x800,0x0,0x88000,0x0,0x88000,0x800,0x0,0x0,0x0,0x88000,0x0,0x0,0x800,0x88800,0x0,0x0,0x1,0x0,0x800,0x0,0x88000,0x0,0x0,0x88000,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x90000012,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x19,0x100000,0x800,0x0,0x0,0x10,0x60000000,0x60000000,0x0,0x800000,0x0,0x400000,0x0,0x400000,0x0,0x200,0x0,0x0,0x80000000,0x0,0x8000,0x0,0x88000,0x0,0x88000,0x0,0x0,0x88000,0x8000,0x0,0x80000,0x80000,0x0,0x88000,0x90000012,0x0,0x0,0x0,0x300000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x19,0x0,0x0,0x88000,0x0,0x0,0x88000,0x0,0x88000,0x88000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x88000,0x14000,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x400,0x19,0x0,0x0,0x0,0x0,0x800000,0x0,0x400,0x0,0x0,0x0,0x400,0x0,0x0,0x88000,0x80000,0x80000,0x0,0x0,0x1000,0x0,0x9c000,};
+0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x110000,0x28000,0x0,0x20000000,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x4000,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x4000,0x4000,0x0,0x0,0x0,0x0,0x28000,0x0,0x0,0x0,0x400,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x400000,0x8000,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x1000,0x1000,0x0,0x0,0x0,0x100,0x11000,0x0,0x0,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x4000,0x0,0x400,0x8000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x209,0x209,0x0,0x32,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x0,0x0,0x0,0x400,0x1000,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x1000,0x20,0x0,0x0,0x0,0x10,0x800,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000,0x0,0x110000,0x0,0x110000,0x1000,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x2,0x0,0x1000,0x0,0x110000,0x0,0x0,0x110000,0x0,0x8000,0x0,0x0,0x0,0x8000,0x0,0x20000024,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x200000,0x1000,0x0,0x0,0x20,0xc0000000,0xc0000000,0x0,0x1000000,0x0,0x800000,0x0,0x800000,0x0,0x400,0x0,0x0,0x0,0x0,0x10000,0x0,0x110000,0x0,0x110000,0x0,0x0,0x110000,0x10000,0x0,0x100000,0x100000,0x0,0x110000,0x20000024,0x0,0x0,0x0,0x600000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x32,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x110000,0x110000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x110000,0x28000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x800,0x32,0x0,0x0,0x0,0x0,0x1000000,0x0,0x800,0x0,0x0,0x0,0x800,0x0,0x0,0x110000,0x100000,0x100000,0x0,0x0,0x2000,0x0,0x138000,};
   unsigned int jj_la1_3[] = {
-0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc4418,0x84000000,0x0,0x0,0x4,0x0,0x0,0x0,0x80000000,0x40000,0x0,0x0,0x40000,0x0,0x84418,0x40000,0x0,0xc4418,0x0,0x0,0x0,0x80000000,0x80000000,0x0,0x0,0x84000000,0x0,0x1000000,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x1000000,0x0,0x0,0x40000,0x40000,0x0,0x0,0x40000,0x40000,0x0,0x2000,0x40000,0x40000,0x0,0x1000,0x80000000,0x0,0x94408,0x0,0x0,0x0,0x0,0x0,0x84418,0x40000,0x0,0x0,0xc4418,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x18000000,0x18000000,0x0,0x80000000,0x0,0x0,0x0,0x80000000,0xc4418,0xc4418,0x84000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x80000000,0x0,0x0,0x0,0x84018,0x0,0x80018,0x80018,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x1000000,0x0,0x0,0x84018,0x0,0x2000,0x0,0x0,0xc4410,0x0,0xc4410,0x0,0x0,0x0,0x0,0x84418,0x40000,0x0,0x0,0xc4418,0x0,0x0,0x80000000,0x0,0x0,0x80000000,0x84410,0x40000,0x0,0xc4410,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x86800000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x1e0,0x1e0,0x0,0x2000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84410,0x40000,0x0,0xc4410,0x0,0x80000000,0x0,0x0,0x80000000,0x0,0x86800000,0x0,0x80000000,0x4000,0x80000000,0x0,0x0,0x0,0x84000000,0x10,0x0,0x0,0x0,0x20000,0x0,0x0,0x80008000,0x0,0x0,0x84410,0x40000,0x0,0xc4410,0x0,0x40000,0x40000,0x40000,0x0,0x0,0x40000,0x0,0x0,0x0,0x1000000,0x0,0xc4418,0x84000000,0x80008,0x0,0x0,0x0,0x80000000,0x80000000,0x2000,0x0,0x1000000,0x0,0x80000000,0x4000000,0x0,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,};
+0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x188830,0x8000000,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0x80000,0x0,0x108830,0x80000,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x2000000,0x0,0x0,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x2000000,0x0,0x0,0x80000,0x80000,0x0,0x0,0x80000,0x80000,0x0,0x4000,0x80000,0x80000,0x0,0x2000,0x0,0x0,0x128810,0x0,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x30000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x108030,0x0,0x100030,0x100030,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x108030,0x0,0x4000,0x0,0x0,0x188820,0x0,0x188820,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c0,0x3c0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x8000000,0x20,0x0,0x0,0x0,0x40000,0x0,0x0,0x10000,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x80000,0x80000,0x80000,0x0,0x0,0x80000,0x0,0x0,0x0,0x2000000,0x0,0x188830,0x8000000,0x8000000,0x100010,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x2000000,0x0,0x0,0x8000000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
   unsigned int jj_la1_4[] = {
-0x0,0x0,0x30000,0x18,0x20,0x80,0x0,0x0,0x0,0x0,0x20000,0x0,0x20000,0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x8000000,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x20,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x20000,0x20000,0x20000,0x20000,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x2,0x20000,0x0,0x0,0x20000,0x0,0x0,0x0,0x20000,0x0,0x0,0x20000,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x20,0x20018,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x20000004,0x20000,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x20000,0x7e00,0x7e00,0x0,0x0,0x0,0x20018,0x0,0x0,0x20,0x20,0x0,0x0,0x0,0x18,0x0,0x20000,0x0,0x40,0x0,0x20,0x20000,0x20,0x20000,0x0,0x18,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x20000,0x0,0x0,0x0,0x20,0x20,0x20000,0x0,0x40,0x0,0x0,0x0,0x0,0x20,0x20018,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0xd0000000,0x10000000,0x80000000,0x0,0x20000,0x0,0x0,0x0,0x0,0x20018,0x0,0x4000000,0x20000,0x4000000,0x0,0x4000000,0x0,0x120,0x120,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x0,0x0,};
+0x0,0x0,0x60000,0x30,0x40,0x100,0x0,0x0,0x0,0x0,0x40000,0x0,0x40001,0x0,0x0,0x0,0x0,0x40,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x40001,0x0,0x0,0x0,0x0,0x10000000,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x20000,0x40,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x40000,0x40000,0x40000,0x40000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x4,0x40001,0x0,0x0,0x40000,0x1,0x0,0x0,0x40000,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x40031,0x0,0x1,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x40000008,0x40000,0x40,0x1,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x0,0x40001,0x1,0x0,0x40000,0xfc00,0xfc00,0x0,0x0,0x0,0x40031,0x1,0x0,0x40,0x40,0x0,0x0,0x0,0x30,0x0,0x40001,0x0,0x80,0x0,0x40,0x40000,0x40,0x40000,0x0,0x30,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x40001,0x0,0x40001,0x0,0x1,0x0,0x40,0x40,0x40001,0x0,0x80,0x0,0x0,0x0,0x0,0x40,0x40031,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40001,0x40001,0x0,0xa0000000,0x20000000,0x0,0x1,0x40001,0x0,0x0,0x0,0x0,0x40031,0x0,0x8000000,0x40000,0x8000000,0x0,0x8000000,0x0,0x240,0x240,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x1,0x0,};
   unsigned int jj_la1_5[] = {
-0xa10,0x0,0xe0,0x0,0x0,0x0,0x1,0x1e0,0x0,0x0,0xe0,0x0,0xe0,0x0,0x0,0x0,0xc0,0x0,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0,0xe0,0xc0,0x0,0xc0,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1e0,0x1e0,0xe0,0xe0,0x1e0,0x1c0,0x0,0xc0,0xc0,0x0,0x0,0x0,0x0,0x40bf0,0x0,0x0,0xf0,0x0,0x0,0x0,0xe0,0xc0,0x0,0x1e0,0x0,0xc0,0x0,0xc0,0x0,0x0,0xc0,0x0,0x40bf0,0x0,0x0,0xc0,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0xc0,0x0,0xc0,0x0,0x0,0x0,0xe0,0x0,0x0,0x0,0xc0,0xc0,0x0,0xc0,0xa10,0x0,0x0,0x0,0x0,0xe0,0x0,0x0,0x0,0x0,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0,0x0,0xe0,0x0,0x0,0x0,0xc0,0xe0,0x0,0xc0,0xe0,0x0,0x0,0xc0,0x0,0xc0,0x40bf0,0x0,0x0,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0xe0,0x0,0x0,0x0,0x0,0xe0,0x0,0xe0,0x0,0x0,0x0,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe0,0x120,0xe0,0x0,0x0,0x0,0x0,0x0,0xe0,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0x40bf0,0x0,0xc0,0x0,0x0,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0x0,0xc0,0x0,0xe0,0x0,0x0,0x0,0x0,0x0,0xe0,0x0,0x0,0x0,0x0,0x40bf0,0x0,0x0,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0,0x0,0x0,0x0,0xc0,};
+0x1420,0x0,0x1c0,0x0,0x0,0x0,0x2,0x3c0,0x0,0x0,0x1c0,0x4000000,0x40001c0,0x0,0x0,0x0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x40001c0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x4000000,0x4000000,0x2,0x0,0x0,0x3c0,0x3c0,0x1c0,0x1c0,0x3c0,0x380,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x817e0,0x0,0x0,0x1e0,0x0,0x180,0x0,0x3c0,0x0,0x180,0x0,0x180,0x0,0x0,0x180,0x0,0x817e0,0x0,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x180,0x0,0x180,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x180,0x180,0x0,0x180,0x1420,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x1c0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x180,0x1c0,0x0,0x0,0x180,0x0,0x180,0x817e0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x1c0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x240,0x1c0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x817e0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x180,0x4000000,0x40001c0,0x40001c0,0x0,0x1,0x0,0x1,0x0,0x1c0,0x0,0x0,0x0,0x0,0x817e0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x180,};
 
   /** Constructor with user supplied TokenManager. */
 
@@ -273,7 +273,7 @@ s+=","+s1;
     jj_consume_token(RPAREN_T);
     }
     
-return s;
+return "("+s+")";
 assert(false);
   }
 
@@ -551,7 +551,8 @@ void VhdlParser::architecture_declarative_part() {if (!hasError) {
       case SUBTYPE_T:
       case TYPE_T:
       case USE_T:
-      case VARIABLE_T:{
+      case VARIABLE_T:
+      case VHDL2008TOOLDIR:{
         ;
         break;
         }
@@ -583,7 +584,8 @@ void VhdlParser::architecture_statement_part() {if (!hasError) {
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{
+      case EXTENDED_CHARACTER:
+      case VHDL2008TOOLDIR:{
         ;
         break;
         }
@@ -725,11 +727,11 @@ assert(false);
   }
 
 
-QCString VhdlParser::association_element() {if (!hasError) {
+QCString VhdlParser::association_element() {QCString s,s1;if (!hasError) {
     
     if (jj_2_6(2147483647)) {if (!hasError) {
       
-      formal_part();
+      s = formal_part();
       }
       if (!hasError) {
       
@@ -742,10 +744,10 @@ QCString VhdlParser::association_element() {if (!hasError) {
     }
     if (!hasError) {
     
-    actual_part();
+    s1 = actual_part();
     }
     
-return " ";
+return s+" => "+s1;
 assert(false);
   }
 
@@ -1250,6 +1252,13 @@ void VhdlParser::block_declarative_item() {
               
               break;
               }
+            case VHDL2008TOOLDIR:{if (!hasError) {
+              
+              jj_consume_token(VHDL2008TOOLDIR);
+              }
+              
+              break;
+              }
             default:
               jj_la1[27] = jj_gen;
               jj_consume_token(-1);
@@ -1283,7 +1292,8 @@ void VhdlParser::block_declarative_part() {if (!hasError) {
       case SUBTYPE_T:
       case TYPE_T:
       case USE_T:
-      case VARIABLE_T:{
+      case VARIABLE_T:
+      case VHDL2008TOOLDIR:{
         ;
         break;
         }
@@ -1517,7 +1527,8 @@ void VhdlParser::block_statement_part() {if (!hasError) {
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{
+      case EXTENDED_CHARACTER:
+      case VHDL2008TOOLDIR:{
         ;
         break;
         }
@@ -1626,7 +1637,7 @@ QCString ca="case "+s;
     }
     
 FlowChart::moveToPrevLevel();
-         FlowChart::addFlowChart(FlowChart::END_CASE,0,0);
+         FlowChart::addFlowChart(FlowChart::END_CASE,"end case",0);
   }
 
 
@@ -1670,7 +1681,7 @@ assert(false);
 QCString VhdlParser::choice() {QCString s;
     if (jj_2_10(2147483647)) {if (!hasError) {
       
-      s = discrete_range();
+      s = simple_expression();
       }
       if (!hasError) {
       
@@ -1679,7 +1690,16 @@ return s;
       
     } else if (jj_2_11(2147483647)) {if (!hasError) {
       
-      s = simple_expression();
+      s = discrete_range();
+      }
+      if (!hasError) {
+      
+return s;
+      }
+      
+    } else if (jj_2_12(2147483647)) {if (!hasError) {
+      
+      s = identifier();
       }
       if (!hasError) {
       
@@ -1688,18 +1708,6 @@ return s;
       
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{if (!hasError) {
-        
-        s = identifier();
-        }
-        if (!hasError) {
-        
-return s;
-        }
-        
-        break;
-        }
       case OTHER_T:{if (!hasError) {
         
         jj_consume_token(OTHER_T);
@@ -1742,7 +1750,7 @@ QCString VhdlParser::choices() {QCString s,s1;if (!hasError) {
       }
       if (!hasError) {
       
-      choice();
+      s1 = choice();
       }
       if (!hasError) {
       
@@ -1931,7 +1939,7 @@ addCompInst(s.lower().data(),s1.lower().data(),0,getLine());
     }
     if (!hasError) {
     
-    if (jj_2_12(2147483647)) {if (!hasError) {
+    if (jj_2_13(2147483647)) {if (!hasError) {
       
       generic_map_aspect();
       }
@@ -2014,7 +2022,7 @@ assert(false);
 
 void VhdlParser::concurrent_assertion_statement() {if (!hasError) {
     
-    if (jj_2_13(2)) {if (!hasError) {
+    if (jj_2_14(2)) {if (!hasError) {
       
       identifier();
       }
@@ -2056,7 +2064,7 @@ void VhdlParser::concurrent_assertion_statement() {if (!hasError) {
 
 void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) {
     
-    if (jj_2_14(2)) {if (!hasError) {
+    if (jj_2_15(2)) {if (!hasError) {
       
       identifier();
       }
@@ -2098,7 +2106,7 @@ void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) {
 
 void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) {
     
-    if (jj_2_15(2)) {if (!hasError) {
+    if (jj_2_16(2)) {if (!hasError) {
       
       identifier();
       }
@@ -2128,7 +2136,7 @@ void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) {
     }
     if (!hasError) {
     
-    if (jj_2_16(2147483647)) {if (!hasError) {
+    if (jj_2_17(2147483647)) {if (!hasError) {
       
       conditional_signal_assignment();
       }
@@ -2154,17 +2162,17 @@ void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) {
 
 
 void VhdlParser::concurrent_statement() {
-    if (jj_2_17(2147483647)) {if (!hasError) {
+    if (jj_2_18(2147483647)) {if (!hasError) {
       
       block_statement();
       }
       
-    } else if (jj_2_18(2147483647)) {if (!hasError) {
+    } else if (jj_2_19(2147483647)) {if (!hasError) {
       
       process_statement();
       }
       
-    } else if (jj_2_19(2147483647)) {if (!hasError) {
+    } else if (jj_2_20(2147483647)) {if (!hasError) {
       
       generate_statement();
       }
@@ -2180,29 +2188,40 @@ void VhdlParser::concurrent_statement() {
         }
       default:
         jj_la1[54] = jj_gen;
-        if (jj_2_20(2147483647)) {if (!hasError) {
+        if (jj_2_21(2147483647)) {if (!hasError) {
           
           concurrent_assertion_statement();
           }
           
-        } else if (jj_2_21(2147483647)) {if (!hasError) {
+        } else if (jj_2_22(2147483647)) {if (!hasError) {
           
           concurrent_signal_assignment_statement();
           }
           
-        } else if (jj_2_22(2147483647)) {if (!hasError) {
+        } else if (jj_2_23(2147483647)) {if (!hasError) {
           
           component_instantiation_statement();
           }
           
-        } else if (jj_2_23(2147483647)) {if (!hasError) {
+        } else if (jj_2_24(2147483647)) {if (!hasError) {
           
           concurrent_procedure_call_statement();
           }
           
         } else {
-          jj_consume_token(-1);
-          errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case VHDL2008TOOLDIR:{if (!hasError) {
+            
+            jj_consume_token(VHDL2008TOOLDIR);
+            }
+            
+            break;
+            }
+          default:
+            jj_la1[55] = jj_gen;
+            jj_consume_token(-1);
+            errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
+          }
         }
       }
     }
@@ -2264,7 +2283,7 @@ void VhdlParser::conditional_waveforms() {if (!hasError) {
     if (!hasError) {
     
     while (!hasError) {
-      if (jj_2_24(2147483647)) {
+      if (jj_2_25(2147483647)) {
         ;
       } else {
         goto end_label_11;
@@ -2303,7 +2322,7 @@ void VhdlParser::conditional_waveforms() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[55] = jj_gen;
+      jj_la1[56] = jj_gen;
       ;
     }
     }
@@ -2359,7 +2378,7 @@ confName=s+"::"+s1;
       break;
       }
     default:
-      jj_la1[56] = jj_gen;
+      jj_la1[57] = jj_gen;
       ;
     }
     }
@@ -2377,7 +2396,7 @@ confName=s+"::"+s1;
       break;
       }
     default:
-      jj_la1[57] = jj_gen;
+      jj_la1[58] = jj_gen;
       ;
     }
     }
@@ -2414,7 +2433,7 @@ void VhdlParser::configuration_declarative_item() {
       break;
       }
     default:
-      jj_la1[58] = jj_gen;
+      jj_la1[59] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -2432,7 +2451,7 @@ void VhdlParser::configuration_declarative_part() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[59] = jj_gen;
+        jj_la1[60] = jj_gen;
         goto end_label_12;
       }if (!hasError) {
       
@@ -2447,7 +2466,7 @@ void VhdlParser::configuration_declarative_part() {if (!hasError) {
 
 
 void VhdlParser::configuration_item() {
-    if (jj_2_25(2147483647)) {if (!hasError) {
+    if (jj_2_26(2147483647)) {if (!hasError) {
       
       component_configuration();
       }
@@ -2462,7 +2481,7 @@ void VhdlParser::configuration_item() {
         break;
         }
       default:
-        jj_la1[60] = jj_gen;
+        jj_la1[61] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -2521,7 +2540,7 @@ QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0;if (!ha
       break;
       }
     default:
-      jj_la1[61] = jj_gen;
+      jj_la1[62] = jj_gen;
       ;
     }
     }
@@ -2572,7 +2591,7 @@ void VhdlParser::context_clause() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[62] = jj_gen;
+        jj_la1[63] = jj_gen;
         goto end_label_13;
       }if (!hasError) {
       
@@ -2587,7 +2606,7 @@ void VhdlParser::context_clause() {if (!hasError) {
 
 
 QCString VhdlParser::constraint() {QCString s;
-    if (jj_2_26(2147483647)) {if (!hasError) {
+    if (jj_2_27(2147483647)) {if (!hasError) {
       
       s = range_constraint();
       }
@@ -2596,7 +2615,7 @@ QCString VhdlParser::constraint() {QCString s;
 return s;
       }
       
-    } else if (jj_2_27(2147483647)) {if (!hasError) {
+    } else if (jj_2_28(2147483647)) {if (!hasError) {
       
       s = index_constraint();
       }
@@ -2630,7 +2649,7 @@ void VhdlParser::context_item() {
       break;
       }
     default:
-      jj_la1[63] = jj_gen;
+      jj_la1[64] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -2680,7 +2699,7 @@ s.prepend(" reject ");
         break;
         }
       default:
-        jj_la1[64] = jj_gen;
+        jj_la1[65] = jj_gen;
         ;
       }
       }
@@ -2696,7 +2715,7 @@ return s+" inertial ";
       break;
       }
     default:
-      jj_la1[65] = jj_gen;
+      jj_la1[66] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -2731,7 +2750,7 @@ void VhdlParser::design_file() {
           break;
           }
         default:
-          jj_la1[66] = jj_gen;
+          jj_la1[67] = jj_gen;
           goto end_label_14;
         }
       }
@@ -2752,7 +2771,7 @@ void VhdlParser::design_file() {
       break;
       }
     default:
-      jj_la1[67] = jj_gen;
+      jj_la1[68] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -2797,7 +2816,7 @@ return s;
       break;
       }
     default:
-      jj_la1[68] = jj_gen;
+      jj_la1[69] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -2830,7 +2849,7 @@ return tok->image.c_str();
       break;
       }
     default:
-      jj_la1[69] = jj_gen;
+      jj_la1[70] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -2879,7 +2898,7 @@ void VhdlParser::guarded_signal_specificatio() {if (!hasError) {
 
 
 QCString VhdlParser::discrete_range() {QCString s;
-    if (jj_2_28(2147483647)) {if (!hasError) {
+    if (jj_2_29(2147483647)) {if (!hasError) {
       
       s = range();
       }
@@ -2888,7 +2907,7 @@ QCString VhdlParser::discrete_range() {QCString s;
 return s;
       }
       
-    } else if (jj_2_29(2147483647)) {if (!hasError) {
+    } else if (jj_2_30(2147483647)) {if (!hasError) {
       
       s = subtype_indication();
       }
@@ -2907,9 +2926,9 @@ assert(false);
 
 QCString VhdlParser::element_association() {QCString s,s1;if (!hasError) {
     
-    if (jj_2_30(2147483647)) {if (!hasError) {
+    if (jj_2_31(2147483647)) {if (!hasError) {
       
-      choices();
+      s = choices();
       }
       if (!hasError) {
       
@@ -2925,6 +2944,8 @@ QCString VhdlParser::element_association() {QCString s,s1;if (!hasError) {
     s1 = expression();
     }
     
+if(!s.isEmpty())
+ return s+"=>"+s1;
 return s1;
 assert(false);
   }
@@ -2985,7 +3006,7 @@ s+="("+s1+")";
         break;
         }
       default:
-        jj_la1[70] = jj_gen;
+        jj_la1[71] = jj_gen;
         ;
       }
       }
@@ -3023,7 +3044,7 @@ return tok->image.c_str();
       break;
       }
     default:
-      jj_la1[71] = jj_gen;
+      jj_la1[72] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -3221,7 +3242,7 @@ return "file";
       break;
       }
     default:
-      jj_la1[72] = jj_gen;
+      jj_la1[73] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -3248,7 +3269,7 @@ s+="<>";
       break;
       }
     default:
-      jj_la1[73] = jj_gen;
+      jj_la1[74] = jj_gen;
       ;
     }
     }
@@ -3278,7 +3299,7 @@ s+=s1;
         break;
         }
       default:
-        jj_la1[74] = jj_gen;
+        jj_la1[75] = jj_gen;
         goto end_label_15;
       }if (!hasError) {
       
@@ -3304,91 +3325,84 @@ assert(false);
 
 void VhdlParser::entity_declaration() {QCString s;if (!hasError) {
     
-    try {if (!hasError) {
-      
-      jj_consume_token(ENTITY_T);
-      }
-      if (!hasError) {
-      
-      s = identifier();
-      }
-      if (!hasError) {
-      
-      jj_consume_token(IS_T);
-      }
-      if (!hasError) {
-      
+    jj_consume_token(ENTITY_T);
+    }
+    if (!hasError) {
+    
+    s = identifier();
+    }
+    if (!hasError) {
+    
+    jj_consume_token(IS_T);
+    }
+    if (!hasError) {
+    
 lastEntity=current;
                 lastCompound=0;
                 addVhdlType(s.data(),getLine(ENTITY_T),Entry::CLASS_SEC,VhdlDocGen::ENTITY,0,0,Public);
-      }
-      if (!hasError) {
+    }
+    if (!hasError) {
+    
+    entity_header();
+    }
+    if (!hasError) {
+    
+    entity_declarative_part();
+    }
+    if (!hasError) {
+    
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BEGIN_T:{if (!hasError) {
       
-      entity_header();
+      jj_consume_token(BEGIN_T);
       }
       if (!hasError) {
       
-      entity_declarative_part();
+      entity_statement_part();
       }
-      if (!hasError) {
       
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case BEGIN_T:{if (!hasError) {
-        
-        jj_consume_token(BEGIN_T);
-        }
-        if (!hasError) {
-        
-        entity_statement_part();
-        }
-        
-        break;
-        }
-      default:
-        jj_la1[75] = jj_gen;
-        ;
-      }
+      break;
       }
-      if (!hasError) {
+    default:
+      jj_la1[76] = jj_gen;
+      ;
+    }
+    }
+    if (!hasError) {
+    
+    jj_consume_token(END_T);
+    }
+    if (!hasError) {
+    
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ENTITY_T:{if (!hasError) {
       
-      jj_consume_token(END_T);
+      jj_consume_token(ENTITY_T);
       }
-      if (!hasError) {
       
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case ENTITY_T:{if (!hasError) {
-        
-        jj_consume_token(ENTITY_T);
-        }
-        
-        break;
-        }
-      default:
-        jj_la1[76] = jj_gen;
-        ;
-      }
+      break;
       }
-      if (!hasError) {
+    default:
+      jj_la1[77] = jj_gen;
+      ;
+    }
+    }
+    if (!hasError) {
+    
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case SLSL_T:
+    case STRINGLITERAL:
+    case BASIC_IDENTIFIER:
+    case EXTENDED_CHARACTER:{if (!hasError) {
       
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case SLSL_T:
-      case STRINGLITERAL:
-      case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{if (!hasError) {
-        
-        name();
-        }
-        
-        break;
-        }
-      default:
-        jj_la1[77] = jj_gen;
-        ;
-      }
+      name();
       }
       
-    } catch ( ...) {
-error_skipto(SEMI_T);
+      break;
+      }
+    default:
+      jj_la1[78] = jj_gen;
+      ;
     }
     }
     if (!hasError) {
@@ -3463,8 +3477,8 @@ void VhdlParser::entity_declarative_item() {
       break;
       }
     default:
-      jj_la1[78] = jj_gen;
-      if (jj_2_31(2147483647)) {if (!hasError) {
+      jj_la1[79] = jj_gen;
+      if (jj_2_32(2147483647)) {if (!hasError) {
         
         attribute_declaration();
         }
@@ -3493,8 +3507,8 @@ void VhdlParser::entity_declarative_item() {
           break;
           }
         default:
-          jj_la1[79] = jj_gen;
-          if (jj_2_32(3)) {if (!hasError) {
+          jj_la1[80] = jj_gen;
+          if (jj_2_33(3)) {if (!hasError) {
             
             group_template_declaration();
             }
@@ -3509,8 +3523,8 @@ void VhdlParser::entity_declarative_item() {
               break;
               }
             default:
-              jj_la1[80] = jj_gen;
-              if (jj_2_33(5)) {if (!hasError) {
+              jj_la1[81] = jj_gen;
+              if (jj_2_34(5)) {if (!hasError) {
                 
                 package_instantiation_declaration();
                 }
@@ -3524,8 +3538,15 @@ void VhdlParser::entity_declarative_item() {
                   
                   break;
                   }
+                case VHDL2008TOOLDIR:{if (!hasError) {
+                  
+                  jj_consume_token(VHDL2008TOOLDIR);
+                  }
+                  
+                  break;
+                  }
                 default:
-                  jj_la1[81] = jj_gen;
+                  jj_la1[82] = jj_gen;
                   jj_consume_token(-1);
                   errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
                 }
@@ -3558,12 +3579,13 @@ void VhdlParser::entity_declarative_part() {if (!hasError) {
       case SUBTYPE_T:
       case TYPE_T:
       case USE_T:
-      case VARIABLE_T:{
+      case VARIABLE_T:
+      case VHDL2008TOOLDIR:{
         ;
         break;
         }
       default:
-        jj_la1[82] = jj_gen;
+        jj_la1[83] = jj_gen;
         goto end_label_16;
       }if (!hasError) {
       
@@ -3592,7 +3614,7 @@ QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) {
       break;
       }
     default:
-      jj_la1[83] = jj_gen;
+      jj_la1[84] = jj_gen;
       ;
     }
     }
@@ -3617,7 +3639,7 @@ currP=VhdlDocGen::GENERIC;parse_sec=GEN_SEC;
       break;
       }
     default:
-      jj_la1[84] = jj_gen;
+      jj_la1[85] = jj_gen;
       ;
     }
     }
@@ -3636,7 +3658,7 @@ currP=VhdlDocGen::PORT;
       break;
       }
     default:
-      jj_la1[85] = jj_gen;
+      jj_la1[86] = jj_gen;
       ;
     }
     }
@@ -3671,7 +3693,7 @@ s+=s1;
           break;
           }
         default:
-          jj_la1[86] = jj_gen;
+          jj_la1[87] = jj_gen;
           goto end_label_17;
         }
       }
@@ -3707,7 +3729,7 @@ return "all";
       break;
       }
     default:
-      jj_la1[87] = jj_gen;
+      jj_la1[88] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -3734,12 +3756,12 @@ assert(false);
 
 
 void VhdlParser::entity_statement() {
-    if (jj_2_34(2147483647)) {if (!hasError) {
+    if (jj_2_35(2147483647)) {if (!hasError) {
       
       concurrent_assertion_statement();
       }
       
-    } else if (jj_2_35(2147483647)) {if (!hasError) {
+    } else if (jj_2_36(2147483647)) {if (!hasError) {
       
       process_statement();
       }
@@ -3758,7 +3780,7 @@ void VhdlParser::entity_statement() {
         break;
         }
       default:
-        jj_la1[88] = jj_gen;
+        jj_la1[89] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -3781,7 +3803,7 @@ void VhdlParser::entity_statement_part() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[89] = jj_gen;
+        jj_la1[90] = jj_gen;
         goto end_label_18;
       }if (!hasError) {
       
@@ -3823,7 +3845,7 @@ return s;
       break;
       }
     default:
-      jj_la1[90] = jj_gen;
+      jj_la1[91] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -3857,7 +3879,7 @@ return s;
       break;
       }
     default:
-      jj_la1[91] = jj_gen;
+      jj_la1[92] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -3882,7 +3904,7 @@ QCString VhdlParser::enumeration_type_definition() {QCString s,s1;if (!hasError)
         break;
         }
       default:
-        jj_la1[92] = jj_gen;
+        jj_la1[93] = jj_gen;
         goto end_label_19;
       }if (!hasError) {
       
@@ -3926,7 +3948,7 @@ QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
       break;
       }
     default:
-      jj_la1[93] = jj_gen;
+      jj_la1[94] = jj_gen;
       ;
     }
     }
@@ -3946,7 +3968,7 @@ QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
       break;
       }
     default:
-      jj_la1[94] = jj_gen;
+      jj_la1[95] = jj_gen;
       ;
     }
     }
@@ -3965,7 +3987,7 @@ QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
       break;
       }
     default:
-      jj_la1[95] = jj_gen;
+      jj_la1[96] = jj_gen;
       ;
     }
     }
@@ -3974,8 +3996,11 @@ QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
     jj_consume_token(SEMI_T);
     }
     
-if(t) s+=":";
+lab.resize(0);
+  if(t) s+=":";
   if(t1) s2.prepend(" when ");
+   FlowChart::addFlowChart(FlowChart::EXIT_NO,"exit",s2.data(),s1.data());
+
   return s+s1+s2+";";
 assert(false);
   }
@@ -3999,7 +4024,7 @@ QCString VhdlParser::expression() {QCString s,s1,s2;if (!hasError) {
         break;
         }
       default:
-        jj_la1[96] = jj_gen;
+        jj_la1[97] = jj_gen;
         goto end_label_20;
       }if (!hasError) {
       
@@ -4092,7 +4117,7 @@ return "or" ;
       break;
       }
     default:
-      jj_la1[97] = jj_gen;
+      jj_la1[98] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -4146,7 +4171,7 @@ s+="**";s+=s1;
         break;
         }
       default:
-        jj_la1[98] = jj_gen;
+        jj_la1[99] = jj_gen;
         ;
       }
       }
@@ -4188,7 +4213,7 @@ s1="not ";return s1+s;
       break;
       }
     default:
-      jj_la1[99] = jj_gen;
+      jj_la1[100] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -4224,7 +4249,7 @@ QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3;if (!hasError) {
       break;
       }
     default:
-      jj_la1[100] = jj_gen;
+      jj_la1[101] = jj_gen;
       ;
     }
     }
@@ -4265,7 +4290,7 @@ QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) {
       break;
       }
     default:
-      jj_la1[101] = jj_gen;
+      jj_la1[102] = jj_gen;
       ;
     }
     }
@@ -4339,7 +4364,7 @@ return tok->image.c_str();
       break;
       }
     default:
-      jj_la1[102] = jj_gen;
+      jj_la1[103] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -4384,7 +4409,7 @@ s+"("+s1+")";
       break;
       }
     default:
-      jj_la1[103] = jj_gen;
+      jj_la1[104] = jj_gen;
       ;
     }
     }
@@ -4474,100 +4499,7 @@ pushLabel(genLabels,s);
       }
       if (!hasError) {
       
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case ALIAS_T:
-      case ATTRIBUTE_T:
-      case BEGIN_T:
-      case COMPONENT_T:
-      case CONSTANT_T:
-      case DISCONNECT_T:
-      case FILE_T:
-      case FOR_T:
-      case FUNCTION_T:
-      case GROUP_T:
-      case IMPURE_T:
-      case PROCEDURE_T:
-      case PURE_T:
-      case SIGNAL_T:
-      case SHARED_T:
-      case SUBTYPE_T:
-      case TYPE_T:
-      case USE_T:
-      case VARIABLE_T:{if (!hasError) {
-        
-        while (!hasError) {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case ALIAS_T:
-          case ATTRIBUTE_T:
-          case COMPONENT_T:
-          case CONSTANT_T:
-          case DISCONNECT_T:
-          case FILE_T:
-          case FOR_T:
-          case FUNCTION_T:
-          case GROUP_T:
-          case IMPURE_T:
-          case PROCEDURE_T:
-          case PURE_T:
-          case SIGNAL_T:
-          case SHARED_T:
-          case SUBTYPE_T:
-          case TYPE_T:
-          case USE_T:
-          case VARIABLE_T:{
-            ;
-            break;
-            }
-          default:
-            jj_la1[104] = jj_gen;
-            goto end_label_21;
-          }if (!hasError) {
-          
-          block_declarative_item();
-          }
-          
-        }
-        end_label_21: ;
-        }
-        if (!hasError) {
-        
-        jj_consume_token(BEGIN_T);
-        }
-        
-        break;
-        }
-      default:
-        jj_la1[105] = jj_gen;
-        ;
-      }
-      }
-      if (!hasError) {
-      
-      while (!hasError) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ASSERT_T:
-        case CASE_T:
-        case POSTPONED_T:
-        case PROCESS_T:
-        case WITH_T:
-        case LPAREN_T:
-        case SLSL_T:
-        case STRINGLITERAL:
-        case BASIC_IDENTIFIER:
-        case EXTENDED_CHARACTER:{
-          ;
-          break;
-          }
-        default:
-          jj_la1[106] = jj_gen;
-          goto end_label_22;
-        }if (!hasError) {
-        
-        concurrent_statement();
-        }
-        
-      }
-      end_label_22: ;
+      generate_statement_body1();
       }
       if (!hasError) {
       
@@ -4594,7 +4526,7 @@ error_skipto(GENERATE_T);
       break;
       }
     default:
-      jj_la1[107] = jj_gen;
+      jj_la1[105] = jj_gen;
       ;
     }
     }
@@ -4632,7 +4564,7 @@ void VhdlParser::generate_scheme() {
       break;
       }
     default:
-      jj_la1[108] = jj_gen;
+      jj_la1[106] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -4730,7 +4662,7 @@ return s;
       break;
       }
     default:
-      jj_la1[109] = jj_gen;
+      jj_la1[107] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -4754,8 +4686,8 @@ QCString VhdlParser::group_constituent_list() {QCString s,s1,s2;if (!hasError) {
         break;
         }
       default:
-        jj_la1[110] = jj_gen;
-        goto end_label_23;
+        jj_la1[108] = jj_gen;
+        goto end_label_21;
       }if (!hasError) {
       
       jj_consume_token(COMMA_T);
@@ -4770,7 +4702,7 @@ s2+=",";s2+=s1;
       }
       
     }
-    end_label_23: ;
+    end_label_21: ;
     }
     
 return s+s2;
@@ -4891,7 +4823,7 @@ return tok->image.c_str();
       break;
       }
     default:
-      jj_la1[111] = jj_gen;
+      jj_la1[109] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -4912,8 +4844,8 @@ QCString VhdlParser::identifier_list() {QCString str,str1;if (!hasError) {
         break;
         }
       default:
-        jj_la1[112] = jj_gen;
-        goto end_label_24;
+        jj_la1[110] = jj_gen;
+        goto end_label_22;
       }if (!hasError) {
       
       jj_consume_token(COMMA_T);
@@ -4928,7 +4860,7 @@ str+=",";str+=str1;
       }
       
     }
-    end_label_24: ;
+    end_label_22: ;
     }
     
 return str;
@@ -4952,7 +4884,7 @@ void VhdlParser::if_statement() {QCString s,s1;if (!hasError) {
       break;
       }
     default:
-      jj_la1[113] = jj_gen;
+      jj_la1[111] = jj_gen;
       ;
     }
     }
@@ -4986,8 +4918,8 @@ s.prepend("if ");
         break;
         }
       default:
-        jj_la1[114] = jj_gen;
-        goto end_label_25;
+        jj_la1[112] = jj_gen;
+        goto end_label_23;
       }if (!hasError) {
       
       jj_consume_token(ELSIF_T);
@@ -5011,7 +4943,7 @@ s1.prepend("elsif ");
       }
       
     }
-    end_label_25: ;
+    end_label_23: ;
     }
     if (!hasError) {
     
@@ -5032,7 +4964,7 @@ FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
       break;
       }
     default:
-      jj_la1[115] = jj_gen;
+      jj_la1[113] = jj_gen;
       ;
     }
     }
@@ -5056,7 +4988,7 @@ FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
       break;
       }
     default:
-      jj_la1[116] = jj_gen;
+      jj_la1[114] = jj_gen;
       ;
     }
     }
@@ -5109,8 +5041,8 @@ s+=s2;
         break;
         }
       default:
-        jj_la1[117] = jj_gen;
-        goto end_label_26;
+        jj_la1[115] = jj_gen;
+        goto end_label_24;
       }if (!hasError) {
       
       jj_consume_token(COMMA_T);
@@ -5125,7 +5057,7 @@ s+=",";s+=s1;
       }
       
     }
-    end_label_26: ;
+    end_label_24: ;
     }
     if (!hasError) {
     
@@ -5138,7 +5070,7 @@ assert(false);
 
 
 QCString VhdlParser::index_specification() {QCString s;
-    if (jj_2_36(2147483647)) {if (!hasError) {
+    if (jj_2_37(2147483647)) {if (!hasError) {
       
       s = discrete_range();
       }
@@ -5176,7 +5108,7 @@ return s;
         break;
         }
       default:
-        jj_la1[118] = jj_gen;
+        jj_la1[116] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -5218,7 +5150,7 @@ QCString VhdlParser::instantiation_unit() {QCString s,s1,s2;Token *tok;
         break;
         }
       default:
-        jj_la1[119] = jj_gen;
+        jj_la1[117] = jj_gen;
         ;
       }
       }
@@ -5268,7 +5200,7 @@ s+="(";s+=s1;s+=")" ;
         break;
         }
       default:
-        jj_la1[120] = jj_gen;
+        jj_la1[118] = jj_gen;
         ;
       }
       }
@@ -5295,7 +5227,7 @@ s1="configuration ";return s;
       break;
       }
     default:
-      jj_la1[121] = jj_gen;
+      jj_la1[119] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -5340,7 +5272,7 @@ return tok->image.c_str();
       break;
       }
     default:
-      jj_la1[122] = jj_gen;
+      jj_la1[120] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -5369,7 +5301,7 @@ assert(false);
 
 
 QCString VhdlParser::interface_declaration() {QCString s,s1;
-    if (jj_2_37(5)) {if (!hasError) {
+    if (jj_2_38(5)) {if (!hasError) {
       
       s = interface_subprogram_declaration();
       }
@@ -5392,8 +5324,8 @@ return s;
         break;
         }
       default:
-        jj_la1[123] = jj_gen;
-        if (jj_2_38(5)) {if (!hasError) {
+        jj_la1[121] = jj_gen;
+        if (jj_2_39(5)) {if (!hasError) {
           
           s = interface_variable_declaration();
           }
@@ -5402,7 +5334,7 @@ return s;
 return s;
           }
           
-        } else if (jj_2_39(5)) {if (!hasError) {
+        } else if (jj_2_40(5)) {if (!hasError) {
           
           interface_file_declaration();
           }
@@ -5411,7 +5343,7 @@ return s;
 return s;
           }
           
-        } else if (jj_2_40(2147483647)) {if (!hasError) {
+        } else if (jj_2_41(2147483647)) {if (!hasError) {
           
           subprogram_declaration();
           }
@@ -5445,7 +5377,7 @@ if (parse_sec==GEN_SEC)
             break;
             }
           default:
-            jj_la1[124] = jj_gen;
+            jj_la1[122] = jj_gen;
             jj_consume_token(-1);
             errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
           }
@@ -5502,8 +5434,8 @@ QCString VhdlParser::interface_list() {QCString s,s1,s2;if (!hasError) {
         break;
         }
       default:
-        jj_la1[125] = jj_gen;
-        goto end_label_27;
+        jj_la1[123] = jj_gen;
+        goto end_label_25;
       }if (!hasError) {
       
       jj_consume_token(SEMI_T);
@@ -5518,7 +5450,7 @@ s2+=";";s2+=s1;
       }
       
     }
-    end_label_27: ;
+    end_label_25: ;
     }
     
 return s+s2;
@@ -5564,7 +5496,7 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
         break;
         }
       default:
-        jj_la1[126] = jj_gen;
+        jj_la1[124] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -5573,7 +5505,7 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
       break;
       }
     default:
-      jj_la1[127] = jj_gen;
+      jj_la1[125] = jj_gen;
       ;
     }
     }
@@ -5600,7 +5532,7 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
       break;
       }
     default:
-      jj_la1[128] = jj_gen;
+      jj_la1[126] = jj_gen;
       ;
     }
     }
@@ -5619,7 +5551,7 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
       break;
       }
     default:
-      jj_la1[129] = jj_gen;
+      jj_la1[127] = jj_gen;
       ;
     }
     }
@@ -5638,7 +5570,7 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
       break;
       }
     default:
-      jj_la1[130] = jj_gen;
+      jj_la1[128] = jj_gen;
       ;
     }
     }
@@ -5657,7 +5589,7 @@ if(tok)
                     {
                       if (currP==VhdlDocGen::FUNCTION || currP==VhdlDocGen::PROCEDURE)
                       {
-                        addProto(s5.data(),s.data(),s2.data(),s3.data(),0,s4.data());
+                        addProto(s5.data(),s.data(),s1.data(),s2.data(),s3.data(),s4.data());
                       }
                       else
                       {
@@ -5674,7 +5606,7 @@ assert(false);
   }
 
 
-void VhdlParser::iteration_scheme() {
+QCString VhdlParser::iteration_scheme() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case WHILE_T:{if (!hasError) {
       
@@ -5682,7 +5614,14 @@ void VhdlParser::iteration_scheme() {
       }
       if (!hasError) {
       
-      condition();
+      s = condition();
+      }
+      if (!hasError) {
+      
+s.prepend("while ");
+   FlowChart::addFlowChart(FlowChart::WHILE_NO,0,s.data(),lab.data());
+   lab="";
+  return s;
       }
       
       break;
@@ -5693,16 +5632,24 @@ void VhdlParser::iteration_scheme() {
       }
       if (!hasError) {
       
-      parameter_specification();
+      s = parameter_specification();
+      }
+      if (!hasError) {
+      
+QCString q=lab+" for "+s;
+    FlowChart::addFlowChart(FlowChart::FOR_NO,0,q.data(),lab.data());
+    lab="";
+        return q;
       }
       
       break;
       }
     default:
-      jj_la1[131] = jj_gen;
+      jj_la1[129] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
+assert(false);
   }
 
 
@@ -5743,7 +5690,7 @@ assert(false);
 
 
 QCString VhdlParser::library_unit() {QCString s;
-    if (jj_2_41(2)) {if (!hasError) {
+    if (jj_2_42(2)) {if (!hasError) {
       
       primary_unit();
       }
@@ -5774,7 +5721,7 @@ return s;
         break;
         }
       default:
-        jj_la1[132] = jj_gen;
+        jj_la1[130] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -5784,7 +5731,7 @@ assert(false);
 
 
 QCString VhdlParser::literal() {QCString s;
-    if (jj_2_42(2147483647)) {if (!hasError) {
+    if (jj_2_43(2147483647)) {if (!hasError) {
       
       s = bit_string_literal();
       }
@@ -5793,7 +5740,7 @@ QCString VhdlParser::literal() {QCString s;
 return s;
       }
       
-    } else if (jj_2_43(2147483647)) {if (!hasError) {
+    } else if (jj_2_44(2147483647)) {if (!hasError) {
       
       s = numeric_literal();
       }
@@ -5802,7 +5749,7 @@ return s;
 return s;
       }
       
-    } else if (jj_2_44(2147483647)) {if (!hasError) {
+    } else if (jj_2_45(2147483647)) {if (!hasError) {
       
       s = enumeration_literal();
       }
@@ -5836,7 +5783,7 @@ return "null";
         break;
         }
       default:
-        jj_la1[133] = jj_gen;
+        jj_la1[131] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -5855,23 +5802,27 @@ assert(false);
   }
 
 
-void VhdlParser::loop_statement() {if (!hasError) {
+QCString VhdlParser::loop_statement() {QCString s,s1,s2,s3;if (!hasError) {
     
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
     case EXTENDED_CHARACTER:{if (!hasError) {
       
-      identifier();
+      s = identifier();
       }
       if (!hasError) {
       
       jj_consume_token(COLON_T);
       }
+      if (!hasError) {
+      
+s+=":";
+      }
       
       break;
       }
     default:
-      jj_la1[134] = jj_gen;
+      jj_la1[132] = jj_gen;
       ;
     }
     }
@@ -5881,23 +5832,28 @@ void VhdlParser::loop_statement() {if (!hasError) {
     case FOR_T:
     case WHILE_T:{if (!hasError) {
       
-      iteration_scheme();
+      s1 = iteration_scheme();
       }
       
       break;
       }
     default:
-      jj_la1[135] = jj_gen;
+      jj_la1[133] = jj_gen;
       ;
     }
     }
     if (!hasError) {
     
+if(s1.isEmpty())
+           FlowChart::addFlowChart(FlowChart::LOOP_NO,0,"infinite");
+    }
+    if (!hasError) {
+    
     jj_consume_token(LOOP_T);
     }
     if (!hasError) {
     
-    sequence_of_statement();
+    s2 = sequence_of_statement();
     }
     if (!hasError) {
     
@@ -5913,13 +5869,13 @@ void VhdlParser::loop_statement() {if (!hasError) {
     case BASIC_IDENTIFIER:
     case EXTENDED_CHARACTER:{if (!hasError) {
       
-      identifier();
+      s3 = identifier();
       }
       
       break;
       }
     default:
-      jj_la1[136] = jj_gen;
+      jj_la1[134] = jj_gen;
       ;
     }
     }
@@ -5928,6 +5884,12 @@ void VhdlParser::loop_statement() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
+QCString q = s+" loop "+s2+" end loop" +s3;
+         QCString endLoop="end loop" + s3;
+         FlowChart::moveToPrevLevel();
+         FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop.data(),0);
+                return q;
+assert(false);
   }
 
 
@@ -5967,7 +5929,7 @@ return "not";
       break;
       }
     default:
-      jj_la1[137] = jj_gen;
+      jj_la1[135] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -6033,7 +5995,7 @@ return "linkage";
       break;
       }
     default:
-      jj_la1[138] = jj_gen;
+      jj_la1[136] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -6088,7 +6050,7 @@ return tok->image.c_str();
       break;
       }
     default:
-      jj_la1[139] = jj_gen;
+      jj_la1[137] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -6122,14 +6084,14 @@ QCString VhdlParser::name() {QCString s,s1;if (!hasError) {
       break;
       }
     default:
-      jj_la1[140] = jj_gen;
+      jj_la1[138] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
     }
     if (!hasError) {
     
-    if (jj_2_45(2147483647)) {if (!hasError) {
+    if (jj_2_46(2147483647)) {if (!hasError) {
       
       s1 = name_ext1();
       }
@@ -6155,10 +6117,10 @@ QCString VhdlParser::name_ext1() {QCString s,s1,s2;if (!hasError) {
     if (!hasError) {
     
     while (!hasError) {
-      if (jj_2_46(2147483647)) {
+      if (jj_2_47(2147483647)) {
         ;
       } else {
-        goto end_label_28;
+        goto end_label_26;
       }if (!hasError) {
       
       s1 = name_ext();
@@ -6169,7 +6131,7 @@ s+=s1;
       }
       
     }
-    end_label_28: ;
+    end_label_26: ;
     }
     
 return s;
@@ -6179,7 +6141,7 @@ assert(false);
 
 QCString VhdlParser::name_ext() {QCString s,s1,s2;if (!hasError) {
     
-    if (jj_2_47(2147483647)) {if (!hasError) {
+    if (jj_2_48(2147483647)) {if (!hasError) {
       
       jj_consume_token(DOT_T);
       }
@@ -6192,7 +6154,7 @@ QCString VhdlParser::name_ext() {QCString s,s1,s2;if (!hasError) {
 s+=".";s+=s1;
       }
       
-    } else if (jj_2_48(2147483647)) {if (!hasError) {
+    } else if (jj_2_49(2147483647)) {if (!hasError) {
       
       s1 = test_att_name();
       }
@@ -6201,7 +6163,7 @@ s+=".";s+=s1;
 s+=s1;
       }
       
-    } else if (jj_2_49(2147483647)) {if (!hasError) {
+    } else if (jj_2_50(2147483647)) {if (!hasError) {
       
       jj_consume_token(LPAREN_T);
       }
@@ -6218,7 +6180,7 @@ s+=s1;
 s+="(";s+=s1;s+=")";
       }
       
-    } else if (jj_2_50(2147483647)) {if (!hasError) {
+    } else if (jj_2_51(2147483647)) {if (!hasError) {
       
       jj_consume_token(LPAREN_T);
       }
@@ -6239,8 +6201,8 @@ s+="(";s+=s1;
           break;
           }
         default:
-          jj_la1[141] = jj_gen;
-          goto end_label_29;
+          jj_la1[139] = jj_gen;
+          goto end_label_27;
         }if (!hasError) {
         
         jj_consume_token(COMMA_T);
@@ -6255,7 +6217,7 @@ s+=",";s+=s1;
         }
         
       }
-      end_label_29: ;
+      end_label_27: ;
       }
       if (!hasError) {
       
@@ -6279,7 +6241,7 @@ assert(false);
 
 QCString VhdlParser::test_att_name() {QCString s,s1;if (!hasError) {
     
-    if (jj_2_51(2147483647)) {if (!hasError) {
+    if (jj_2_52(2147483647)) {if (!hasError) {
       
       s1 = signature();
       }
@@ -6327,7 +6289,7 @@ s+="(";s+=s1;s+=")";
       break;
       }
     default:
-      jj_la1[142] = jj_gen;
+      jj_la1[140] = jj_gen;
       ;
     }
     }
@@ -6362,8 +6324,8 @@ s=s2+"("+s1;
         break;
         }
       default:
-        jj_la1[143] = jj_gen;
-        goto end_label_30;
+        jj_la1[141] = jj_gen;
+        goto end_label_28;
       }if (!hasError) {
       
       jj_consume_token(COMMA_T);
@@ -6378,7 +6340,7 @@ s+=",";s+=s1;
       }
       
     }
-    end_label_30: ;
+    end_label_28: ;
     }
     if (!hasError) {
     
@@ -6406,7 +6368,7 @@ QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
       break;
       }
     default:
-      jj_la1[144] = jj_gen;
+      jj_la1[142] = jj_gen;
       ;
     }
     }
@@ -6426,7 +6388,7 @@ QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
       break;
       }
     default:
-      jj_la1[145] = jj_gen;
+      jj_la1[143] = jj_gen;
       ;
     }
     }
@@ -6445,7 +6407,7 @@ QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
       break;
       }
     default:
-      jj_la1[146] = jj_gen;
+      jj_la1[144] = jj_gen;
       ;
     }
     }
@@ -6455,8 +6417,10 @@ QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
     }
     
 if(t) s+=":";
+   FlowChart::addFlowChart(FlowChart::NEXT_NO,"next ",s2.data(),s1.data());
+    lab.resize(0);
   if(t1) s2.prepend("when ");
-   return s+s1+s2+";";
+  return s+s1+s2+";";
 assert(false);
   }
 
@@ -6481,7 +6445,7 @@ s+=":";
       break;
       }
     default:
-      jj_la1[147] = jj_gen;
+      jj_la1[145] = jj_gen;
       ;
     }
     }
@@ -6500,7 +6464,7 @@ assert(false);
 
 
 QCString VhdlParser::numeric_literal() {QCString s;
-    if (jj_2_52(2147483647)) {if (!hasError) {
+    if (jj_2_53(2147483647)) {if (!hasError) {
       
       s = physical_literal();
       }
@@ -6525,7 +6489,7 @@ return s;
         break;
         }
       default:
-        jj_la1[148] = jj_gen;
+        jj_la1[146] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -6607,7 +6571,7 @@ return "type";
       break;
       }
     default:
-      jj_la1[149] = jj_gen;
+      jj_la1[147] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -6636,7 +6600,7 @@ void VhdlParser::options() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[150] = jj_gen;
+      jj_la1[148] = jj_gen;
       ;
     }
     }
@@ -6653,7 +6617,7 @@ void VhdlParser::options() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[151] = jj_gen;
+      jj_la1[149] = jj_gen;
       ;
     }
     }
@@ -6706,7 +6670,7 @@ lastCompound=current;
       break;
       }
     default:
-      jj_la1[152] = jj_gen;
+      jj_la1[150] = jj_gen;
       ;
     }
     }
@@ -6724,7 +6688,7 @@ lastCompound=current;
       break;
       }
     default:
-      jj_la1[153] = jj_gen;
+      jj_la1[151] = jj_gen;
       ;
     }
     }
@@ -6800,8 +6764,8 @@ void VhdlParser::package_body_declarative_item() {
       break;
       }
     default:
-      jj_la1[154] = jj_gen;
-      if (jj_2_53(3)) {if (!hasError) {
+      jj_la1[152] = jj_gen;
+      if (jj_2_54(3)) {if (!hasError) {
         
         group_template_declaration();
         }
@@ -6816,7 +6780,7 @@ void VhdlParser::package_body_declarative_item() {
           break;
           }
         default:
-          jj_la1[155] = jj_gen;
+          jj_la1[153] = jj_gen;
           jj_consume_token(-1);
           errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
         }
@@ -6846,15 +6810,15 @@ void VhdlParser::package_body_declarative_part() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[156] = jj_gen;
-        goto end_label_31;
+        jj_la1[154] = jj_gen;
+        goto end_label_29;
       }if (!hasError) {
       
       package_body_declarative_item();
       }
       
     }
-    end_label_31: ;
+    end_label_29: ;
     }
     
   }
@@ -6904,7 +6868,7 @@ lastCompound=current;
       break;
       }
     default:
-      jj_la1[157] = jj_gen;
+      jj_la1[155] = jj_gen;
       ;
     }
     }
@@ -6922,7 +6886,7 @@ lastCompound=current;
       break;
       }
     default:
-      jj_la1[158] = jj_gen;
+      jj_la1[156] = jj_gen;
       ;
     }
     }
@@ -6961,7 +6925,7 @@ void VhdlParser::geninter() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[159] = jj_gen;
+        jj_la1[157] = jj_gen;
         ;
       }
       }
@@ -6969,7 +6933,7 @@ void VhdlParser::geninter() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[160] = jj_gen;
+      jj_la1[158] = jj_gen;
       ;
     }
     }
@@ -7047,8 +7011,8 @@ void VhdlParser::package_declarative_item() {
       break;
       }
     default:
-      jj_la1[161] = jj_gen;
-      if (jj_2_54(2147483647)) {if (!hasError) {
+      jj_la1[159] = jj_gen;
+      if (jj_2_55(2147483647)) {if (!hasError) {
         
         attribute_declaration();
         }
@@ -7077,8 +7041,8 @@ void VhdlParser::package_declarative_item() {
           break;
           }
         default:
-          jj_la1[162] = jj_gen;
-          if (jj_2_55(3)) {if (!hasError) {
+          jj_la1[160] = jj_gen;
+          if (jj_2_56(3)) {if (!hasError) {
             
             group_template_declaration();
             }
@@ -7093,8 +7057,8 @@ void VhdlParser::package_declarative_item() {
               break;
               }
             default:
-              jj_la1[163] = jj_gen;
-              if (jj_2_56(5)) {if (!hasError) {
+              jj_la1[161] = jj_gen;
+              if (jj_2_57(5)) {if (!hasError) {
                 
                 package_instantiation_declaration();
                 }
@@ -7109,7 +7073,7 @@ void VhdlParser::package_declarative_item() {
                   break;
                   }
                 default:
-                  jj_la1[164] = jj_gen;
+                  jj_la1[162] = jj_gen;
                   jj_consume_token(-1);
                   errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
                 }
@@ -7148,15 +7112,15 @@ void VhdlParser::package_declarative_part() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[165] = jj_gen;
-        goto end_label_32;
+        jj_la1[163] = jj_gen;
+        goto end_label_30;
       }if (!hasError) {
       
       package_declarative_item();
       }
       
     }
-    end_label_32: ;
+    end_label_30: ;
     }
     
   }
@@ -7182,7 +7146,7 @@ assert(false);
 
 QCString VhdlParser::physical_literal() {QCString s,s1;if (!hasError) {
     
-    if (jj_2_57(2147483647)) {if (!hasError) {
+    if (jj_2_58(2147483647)) {if (!hasError) {
       
       s = abstract_literal();
       }
@@ -7223,8 +7187,8 @@ QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;if (!hasError)
         break;
         }
       default:
-        jj_la1[166] = jj_gen;
-        goto end_label_33;
+        jj_la1[164] = jj_gen;
+        goto end_label_31;
       }if (!hasError) {
       
       s1 = secondary_unit_declaration();
@@ -7235,7 +7199,7 @@ s2+=s1;s2+="#";
       }
       
     }
-    end_label_33: ;
+    end_label_31: ;
     }
     if (!hasError) {
     
@@ -7259,7 +7223,7 @@ s2+=s1;s2+="#";
       break;
       }
     default:
-      jj_la1[167] = jj_gen;
+      jj_la1[165] = jj_gen;
       ;
     }
     }
@@ -7332,7 +7296,7 @@ void VhdlParser::port_map_aspect() {if (!hasError) {
 
 
 QCString VhdlParser::primary() {QCString s,s1;
-    if (jj_2_58(2147483647)) {if (!hasError) {
+    if (jj_2_59(2147483647)) {if (!hasError) {
       
       s = function_call();
       }
@@ -7341,7 +7305,7 @@ QCString VhdlParser::primary() {QCString s,s1;
 return s;
       }
       
-    } else if (jj_2_59(2147483647)) {if (!hasError) {
+    } else if (jj_2_60(2147483647)) {if (!hasError) {
       
       jj_consume_token(LPAREN_T);
       }
@@ -7358,7 +7322,7 @@ return s;
 s="("+s1+")"; return s;
       }
       
-    } else if (jj_2_60(2147483647)) {if (!hasError) {
+    } else if (jj_2_61(2147483647)) {if (!hasError) {
       
       s = qualified_expression();
       }
@@ -7367,7 +7331,7 @@ s="("+s1+")"; return s;
 return s;
       }
       
-    } else if (jj_2_61(2147483647)) {if (!hasError) {
+    } else if (jj_2_62(2147483647)) {if (!hasError) {
       
       s = type_conversion();
       }
@@ -7376,7 +7340,7 @@ return s;
 return s;
       }
       
-    } else if (jj_2_62(2147483647)) {if (!hasError) {
+    } else if (jj_2_63(2147483647)) {if (!hasError) {
       
       s = literal();
       }
@@ -7385,7 +7349,7 @@ return s;
 s.prepend(" ");return s;
       }
       
-    } else if (jj_2_63(2147483647)) {if (!hasError) {
+    } else if (jj_2_64(2147483647)) {if (!hasError) {
       
       s = name();
       }
@@ -7419,7 +7383,7 @@ return s;
         break;
         }
       default:
-        jj_la1[168] = jj_gen;
+        jj_la1[166] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -7445,13 +7409,13 @@ void VhdlParser::primary_unit() {
       break;
       }
     default:
-      jj_la1[169] = jj_gen;
-      if (jj_2_64(2147483647)) {if (!hasError) {
+      jj_la1[167] = jj_gen;
+      if (jj_2_65(2147483647)) {if (!hasError) {
         
         package_instantiation_declaration();
         }
         
-      } else if (jj_2_65(4)) {if (!hasError) {
+      } else if (jj_2_66(4)) {if (!hasError) {
         
         interface_package_declaration();
         }
@@ -7466,7 +7430,7 @@ void VhdlParser::primary_unit() {
           break;
           }
         default:
-          jj_la1[170] = jj_gen;
+          jj_la1[168] = jj_gen;
           jj_consume_token(-1);
           errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
         }
@@ -7502,7 +7466,7 @@ s1.prepend("("); s1.append(")");
       break;
       }
     default:
-      jj_la1[171] = jj_gen;
+      jj_la1[169] = jj_gen;
       ;
     }
     }
@@ -7514,7 +7478,7 @@ assert(false);
 
 QCString VhdlParser::procedure_call_statement() {QCString s,s1;if (!hasError) {
     
-    if (jj_2_66(2)) {if (!hasError) {
+    if (jj_2_67(2)) {if (!hasError) {
       
       s = identifier();
       }
@@ -7629,8 +7593,8 @@ return s;
       break;
       }
     default:
-      jj_la1[172] = jj_gen;
-      if (jj_2_67(3)) {if (!hasError) {
+      jj_la1[170] = jj_gen;
+      if (jj_2_68(3)) {if (!hasError) {
         
         s = attribute_declaration();
         }
@@ -7664,8 +7628,8 @@ return s;
           break;
           }
         default:
-          jj_la1[173] = jj_gen;
-          if (jj_2_68(3)) {if (!hasError) {
+          jj_la1[171] = jj_gen;
+          if (jj_2_69(3)) {if (!hasError) {
             
             s = group_template_declaration();
             }
@@ -7688,7 +7652,7 @@ return s;
               break;
               }
             default:
-              jj_la1[174] = jj_gen;
+              jj_la1[172] = jj_gen;
               jj_consume_token(-1);
               errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
             }
@@ -7722,8 +7686,8 @@ QCString VhdlParser::process_declarative_part() {QCString s,s1;if (!hasError) {
         break;
         }
       default:
-        jj_la1[175] = jj_gen;
-        goto end_label_34;
+        jj_la1[173] = jj_gen;
+        goto end_label_32;
       }if (!hasError) {
       
       s1 = process_declarative_item();
@@ -7734,7 +7698,7 @@ s+=s1;
       }
       
     }
-    end_label_34: ;
+    end_label_32: ;
     }
     
 return s;
@@ -7758,7 +7722,7 @@ void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;if (!hasErro
       break;
       }
     default:
-      jj_la1[176] = jj_gen;
+      jj_la1[174] = jj_gen;
       ;
     }
     }
@@ -7773,7 +7737,7 @@ void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;if (!hasErro
       break;
       }
     default:
-      jj_la1[177] = jj_gen;
+      jj_la1[175] = jj_gen;
       ;
     }
     }
@@ -7789,106 +7753,99 @@ currP=VhdlDocGen::PROCESS;
     }
     if (!hasError) {
     
-    try {if (!hasError) {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LPAREN_T:{if (!hasError) {
+      
+      jj_consume_token(LPAREN_T);
+      }
+      if (!hasError) {
       
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LPAREN_T:{if (!hasError) {
-        
-        jj_consume_token(LPAREN_T);
-        }
-        if (!hasError) {
-        
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ALL_T:{if (!hasError) {
-          
-          tok = jj_consume_token(ALL_T);
-          }
-          
-          break;
-          }
-        case SLSL_T:
-        case STRINGLITERAL:
-        case BASIC_IDENTIFIER:
-        case EXTENDED_CHARACTER:{if (!hasError) {
-          
-          s1 = sensitivity_list();
-          }
-          
-          break;
-          }
-        default:
-          jj_la1[178] = jj_gen;
-          jj_consume_token(-1);
-          errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
-        }
-        }
-        if (!hasError) {
+      case ALL_T:{if (!hasError) {
         
-        jj_consume_token(RPAREN_T);
+        tok = jj_consume_token(ALL_T);
         }
         
         break;
         }
-      default:
-        jj_la1[179] = jj_gen;
-        ;
-      }
-      }
-      if (!hasError) {
-      
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case IS_T:{if (!hasError) {
+      case SLSL_T:
+      case STRINGLITERAL:
+      case BASIC_IDENTIFIER:
+      case EXTENDED_CHARACTER:{if (!hasError) {
         
-        jj_consume_token(IS_T);
+        s1 = sensitivity_list();
         }
         
         break;
         }
       default:
-        jj_la1[180] = jj_gen;
-        ;
+        jj_la1[176] = jj_gen;
+        jj_consume_token(-1);
+        errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
       }
       if (!hasError) {
       
-      s2 = process_declarative_part();
+      jj_consume_token(RPAREN_T);
       }
-      if (!hasError) {
       
-if (s2.data())
-                  FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s2.data(),0);
-                FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
+      break;
       }
-      if (!hasError) {
+    default:
+      jj_la1[177] = jj_gen;
+      ;
+    }
+    }
+    if (!hasError) {
+    
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IS_T:{if (!hasError) {
       
-      jj_consume_token(BEGIN_T);
+      jj_consume_token(IS_T);
       }
-      if (!hasError) {
       
-      process_statement_part();
+      break;
       }
-      if (!hasError) {
+    default:
+      jj_la1[178] = jj_gen;
+      ;
+    }
+    }
+    if (!hasError) {
+    
+    s2 = process_declarative_part();
+    }
+    if (!hasError) {
+    
+if (s2.data())
+                  FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s2.data(),0);
+                FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
+    }
+    if (!hasError) {
+    
+    jj_consume_token(BEGIN_T);
+    }
+    if (!hasError) {
+    
+    process_statement_part();
+    }
+    if (!hasError) {
+    
+    jj_consume_token(END_T);
+    }
+    if (!hasError) {
+    
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case POSTPONED_T:{if (!hasError) {
       
-      jj_consume_token(END_T);
+      jj_consume_token(POSTPONED_T);
       }
-      if (!hasError) {
       
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case POSTPONED_T:{if (!hasError) {
-        
-        jj_consume_token(POSTPONED_T);
-        }
-        
-        break;
-        }
-      default:
-        jj_la1[181] = jj_gen;
-        ;
-      }
+      break;
       }
-      
-    } catch ( ...) {
-error_skipto(PROCESS_T);
+    default:
+      jj_la1[179] = jj_gen;
+      ;
     }
     }
     if (!hasError) {
@@ -7907,7 +7864,7 @@ error_skipto(PROCESS_T);
       break;
       }
     default:
-      jj_la1[182] = jj_gen;
+      jj_la1[180] = jj_gen;
       ;
     }
     }
@@ -7960,15 +7917,15 @@ void VhdlParser::process_statement_part() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[183] = jj_gen;
-        goto end_label_35;
+        jj_la1[181] = jj_gen;
+        goto end_label_33;
       }if (!hasError) {
       
       sequential_statement();
       }
       
     }
-    end_label_35: ;
+    end_label_33: ;
     }
     
   }
@@ -7988,7 +7945,7 @@ s=s1+"'";
     }
     if (!hasError) {
     
-    if (jj_2_69(2147483647)) {if (!hasError) {
+    if (jj_2_70(2147483647)) {if (!hasError) {
       
       s1 = aggregate();
       }
@@ -8019,7 +7976,7 @@ s+="(";s+=s1;s+=")";
         break;
         }
       default:
-        jj_la1[184] = jj_gen;
+        jj_la1[182] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -8032,7 +7989,7 @@ assert(false);
 
 
 QCString VhdlParser::range() {QCString s,s1,s2;
-    if (jj_2_70(2147483647)) {if (!hasError) {
+    if (jj_2_71(2147483647)) {if (!hasError) {
       
       s = simple_expression();
       }
@@ -8049,7 +8006,7 @@ QCString VhdlParser::range() {QCString s,s1,s2;
 return s+" "+s1+" "+s2;
       }
       
-    } else if (jj_2_71(2147483647)) {if (!hasError) {
+    } else if (jj_2_72(2147483647)) {if (!hasError) {
       
       s = attribute_name();
       }
@@ -8086,30 +8043,23 @@ void VhdlParser::record_type_definition() {if (!hasError) {
     }
     if (!hasError) {
     
-    try {if (!hasError) {
+    while (!hasError) {if (!hasError) {
       
-      while (!hasError) {if (!hasError) {
-        
-        element_declaration();
-        }
-        
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case BASIC_IDENTIFIER:
-        case EXTENDED_CHARACTER:{
-          ;
-          break;
-          }
-        default:
-          jj_la1[185] = jj_gen;
-          goto end_label_36;
-        }
-      }
-      end_label_36: ;
+      element_declaration();
       }
       
-    } catch ( ...) {
-error_skipto(END_T);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case BASIC_IDENTIFIER:
+      case EXTENDED_CHARACTER:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[183] = jj_gen;
+        goto end_label_34;
+      }
     }
+    end_label_34: ;
     }
     if (!hasError) {
     
@@ -8133,7 +8083,7 @@ error_skipto(END_T);
       break;
       }
     default:
-      jj_la1[186] = jj_gen;
+      jj_la1[184] = jj_gen;
       ;
     }
     }
@@ -8165,7 +8115,7 @@ QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) {
       break;
       }
     default:
-      jj_la1[187] = jj_gen;
+      jj_la1[185] = jj_gen;
       ;
     }
     }
@@ -8244,7 +8194,7 @@ return "/=";
       break;
       }
     default:
-      jj_la1[188] = jj_gen;
+      jj_la1[186] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -8268,7 +8218,7 @@ QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2
       break;
       }
     default:
-      jj_la1[189] = jj_gen;
+      jj_la1[187] = jj_gen;
       ;
     }
     }
@@ -8295,7 +8245,7 @@ QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2
       break;
       }
     default:
-      jj_la1[190] = jj_gen;
+      jj_la1[188] = jj_gen;
       ;
     }
     }
@@ -8332,7 +8282,7 @@ s+=":";
       break;
       }
     default:
-      jj_la1[191] = jj_gen;
+      jj_la1[189] = jj_gen;
       ;
     }
     }
@@ -8366,7 +8316,7 @@ s+=":";
       break;
       }
     default:
-      jj_la1[192] = jj_gen;
+      jj_la1[190] = jj_gen;
       ;
     }
     }
@@ -8399,7 +8349,7 @@ return s;
       }
       if (!hasError) {
       
-      if (jj_2_72(2147483647)) {if (!hasError) {
+      if (jj_2_73(2147483647)) {if (!hasError) {
         
         s1 = physical_type_definition();
         }
@@ -8416,7 +8366,7 @@ s+=" ";s+=s1;return s;
       break;
       }
     default:
-      jj_la1[193] = jj_gen;
+      jj_la1[191] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -8441,7 +8391,7 @@ void VhdlParser::secondary_unit() {
       break;
       }
     default:
-      jj_la1[194] = jj_gen;
+      jj_la1[192] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -8545,8 +8495,8 @@ void VhdlParser::selected_waveforms() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[195] = jj_gen;
-        goto end_label_37;
+        jj_la1[193] = jj_gen;
+        goto end_label_35;
       }if (!hasError) {
       
       jj_consume_token(COMMA_T);
@@ -8565,7 +8515,7 @@ void VhdlParser::selected_waveforms() {if (!hasError) {
       }
       
     }
-    end_label_37: ;
+    end_label_35: ;
     }
     
   }
@@ -8599,8 +8549,8 @@ QCString VhdlParser::sensitivity_list() {QCString s,s1;if (!hasError) {
         break;
         }
       default:
-        jj_la1[196] = jj_gen;
-        goto end_label_38;
+        jj_la1[194] = jj_gen;
+        goto end_label_36;
       }if (!hasError) {
       
       jj_consume_token(COMMA_T);
@@ -8615,7 +8565,7 @@ s+=",";s+=s1;
       }
       
     }
-    end_label_38: ;
+    end_label_36: ;
     }
     
 return s;
@@ -8623,112 +8573,138 @@ assert(false);
   }
 
 
-void VhdlParser::sequence_of_statement() {if (!hasError) {
+QCString VhdlParser::sequence_of_statement() {QCString s,s1;if (!hasError) {
     
     while (!hasError) {
-      if (jj_2_73(3)) {
+      if (jj_2_74(3)) {
         ;
       } else {
-        goto end_label_39;
+        goto end_label_37;
       }if (!hasError) {
       
-      sequential_statement();
+      s1 = sequential_statement();
+      }
+      if (!hasError) {
+      
+s+=s1;
       }
       
     }
-    end_label_39: ;
+    end_label_37: ;
     }
     
+return s;
+assert(false);
   }
 
 
-void VhdlParser::sequential_statement() {QCString s;
-    if (jj_2_74(2147483647)) {if (!hasError) {
+QCString VhdlParser::sequential_statement() {QCString s;
+    if (jj_2_75(2147483647)) {if (!hasError) {
       
       s = signal_assignment_statement();
       }
       if (!hasError) {
       
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
       
-    } else if (jj_2_75(3)) {if (!hasError) {
+    } else if (jj_2_76(3)) {if (!hasError) {
       
       s = assertion_statement();
       }
       if (!hasError) {
       
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
       
-    } else if (jj_2_76(3)) {if (!hasError) {
+    } else if (jj_2_77(3)) {if (!hasError) {
       
       s = report_statement();
       }
       if (!hasError) {
       
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
       
-    } else if (jj_2_77(3)) {if (!hasError) {
+    } else if (jj_2_78(3)) {if (!hasError) {
       
       s = wait_statement();
       }
       if (!hasError) {
       
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
       
-    } else if (jj_2_78(2147483647)) {if (!hasError) {
+    } else if (jj_2_79(2147483647)) {if (!hasError) {
       
       s = variable_assignment_statement();
       }
       if (!hasError) {
       
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
       
-    } else if (jj_2_79(3)) {if (!hasError) {
+    } else if (jj_2_80(3)) {if (!hasError) {
       
       s = procedure_call_statement();
       }
       if (!hasError) {
       
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
       
-    } else if (jj_2_80(3)) {if (!hasError) {
+    } else if (jj_2_81(3)) {if (!hasError) {
       
       if_statement();
       }
+      if (!hasError) {
       
-    } else if (jj_2_81(3)) {if (!hasError) {
+return s;
+      }
+      
+    } else if (jj_2_82(3)) {if (!hasError) {
       
       case_statement();
       }
+      if (!hasError) {
       
-    } else if (jj_2_82(3)) {if (!hasError) {
+return s;
+      }
+      
+    } else if (jj_2_83(3)) {if (!hasError) {
       
       loop_statement();
       }
+      if (!hasError) {
+      
+return s;
+      }
       
-    } else if (jj_2_83(3)) {if (!hasError) {
+    } else if (jj_2_84(3)) {if (!hasError) {
       
       s = next_statement();
       }
+      if (!hasError) {
       
-    } else if (jj_2_84(3)) {if (!hasError) {
+return s;
+      }
+      
+    } else if (jj_2_85(3)) {if (!hasError) {
       
       s = exit_statement();
       }
+      if (!hasError) {
       
-    } else if (jj_2_85(3)) {if (!hasError) {
+return s;
+      }
+      
+    } else if (jj_2_86(3)) {if (!hasError) {
       
       s = return_statement();
       }
       if (!hasError) {
       
-FlowChart::addFlowChart(FlowChart::RETURN_NO,s.data(),0);
+FlowChart::addFlowChart(FlowChart::RETURN_NO,s.data(),0);return s;
       }
       
     } else {
@@ -8741,17 +8717,18 @@ FlowChart::addFlowChart(FlowChart::RETURN_NO,s.data(),0);
         }
         if (!hasError) {
         
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
         }
         
         break;
         }
       default:
-        jj_la1[197] = jj_gen;
+        jj_la1[195] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
+assert(false);
   }
 
 
@@ -8779,7 +8756,7 @@ QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) {
       break;
       }
     default:
-      jj_la1[198] = jj_gen;
+      jj_la1[196] = jj_gen;
       ;
     }
     }
@@ -8858,7 +8835,7 @@ return "ror";
       break;
       }
     default:
-      jj_la1[199] = jj_gen;
+      jj_la1[197] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -8891,7 +8868,7 @@ return "-";
       break;
       }
     default:
-      jj_la1[200] = jj_gen;
+      jj_la1[198] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -8900,7 +8877,7 @@ assert(false);
 
 
 QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3;
-    if (jj_2_87(2147483647)) {if (!hasError) {
+    if (jj_2_88(2147483647)) {if (!hasError) {
       
       conditional_signal_assignment_wave();
       }
@@ -8909,7 +8886,7 @@ QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3;
 return "";
       }
       
-    } else if (jj_2_88(2147483647)) {if (!hasError) {
+    } else if (jj_2_89(2147483647)) {if (!hasError) {
       
       selected_signal_assignment_wave();
       }
@@ -8926,7 +8903,7 @@ return "";
       case BASIC_IDENTIFIER:
       case EXTENDED_CHARACTER:{if (!hasError) {
         
-        if (jj_2_86(2)) {if (!hasError) {
+        if (jj_2_87(2)) {if (!hasError) {
           
           s = identifier();
           }
@@ -8964,7 +8941,7 @@ s+=":";
           break;
           }
         default:
-          jj_la1[201] = jj_gen;
+          jj_la1[199] = jj_gen;
           ;
         }
         }
@@ -8984,7 +8961,7 @@ return s+s1+"<="+s2+s3+";";
         break;
         }
       default:
-        jj_la1[202] = jj_gen;
+        jj_la1[200] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -9001,7 +8978,7 @@ void VhdlParser::semi() {if (!hasError) {
   }
 
 
-void VhdlParser::signal_declaration() {QCString s,s1,s2,s3,s4;if (!hasError) {
+void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;if (!hasError) {
     
     jj_consume_token(SIGNAL_T);
     }
@@ -9029,7 +9006,7 @@ void VhdlParser::signal_declaration() {QCString s,s1,s2,s3,s4;if (!hasError) {
       break;
       }
     default:
-      jj_la1[203] = jj_gen;
+      jj_la1[201] = jj_gen;
       ;
     }
     }
@@ -9038,7 +9015,7 @@ void VhdlParser::signal_declaration() {QCString s,s1,s2,s3,s4;if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case VARASSIGN_T:{if (!hasError) {
       
-      jj_consume_token(VARASSIGN_T);
+      tok = jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
       
@@ -9048,7 +9025,7 @@ void VhdlParser::signal_declaration() {QCString s,s1,s2,s3,s4;if (!hasError) {
       break;
       }
     default:
-      jj_la1[204] = jj_gen;
+      jj_la1[202] = jj_gen;
       ;
     }
     }
@@ -9057,7 +9034,9 @@ void VhdlParser::signal_declaration() {QCString s,s1,s2,s3,s4;if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-s4=s1+s2+s3;
+if(tok)
+          s3.prepend(":=");
+         s4=s1+s2+s3;
          addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SIGNAL,0,s4.data(),Public);
   }
 
@@ -9087,7 +9066,7 @@ return "bus";
       break;
       }
     default:
-      jj_la1[205] = jj_gen;
+      jj_la1[203] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -9113,8 +9092,8 @@ QCString VhdlParser::signal_list() {QCString s,s1;
           break;
           }
         default:
-          jj_la1[206] = jj_gen;
-          goto end_label_40;
+          jj_la1[204] = jj_gen;
+          goto end_label_38;
         }if (!hasError) {
         
         jj_consume_token(COMMA_T);
@@ -9129,7 +9108,7 @@ s+=",";s+=s1;
         }
         
       }
-      end_label_40: ;
+      end_label_38: ;
       }
       
       break;
@@ -9157,7 +9136,7 @@ return "all";
       break;
       }
     default:
-      jj_la1[207] = jj_gen;
+      jj_la1[205] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -9188,8 +9167,8 @@ QCString VhdlParser::signature() {QCString s,s1,s2;if (!hasError) {
           break;
           }
         default:
-          jj_la1[208] = jj_gen;
-          goto end_label_41;
+          jj_la1[206] = jj_gen;
+          goto end_label_39;
         }if (!hasError) {
         
         jj_consume_token(COMMA_T);
@@ -9204,13 +9183,13 @@ s+=",";s+=s1;
         }
         
       }
-      end_label_41: ;
+      end_label_39: ;
       }
       
       break;
       }
     default:
-      jj_la1[209] = jj_gen;
+      jj_la1[207] = jj_gen;
       ;
     }
     }
@@ -9233,7 +9212,7 @@ s+="return ";s+=s1;
       break;
       }
     default:
-      jj_la1[210] = jj_gen;
+      jj_la1[208] = jj_gen;
       ;
     }
     }
@@ -9259,7 +9238,7 @@ QCString VhdlParser::simple_expression() {QCString s,s1,s2;if (!hasError) {
       break;
       }
     default:
-      jj_la1[211] = jj_gen;
+      jj_la1[209] = jj_gen;
       ;
     }
     }
@@ -9274,10 +9253,10 @@ s+=s1;
     if (!hasError) {
     
     while (!hasError) {
-      if (jj_2_89(2147483647)) {
+      if (jj_2_90(2147483647)) {
         ;
       } else {
-        goto end_label_42;
+        goto end_label_40;
       }if (!hasError) {
       
       s1 = adding_operator();
@@ -9292,7 +9271,7 @@ s+=s1;s+=s2;
       }
       
     }
-    end_label_42: ;
+    end_label_40: ;
     }
     
 return s;
@@ -9346,22 +9325,16 @@ void VhdlParser::subprogram_body() {QCString s;if (!hasError) {
     }
     if (!hasError) {
     
-    try {if (!hasError) {
-      
-      s = subprogram_declarative_part();
-      }
-      if (!hasError) {
-      
+    //try{
+     s = subprogram_declarative_part();
+    }
+    if (!hasError) {
+    
 if (s.data())
       {
         FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s,0);
       }
       FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
-      }
-      
-    } catch ( ...) {
-error_skipto(BEGIN_T);
-    }
     }
     if (!hasError) {
     
@@ -9387,7 +9360,7 @@ error_skipto(BEGIN_T);
       break;
       }
     default:
-      jj_la1[212] = jj_gen;
+      jj_la1[210] = jj_gen;
       ;
     }
     }
@@ -9404,7 +9377,7 @@ error_skipto(BEGIN_T);
       break;
       }
     default:
-      jj_la1[213] = jj_gen;
+      jj_la1[211] = jj_gen;
       ;
     }
     }
@@ -9420,7 +9393,7 @@ tempEntry->endBodyLine=getLine(END_T);
 
 
 void VhdlParser::subprogram_declaration() {
-    if (jj_2_90(2147483647)) {if (!hasError) {
+    if (jj_2_91(2147483647)) {if (!hasError) {
       
       subprogram_instantiation_declaration();
       }
@@ -9446,7 +9419,7 @@ currP=0;
         break;
         }
       default:
-        jj_la1[214] = jj_gen;
+        jj_la1[212] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -9471,7 +9444,7 @@ void VhdlParser::subprogram_1() {
       break;
       }
     default:
-      jj_la1[215] = jj_gen;
+      jj_la1[213] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -9573,8 +9546,8 @@ return s;
       break;
       }
     default:
-      jj_la1[216] = jj_gen;
-      if (jj_2_91(2147483647)) {if (!hasError) {
+      jj_la1[214] = jj_gen;
+      if (jj_2_92(2147483647)) {if (!hasError) {
         
         s = attribute_declaration();
         }
@@ -9608,8 +9581,8 @@ return s;
           break;
           }
         default:
-          jj_la1[217] = jj_gen;
-          if (jj_2_92(3)) {if (!hasError) {
+          jj_la1[215] = jj_gen;
+          if (jj_2_93(3)) {if (!hasError) {
             
             s = group_template_declaration();
             }
@@ -9632,7 +9605,7 @@ return s;
               break;
               }
             default:
-              jj_la1[218] = jj_gen;
+              jj_la1[216] = jj_gen;
               jj_consume_token(-1);
               errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
             }
@@ -9667,8 +9640,8 @@ QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;if (!hasError)
         break;
         }
       default:
-        jj_la1[219] = jj_gen;
-        goto end_label_43;
+        jj_la1[217] = jj_gen;
+        goto end_label_41;
       }if (!hasError) {
       
       s1 = subprogram_declarative_item();
@@ -9679,7 +9652,7 @@ s+=s1;
       }
       
     }
-    end_label_43: ;
+    end_label_41: ;
     }
     
 return s;
@@ -9704,7 +9677,7 @@ void VhdlParser::subprogram_kind() {
       break;
       }
     default:
-      jj_la1[220] = jj_gen;
+      jj_la1[218] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -9756,13 +9729,13 @@ param_sec=0;
         break;
         }
       default:
-        jj_la1[221] = jj_gen;
+        jj_la1[219] = jj_gen;
         ;
       }
       }
       if (!hasError) {
       
-      if (jj_2_93(2)) {if (!hasError) {
+      if (jj_2_94(2)) {if (!hasError) {
         
         gen_interface_list();
         }
@@ -9773,7 +9746,7 @@ param_sec=0;
       }
       if (!hasError) {
       
-      if (jj_2_94(2)) {if (!hasError) {
+      if (jj_2_95(2)) {if (!hasError) {
         
         gen_assoc_list();
         }
@@ -9817,7 +9790,7 @@ newEntry();
           break;
           }
         default:
-          jj_la1[222] = jj_gen;
+          jj_la1[220] = jj_gen;
           jj_consume_token(-1);
           errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
         }
@@ -9826,7 +9799,7 @@ newEntry();
         break;
         }
       default:
-        jj_la1[223] = jj_gen;
+        jj_la1[221] = jj_gen;
         ;
       }
       }
@@ -9876,7 +9849,7 @@ param_sec=0;
         break;
         }
       default:
-        jj_la1[224] = jj_gen;
+        jj_la1[222] = jj_gen;
         ;
       }
       }
@@ -9898,7 +9871,7 @@ tempEntry=current;
       break;
       }
     default:
-      jj_la1[225] = jj_gen;
+      jj_la1[223] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -9931,15 +9904,15 @@ void VhdlParser::subprogram_statement_part() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[226] = jj_gen;
-        goto end_label_44;
+        jj_la1[224] = jj_gen;
+        goto end_label_42;
       }if (!hasError) {
       
       sequential_statement();
       }
       
     }
-    end_label_44: ;
+    end_label_42: ;
     }
     
   }
@@ -9978,7 +9951,7 @@ QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) {
     }
     if (!hasError) {
     
-    if (jj_2_95(2147483647)) {if (!hasError) {
+    if (jj_2_96(2147483647)) {if (!hasError) {
       
       s1 = name();
       }
@@ -9989,7 +9962,7 @@ QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) {
     }
     if (!hasError) {
     
-    if (jj_2_96(2147483647)) {if (!hasError) {
+    if (jj_2_97(2147483647)) {if (!hasError) {
       
       s2 = constraint();
       }
@@ -10005,7 +9978,7 @@ assert(false);
 
 
 QCString VhdlParser::suffix() {QCString s;
-    if (jj_2_97(2147483647)) {if (!hasError) {
+    if (jj_2_98(2147483647)) {if (!hasError) {
       
       s = name();
       }
@@ -10050,7 +10023,7 @@ return " all ";
         break;
         }
       default:
-        jj_la1[227] = jj_gen;
+        jj_la1[225] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -10087,7 +10060,7 @@ return s;
       break;
       }
     default:
-      jj_la1[228] = jj_gen;
+      jj_la1[226] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -10102,10 +10075,10 @@ QCString VhdlParser::term() {QCString s,s1,s2;if (!hasError) {
     if (!hasError) {
     
     while (!hasError) {
-      if (jj_2_98(2)) {
+      if (jj_2_99(2)) {
         ;
       } else {
-        goto end_label_45;
+        goto end_label_43;
       }if (!hasError) {
       
       s1 = multiplying_operation();
@@ -10120,7 +10093,7 @@ s+=s1;s+=s2;
       }
       
     }
-    end_label_45: ;
+    end_label_43: ;
     }
     
 return s;
@@ -10165,7 +10138,7 @@ assert(false);
 
 
 QCString VhdlParser::type_declaration() {QCString s;
-    if (jj_2_99(3)) {if (!hasError) {
+    if (jj_2_100(3)) {if (!hasError) {
       
       s = full_type_declaration();
       }
@@ -10188,7 +10161,7 @@ return s;
         break;
         }
       default:
-        jj_la1[229] = jj_gen;
+        jj_la1[227] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -10247,8 +10220,8 @@ return s;
       break;
       }
     default:
-      jj_la1[230] = jj_gen;
-      if (jj_2_100(2)) {if (!hasError) {
+      jj_la1[228] = jj_gen;
+      if (jj_2_101(2)) {if (!hasError) {
         
         protected_type_body();
         }
@@ -10271,7 +10244,7 @@ return "";
           break;
           }
         default:
-          jj_la1[231] = jj_gen;
+          jj_la1[229] = jj_gen;
           jj_consume_token(-1);
           errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
         }
@@ -10312,8 +10285,8 @@ QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;if (!h
         break;
         }
       default:
-        jj_la1[232] = jj_gen;
-        goto end_label_46;
+        jj_la1[230] = jj_gen;
+        goto end_label_44;
       }if (!hasError) {
       
       jj_consume_token(COMMA_T);
@@ -10328,7 +10301,7 @@ s3+=",";s3+=s1;
       }
       
     }
-    end_label_46: ;
+    end_label_44: ;
     }
     if (!hasError) {
     
@@ -10365,8 +10338,8 @@ QCString VhdlParser::use_clause() {QCString s,s1;if (!hasError) {
         break;
         }
       default:
-        jj_la1[233] = jj_gen;
-        goto end_label_47;
+        jj_la1[231] = jj_gen;
+        goto end_label_45;
       }if (!hasError) {
       
       jj_consume_token(COMMA_T);
@@ -10381,7 +10354,7 @@ s+=",";s+=s1;
       }
       
     }
-    end_label_47: ;
+    end_label_45: ;
     }
     if (!hasError) {
     
@@ -10391,10 +10364,11 @@ s+=",";s+=s1;
 QStringList ql1=QStringList::split(",",s,FALSE);
                    for (uint j=0;j<ql1.count();j++)
                    {
-                     QCString it=ql1[j].utf8();
+                    QStringList ql=QStringList::split(".",ql1[j],FALSE);
+                                        QCString it=ql[1].utf8();
                      if ( parse_sec==0 && Config_getBool("SHOW_INCLUDE_FILES") )
                      {
-                       ::vhdl::parser::VhdlParser::addVhdlType(it.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::USE,it.data(),"_use_",Public);
+                       VhdlParser::addVhdlType(it.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::USE,it.data(),"_use_",Public);
                      }
                    }
                    s1="use "+s;
@@ -10411,7 +10385,7 @@ QCString VhdlParser::variable_assignment_statement() {QCString s,s1,s2;
     case BASIC_IDENTIFIER:
     case EXTENDED_CHARACTER:{if (!hasError) {
       
-      if (jj_2_101(2)) {if (!hasError) {
+      if (jj_2_102(2)) {if (!hasError) {
         
         s = identifier();
         }
@@ -10463,7 +10437,7 @@ return "";
       break;
       }
     default:
-      jj_la1[234] = jj_gen;
+      jj_la1[232] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -10471,7 +10445,7 @@ assert(false);
   }
 
 
-QCString VhdlParser::variable_declaration() {Token *tok=0;QCString s,s1,s2;if (!hasError) {
+QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s,s1,s2;if (!hasError) {
     
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SHARED_T:{if (!hasError) {
@@ -10482,7 +10456,7 @@ QCString VhdlParser::variable_declaration() {Token *tok=0;QCString s,s1,s2;if (!
       break;
       }
     default:
-      jj_la1[235] = jj_gen;
+      jj_la1[233] = jj_gen;
       ;
     }
     }
@@ -10507,7 +10481,7 @@ QCString VhdlParser::variable_declaration() {Token *tok=0;QCString s,s1,s2;if (!
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case VARASSIGN_T:{if (!hasError) {
       
-      jj_consume_token(VARASSIGN_T);
+      t1 = jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
       
@@ -10517,7 +10491,7 @@ QCString VhdlParser::variable_declaration() {Token *tok=0;QCString s,s1,s2;if (!
       break;
       }
     default:
-      jj_la1[236] = jj_gen;
+      jj_la1[234] = jj_gen;
       ;
     }
     }
@@ -10527,8 +10501,10 @@ QCString VhdlParser::variable_declaration() {Token *tok=0;QCString s,s1,s2;if (!
     }
     
 int spec;
-        QCString val=" variable "+s+":"+s1+":="+s2+";";
-        QCString it=s1+" "+s2;
+        if(t1)
+         s2.prepend(":=");
+        QCString val=" variable "+s+":"+s1+s2+";";
+        QCString it=s1;
         if(tok != 0)
         {
          it.prepend(" shared ");
@@ -10538,6 +10514,10 @@ int spec;
          else
          spec=VhdlDocGen::SHAREDVARIABLE;
 
+        if(t1){
+         it+=":=";
+     it+=s2;
+         }
         addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,spec,0,it.data(),Public);
     return val;
 assert(false);
@@ -10554,13 +10534,13 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr
       }
       if (!hasError) {
       
-      jj_consume_token(COLON_T);
+      t = jj_consume_token(COLON_T);
       }
       
       break;
       }
     default:
-      jj_la1[237] = jj_gen;
+      jj_la1[235] = jj_gen;
       ;
     }
     }
@@ -10579,7 +10559,7 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr
       break;
       }
     default:
-      jj_la1[238] = jj_gen;
+      jj_la1[236] = jj_gen;
       ;
     }
     }
@@ -10594,7 +10574,7 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr
       break;
       }
     default:
-      jj_la1[239] = jj_gen;
+      jj_la1[237] = jj_gen;
       ;
     }
     }
@@ -10609,7 +10589,7 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr
       break;
       }
     default:
-      jj_la1[240] = jj_gen;
+      jj_la1[238] = jj_gen;
       ;
     }
     }
@@ -10654,8 +10634,8 @@ QCString VhdlParser::waveform() {QCString s,s1;
           break;
           }
         default:
-          jj_la1[241] = jj_gen;
-          goto end_label_48;
+          jj_la1[239] = jj_gen;
+          goto end_label_46;
         }if (!hasError) {
         
         jj_consume_token(COMMA_T);
@@ -10670,7 +10650,7 @@ s+=","; s+=s1;
         }
         
       }
-      end_label_48: ;
+      end_label_46: ;
       }
       if (!hasError) {
       
@@ -10691,7 +10671,7 @@ return " unaffected ";
       break;
       }
     default:
-      jj_la1[242] = jj_gen;
+      jj_la1[240] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -10722,7 +10702,7 @@ s1.prepend(" after ");
       break;
       }
     default:
-      jj_la1[243] = jj_gen;
+      jj_la1[241] = jj_gen;
       ;
     }
     }
@@ -10734,22 +10714,15 @@ assert(false);
 
 QCString VhdlParser::protected_type_body() {if (!hasError) {
     
-    try {if (!hasError) {
-      
-      jj_consume_token(PROTECTED_T);
-      }
-      if (!hasError) {
-      
-      jj_consume_token(BODY_T);
-      }
-      if (!hasError) {
-      
-      protected_type_body_declarative_part();
-      }
-      
-    } catch ( ...) {
-error_skipto(END_T);
+    jj_consume_token(PROTECTED_T);
     }
+    if (!hasError) {
+    
+    jj_consume_token(BODY_T);
+    }
+    if (!hasError) {
+    
+    protected_type_body_declarative_part();
     }
     if (!hasError) {
     
@@ -10775,7 +10748,7 @@ error_skipto(END_T);
       break;
       }
     default:
-      jj_la1[244] = jj_gen;
+      jj_la1[242] = jj_gen;
       ;
     }
     }
@@ -10848,8 +10821,8 @@ void VhdlParser::protected_type_body_declarative_item() {
       break;
       }
     default:
-      jj_la1[245] = jj_gen;
-      if (jj_2_102(2147483647)) {if (!hasError) {
+      jj_la1[243] = jj_gen;
+      if (jj_2_103(2147483647)) {if (!hasError) {
         
         attribute_declaration();
         }
@@ -10871,8 +10844,8 @@ void VhdlParser::protected_type_body_declarative_item() {
           break;
           }
         default:
-          jj_la1[246] = jj_gen;
-          if (jj_2_103(3)) {if (!hasError) {
+          jj_la1[244] = jj_gen;
+          if (jj_2_104(3)) {if (!hasError) {
             
             group_template_declaration();
             }
@@ -10887,7 +10860,7 @@ void VhdlParser::protected_type_body_declarative_item() {
               break;
               }
             default:
-              jj_la1[247] = jj_gen;
+              jj_la1[245] = jj_gen;
               jj_consume_token(-1);
               errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
             }
@@ -10921,15 +10894,15 @@ void VhdlParser::protected_type_body_declarative_part() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[248] = jj_gen;
-        goto end_label_49;
+        jj_la1[246] = jj_gen;
+        goto end_label_47;
       }if (!hasError) {
       
       protected_type_body_declarative_item();
       }
       
     }
-    end_label_49: ;
+    end_label_47: ;
     }
     
   }
@@ -10970,7 +10943,7 @@ error_skipto(END_T);
       break;
       }
     default:
-      jj_la1[249] = jj_gen;
+      jj_la1[247] = jj_gen;
       ;
     }
     }
@@ -11007,7 +10980,7 @@ void VhdlParser::protected_type_declarative_item() {
       break;
       }
     default:
-      jj_la1[250] = jj_gen;
+      jj_la1[248] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -11028,8 +11001,8 @@ void VhdlParser::protected_type_declarative_part() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[251] = jj_gen;
-        goto end_label_50;
+        jj_la1[249] = jj_gen;
+        goto end_label_48;
       }if (!hasError) {
       
       protected_type_declarative_item();
@@ -11040,7 +11013,7 @@ void VhdlParser::protected_type_declarative_part() {if (!hasError) {
       }
       
     }
-    end_label_50: ;
+    end_label_48: ;
     }
     
   }
@@ -11091,15 +11064,15 @@ parse_sec=CONTEXT_SEC;
         break;
         }
       default:
-        jj_la1[252] = jj_gen;
-        goto end_label_51;
+        jj_la1[250] = jj_gen;
+        goto end_label_49;
       }if (!hasError) {
       
       s1 = libustcont_stats();
       }
       
     }
-    end_label_51: ;
+    end_label_49: ;
     }
     if (!hasError) {
     
@@ -11116,7 +11089,7 @@ parse_sec=CONTEXT_SEC;
       break;
       }
     default:
-      jj_la1[253] = jj_gen;
+      jj_la1[251] = jj_gen;
       ;
     }
     }
@@ -11132,7 +11105,7 @@ parse_sec=CONTEXT_SEC;
       break;
       }
     default:
-      jj_la1[254] = jj_gen;
+      jj_la1[252] = jj_gen;
       ;
     }
     }
@@ -11182,7 +11155,7 @@ return s;
       break;
       }
     default:
-      jj_la1[255] = jj_gen;
+      jj_la1[253] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -11225,7 +11198,7 @@ void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasE
       break;
       }
     default:
-      jj_la1[256] = jj_gen;
+      jj_la1[254] = jj_gen;
       ;
     }
     }
@@ -11270,7 +11243,7 @@ QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasErro
       break;
       }
     default:
-      jj_la1[257] = jj_gen;
+      jj_la1[255] = jj_gen;
       ;
     }
     }
@@ -11316,7 +11289,7 @@ QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;if
       break;
       }
     default:
-      jj_la1[258] = jj_gen;
+      jj_la1[256] = jj_gen;
       ;
     }
     }
@@ -11404,7 +11377,7 @@ void VhdlParser::case_scheme() {if (!hasError) {
     }
     if (!hasError) {
     
-    if (jj_2_104(3)) {if (!hasError) {
+    if (jj_2_105(3)) {if (!hasError) {
       
       ttend();
       }
@@ -11441,7 +11414,7 @@ void VhdlParser::when_stats() {if (!hasError) {
       }
       if (!hasError) {
       
-      if (jj_2_105(2)) {if (!hasError) {
+      if (jj_2_106(2)) {if (!hasError) {
         
         label();
         }
@@ -11473,11 +11446,11 @@ void VhdlParser::when_stats() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[259] = jj_gen;
-        goto end_label_52;
+        jj_la1[257] = jj_gen;
+        goto end_label_50;
       }
     }
-    end_label_52: ;
+    end_label_50: ;
     }
     
   }
@@ -11499,7 +11472,7 @@ void VhdlParser::ttend() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[260] = jj_gen;
+      jj_la1[258] = jj_gen;
       ;
     }
     }
@@ -11517,70 +11490,115 @@ void VhdlParser::generate_statement_body() {if (!hasError) {
     }
     if (!hasError) {
     
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ALIAS_T:
-    case ATTRIBUTE_T:
-    case BEGIN_T:
-    case COMPONENT_T:
-    case CONSTANT_T:
-    case DISCONNECT_T:
-    case FILE_T:
-    case FOR_T:
-    case FUNCTION_T:
-    case GROUP_T:
-    case IMPURE_T:
-    case PROCEDURE_T:
-    case PURE_T:
-    case SIGNAL_T:
-    case SHARED_T:
-    case SUBTYPE_T:
-    case TYPE_T:
-    case USE_T:
-    case VARIABLE_T:{if (!hasError) {
+    generate_statement_body();
+    }
+    
+  }
+
+
+void VhdlParser::generate_statement_body1() {
+    if (jj_2_107(2147483647)) {if (!hasError) {
       
-      block_declarative_part();
+      while (!hasError) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case ALIAS_T:
+        case ATTRIBUTE_T:
+        case COMPONENT_T:
+        case CONSTANT_T:
+        case DISCONNECT_T:
+        case FILE_T:
+        case FOR_T:
+        case FUNCTION_T:
+        case GROUP_T:
+        case IMPURE_T:
+        case PROCEDURE_T:
+        case PURE_T:
+        case SIGNAL_T:
+        case SHARED_T:
+        case SUBTYPE_T:
+        case TYPE_T:
+        case USE_T:
+        case VARIABLE_T:
+        case VHDL2008TOOLDIR:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[259] = jj_gen;
+          goto end_label_51;
+        }if (!hasError) {
+        
+        block_declarative_item();
+        }
+        
+      }
+      end_label_51: ;
       }
       if (!hasError) {
       
       jj_consume_token(BEGIN_T);
       }
+      if (!hasError) {
       
-      break;
-      }
-    default:
-      jj_la1[261] = jj_gen;
-      ;
-    }
-    }
-    if (!hasError) {
-    
-    while (!hasError) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case ASSERT_T:
-      case CASE_T:
-      case POSTPONED_T:
-      case PROCESS_T:
-      case WITH_T:
-      case LPAREN_T:
-      case SLSL_T:
-      case STRINGLITERAL:
-      case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{
-        ;
-        break;
+      while (!hasError) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case ASSERT_T:
+        case CASE_T:
+        case POSTPONED_T:
+        case PROCESS_T:
+        case WITH_T:
+        case LPAREN_T:
+        case SLSL_T:
+        case STRINGLITERAL:
+        case BASIC_IDENTIFIER:
+        case EXTENDED_CHARACTER:
+        case VHDL2008TOOLDIR:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[260] = jj_gen;
+          goto end_label_52;
+        }if (!hasError) {
+        
+        concurrent_statement();
         }
-      default:
-        jj_la1[262] = jj_gen;
-        goto end_label_53;
-      }if (!hasError) {
+        
+      }
+      end_label_52: ;
+      }
       
-      concurrent_statement();
+    } else {if (!hasError) {
+      
+      while (!hasError) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case ASSERT_T:
+        case CASE_T:
+        case POSTPONED_T:
+        case PROCESS_T:
+        case WITH_T:
+        case LPAREN_T:
+        case SLSL_T:
+        case STRINGLITERAL:
+        case BASIC_IDENTIFIER:
+        case EXTENDED_CHARACTER:
+        case VHDL2008TOOLDIR:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[261] = jj_gen;
+          goto end_label_53;
+        }if (!hasError) {
+        
+        concurrent_statement();
+        }
+        
+      }
+      end_label_53: ;
       }
       
     }
-    end_label_53: ;
-    }
-    
   }
 
 
@@ -11652,7 +11670,7 @@ return t->image.data();
       break;
       }
     default:
-      jj_la1[263] = jj_gen;
+      jj_la1[262] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -11696,7 +11714,7 @@ return s;
       break;
       }
     default:
-      jj_la1[264] = jj_gen;
+      jj_la1[263] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -11705,7 +11723,7 @@ assert(false);
 
 
 QCString VhdlParser::absolute_pathname() {QCString s,s1;
-    if (jj_2_106(2147483647)) {if (!hasError) {
+    if (jj_2_108(2147483647)) {if (!hasError) {
       
       jj_consume_token(DOT_T);
       }
@@ -11740,7 +11758,7 @@ return "."+s;
         break;
         }
       default:
-        jj_la1[265] = jj_gen;
+        jj_la1[264] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -11755,7 +11773,7 @@ QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) {
     }
     if (!hasError) {
     
-    if (jj_2_107(2147483647)) {if (!hasError) {
+    if (jj_2_109(2147483647)) {if (!hasError) {
       
       s1 = pathname_element_list();
       }
@@ -11795,7 +11813,7 @@ s+="^.";
         break;
         }
       default:
-        jj_la1[266] = jj_gen;
+        jj_la1[265] = jj_gen;
         goto end_label_54;
       }
     }
@@ -11830,7 +11848,7 @@ QCString VhdlParser::pathname_element() {QCString s,s1;if (!hasError) {
       break;
       }
     default:
-      jj_la1[267] = jj_gen;
+      jj_la1[266] = jj_gen;
       ;
     }
     }
@@ -11861,7 +11879,7 @@ s+=".";
     if (!hasError) {
     
     while (!hasError) {
-      if (jj_2_108(2147483647)) {
+      if (jj_2_110(2147483647)) {
         ;
       } else {
         goto end_label_55;
@@ -11902,7 +11920,7 @@ assert(false);
 
 
 void VhdlParser::conditional_signal_assignment_wave() {
-    if (jj_2_109(2147483647)) {if (!hasError) {
+    if (jj_2_111(2147483647)) {if (!hasError) {
       
       conditional_force_assignment();
       }
@@ -11921,7 +11939,7 @@ void VhdlParser::conditional_signal_assignment_wave() {
         break;
         }
       default:
-        jj_la1[268] = jj_gen;
+        jj_la1[267] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -11950,7 +11968,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[269] = jj_gen;
+      jj_la1[268] = jj_gen;
       ;
     }
     }
@@ -11977,7 +11995,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[270] = jj_gen;
+      jj_la1[269] = jj_gen;
       ;
     }
     }
@@ -12012,7 +12030,7 @@ void VhdlParser::else_wave_list() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[271] = jj_gen;
+      jj_la1[270] = jj_gen;
       ;
     }
     }
@@ -12044,7 +12062,7 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[272] = jj_gen;
+      jj_la1[271] = jj_gen;
       ;
     }
     }
@@ -12086,7 +12104,7 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[273] = jj_gen;
+      jj_la1[272] = jj_gen;
       ;
     }
     }
@@ -12099,7 +12117,7 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
 
 
 void VhdlParser::selected_signal_assignment_wave() {
-    if (jj_2_110(2147483647)) {if (!hasError) {
+    if (jj_2_112(2147483647)) {if (!hasError) {
       
       selected_force_assignment();
       }
@@ -12114,7 +12132,7 @@ void VhdlParser::selected_signal_assignment_wave() {
         break;
         }
       default:
-        jj_la1[274] = jj_gen;
+        jj_la1[273] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -12145,7 +12163,7 @@ void VhdlParser::selected_variable_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[275] = jj_gen;
+      jj_la1[274] = jj_gen;
       ;
     }
     }
@@ -12166,7 +12184,7 @@ void VhdlParser::selected_variable_assignment() {if (!hasError) {
 
 
 void VhdlParser::select_name() {
-    if (jj_2_111(2147483647)) {if (!hasError) {
+    if (jj_2_113(2147483647)) {if (!hasError) {
       
       aggregate();
       }
@@ -12184,7 +12202,7 @@ void VhdlParser::select_name() {
         break;
         }
       default:
-        jj_la1[276] = jj_gen;
+        jj_la1[275] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -12215,7 +12233,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[277] = jj_gen;
+      jj_la1[276] = jj_gen;
       ;
     }
     }
@@ -12240,7 +12258,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[278] = jj_gen;
+      jj_la1[277] = jj_gen;
       ;
     }
     }
@@ -12275,7 +12293,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[279] = jj_gen;
+      jj_la1[278] = jj_gen;
       ;
     }
     }
@@ -12303,7 +12321,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[280] = jj_gen;
+      jj_la1[279] = jj_gen;
       ;
     }
     }
@@ -12346,7 +12364,7 @@ void VhdlParser::sel_var_list() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[281] = jj_gen;
+      jj_la1[280] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12356,7 +12374,7 @@ void VhdlParser::sel_var_list() {if (!hasError) {
     if (!hasError) {
     
     while (!hasError) {
-      if (jj_2_112(2147483647)) {
+      if (jj_2_114(2147483647)) {
         ;
       } else {
         goto end_label_56;
@@ -12390,7 +12408,7 @@ void VhdlParser::sel_var_list() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[282] = jj_gen;
+        jj_la1[281] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -12424,7 +12442,7 @@ void VhdlParser::sel_wave_list() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[283] = jj_gen;
+        jj_la1[282] = jj_gen;
         goto end_label_57;
       }if (!hasError) {
       
@@ -12463,7 +12481,7 @@ void VhdlParser::inout_stat() {
       break;
       }
     default:
-      jj_la1[284] = jj_gen;
+      jj_la1[283] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12495,7 +12513,7 @@ void VhdlParser::else_stat() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[285] = jj_gen;
+        jj_la1[284] = jj_gen;
         ;
       }
       }
@@ -12506,7 +12524,7 @@ void VhdlParser::else_stat() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[286] = jj_gen;
+        jj_la1[285] = jj_gen;
         goto end_label_58;
       }
     }
@@ -12543,7 +12561,7 @@ return s;
       break;
       }
     default:
-      jj_la1[287] = jj_gen;
+      jj_la1[286] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12591,14 +12609,14 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
         break;
         }
       default:
-        jj_la1[288] = jj_gen;
+        jj_la1[287] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
       break;
       }
     default:
-      jj_la1[289] = jj_gen;
+      jj_la1[288] = jj_gen;
       ;
     }
     }
@@ -12648,7 +12666,7 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
         break;
         }
       default:
-        jj_la1[290] = jj_gen;
+        jj_la1[289] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -12657,7 +12675,7 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
       break;
       }
     default:
-      jj_la1[291] = jj_gen;
+      jj_la1[290] = jj_gen;
       ;
     }
     }
@@ -12695,7 +12713,7 @@ QCString VhdlParser::param() {QCString s,s1;Token *tok=0;if (!hasError) {
       break;
       }
     default:
-      jj_la1[292] = jj_gen;
+      jj_la1[291] = jj_gen;
       ;
     }
     }
@@ -12722,7 +12740,7 @@ param_sec=PARAM_SEC;
       break;
       }
     default:
-      jj_la1[293] = jj_gen;
+      jj_la1[292] = jj_gen;
       ;
     }
     }
@@ -12760,7 +12778,7 @@ void VhdlParser::parseInline() {
       break;
       }
     default:
-      jj_la1[294] = jj_gen;
+      jj_la1[293] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12806,7 +12824,7 @@ void VhdlParser::ReInit(TokenManager *tm){
     trace_enabled = false;
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 295; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 294; i++) jj_la1[i] = -1;
   }
 
 
@@ -12819,7 +12837,7 @@ Token * VhdlParser::jj_consume_token(int kind)  {
       jj_gen++;
       if (++jj_gc > 100) {
         jj_gc = 0;
-        for (int i = 0; i < 112; i++) {
+        for (int i = 0; i < 114; i++) {
           JJCalls *c = &jj_2_rtns[i];
           while (c != NULL) {
             if (c->gen < jj_gen) c->first = NULL;
@@ -12895,7 +12913,7 @@ void VhdlParser::jj_add_error_token(int kind, int pos)  {
   /** Generate ParseException. */
 
  void  VhdlParser::parseError()   {
-      fprintf(stderr, "Parse error at: %d:%d, after token: %s encountered: %s\n", token->beginLine, token->beginColumn, addUnicodeEscapes(token->image).c_str(), addUnicodeEscapes(getToken(1)->image).c_str());
+    //  fprintf(stderr, "Parse error at: %d:%d, after token: %s encountered: %s\n", token->beginLine, token->beginColumn, addUnicodeEscapes(token->image).c_str(), addUnicodeEscapes(getToken(1)->image).c_str());
    }
 
 
@@ -12910,7 +12928,7 @@ void VhdlParser::jj_add_error_token(int kind, int pos)  {
 
 void VhdlParser::jj_rescan_token(){
     jj_rescan = true;
-    for (int i = 0; i < 112; i++) {
+    for (int i = 0; i < 114; i++) {
       JJCalls *p = &jj_2_rtns[i];
       do {
         if (p->gen > jj_gen) {
@@ -13028,6 +13046,8 @@ void VhdlParser::jj_rescan_token(){
             case 109: jj_3_110(); break;
             case 110: jj_3_111(); break;
             case 111: jj_3_112(); break;
+            case 112: jj_3_113(); break;
+            case 113: jj_3_114(); break;
           }
         }
         p = p->next;
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index dcde4f3..78450d1 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -1,12 +1,10 @@
 #ifndef VHDLPARSER_H
 #define VHDLPARSER_H
-
 #include "JavaCC.h"
 #include "CharStream.h"
 #include "Token.h"
 #include "TokenManager.h"
 #include "VhdlParserTokenManager.h"
-#include "VhdlParser.h"
 #include "vhdljjparser.h"
 
 #include "VhdlParserConstants.h"
@@ -293,7 +291,7 @@ QCString interface_list();
 
 QCString interface_variable_declaration();
 
-void iteration_scheme();
+QCString iteration_scheme();
 
 QCString label();
 
@@ -305,7 +303,7 @@ QCString literal();
 
 QCString logical_operator();
 
-void loop_statement();
+QCString loop_statement();
 
 QCString miscellaneous_operator();
 
@@ -409,9 +407,9 @@ QCString sensitivity_clause();
 
 QCString sensitivity_list();
 
-void sequence_of_statement();
+QCString sequence_of_statement();
 
-void sequential_statement();
+QCString sequential_statement();
 
 QCString shift_expression();
 
@@ -525,6 +523,8 @@ void ttend();
 
 void generate_statement_body();
 
+void generate_statement_body1();
+
 QCString external_name();
 
 QCString sig_stat();
@@ -583,7 +583,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_1() || jj_done;
-    finally { jj_save(0, xla); }
+ { jj_save(0, xla); }
   }
 
  inline bool jj_2_2(int xla)
@@ -591,7 +591,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_2() || jj_done;
-    finally { jj_save(1, xla); }
+ { jj_save(1, xla); }
   }
 
  inline bool jj_2_3(int xla)
@@ -599,7 +599,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_3() || jj_done;
-    finally { jj_save(2, xla); }
+ { jj_save(2, xla); }
   }
 
  inline bool jj_2_4(int xla)
@@ -607,7 +607,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_4() || jj_done;
-    finally { jj_save(3, xla); }
+ { jj_save(3, xla); }
   }
 
  inline bool jj_2_5(int xla)
@@ -615,7 +615,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_5() || jj_done;
-    finally { jj_save(4, xla); }
+ { jj_save(4, xla); }
   }
 
  inline bool jj_2_6(int xla)
@@ -623,7 +623,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_6() || jj_done;
-    finally { jj_save(5, xla); }
+ { jj_save(5, xla); }
   }
 
  inline bool jj_2_7(int xla)
@@ -631,7 +631,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_7() || jj_done;
-    finally { jj_save(6, xla); }
+ { jj_save(6, xla); }
   }
 
  inline bool jj_2_8(int xla)
@@ -639,7 +639,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_8() || jj_done;
-    finally { jj_save(7, xla); }
+ { jj_save(7, xla); }
   }
 
  inline bool jj_2_9(int xla)
@@ -647,7 +647,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_9() || jj_done;
-    finally { jj_save(8, xla); }
+ { jj_save(8, xla); }
   }
 
  inline bool jj_2_10(int xla)
@@ -655,7 +655,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_10() || jj_done;
-    finally { jj_save(9, xla); }
+ { jj_save(9, xla); }
   }
 
  inline bool jj_2_11(int xla)
@@ -663,7 +663,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_11() || jj_done;
-    finally { jj_save(10, xla); }
+ { jj_save(10, xla); }
   }
 
  inline bool jj_2_12(int xla)
@@ -671,7 +671,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_12() || jj_done;
-    finally { jj_save(11, xla); }
+ { jj_save(11, xla); }
   }
 
  inline bool jj_2_13(int xla)
@@ -679,7 +679,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_13() || jj_done;
-    finally { jj_save(12, xla); }
+ { jj_save(12, xla); }
   }
 
  inline bool jj_2_14(int xla)
@@ -687,7 +687,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_14() || jj_done;
-    finally { jj_save(13, xla); }
+ { jj_save(13, xla); }
   }
 
  inline bool jj_2_15(int xla)
@@ -695,7 +695,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_15() || jj_done;
-    finally { jj_save(14, xla); }
+ { jj_save(14, xla); }
   }
 
  inline bool jj_2_16(int xla)
@@ -703,7 +703,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_16() || jj_done;
-    finally { jj_save(15, xla); }
+ { jj_save(15, xla); }
   }
 
  inline bool jj_2_17(int xla)
@@ -711,7 +711,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_17() || jj_done;
-    finally { jj_save(16, xla); }
+ { jj_save(16, xla); }
   }
 
  inline bool jj_2_18(int xla)
@@ -719,7 +719,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_18() || jj_done;
-    finally { jj_save(17, xla); }
+ { jj_save(17, xla); }
   }
 
  inline bool jj_2_19(int xla)
@@ -727,7 +727,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_19() || jj_done;
-    finally { jj_save(18, xla); }
+ { jj_save(18, xla); }
   }
 
  inline bool jj_2_20(int xla)
@@ -735,7 +735,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_20() || jj_done;
-    finally { jj_save(19, xla); }
+ { jj_save(19, xla); }
   }
 
  inline bool jj_2_21(int xla)
@@ -743,7 +743,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_21() || jj_done;
-    finally { jj_save(20, xla); }
+ { jj_save(20, xla); }
   }
 
  inline bool jj_2_22(int xla)
@@ -751,7 +751,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_22() || jj_done;
-    finally { jj_save(21, xla); }
+ { jj_save(21, xla); }
   }
 
  inline bool jj_2_23(int xla)
@@ -759,7 +759,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_23() || jj_done;
-    finally { jj_save(22, xla); }
+ { jj_save(22, xla); }
   }
 
  inline bool jj_2_24(int xla)
@@ -767,7 +767,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_24() || jj_done;
-    finally { jj_save(23, xla); }
+ { jj_save(23, xla); }
   }
 
  inline bool jj_2_25(int xla)
@@ -775,7 +775,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_25() || jj_done;
-    finally { jj_save(24, xla); }
+ { jj_save(24, xla); }
   }
 
  inline bool jj_2_26(int xla)
@@ -783,7 +783,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_26() || jj_done;
-    finally { jj_save(25, xla); }
+ { jj_save(25, xla); }
   }
 
  inline bool jj_2_27(int xla)
@@ -791,7 +791,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_27() || jj_done;
-    finally { jj_save(26, xla); }
+ { jj_save(26, xla); }
   }
 
  inline bool jj_2_28(int xla)
@@ -799,7 +799,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_28() || jj_done;
-    finally { jj_save(27, xla); }
+ { jj_save(27, xla); }
   }
 
  inline bool jj_2_29(int xla)
@@ -807,7 +807,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_29() || jj_done;
-    finally { jj_save(28, xla); }
+ { jj_save(28, xla); }
   }
 
  inline bool jj_2_30(int xla)
@@ -815,7 +815,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_30() || jj_done;
-    finally { jj_save(29, xla); }
+ { jj_save(29, xla); }
   }
 
  inline bool jj_2_31(int xla)
@@ -823,7 +823,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_31() || jj_done;
-    finally { jj_save(30, xla); }
+ { jj_save(30, xla); }
   }
 
  inline bool jj_2_32(int xla)
@@ -831,7 +831,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_32() || jj_done;
-    finally { jj_save(31, xla); }
+ { jj_save(31, xla); }
   }
 
  inline bool jj_2_33(int xla)
@@ -839,7 +839,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_33() || jj_done;
-    finally { jj_save(32, xla); }
+ { jj_save(32, xla); }
   }
 
  inline bool jj_2_34(int xla)
@@ -847,7 +847,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_34() || jj_done;
-    finally { jj_save(33, xla); }
+ { jj_save(33, xla); }
   }
 
  inline bool jj_2_35(int xla)
@@ -855,7 +855,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_35() || jj_done;
-    finally { jj_save(34, xla); }
+ { jj_save(34, xla); }
   }
 
  inline bool jj_2_36(int xla)
@@ -863,7 +863,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_36() || jj_done;
-    finally { jj_save(35, xla); }
+ { jj_save(35, xla); }
   }
 
  inline bool jj_2_37(int xla)
@@ -871,7 +871,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_37() || jj_done;
-    finally { jj_save(36, xla); }
+ { jj_save(36, xla); }
   }
 
  inline bool jj_2_38(int xla)
@@ -879,7 +879,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_38() || jj_done;
-    finally { jj_save(37, xla); }
+ { jj_save(37, xla); }
   }
 
  inline bool jj_2_39(int xla)
@@ -887,7 +887,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_39() || jj_done;
-    finally { jj_save(38, xla); }
+ { jj_save(38, xla); }
   }
 
  inline bool jj_2_40(int xla)
@@ -895,7 +895,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_40() || jj_done;
-    finally { jj_save(39, xla); }
+ { jj_save(39, xla); }
   }
 
  inline bool jj_2_41(int xla)
@@ -903,7 +903,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_41() || jj_done;
-    finally { jj_save(40, xla); }
+ { jj_save(40, xla); }
   }
 
  inline bool jj_2_42(int xla)
@@ -911,7 +911,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_42() || jj_done;
-    finally { jj_save(41, xla); }
+ { jj_save(41, xla); }
   }
 
  inline bool jj_2_43(int xla)
@@ -919,7 +919,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_43() || jj_done;
-    finally { jj_save(42, xla); }
+ { jj_save(42, xla); }
   }
 
  inline bool jj_2_44(int xla)
@@ -927,7 +927,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_44() || jj_done;
-    finally { jj_save(43, xla); }
+ { jj_save(43, xla); }
   }
 
  inline bool jj_2_45(int xla)
@@ -935,7 +935,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_45() || jj_done;
-    finally { jj_save(44, xla); }
+ { jj_save(44, xla); }
   }
 
  inline bool jj_2_46(int xla)
@@ -943,7 +943,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_46() || jj_done;
-    finally { jj_save(45, xla); }
+ { jj_save(45, xla); }
   }
 
  inline bool jj_2_47(int xla)
@@ -951,7 +951,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_47() || jj_done;
-    finally { jj_save(46, xla); }
+ { jj_save(46, xla); }
   }
 
  inline bool jj_2_48(int xla)
@@ -959,7 +959,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_48() || jj_done;
-    finally { jj_save(47, xla); }
+ { jj_save(47, xla); }
   }
 
  inline bool jj_2_49(int xla)
@@ -967,7 +967,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_49() || jj_done;
-    finally { jj_save(48, xla); }
+ { jj_save(48, xla); }
   }
 
  inline bool jj_2_50(int xla)
@@ -975,7 +975,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_50() || jj_done;
-    finally { jj_save(49, xla); }
+ { jj_save(49, xla); }
   }
 
  inline bool jj_2_51(int xla)
@@ -983,7 +983,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_51() || jj_done;
-    finally { jj_save(50, xla); }
+ { jj_save(50, xla); }
   }
 
  inline bool jj_2_52(int xla)
@@ -991,7 +991,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_52() || jj_done;
-    finally { jj_save(51, xla); }
+ { jj_save(51, xla); }
   }
 
  inline bool jj_2_53(int xla)
@@ -999,7 +999,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_53() || jj_done;
-    finally { jj_save(52, xla); }
+ { jj_save(52, xla); }
   }
 
  inline bool jj_2_54(int xla)
@@ -1007,7 +1007,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_54() || jj_done;
-    finally { jj_save(53, xla); }
+ { jj_save(53, xla); }
   }
 
  inline bool jj_2_55(int xla)
@@ -1015,7 +1015,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_55() || jj_done;
-    finally { jj_save(54, xla); }
+ { jj_save(54, xla); }
   }
 
  inline bool jj_2_56(int xla)
@@ -1023,7 +1023,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_56() || jj_done;
-    finally { jj_save(55, xla); }
+ { jj_save(55, xla); }
   }
 
  inline bool jj_2_57(int xla)
@@ -1031,7 +1031,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_57() || jj_done;
-    finally { jj_save(56, xla); }
+ { jj_save(56, xla); }
   }
 
  inline bool jj_2_58(int xla)
@@ -1039,7 +1039,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_58() || jj_done;
-    finally { jj_save(57, xla); }
+ { jj_save(57, xla); }
   }
 
  inline bool jj_2_59(int xla)
@@ -1047,7 +1047,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_59() || jj_done;
-    finally { jj_save(58, xla); }
+ { jj_save(58, xla); }
   }
 
  inline bool jj_2_60(int xla)
@@ -1055,7 +1055,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_60() || jj_done;
-    finally { jj_save(59, xla); }
+ { jj_save(59, xla); }
   }
 
  inline bool jj_2_61(int xla)
@@ -1063,7 +1063,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_61() || jj_done;
-    finally { jj_save(60, xla); }
+ { jj_save(60, xla); }
   }
 
  inline bool jj_2_62(int xla)
@@ -1071,7 +1071,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_62() || jj_done;
-    finally { jj_save(61, xla); }
+ { jj_save(61, xla); }
   }
 
  inline bool jj_2_63(int xla)
@@ -1079,7 +1079,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_63() || jj_done;
-    finally { jj_save(62, xla); }
+ { jj_save(62, xla); }
   }
 
  inline bool jj_2_64(int xla)
@@ -1087,7 +1087,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_64() || jj_done;
-    finally { jj_save(63, xla); }
+ { jj_save(63, xla); }
   }
 
  inline bool jj_2_65(int xla)
@@ -1095,7 +1095,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_65() || jj_done;
-    finally { jj_save(64, xla); }
+ { jj_save(64, xla); }
   }
 
  inline bool jj_2_66(int xla)
@@ -1103,7 +1103,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_66() || jj_done;
-    finally { jj_save(65, xla); }
+ { jj_save(65, xla); }
   }
 
  inline bool jj_2_67(int xla)
@@ -1111,7 +1111,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_67() || jj_done;
-    finally { jj_save(66, xla); }
+ { jj_save(66, xla); }
   }
 
  inline bool jj_2_68(int xla)
@@ -1119,7 +1119,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_68() || jj_done;
-    finally { jj_save(67, xla); }
+ { jj_save(67, xla); }
   }
 
  inline bool jj_2_69(int xla)
@@ -1127,7 +1127,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_69() || jj_done;
-    finally { jj_save(68, xla); }
+ { jj_save(68, xla); }
   }
 
  inline bool jj_2_70(int xla)
@@ -1135,7 +1135,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_70() || jj_done;
-    finally { jj_save(69, xla); }
+ { jj_save(69, xla); }
   }
 
  inline bool jj_2_71(int xla)
@@ -1143,7 +1143,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_71() || jj_done;
-    finally { jj_save(70, xla); }
+ { jj_save(70, xla); }
   }
 
  inline bool jj_2_72(int xla)
@@ -1151,7 +1151,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_72() || jj_done;
-    finally { jj_save(71, xla); }
+ { jj_save(71, xla); }
   }
 
  inline bool jj_2_73(int xla)
@@ -1159,7 +1159,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_73() || jj_done;
-    finally { jj_save(72, xla); }
+ { jj_save(72, xla); }
   }
 
  inline bool jj_2_74(int xla)
@@ -1167,7 +1167,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_74() || jj_done;
-    finally { jj_save(73, xla); }
+ { jj_save(73, xla); }
   }
 
  inline bool jj_2_75(int xla)
@@ -1175,7 +1175,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_75() || jj_done;
-    finally { jj_save(74, xla); }
+ { jj_save(74, xla); }
   }
 
  inline bool jj_2_76(int xla)
@@ -1183,7 +1183,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_76() || jj_done;
-    finally { jj_save(75, xla); }
+ { jj_save(75, xla); }
   }
 
  inline bool jj_2_77(int xla)
@@ -1191,7 +1191,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_77() || jj_done;
-    finally { jj_save(76, xla); }
+ { jj_save(76, xla); }
   }
 
  inline bool jj_2_78(int xla)
@@ -1199,7 +1199,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_78() || jj_done;
-    finally { jj_save(77, xla); }
+ { jj_save(77, xla); }
   }
 
  inline bool jj_2_79(int xla)
@@ -1207,7 +1207,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_79() || jj_done;
-    finally { jj_save(78, xla); }
+ { jj_save(78, xla); }
   }
 
  inline bool jj_2_80(int xla)
@@ -1215,7 +1215,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_80() || jj_done;
-    finally { jj_save(79, xla); }
+ { jj_save(79, xla); }
   }
 
  inline bool jj_2_81(int xla)
@@ -1223,7 +1223,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_81() || jj_done;
-    finally { jj_save(80, xla); }
+ { jj_save(80, xla); }
   }
 
  inline bool jj_2_82(int xla)
@@ -1231,7 +1231,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_82() || jj_done;
-    finally { jj_save(81, xla); }
+ { jj_save(81, xla); }
   }
 
  inline bool jj_2_83(int xla)
@@ -1239,7 +1239,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_83() || jj_done;
-    finally { jj_save(82, xla); }
+ { jj_save(82, xla); }
   }
 
  inline bool jj_2_84(int xla)
@@ -1247,7 +1247,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_84() || jj_done;
-    finally { jj_save(83, xla); }
+ { jj_save(83, xla); }
   }
 
  inline bool jj_2_85(int xla)
@@ -1255,7 +1255,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_85() || jj_done;
-    finally { jj_save(84, xla); }
+ { jj_save(84, xla); }
   }
 
  inline bool jj_2_86(int xla)
@@ -1263,7 +1263,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_86() || jj_done;
-    finally { jj_save(85, xla); }
+ { jj_save(85, xla); }
   }
 
  inline bool jj_2_87(int xla)
@@ -1271,7 +1271,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_87() || jj_done;
-    finally { jj_save(86, xla); }
+ { jj_save(86, xla); }
   }
 
  inline bool jj_2_88(int xla)
@@ -1279,7 +1279,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_88() || jj_done;
-    finally { jj_save(87, xla); }
+ { jj_save(87, xla); }
   }
 
  inline bool jj_2_89(int xla)
@@ -1287,7 +1287,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_89() || jj_done;
-    finally { jj_save(88, xla); }
+ { jj_save(88, xla); }
   }
 
  inline bool jj_2_90(int xla)
@@ -1295,7 +1295,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_90() || jj_done;
-    finally { jj_save(89, xla); }
+ { jj_save(89, xla); }
   }
 
  inline bool jj_2_91(int xla)
@@ -1303,7 +1303,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_91() || jj_done;
-    finally { jj_save(90, xla); }
+ { jj_save(90, xla); }
   }
 
  inline bool jj_2_92(int xla)
@@ -1311,7 +1311,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_92() || jj_done;
-    finally { jj_save(91, xla); }
+ { jj_save(91, xla); }
   }
 
  inline bool jj_2_93(int xla)
@@ -1319,7 +1319,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_93() || jj_done;
-    finally { jj_save(92, xla); }
+ { jj_save(92, xla); }
   }
 
  inline bool jj_2_94(int xla)
@@ -1327,7 +1327,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_94() || jj_done;
-    finally { jj_save(93, xla); }
+ { jj_save(93, xla); }
   }
 
  inline bool jj_2_95(int xla)
@@ -1335,7 +1335,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_95() || jj_done;
-    finally { jj_save(94, xla); }
+ { jj_save(94, xla); }
   }
 
  inline bool jj_2_96(int xla)
@@ -1343,7 +1343,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_96() || jj_done;
-    finally { jj_save(95, xla); }
+ { jj_save(95, xla); }
   }
 
  inline bool jj_2_97(int xla)
@@ -1351,7 +1351,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_97() || jj_done;
-    finally { jj_save(96, xla); }
+ { jj_save(96, xla); }
   }
 
  inline bool jj_2_98(int xla)
@@ -1359,7 +1359,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_98() || jj_done;
-    finally { jj_save(97, xla); }
+ { jj_save(97, xla); }
   }
 
  inline bool jj_2_99(int xla)
@@ -1367,7 +1367,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_99() || jj_done;
-    finally { jj_save(98, xla); }
+ { jj_save(98, xla); }
   }
 
  inline bool jj_2_100(int xla)
@@ -1375,7 +1375,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_100() || jj_done;
-    finally { jj_save(99, xla); }
+ { jj_save(99, xla); }
   }
 
  inline bool jj_2_101(int xla)
@@ -1383,7 +1383,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_101() || jj_done;
-    finally { jj_save(100, xla); }
+ { jj_save(100, xla); }
   }
 
  inline bool jj_2_102(int xla)
@@ -1391,7 +1391,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_102() || jj_done;
-    finally { jj_save(101, xla); }
+ { jj_save(101, xla); }
   }
 
  inline bool jj_2_103(int xla)
@@ -1399,7 +1399,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_103() || jj_done;
-    finally { jj_save(102, xla); }
+ { jj_save(102, xla); }
   }
 
  inline bool jj_2_104(int xla)
@@ -1407,7 +1407,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_104() || jj_done;
-    finally { jj_save(103, xla); }
+ { jj_save(103, xla); }
   }
 
  inline bool jj_2_105(int xla)
@@ -1415,7 +1415,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_105() || jj_done;
-    finally { jj_save(104, xla); }
+ { jj_save(104, xla); }
   }
 
  inline bool jj_2_106(int xla)
@@ -1423,7 +1423,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_106() || jj_done;
-    finally { jj_save(105, xla); }
+ { jj_save(105, xla); }
   }
 
  inline bool jj_2_107(int xla)
@@ -1431,7 +1431,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_107() || jj_done;
-    finally { jj_save(106, xla); }
+ { jj_save(106, xla); }
   }
 
  inline bool jj_2_108(int xla)
@@ -1439,7 +1439,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_108() || jj_done;
-    finally { jj_save(107, xla); }
+ { jj_save(107, xla); }
   }
 
  inline bool jj_2_109(int xla)
@@ -1447,7 +1447,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_109() || jj_done;
-    finally { jj_save(108, xla); }
+ { jj_save(108, xla); }
   }
 
  inline bool jj_2_110(int xla)
@@ -1455,7 +1455,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_110() || jj_done;
-    finally { jj_save(109, xla); }
+ { jj_save(109, xla); }
   }
 
  inline bool jj_2_111(int xla)
@@ -1463,7 +1463,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_111() || jj_done;
-    finally { jj_save(110, xla); }
+ { jj_save(110, xla); }
   }
 
  inline bool jj_2_112(int xla)
@@ -1471,246 +1471,53 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_112() || jj_done;
-    finally { jj_save(111, xla); }
-  }
-
- inline bool jj_3_48()
- {
-    if (jj_done) return true;
-    if (jj_3R_101()) return true;
-    return false;
-  }
-
- inline bool jj_3R_214()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_338()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RPAREN_T)) return true;
-    return false;
-  }
-
- inline bool jj_3_47()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_100()) return true;
-    return false;
-  }
-
- inline bool jj_3R_210()
- {
-    if (jj_done) return true;
-    if (jj_3R_99()) return true;
-    return false;
-  }
-
- inline bool jj_3R_213()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_68()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_148()
- {
-    if (jj_done) return true;
-    if (jj_3R_296()) return true;
-    return false;
-  }
-
- inline bool jj_3R_212()
- {
-    if (jj_done) return true;
-    if (jj_3R_101()) return true;
-    return false;
-  }
-
- inline bool jj_3R_211()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_100()) return true;
-    return false;
-  }
-
- inline bool jj_3R_99()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_211()) {
-    jj_scanpos = xsp;
-    if (jj_3R_212()) {
-    jj_scanpos = xsp;
-    if (jj_3R_213()) {
-    jj_scanpos = xsp;
-    if (jj_3R_214()) return true;
-    }
-    }
-    }
-    return false;
-  }
-
- inline bool jj_3_45()
- {
-    if (jj_done) return true;
-    if (jj_3R_98()) return true;
-    return false;
-  }
-
- inline bool jj_3R_98()
- {
-    if (jj_done) return true;
-    if (jj_3R_99()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_210()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
- inline bool jj_3R_147()
- {
-    if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    return false;
-  }
-
- inline bool jj_3R_149()
- {
-    if (jj_done) return true;
-    if (jj_3R_98()) return true;
-    return false;
-  }
-
- inline bool jj_3R_590()
- {
-    if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    return false;
-  }
-
- inline bool jj_3R_146()
- {
-    if (jj_done) return true;
-    if (jj_3R_295()) return true;
-    return false;
-  }
-
- inline bool jj_3R_60()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_146()) {
-    jj_scanpos = xsp;
-    if (jj_3R_147()) {
-    jj_scanpos = xsp;
-    if (jj_3R_148()) return true;
-    }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_149()) jj_scanpos = xsp;
-    return false;
-  }
-
- inline bool jj_3R_281()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(REM_T)) return true;
-    return false;
+ { jj_save(111, xla); }
   }
 
- inline bool jj_3R_280()
+ inline bool jj_2_113(int xla)
  {
-    if (jj_done) return true;
-    if (jj_scan_token(MOD_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_279()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(SLASH_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_134()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_278()) {
-    jj_scanpos = xsp;
-    if (jj_3R_279()) {
-    jj_scanpos = xsp;
-    if (jj_3R_280()) {
-    jj_scanpos = xsp;
-    if (jj_3R_281()) return true;
-    }
-    }
-    }
-    return false;
-  }
-
- inline bool jj_3R_278()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(MULT_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_410()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(LINKAGE_T)) return true;
-    return false;
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    jj_done = false;
+    return !jj_3_113() || jj_done;
+ { jj_save(112, xla); }
   }
 
- inline bool jj_3R_409()
+ inline bool jj_2_114(int xla)
  {
-    if (jj_done) return true;
-    if (jj_scan_token(BUFFER_T)) return true;
-    return false;
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    jj_done = false;
+    return !jj_3_114() || jj_done;
+ { jj_save(113, xla); }
   }
 
- inline bool jj_3R_408()
+ inline bool jj_3R_430()
  {
     if (jj_done) return true;
     if (jj_scan_token(INOUT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_407()
+ inline bool jj_3R_429()
  {
     if (jj_done) return true;
     if (jj_scan_token(OUT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_331()
+ inline bool jj_3R_346()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_406()) {
+    if (jj_3R_428()) {
     jj_scanpos = xsp;
-    if (jj_3R_407()) {
+    if (jj_3R_429()) {
     jj_scanpos = xsp;
-    if (jj_3R_408()) {
+    if (jj_3R_430()) {
     jj_scanpos = xsp;
-    if (jj_3R_409()) {
+    if (jj_3R_431()) {
     jj_scanpos = xsp;
-    if (jj_3R_410()) return true;
+    if (jj_3R_432()) return true;
     }
     }
     }
@@ -1718,7 +1525,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_406()
+ inline bool jj_3R_428()
  {
     if (jj_done) return true;
     if (jj_scan_token(IN_T)) return true;
@@ -1728,14 +1535,14 @@ void parseInline();
  inline bool jj_3R_258()
  {
     if (jj_done) return true;
-    if (jj_3R_352()) return true;
+    if (jj_3R_367()) return true;
     return false;
   }
 
  inline bool jj_3R_257()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
@@ -1753,19 +1560,19 @@ void parseInline();
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(LOOP_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_590()) jj_scanpos = xsp;
+    if (jj_3R_625()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_44()
+ inline bool jj_3_45()
  {
     if (jj_done) return true;
     if (jj_3R_97()) return true;
     return false;
   }
 
- inline bool jj_3_43()
+ inline bool jj_3_44()
  {
     if (jj_done) return true;
     if (jj_3R_96()) return true;
@@ -1779,17 +1586,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_232()
+ inline bool jj_3_43()
  {
     if (jj_done) return true;
-    if (jj_3R_341()) return true;
+    if (jj_3R_95()) return true;
     return false;
   }
 
- inline bool jj_3_42()
+ inline bool jj_3R_232()
  {
     if (jj_done) return true;
-    if (jj_3R_95()) return true;
+    if (jj_3R_356()) return true;
     return false;
   }
 
@@ -1835,49 +1642,49 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_41()
+ inline bool jj_3_42()
  {
     if (jj_done) return true;
     if (jj_3R_94()) return true;
     return false;
   }
 
- inline bool jj_3R_199()
+ inline bool jj_3R_140()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_139()
+ inline bool jj_3R_199()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_422()
+ inline bool jj_3R_444()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_380()) return true;
+    if (jj_3R_408()) return true;
     return false;
   }
 
- inline bool jj_3R_352()
+ inline bool jj_3R_367()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_421()) {
+    if (jj_3R_443()) {
     jj_scanpos = xsp;
-    if (jj_3R_422()) return true;
+    if (jj_3R_444()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_421()
+ inline bool jj_3R_443()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHILE_T)) return true;
@@ -1888,15 +1695,15 @@ void parseInline();
  inline bool jj_3R_198()
  {
     if (jj_done) return true;
-    if (jj_3R_331()) return true;
+    if (jj_3R_346()) return true;
     return false;
   }
 
- inline bool jj_3R_372()
+ inline bool jj_3R_400()
  {
     if (jj_done) return true;
     if (jj_scan_token(SEMI_T)) return true;
-    if (jj_3R_371()) return true;
+    if (jj_3R_399()) return true;
     return false;
   }
 
@@ -1905,13 +1712,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(115)) {
+    if (jj_scan_token(116)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(99)) {
+    if (jj_scan_token(100)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(30)) {
+    if (jj_scan_token(31)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(100)) return true;
+    if (jj_scan_token(101)) return true;
     }
     }
     }
@@ -1930,29 +1737,29 @@ void parseInline();
     if (jj_3R_198()) jj_scanpos = xsp;
     if (jj_3R_85()) return true;
     xsp = jj_scanpos;
-    if (jj_scan_token(26)) jj_scanpos = xsp;
+    if (jj_scan_token(27)) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3R_199()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_298()
+ inline bool jj_3R_313()
  {
     if (jj_done) return true;
-    if (jj_3R_371()) return true;
+    if (jj_3R_399()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_372()) { jj_scanpos = xsp; break; }
+      if (jj_3R_400()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_391()
+ inline bool jj_3R_413()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -1967,79 +1774,79 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_371()
+ inline bool jj_3R_399()
  {
     if (jj_done) return true;
-    if (jj_3R_450()) return true;
+    if (jj_3R_491()) return true;
     return false;
   }
 
- inline bool jj_3_40()
+ inline bool jj_3_41()
  {
     if (jj_done) return true;
     if (jj_3R_93()) return true;
     return false;
   }
 
- inline bool jj_3R_515()
+ inline bool jj_3R_552()
  {
     if (jj_done) return true;
-    if (jj_3R_557()) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_613()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_514()
+ inline bool jj_3R_551()
  {
     if (jj_done) return true;
     if (jj_3R_93()) return true;
     return false;
   }
 
- inline bool jj_3_39()
+ inline bool jj_3_40()
  {
     if (jj_done) return true;
     if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3_38()
+ inline bool jj_3_39()
  {
     if (jj_done) return true;
     if (jj_3R_91()) return true;
     return false;
   }
 
- inline bool jj_3R_513()
+ inline bool jj_3R_550()
  {
     if (jj_done) return true;
     if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3_37()
+ inline bool jj_3_38()
  {
     if (jj_done) return true;
     if (jj_3R_90()) return true;
     return false;
   }
 
- inline bool jj_3R_450()
+ inline bool jj_3R_491()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_37()) {
-    jj_scanpos = xsp;
-    if (jj_3R_513()) {
-    jj_scanpos = xsp;
     if (jj_3_38()) {
     jj_scanpos = xsp;
+    if (jj_3R_550()) {
+    jj_scanpos = xsp;
     if (jj_3_39()) {
     jj_scanpos = xsp;
-    if (jj_3R_514()) {
+    if (jj_3_40()) {
     jj_scanpos = xsp;
-    if (jj_3R_515()) return true;
+    if (jj_3R_551()) {
+    jj_scanpos = xsp;
+    if (jj_3R_552()) return true;
     }
     }
     }
@@ -2048,10 +1855,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_586()
+ inline bool jj_3R_621()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
@@ -2059,47 +1866,54 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_394()
+ inline bool jj_3R_416()
  {
     if (jj_done) return true;
     if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_393()
+ inline bool jj_3R_415()
  {
     if (jj_done) return true;
     if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_316()
+ inline bool jj_3R_331()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_392()) {
+    if (jj_3R_414()) {
     jj_scanpos = xsp;
-    if (jj_3R_393()) {
+    if (jj_3R_415()) {
     jj_scanpos = xsp;
-    if (jj_3R_394()) return true;
+    if (jj_3R_416()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_392()
+ inline bool jj_3R_414()
  {
     if (jj_done) return true;
     if (jj_3R_197()) return true;
     return false;
   }
 
- inline bool jj_3R_313()
+ inline bool jj_3R_698()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_328()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONFIGURATION_T)) return true;
@@ -2107,14 +1921,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_312()
+ inline bool jj_3R_327()
  {
     if (jj_done) return true;
     if (jj_scan_token(ENTITY_T)) return true;
     if (jj_3R_60()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_391()) jj_scanpos = xsp;
+    if (jj_3R_413()) jj_scanpos = xsp;
     return false;
   }
 
@@ -2123,64 +1937,77 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_311()) {
+    if (jj_3R_326()) {
     jj_scanpos = xsp;
-    if (jj_3R_312()) {
+    if (jj_3R_327()) {
     jj_scanpos = xsp;
-    if (jj_3R_313()) return true;
+    if (jj_3R_328()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3_36()
+ inline bool jj_3_37()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_311()
+ inline bool jj_3R_326()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(27)) jj_scanpos = xsp;
-    if (jj_3R_71()) return true;
+    if (jj_scan_token(28)) jj_scanpos = xsp;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_153()
+ inline bool jj_3R_155()
  {
     if (jj_done) return true;
-    if (jj_3R_156()) return true;
+    if (jj_3R_158()) return true;
     if (jj_scan_token(RANGE_T)) return true;
     if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
- inline bool jj_3R_583()
+ inline bool jj_3R_427()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(IS_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_698()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(145)) return true;
+    }
+    return false;
+  }
+
+ inline bool jj_3R_618()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_582()
+ inline bool jj_3R_617()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_539()
+ inline bool jj_3R_565()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_582()) {
+    if (jj_3R_617()) {
     jj_scanpos = xsp;
-    if (jj_3R_583()) return true;
+    if (jj_3R_618()) return true;
     }
     return false;
   }
@@ -2189,7 +2016,7 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_69()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
@@ -2199,7 +2026,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_585()
+ inline bool jj_3R_620()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSE_T)) return true;
@@ -2207,16 +2034,16 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_602()
+ inline bool jj_3R_526()
  {
     if (jj_done) return true;
     if (jj_scan_token(TYPE_T)) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_584()
+ inline bool jj_3R_619()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSIF_T)) return true;
@@ -2226,38 +2053,27 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_673()
- {
-    if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    return false;
-  }
-
- inline bool jj_3R_330()
+ inline bool jj_3R_345()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_405()
+ inline bool jj_3R_514()
  {
     if (jj_done) return true;
-    if (jj_scan_token(IS_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_673()) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(144)) return true;
-    }
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_313()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
  inline bool jj_3R_255()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
@@ -2274,14 +2090,14 @@ void parseInline();
     if (jj_3R_259()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_584()) { jj_scanpos = xsp; break; }
+      if (jj_3R_619()) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_585()) jj_scanpos = xsp;
+    if (jj_3R_620()) jj_scanpos = xsp;
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(IF_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_586()) jj_scanpos = xsp;
+    if (jj_3R_621()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -2289,11 +2105,11 @@ void parseInline();
  inline bool jj_3R_197()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_330()) { jj_scanpos = xsp; break; }
+      if (jj_3R_345()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
@@ -2312,7 +2128,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_71()
+ inline bool jj_3R_70()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -2324,346 +2140,224 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_615()
+ inline bool jj_3R_539()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_614()) return true;
-    return false;
-  }
-
- inline bool jj_3R_170()
- {
-    if (jj_done) return true;
-    if (jj_3R_309()) return true;
+    if (jj_3R_538()) return true;
     return false;
   }
 
- inline bool jj_3R_66()
+ inline bool jj_3R_425()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GROUP_T)) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_572()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(77)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_514()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_491()
+ inline bool jj_3_114()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_298()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_59()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_528()
+ inline bool jj_3R_66()
  {
     if (jj_done) return true;
     if (jj_scan_token(GROUP_T)) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(IS_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_573()) return true;
+    if (jj_3R_475()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_573()
- {
-    if (jj_done) return true;
-    if (jj_3R_614()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_615()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
- inline bool jj_3R_171()
- {
-    if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    return false;
-  }
-
- inline bool jj_3R_650()
- {
-    if (jj_done) return true;
-    if (jj_3R_337()) return true;
-    return false;
-  }
-
- inline bool jj_3R_649()
- {
-    if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    return false;
-  }
-
- inline bool jj_3R_614()
+ inline bool jj_3R_386()
  {
     if (jj_done) return true;
+    if (jj_3R_59()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_86()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_649()) {
+    if (jj_scan_token(134)) {
     jj_scanpos = xsp;
-    if (jj_3R_650()) return true;
+    if (jj_scan_token(137)) return true;
     }
     return false;
   }
 
- inline bool jj_3R_70()
+ inline bool jj_3R_447()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(MAP_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_163()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_523()) return true;
     return false;
   }
 
- inline bool jj_3R_403()
+ inline bool jj_3R_383()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(76)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_491()) jj_scanpos = xsp;
+    if (jj_scan_token(GROUP_T)) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_476()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_157()
+ inline bool jj_3R_524()
  {
     if (jj_done) return true;
-    if (jj_3R_298()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_449()) return true;
     return false;
   }
 
- inline bool jj_3_112()
+ inline bool jj_3R_540()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
     if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_67()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_157()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_307()
+ inline bool jj_3R_305()
  {
     if (jj_done) return true;
-    if (jj_scan_token(IF_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_384()) return true;
     return false;
   }
 
- inline bool jj_3R_308()
- {
-    if (jj_done) return true;
-    if (jj_3R_381()) return true;
-    return false;
-  }
-
- inline bool jj_3R_169()
+ inline bool jj_3R_476()
  {
     if (jj_done) return true;
+    if (jj_3R_538()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_308()) { jj_scanpos = xsp; break; }
+      if (jj_3R_539()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(BEGIN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_358()
+ inline bool jj_3R_426()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(133)) {
+    if (jj_scan_token(84)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(136)) return true;
+    if (jj_scan_token(52)) return true;
     }
     return false;
   }
 
- inline bool jj_3R_168()
+ inline bool jj_3R_344()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_306()) {
-    jj_scanpos = xsp;
-    if (jj_3R_307()) return true;
-    }
-    return false;
-  }
-
- inline bool jj_3R_306()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_380()) return true;
-    return false;
-  }
-
- inline bool jj_3R_425()
- {
-    if (jj_done) return true;
-    if (jj_3R_500()) return true;
-    return false;
-  }
-
- inline bool jj_3R_501()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_427()) return true;
-    return false;
-  }
-
- inline bool jj_3R_503()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_59()) return true;
-    return false;
-  }
-
- inline bool jj_3R_290()
- {
-    if (jj_done) return true;
-    if (jj_3R_356()) return true;
+    if (jj_3R_426()) jj_scanpos = xsp;
+    if (jj_scan_token(FUNCTION_T)) return true;
+    if (jj_3R_60()) return true;
+    if (jj_3R_425()) return true;
+    if (jj_scan_token(RETURN_T)) return true;
+    if (jj_3R_60()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_427()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_404()
+ inline bool jj_3R_171()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(83)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(51)) return true;
-    }
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_563()
+ inline bool jj_3R_608()
  {
     if (jj_done) return true;
-    if (jj_3R_604()) return true;
+    if (jj_3R_352()) return true;
     return false;
   }
 
- inline bool jj_3R_329()
+ inline bool jj_3R_607()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_404()) jj_scanpos = xsp;
-    if (jj_scan_token(FUNCTION_T)) return true;
-    if (jj_3R_60()) return true;
-    if (jj_3R_403()) return true;
-    if (jj_scan_token(RETURN_T)) return true;
     if (jj_3R_60()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_405()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_75()
+ inline bool jj_3R_538()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_168()) return true;
-    if (jj_scan_token(GENERATE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_169()) jj_scanpos = xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_170()) { jj_scanpos = xsp; break; }
+    if (jj_3R_607()) {
+    jj_scanpos = xsp;
+    if (jj_3R_608()) return true;
     }
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(GENERATE_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_171()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_105()
+ inline bool jj_3R_71()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(MAP_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_226()) return true;
+    if (jj_3R_166()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_289()
+ inline bool jj_3R_304()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
-    if (jj_3R_357()) return true;
+    if (jj_3R_385()) return true;
     return false;
   }
 
- inline bool jj_3R_328()
+ inline bool jj_3R_343()
  {
     if (jj_done) return true;
     if (jj_scan_token(PROCEDURE_T)) return true;
-    if (jj_3R_71()) return true;
-    if (jj_3R_403()) return true;
+    if (jj_3R_70()) return true;
+    if (jj_3R_425()) return true;
     return false;
   }
 
  inline bool jj_3R_195()
  {
     if (jj_done) return true;
-    if (jj_3R_329()) return true;
+    if (jj_3R_344()) return true;
     return false;
   }
 
- inline bool jj_3R_155()
+ inline bool jj_3R_159()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_297()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_313()) return true;
     return false;
   }
 
  inline bool jj_3R_194()
  {
     if (jj_done) return true;
-    if (jj_3R_328()) return true;
+    if (jj_3R_343()) return true;
     return false;
   }
 
@@ -2679,118 +2373,127 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_136()
+ inline bool jj_3R_67()
  {
     if (jj_done) return true;
-    if (jj_scan_token(TYPE_T)) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_619()) return true;
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_159()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_436()
+ inline bool jj_3R_477()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSE_T)) return true;
     if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_503()) jj_scanpos = xsp;
+    if (jj_3R_540()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_357()
+ inline bool jj_3R_385()
  {
     if (jj_done) return true;
     Token * xsp;
-    if (jj_3R_436()) return true;
+    if (jj_3R_477()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_436()) { jj_scanpos = xsp; break; }
+      if (jj_3R_477()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_64()
+ inline bool jj_3R_322()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_155()) jj_scanpos = xsp;
+    if (jj_scan_token(IF_T)) return true;
+    if (jj_3R_80()) return true;
     return false;
   }
 
- inline bool jj_3R_370()
+ inline bool jj_3R_169()
  {
     if (jj_done) return true;
-    if (jj_scan_token(INTEGER)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_321()) {
+    jj_scanpos = xsp;
+    if (jj_3R_322()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_546()
+ inline bool jj_3R_321()
  {
     if (jj_done) return true;
-    if (jj_3R_298()) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_3R_408()) return true;
     return false;
   }
 
- inline bool jj_3R_356()
+ inline bool jj_3R_384()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(52)) {
+    if (jj_scan_token(53)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(74)) return true;
+    if (jj_scan_token(75)) return true;
     }
     return false;
   }
 
- inline bool jj_3R_426()
+ inline bool jj_3R_448()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_405()) return true;
     return false;
   }
 
- inline bool jj_3R_297()
+ inline bool jj_3R_449()
  {
     if (jj_done) return true;
+    if (jj_3R_446()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_86()) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_369()) {
-    jj_scanpos = xsp;
-    if (jj_3R_370()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_524()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_369()
+ inline bool jj_3R_464()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_528()) return true;
     return false;
   }
 
- inline bool jj_3R_427()
+ inline bool jj_3R_75()
  {
     if (jj_done) return true;
-    if (jj_3R_424()) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_169()) return true;
+    if (jj_scan_token(GENERATE_T)) return true;
+    if (jj_3R_170()) return true;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(GENERATE_T)) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_501()) { jj_scanpos = xsp; break; }
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_171()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_291()
+ inline bool jj_3R_306()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
@@ -2798,61 +2501,43 @@ void parseInline();
     if (jj_3R_86()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(133)) {
+    if (jj_scan_token(134)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(136)) return true;
+    if (jj_scan_token(137)) return true;
     }
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_358()) { jj_scanpos = xsp; break; }
+      if (jj_3R_386()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_677()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(FILE_T)) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_156()) return true;
-    return false;
-  }
-
- inline bool jj_3R_288()
+ inline bool jj_3R_105()
  {
     if (jj_done) return true;
-    if (jj_3R_356()) return true;
+    if (jj_3R_60()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_226()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_622()
+ inline bool jj_3R_303()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_384()) return true;
     return false;
   }
 
- inline bool jj_3_108()
+ inline bool jj_3_110()
  {
     if (jj_done) return true;
-    if (jj_3R_141()) return true;
+    if (jj_3R_143()) return true;
     if (jj_scan_token(DOT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_604()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_622()) jj_scanpos = xsp;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_623()) return true;
-    return false;
-  }
-
- inline bool jj_3R_143()
+ inline bool jj_3R_145()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
@@ -2860,31 +2545,33 @@ void parseInline();
     if (jj_scan_token(SELECT_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(154)) jj_scanpos = xsp;
+    if (jj_scan_token(155)) jj_scanpos = xsp;
     if (jj_3R_115()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     if (jj_scan_token(FORCE_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_290()) jj_scanpos = xsp;
-    if (jj_3R_291()) return true;
+    if (jj_3R_305()) jj_scanpos = xsp;
+    if (jj_3R_306()) return true;
     return false;
   }
 
- inline bool jj_3_111()
+ inline bool jj_3R_157()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_312()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_623()
+ inline bool jj_3_113()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_109()) return true;
     return false;
   }
 
- inline bool jj_3R_354()
+ inline bool jj_3R_369()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
@@ -2892,39 +2579,42 @@ void parseInline();
     if (jj_scan_token(SELECT_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(154)) jj_scanpos = xsp;
+    if (jj_scan_token(155)) jj_scanpos = xsp;
     if (jj_3R_115()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_426()) jj_scanpos = xsp;
-    if (jj_3R_427()) return true;
+    if (jj_3R_448()) jj_scanpos = xsp;
+    if (jj_3R_449()) return true;
     return false;
   }
 
- inline bool jj_3R_286()
+ inline bool jj_3R_301()
  {
     if (jj_done) return true;
-    if (jj_3R_141()) return true;
+    if (jj_3R_143()) return true;
     if (jj_scan_token(DOT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_672()
+ inline bool jj_3R_689()
  {
     if (jj_done) return true;
     if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_451()
+ inline bool jj_3R_137()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOUBLEMULT_T)) return true;
-    if (jj_3R_355()) return true;
+    if (jj_scan_token(TYPE_T)) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_577()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_551()
+ inline bool jj_3R_575()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
@@ -2932,61 +2622,57 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_671()
+ inline bool jj_3R_688()
  {
     if (jj_done) return true;
     if (jj_3R_109()) return true;
     return false;
   }
 
- inline bool jj_3R_651()
+ inline bool jj_3R_662()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_671()) {
+    if (jj_3R_688()) {
     jj_scanpos = xsp;
-    if (jj_3R_672()) return true;
+    if (jj_3R_689()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_264()
+ inline bool jj_3R_64()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_60()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_157()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_522()
+ inline bool jj_3R_398()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FILE_T)) return true;
-    if (jj_3R_197()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_563()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
- inline bool jj_3_110()
+ inline bool jj_3_112()
  {
     if (jj_done) return true;
-    if (jj_3R_143()) return true;
+    if (jj_3R_145()) return true;
     return false;
   }
 
- inline bool jj_3R_423()
+ inline bool jj_3R_570()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_313()) return true;
     return false;
   }
 
- inline bool jj_3R_498()
+ inline bool jj_3R_521()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
@@ -2994,66 +2680,43 @@ void parseInline();
     if (jj_scan_token(SELECT_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(154)) jj_scanpos = xsp;
-    if (jj_3R_651()) return true;
+    if (jj_scan_token(155)) jj_scanpos = xsp;
+    if (jj_3R_662()) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_291()) return true;
-    return false;
-  }
-
- inline bool jj_3R_284()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(NOT_T)) return true;
-    if (jj_3R_355()) return true;
+    if (jj_3R_306()) return true;
     return false;
   }
 
- inline bool jj_3R_283()
+ inline bool jj_3R_445()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ABS_T)) return true;
-    if (jj_3R_355()) return true;
+    if (jj_3R_405()) return true;
     return false;
   }
 
- inline bool jj_3R_135()
+ inline bool jj_3R_312()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_282()) {
+    if (jj_3R_397()) {
     jj_scanpos = xsp;
-    if (jj_3R_283()) {
-    jj_scanpos = xsp;
-    if (jj_3R_284()) return true;
-    }
+    if (jj_3R_398()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_282()
+ inline bool jj_3R_397()
  {
     if (jj_done) return true;
-    if (jj_3R_355()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_451()) jj_scanpos = xsp;
+    if (jj_3R_60()) return true;
     return false;
   }
 
  inline bool jj_3R_271()
  {
     if (jj_done) return true;
-    if (jj_3R_354()) return true;
-    return false;
-  }
-
- inline bool jj_3R_698()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_97()) return true;
+    if (jj_3R_369()) return true;
     return false;
   }
 
@@ -3072,26 +2735,11 @@ void parseInline();
  inline bool jj_3R_270()
  {
     if (jj_done) return true;
-    if (jj_3R_143()) return true;
-    return false;
-  }
-
- inline bool jj_3R_145()
- {
-    if (jj_done) return true;
-    if (jj_3R_294()) return true;
-    if (jj_3R_144()) return true;
-    return false;
-  }
-
- inline bool jj_3R_366()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(OR_T)) return true;
+    if (jj_3R_145()) return true;
     return false;
   }
 
- inline bool jj_3R_142()
+ inline bool jj_3R_144()
  {
     if (jj_done) return true;
     if (jj_3R_115()) return true;
@@ -3099,105 +2747,74 @@ void parseInline();
     if (jj_scan_token(FORCE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_288()) jj_scanpos = xsp;
+    if (jj_3R_303()) jj_scanpos = xsp;
     if (jj_3R_59()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_289()) jj_scanpos = xsp;
+    if (jj_3R_304()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_365()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(XOR_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_364()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(XNOR_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_363()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(NOR_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_362()
+ inline bool jj_3R_654()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NAND_T)) return true;
+    if (jj_scan_token(FILE_T)) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_158()) return true;
     return false;
   }
 
- inline bool jj_3R_294()
+ inline bool jj_3R_523()
  {
     if (jj_done) return true;
+    if (jj_scan_token(ELSE_T)) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_361()) {
-    jj_scanpos = xsp;
-    if (jj_3R_362()) {
-    jj_scanpos = xsp;
-    if (jj_3R_363()) {
-    jj_scanpos = xsp;
-    if (jj_3R_364()) {
-    jj_scanpos = xsp;
-    if (jj_3R_365()) {
-    jj_scanpos = xsp;
-    if (jj_3R_366()) return true;
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_575()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_361()
+ inline bool jj_3_111()
  {
     if (jj_done) return true;
-    if (jj_scan_token(AND_T)) return true;
+    if (jj_3R_144()) return true;
     return false;
   }
 
- inline bool jj_3_109()
+ inline bool jj_3R_580()
  {
     if (jj_done) return true;
-    if (jj_3R_142()) return true;
+    if (jj_scan_token(OPEN_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_500()
+ inline bool jj_3R_528()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_551()) jj_scanpos = xsp;
+    if (jj_3R_580()) jj_scanpos = xsp;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_581()) return true;
     return false;
   }
 
- inline bool jj_3R_353()
+ inline bool jj_3R_368()
  {
     if (jj_done) return true;
     if (jj_3R_115()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_423()) jj_scanpos = xsp;
-    if (jj_3R_424()) return true;
+    if (jj_3R_445()) jj_scanpos = xsp;
+    if (jj_3R_446()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     if (jj_3R_59()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_425()) jj_scanpos = xsp;
+    if (jj_3R_447()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -3205,19 +2822,14 @@ void parseInline();
  inline bool jj_3R_269()
  {
     if (jj_done) return true;
-    if (jj_3R_353()) return true;
+    if (jj_3R_368()) return true;
     return false;
   }
 
- inline bool jj_3R_59()
+ inline bool jj_3R_581()
  {
     if (jj_done) return true;
-    if (jj_3R_144()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_145()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_59()) return true;
     return false;
   }
 
@@ -3236,32 +2848,40 @@ void parseInline();
  inline bool jj_3R_268()
  {
     if (jj_done) return true;
-    if (jj_3R_142()) return true;
+    if (jj_3R_144()) return true;
     return false;
   }
 
- inline bool jj_3R_140()
+ inline bool jj_3R_450()
  {
     if (jj_done) return true;
-    if (jj_3R_141()) return true;
+    if (jj_scan_token(DOUBLEMULT_T)) return true;
+    if (jj_3R_370()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_142()
+ {
+    if (jj_done) return true;
+    if (jj_3R_143()) return true;
     if (jj_scan_token(DOT_T)) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_286()) { jj_scanpos = xsp; break; }
+      if (jj_3R_301()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_265()
+ inline bool jj_3R_549()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_scan_token(AT_T)) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_287()
+ inline bool jj_3R_302()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -3270,135 +2890,137 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_512()
+ inline bool jj_3_109()
  {
     if (jj_done) return true;
-    if (jj_scan_token(AT_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_142()) return true;
     return false;
   }
 
- inline bool jj_3R_263()
+ inline bool jj_3R_376()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_scan_token(FILE_T)) return true;
+    if (jj_3R_197()) return true;
     if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_85()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_464()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_107()
+ inline bool jj_3R_264()
  {
     if (jj_done) return true;
-    if (jj_3R_140()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_125()
+ inline bool jj_3R_284()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_263()) jj_scanpos = xsp;
-    if (jj_scan_token(EXIT_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_264()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_265()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(NOT_T)) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
- inline bool jj_3R_690()
+ inline bool jj_3R_283()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ABS_T)) return true;
+    if (jj_3R_370()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_136()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_97()) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_698()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_282()) {
+    jj_scanpos = xsp;
+    if (jj_3R_283()) {
+    jj_scanpos = xsp;
+    if (jj_3R_284()) return true;
+    }
     }
-    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_209()
+ inline bool jj_3R_282()
  {
     if (jj_done) return true;
-    if (jj_3R_337()) return true;
+    if (jj_3R_370()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_450()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_556()
+ inline bool jj_3R_612()
  {
     if (jj_done) return true;
-    if (jj_3R_140()) return true;
+    if (jj_3R_142()) return true;
     return false;
   }
 
- inline bool jj_3R_580()
+ inline bool jj_3R_699()
  {
     if (jj_done) return true;
-    if (jj_3R_309()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_97()) return true;
     return false;
   }
 
- inline bool jj_3R_208()
+ inline bool jj_3R_147()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_309()) return true;
+    if (jj_3R_146()) return true;
     return false;
   }
 
- inline bool jj_3R_97()
+ inline bool jj_3R_143()
  {
     if (jj_done) return true;
+    if (jj_3R_70()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_208()) {
-    jj_scanpos = xsp;
-    if (jj_3R_209()) return true;
-    }
+    if (jj_3R_302()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_141()
+ inline bool jj_3R_394()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_287()) jj_scanpos = xsp;
+    if (jj_scan_token(OR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_697()
+ inline bool jj_3R_393()
  {
     if (jj_done) return true;
-    if (jj_3R_337()) return true;
+    if (jj_scan_token(XOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_696()
+ inline bool jj_3R_392()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_scan_token(XNOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_688()
+ inline bool jj_3R_391()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_696()) {
-    jj_scanpos = xsp;
-    if (jj_3R_697()) return true;
-    }
+    if (jj_scan_token(NOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_594()
+ inline bool jj_3R_636()
  {
     if (jj_done) return true;
     if (jj_scan_token(NEG_T)) return true;
@@ -3406,556 +3028,627 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_555()
+ inline bool jj_3R_390()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(NAND_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_611()
  {
     if (jj_done) return true;
     Token * xsp;
-    if (jj_3R_594()) return true;
+    if (jj_3R_636()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_594()) { jj_scanpos = xsp; break; }
+      if (jj_3R_636()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3_106()
+ inline bool jj_3R_410()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_140()) return true;
+    if (jj_3R_498()) return true;
     return false;
   }
 
- inline bool jj_3_35()
+ inline bool jj_3R_309()
  {
     if (jj_done) return true;
-    if (jj_3R_89()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_389()) {
+    jj_scanpos = xsp;
+    if (jj_3R_390()) {
+    jj_scanpos = xsp;
+    if (jj_3R_391()) {
+    jj_scanpos = xsp;
+    if (jj_3R_392()) {
+    jj_scanpos = xsp;
+    if (jj_3R_393()) {
+    jj_scanpos = xsp;
+    if (jj_3R_394()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_511()
+ inline bool jj_3R_389()
  {
     if (jj_done) return true;
-    if (jj_3R_555()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_556()) jj_scanpos = xsp;
-    if (jj_3R_71()) return true;
+    if (jj_scan_token(AND_T)) return true;
     return false;
   }
 
- inline bool jj_3_34()
+ inline bool jj_3_108()
  {
     if (jj_done) return true;
-    if (jj_3R_88()) return true;
+    if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_142()) return true;
     return false;
   }
 
- inline bool jj_3R_554()
+ inline bool jj_3R_548()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_611()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_612()) jj_scanpos = xsp;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_553()
+ inline bool jj_3R_610()
  {
     if (jj_done) return true;
     if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_140()) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_510()
+ inline bool jj_3R_59()
  {
     if (jj_done) return true;
+    if (jj_3R_146()) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_553()) {
-    jj_scanpos = xsp;
-    if (jj_3R_554()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_147()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3_104()
+ inline bool jj_3R_609()
  {
     if (jj_done) return true;
-    if (jj_3R_138()) return true;
+    if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_142()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_449()
+ inline bool jj_3R_547()
  {
     if (jj_done) return true;
-    if (jj_3R_512()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_609()) {
+    jj_scanpos = xsp;
+    if (jj_3R_610()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_448()
+ inline bool jj_3R_490()
  {
     if (jj_done) return true;
-    if (jj_3R_511()) return true;
+    if (jj_3R_549()) return true;
     return false;
   }
 
- inline bool jj_3R_368()
+ inline bool jj_3R_489()
+ {
+    if (jj_done) return true;
+    if (jj_3R_548()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_396()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_447()) {
+    if (jj_3R_488()) {
     jj_scanpos = xsp;
-    if (jj_3R_448()) {
+    if (jj_3R_489()) {
     jj_scanpos = xsp;
-    if (jj_3R_449()) return true;
+    if (jj_3R_490()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_447()
+ inline bool jj_3R_488()
  {
     if (jj_done) return true;
-    if (jj_3R_510()) return true;
+    if (jj_3R_547()) return true;
     return false;
   }
 
- inline bool jj_3R_570()
+ inline bool jj_3_105()
  {
     if (jj_done) return true;
-    if (jj_3R_609()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_610()) return true;
+    if (jj_3R_139()) return true;
     return false;
   }
 
- inline bool jj_3R_689()
+ inline bool jj_3R_265()
  {
     if (jj_done) return true;
-    if (jj_3R_234()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_80()) return true;
     return false;
   }
 
- inline bool jj_3R_446()
+ inline bool jj_3R_263()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_487()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_275()
+ inline bool jj_3R_125()
  {
     if (jj_done) return true;
-    if (jj_3R_132()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_263()) jj_scanpos = xsp;
+    if (jj_scan_token(EXIT_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_264()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_265()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_445()
+ inline bool jj_3R_486()
  {
     if (jj_done) return true;
     if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_627()
+ inline bool jj_3R_395()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_485()) {
+    jj_scanpos = xsp;
+    if (jj_3R_486()) {
+    jj_scanpos = xsp;
+    if (jj_3R_487()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_626()
+ inline bool jj_3R_485()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OTHER_T)) return true;
+    if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_367()
+ inline bool jj_3R_690()
  {
     if (jj_done) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_97()) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_444()) {
-    jj_scanpos = xsp;
-    if (jj_3R_445()) {
-    jj_scanpos = xsp;
-    if (jj_3R_446()) return true;
-    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_699()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_444()
+ inline bool jj_3R_275()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONSTANT_T)) return true;
+    if (jj_3R_133()) return true;
     return false;
   }
 
- inline bool jj_3R_669()
+ inline bool jj_3R_209()
  {
     if (jj_done) return true;
-    if (jj_3R_679()) return true;
+    if (jj_3R_352()) return true;
     return false;
   }
 
- inline bool jj_3R_625()
+ inline bool jj_3_107()
  {
     if (jj_done) return true;
-    Token * xsp;
-    if (jj_3R_669()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_669()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_141()) return true;
+    if (jj_scan_token(BEGIN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_609()
+ inline bool jj_3R_208()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_625()) {
-    jj_scanpos = xsp;
-    if (jj_3R_626()) {
-    jj_scanpos = xsp;
-    if (jj_3R_627()) return true;
-    }
-    }
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_579()
+ inline bool jj_3R_97()
  {
     if (jj_done) return true;
-    if (jj_3R_531()) return true;
-    if (jj_scan_token(BEGIN_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_208()) {
+    jj_scanpos = xsp;
+    if (jj_3R_209()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_296()
+ inline bool jj_3R_311()
  {
     if (jj_done) return true;
     if (jj_scan_token(SLSL_T)) return true;
-    if (jj_3R_367()) return true;
-    if (jj_3R_368()) return true;
+    if (jj_3R_395()) return true;
+    if (jj_3R_396()) return true;
     if (jj_scan_token(COLON_T)) return true;
     if (jj_3R_85()) return true;
     if (jj_scan_token(RSRS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_679()
+ inline bool jj_3R_411()
  {
     if (jj_done) return true;
-    if (jj_3R_688()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_689()) jj_scanpos = xsp;
+    if (jj_3R_498()) return true;
     return false;
   }
 
- inline bool jj_3R_285()
+ inline bool jj_3R_697()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_352()) return true;
     return false;
   }
 
- inline bool jj_3R_535()
+ inline bool jj_3R_324()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BEGIN_T)) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_579()) jj_scanpos = xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_580()) { jj_scanpos = xsp; break; }
+      if (jj_3R_411()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_235()
+ inline bool jj_3R_409()
  {
     if (jj_done) return true;
-    if (jj_3R_132()) return true;
+    if (jj_3R_141()) return true;
     return false;
   }
 
- inline bool jj_3_105()
+ inline bool jj_3R_696()
  {
     if (jj_done) return true;
-    if (jj_3R_139()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_138()
+ inline bool jj_3R_683()
  {
     if (jj_done) return true;
-    if (jj_scan_token(END_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_285()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_696()) {
+    jj_scanpos = xsp;
+    if (jj_3R_697()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_595()
+ inline bool jj_3R_170()
  {
     if (jj_done) return true;
-    if (jj_3R_132()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_323()) {
+    jj_scanpos = xsp;
+    if (jj_3R_324()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_31()
+ inline bool jj_3R_323()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_409()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(BEGIN_T)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_410()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3_33()
+ inline bool jj_3_36()
  {
     if (jj_done) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
- inline bool jj_3R_578()
+ inline bool jj_3R_285()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3_105()) jj_scanpos = xsp;
-    if (jj_3R_86()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
-    if (jj_3R_535()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3_32()
+ inline bool jj_3R_687()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_scan_token(BEGIN_T)) return true;
+    if (jj_3R_687()) return true;
     return false;
   }
 
- inline bool jj_3R_613()
+ inline bool jj_3_35()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_612()) return true;
+    if (jj_3R_88()) return true;
     return false;
   }
 
- inline bool jj_3R_534()
+ inline bool jj_3R_235()
  {
     if (jj_done) return true;
-    Token * xsp;
-    if (jj_3R_578()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_578()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_133()) return true;
     return false;
   }
 
- inline bool jj_3R_474()
+ inline bool jj_3_106()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CASE_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(GENERATE_T)) return true;
-    if (jj_3R_534()) return true;
+    if (jj_3R_140()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_139()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(END_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_104()) jj_scanpos = xsp;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(GENERATE_T)) return true;
-    if (jj_3R_535()) return true;
+    if (jj_3R_285()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_131()
+ inline bool jj_3R_637()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_298()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_133()) return true;
     return false;
   }
 
- inline bool jj_3R_648()
+ inline bool jj_3R_661()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BOX_T)) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3_106()) jj_scanpos = xsp;
+    if (jj_3R_86()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_3R_687()) return true;
     return false;
   }
 
- inline bool jj_3R_132()
+ inline bool jj_3R_649()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(MAP_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_163()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    Token * xsp;
+    if (jj_3R_661()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_661()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_334()
+ inline bool jj_3R_471()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ENTITY_T)) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_533()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_534()) return true;
     return false;
   }
 
- inline bool jj_3R_572()
+ inline bool jj_3R_684()
  {
     if (jj_done) return true;
-    if (jj_3R_612()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_613()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_234()) return true;
     return false;
   }
 
- inline bool jj_3R_130()
+ inline bool jj_3R_585()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FUNCTION_T)) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_60()) return true;
-    if (jj_3R_234()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_275()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_612()
+ inline bool jj_3R_584()
  {
     if (jj_done) return true;
-    if (jj_3R_610()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_648()) jj_scanpos = xsp;
+    if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_581()
+ inline bool jj_3R_615()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(CASE_T)) return true;
+    if (jj_3R_59()) return true;
+    if (jj_scan_token(GENERATE_T)) return true;
+    if (jj_3R_649()) return true;
     return false;
   }
 
- inline bool jj_3R_644()
+ inline bool jj_3R_634()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FILE_T)) return true;
+    if (jj_3R_656()) return true;
     return false;
   }
 
- inline bool jj_3R_643()
+ inline bool jj_3R_583()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GROUP_T)) return true;
+    Token * xsp;
+    if (jj_3R_634()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_634()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_108()
+ inline bool jj_3R_533()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PACKAGE_T)) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_60()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_595()) jj_scanpos = xsp;
+    if (jj_3R_583()) {
+    jj_scanpos = xsp;
+    if (jj_3R_584()) {
+    jj_scanpos = xsp;
+    if (jj_3R_585()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_642()
+ inline bool jj_3R_656()
  {
     if (jj_done) return true;
-    if (jj_scan_token(UNITS_T)) return true;
+    if (jj_3R_683()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_684()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_641()
+ inline bool jj_3R_132()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LITERAL_T)) return true;
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_313()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_640()
+ inline bool jj_3R_133()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LABEL_T)) return true;
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(MAP_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_166()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_639()
+ inline bool jj_3_32()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMPONENT_T)) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_638()
+ inline bool jj_3_34()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARIABLE_T)) return true;
+    if (jj_3R_87()) return true;
     return false;
   }
 
- inline bool jj_3R_637()
+ inline bool jj_3_33()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SIGNAL_T)) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3R_636()
+ inline bool jj_3R_537()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONSTANT_T)) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_536()) return true;
     return false;
   }
 
- inline bool jj_3R_635()
+ inline bool jj_3R_131()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SUBTYPE_T)) return true;
+    if (jj_scan_token(FUNCTION_T)) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_60()) return true;
+    if (jj_3R_234()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_275()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_634()
+ inline bool jj_3R_108()
  {
     if (jj_done) return true;
-    if (jj_scan_token(TYPE_T)) return true;
+    if (jj_scan_token(PACKAGE_T)) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_60()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_637()) jj_scanpos = xsp;
     return false;
   }
 
@@ -3963,7 +3656,7 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(PACKAGE_T)) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(IS_T)) return true;
     if (jj_scan_token(NEW_T)) return true;
     if (jj_3R_60()) return true;
@@ -3975,522 +3668,529 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_633()
+ inline bool jj_3R_606()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PACKAGE_T)) return true;
+    if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
- inline bool jj_3R_632()
+ inline bool jj_3R_349()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FUNCTION_T)) return true;
+    if (jj_scan_token(ENTITY_T)) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_631()
+ inline bool jj_3R_682()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PROCEDURE_T)) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_630()
+ inline bool jj_3R_475()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_3R_536()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_537()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_629()
+ inline bool jj_3R_254()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ARCHITECTURE_T)) return true;
+    if (jj_3R_366()) return true;
     return false;
   }
 
- inline bool jj_3R_628()
+ inline bool jj_3R_536()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ENTITY_T)) return true;
+    if (jj_3R_534()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_606()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_610()
+ inline bool jj_3R_616()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_628()) {
-    jj_scanpos = xsp;
-    if (jj_3R_629()) {
-    jj_scanpos = xsp;
-    if (jj_3R_630()) {
-    jj_scanpos = xsp;
-    if (jj_3R_631()) {
-    jj_scanpos = xsp;
-    if (jj_3R_632()) {
-    jj_scanpos = xsp;
-    if (jj_3R_633()) {
-    jj_scanpos = xsp;
-    if (jj_3R_634()) {
-    jj_scanpos = xsp;
-    if (jj_3R_635()) {
-    jj_scanpos = xsp;
-    if (jj_3R_636()) {
-    jj_scanpos = xsp;
-    if (jj_3R_637()) {
-    jj_scanpos = xsp;
-    if (jj_3R_638()) {
-    jj_scanpos = xsp;
-    if (jj_3R_639()) {
-    jj_scanpos = xsp;
-    if (jj_3R_640()) {
-    jj_scanpos = xsp;
-    if (jj_3R_641()) {
-    jj_scanpos = xsp;
-    if (jj_3R_642()) {
-    jj_scanpos = xsp;
-    if (jj_3R_643()) {
-    jj_scanpos = xsp;
-    if (jj_3R_644()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_538()
+ inline bool jj_3R_602()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
+    if (jj_scan_token(FILE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_537()
+ inline bool jj_3R_695()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_705()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_30()
+ inline bool jj_3R_601()
  {
     if (jj_done) return true;
-    if (jj_3R_86()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_scan_token(GROUP_T)) return true;
     return false;
   }
 
- inline bool jj_3R_536()
+ inline bool jj_3R_681()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ENTITY_T)) return true;
-    if (jj_3R_60()) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_581()) jj_scanpos = xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_695()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_476()
+ inline bool jj_3R_600()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_536()) {
-    jj_scanpos = xsp;
-    if (jj_3R_537()) {
-    jj_scanpos = xsp;
-    if (jj_3R_538()) return true;
-    }
-    }
+    if (jj_scan_token(UNITS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_687()
+ inline bool jj_3R_599()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_scan_token(LITERAL_T)) return true;
     return false;
   }
 
- inline bool jj_3_29()
+ inline bool jj_3R_598()
  {
     if (jj_done) return true;
-    if (jj_3R_85()) return true;
+    if (jj_scan_token(LABEL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_706()
+ inline bool jj_3R_722()
  {
     if (jj_done) return true;
-    if (jj_3R_197()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3_28()
+ inline bool jj_3R_597()
  {
     if (jj_done) return true;
-    if (jj_3R_84()) return true;
+    if (jj_scan_token(COMPONENT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_254()
+ inline bool jj_3R_721()
  {
     if (jj_done) return true;
-    if (jj_3R_351()) return true;
+    if (jj_3R_379()) return true;
     return false;
   }
 
- inline bool jj_3R_344()
+ inline bool jj_3R_596()
  {
     if (jj_done) return true;
-    if (jj_3R_86()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_236()
+ inline bool jj_3R_595()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_344()) jj_scanpos = xsp;
-    if (jj_3R_59()) return true;
+    if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_695()
+ inline bool jj_3R_594()
  {
     if (jj_done) return true;
-    if (jj_3R_704()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_159()
+ inline bool jj_3R_720()
  {
     if (jj_done) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_347()) return true;
     return false;
   }
 
- inline bool jj_3R_686()
+ inline bool jj_3R_705()
  {
     if (jj_done) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_695()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_720()) {
+    jj_scanpos = xsp;
+    if (jj_3R_721()) {
+    jj_scanpos = xsp;
+    if (jj_3R_722()) return true;
+    }
     }
     return false;
   }
 
- inline bool jj_3R_158()
+ inline bool jj_3R_593()
  {
     if (jj_done) return true;
-    if (jj_3R_84()) return true;
+    if (jj_scan_token(SUBTYPE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_68()
+ inline bool jj_3R_592()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_158()) {
-    jj_scanpos = xsp;
-    if (jj_3R_159()) return true;
-    }
+    if (jj_scan_token(TYPE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_721()
+ inline bool jj_3R_591()
  {
     if (jj_done) return true;
-    if (jj_3R_478()) return true;
+    if (jj_scan_token(PACKAGE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_720()
+ inline bool jj_3R_590()
  {
     if (jj_done) return true;
-    if (jj_3R_525()) return true;
+    if (jj_scan_token(FUNCTION_T)) return true;
     return false;
   }
 
- inline bool jj_3R_719()
+ inline bool jj_3R_589()
  {
     if (jj_done) return true;
-    if (jj_3R_332()) return true;
+    if (jj_scan_token(PROCEDURE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_704()
+ inline bool jj_3R_680()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_719()) {
-    jj_scanpos = xsp;
-    if (jj_3R_720()) {
-    jj_scanpos = xsp;
-    if (jj_3R_721()) return true;
-    }
-    }
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_571()
+ inline bool jj_3R_588()
  {
     if (jj_done) return true;
-    if (jj_3R_611()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_scan_token(CONFIGURATION_T)) return true;
     return false;
   }
 
- inline bool jj_3R_685()
+ inline bool jj_3R_587()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_scan_token(ARCHITECTURE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_527()
+ inline bool jj_3R_586()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DISCONNECT_T)) return true;
-    if (jj_3R_571()) return true;
-    if (jj_scan_token(AFTER_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(ENTITY_T)) return true;
     return false;
   }
 
- inline bool jj_3R_559()
+ inline bool jj_3R_534()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_586()) {
+    jj_scanpos = xsp;
+    if (jj_3R_587()) {
+    jj_scanpos = xsp;
+    if (jj_3R_588()) {
+    jj_scanpos = xsp;
+    if (jj_3R_589()) {
+    jj_scanpos = xsp;
+    if (jj_3R_590()) {
+    jj_scanpos = xsp;
+    if (jj_3R_591()) {
+    jj_scanpos = xsp;
+    if (jj_3R_592()) {
+    jj_scanpos = xsp;
+    if (jj_3R_593()) {
+    jj_scanpos = xsp;
+    if (jj_3R_594()) {
+    jj_scanpos = xsp;
+    if (jj_3R_595()) {
+    jj_scanpos = xsp;
+    if (jj_3R_596()) {
+    jj_scanpos = xsp;
+    if (jj_3R_597()) {
+    jj_scanpos = xsp;
+    if (jj_3R_598()) {
+    jj_scanpos = xsp;
+    if (jj_3R_599()) {
+    jj_scanpos = xsp;
+    if (jj_3R_600()) {
+    jj_scanpos = xsp;
+    if (jj_3R_601()) {
+    jj_scanpos = xsp;
+    if (jj_3R_602()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_239()
+ inline bool jj_3R_253()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOWNTO_T)) return true;
+    if (jj_3R_365()) return true;
     return false;
   }
 
- inline bool jj_3R_678()
+ inline bool jj_3R_655()
  {
     if (jj_done) return true;
     if (jj_scan_token(PROTECTED_T)) return true;
-    if (jj_3R_686()) return true;
+    if (jj_3R_681()) return true;
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(PROTECTED_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_687()) jj_scanpos = xsp;
+    if (jj_3R_682()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3_102()
+ inline bool jj_3_103()
  {
     if (jj_done) return true;
     if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_253()
+ inline bool jj_3R_564()
  {
     if (jj_done) return true;
-    if (jj_3R_350()) return true;
+    if (jj_scan_token(OPEN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_110()
+ inline bool jj_3R_563()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_238()) {
-    jj_scanpos = xsp;
-    if (jj_3R_239()) return true;
-    }
+    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_238()
+ inline bool jj_3R_694()
  {
     if (jj_done) return true;
-    if (jj_scan_token(TO_T)) return true;
+    if (jj_3R_704()) return true;
     return false;
   }
 
- inline bool jj_3R_694()
+ inline bool jj_3R_679()
  {
     if (jj_done) return true;
-    if (jj_3R_703()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_694()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_545()
+ inline bool jj_3R_562()
  {
     if (jj_done) return true;
-    if (jj_3R_295()) return true;
+    if (jj_scan_token(ENTITY_T)) return true;
+    if (jj_3R_60()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_616()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_684()
+ inline bool jj_3R_500()
  {
     if (jj_done) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_694()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_562()) {
+    jj_scanpos = xsp;
+    if (jj_3R_563()) {
+    jj_scanpos = xsp;
+    if (jj_3R_564()) return true;
+    }
     }
     return false;
   }
 
- inline bool jj_3R_544()
+ inline bool jj_3R_719()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_383()) return true;
     return false;
   }
 
- inline bool jj_3R_492()
+ inline bool jj_3_31()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_544()) {
-    jj_scanpos = xsp;
-    if (jj_3R_545()) return true;
-    }
+    if (jj_3R_86()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_718()
+ inline bool jj_3R_716()
  {
     if (jj_done) return true;
-    if (jj_3R_528()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_715()
+ inline bool jj_3R_707()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_197()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_85()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_103()
+ inline bool jj_3_104()
  {
     if (jj_done) return true;
     if (jj_3R_66()) return true;
     return false;
   }
 
+ inline bool jj_3R_718()
+ {
+    if (jj_done) return true;
+    if (jj_3R_382()) return true;
+    return false;
+  }
+
  inline bool jj_3R_717()
  {
     if (jj_done) return true;
-    if (jj_3R_478()) return true;
+    if (jj_3R_379()) return true;
     return false;
   }
 
- inline bool jj_3R_716()
+ inline bool jj_3_30()
  {
     if (jj_done) return true;
-    if (jj_3R_525()) return true;
+    if (jj_3R_85()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_715()
+ {
+    if (jj_done) return true;
+    if (jj_3R_377()) return true;
     return false;
   }
 
  inline bool jj_3R_714()
  {
     if (jj_done) return true;
-    if (jj_3R_523()) return true;
+    if (jj_3R_376()) return true;
+    return false;
+  }
+
+ inline bool jj_3_29()
+ {
+    if (jj_done) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
  inline bool jj_3R_713()
  {
     if (jj_done) return true;
-    if (jj_3R_522()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
  inline bool jj_3R_712()
  {
     if (jj_done) return true;
-    if (jj_3R_521()) return true;
+    if (jj_3R_373()) return true;
     return false;
   }
 
- inline bool jj_3R_711()
+ inline bool jj_3R_359()
  {
     if (jj_done) return true;
-    if (jj_3R_519()) return true;
+    if (jj_3R_86()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_710()
+ inline bool jj_3R_711()
  {
     if (jj_done) return true;
-    if (jj_3R_518()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3R_516()
+ inline bool jj_3R_236()
  {
     if (jj_done) return true;
-    if (jj_scan_token(REJECT_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_359()) jj_scanpos = xsp;
     if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_709()
+ inline bool jj_3R_710()
  {
     if (jj_done) return true;
-    if (jj_3R_517()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
- inline bool jj_3R_707()
+ inline bool jj_3R_708()
  {
     if (jj_done) return true;
     if (jj_3R_93()) return true;
     return false;
   }
 
- inline bool jj_3R_703()
+ inline bool jj_3R_704()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_707()) {
-    jj_scanpos = xsp;
     if (jj_3R_708()) {
     jj_scanpos = xsp;
     if (jj_3R_709()) {
@@ -4511,9 +4211,11 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3R_717()) {
     jj_scanpos = xsp;
-    if (jj_3_103()) {
+    if (jj_3R_718()) {
     jj_scanpos = xsp;
-    if (jj_3R_718()) return true;
+    if (jj_3_104()) {
+    jj_scanpos = xsp;
+    if (jj_3R_719()) return true;
     }
     }
     }
@@ -4529,190 +4231,221 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_708()
+ inline bool jj_3R_709()
  {
     if (jj_done) return true;
-    if (jj_3R_496()) return true;
+    if (jj_3R_519()) return true;
     return false;
   }
 
- inline bool jj_3R_456()
+ inline bool jj_3R_163()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_516()) jj_scanpos = xsp;
-    if (jj_scan_token(INERTIAL_T)) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
- inline bool jj_3_27()
+ inline bool jj_3R_252()
  {
     if (jj_done) return true;
-    if (jj_3R_83()) return true;
+    if (jj_3R_364()) return true;
     return false;
   }
 
- inline bool jj_3R_377()
+ inline bool jj_3R_162()
+ {
+    if (jj_done) return true;
+    if (jj_3R_84()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_69()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_455()) {
+    if (jj_3R_162()) {
     jj_scanpos = xsp;
-    if (jj_3R_456()) return true;
+    if (jj_3R_163()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_455()
+ inline bool jj_3R_522()
  {
     if (jj_done) return true;
-    if (jj_scan_token(TRANSPORT_T)) return true;
+    if (jj_scan_token(AFTER_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_252()
+ inline bool jj_3R_472()
  {
     if (jj_done) return true;
-    if (jj_3R_349()) return true;
+    if (jj_3R_535()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3_26()
+ inline bool jj_3R_138()
  {
     if (jj_done) return true;
-    if (jj_3R_82()) return true;
+    if (jj_scan_token(PROTECTED_T)) return true;
+    if (jj_scan_token(BODY_T)) return true;
+    if (jj_3R_679()) return true;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(PROTECTED_T)) return true;
+    if (jj_scan_token(BODY_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_680()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_499()
+ inline bool jj_3R_497()
  {
     if (jj_done) return true;
-    if (jj_scan_token(AFTER_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_446()) return true;
     return false;
   }
 
- inline bool jj_3R_277()
+ inline bool jj_3R_381()
  {
     if (jj_done) return true;
-    if (jj_3R_83()) return true;
+    if (jj_scan_token(DISCONNECT_T)) return true;
+    if (jj_3R_472()) return true;
+    if (jj_scan_token(AFTER_T)) return true;
+    if (jj_3R_59()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_137()
+ inline bool jj_3R_460()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PROTECTED_T)) return true;
-    if (jj_scan_token(BODY_T)) return true;
-    if (jj_3R_684()) return true;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(PROTECTED_T)) return true;
-    if (jj_scan_token(BODY_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_685()) jj_scanpos = xsp;
+    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_457()
+ inline bool jj_3R_239()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_424()) return true;
+    if (jj_scan_token(DOWNTO_T)) return true;
     return false;
   }
 
- inline bool jj_3R_133()
+ inline bool jj_3R_110()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_276()) {
+    if (jj_3R_238()) {
     jj_scanpos = xsp;
-    if (jj_3R_277()) return true;
+    if (jj_3R_239()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_276()
+ inline bool jj_3R_238()
  {
     if (jj_done) return true;
-    if (jj_3R_82()) return true;
+    if (jj_scan_token(TO_T)) return true;
     return false;
   }
 
- inline bool jj_3R_424()
+ inline bool jj_3R_569()
+ {
+    if (jj_done) return true;
+    if (jj_3R_310()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_446()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_499()) jj_scanpos = xsp;
+    if (jj_3R_522()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_705()
+ inline bool jj_3R_568()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ARRAY_T)) return true;
-    if (jj_3R_83()) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_379()
+ inline bool jj_3R_515()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_568()) {
+    jj_scanpos = xsp;
+    if (jj_3R_569()) return true;
+    }
+    return false;
+  }
+
+ inline bool jj_3R_407()
  {
     if (jj_done) return true;
     if (jj_scan_token(UNAFFECTED_T)) return true;
     return false;
   }
 
- inline bool jj_3R_303()
+ inline bool jj_3R_318()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_378()) {
+    if (jj_3R_406()) {
     jj_scanpos = xsp;
-    if (jj_3R_379()) return true;
+    if (jj_3R_407()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_378()
+ inline bool jj_3R_406()
  {
     if (jj_done) return true;
-    if (jj_3R_424()) return true;
+    if (jj_3R_446()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_457()) { jj_scanpos = xsp; break; }
+      if (jj_3R_497()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
+ inline bool jj_3R_553()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(REJECT_T)) return true;
+    if (jj_3R_59()) return true;
+    return false;
+  }
+
  inline bool jj_3R_251()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_519()
+ inline bool jj_3R_496()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONSTANT_T)) return true;
-    if (jj_3R_197()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_559()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_553()) jj_scanpos = xsp;
+    if (jj_scan_token(INERTIAL_T)) return true;
     return false;
   }
 
@@ -4733,122 +4466,148 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_25()
+ inline bool jj_3_28()
  {
     if (jj_done) return true;
-    if (jj_3R_81()) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
- inline bool jj_3R_154()
+ inline bool jj_3R_405()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_153()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_495()) {
+    jj_scanpos = xsp;
+    if (jj_3R_496()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_526()
+ inline bool jj_3R_495()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_178()) return true;
-    if (jj_3R_317()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(TRANSPORT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_543()
+ inline bool jj_3_27()
  {
     if (jj_done) return true;
-    if (jj_3R_318()) return true;
+    if (jj_3R_82()) return true;
     return false;
   }
 
- inline bool jj_3R_542()
+ inline bool jj_3R_277()
  {
     if (jj_done) return true;
-    if (jj_3R_81()) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
- inline bool jj_3R_479()
+ inline bool jj_3R_156()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_155()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_134()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_542()) {
+    if (jj_3R_276()) {
     jj_scanpos = xsp;
-    if (jj_3R_543()) return true;
+    if (jj_3R_277()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_562()
+ inline bool jj_3R_276()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_82()) return true;
     return false;
   }
 
- inline bool jj_3R_541()
+ inline bool jj_3R_463()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_540()) return true;
+    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_521()
+ inline bool jj_3R_375()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(100)) jj_scanpos = xsp;
+    if (jj_scan_token(101)) jj_scanpos = xsp;
     if (jj_scan_token(VARIABLE_T)) return true;
     if (jj_3R_197()) return true;
     if (jj_scan_token(COLON_T)) return true;
     if (jj_3R_85()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_562()) jj_scanpos = xsp;
+    if (jj_3R_463()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_419()
+ inline bool jj_3R_474()
  {
     if (jj_done) return true;
-    if (jj_3R_498()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_473()) return true;
     return false;
   }
 
- inline bool jj_3_101()
+ inline bool jj_3R_706()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_scan_token(ARRAY_T)) return true;
+    if (jj_3R_83()) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_85()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_441()
+ {
+    if (jj_done) return true;
+    if (jj_3R_521()) return true;
+    return false;
+  }
+
+ inline bool jj_3_102()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_347()
+ inline bool jj_3R_362()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_418()) {
+    if (jj_3R_440()) {
     jj_scanpos = xsp;
-    if (jj_3R_419()) return true;
+    if (jj_3R_441()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_418()
+ inline bool jj_3R_440()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_101()) jj_scanpos = xsp;
+    if (jj_3_102()) jj_scanpos = xsp;
     if (jj_3R_115()) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
     if (jj_3R_59()) return true;
@@ -4856,66 +4615,74 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_24()
+ inline bool jj_3R_373()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
-    if (jj_scan_token(ELSE_T)) return true;
+    if (jj_scan_token(CONSTANT_T)) return true;
+    if (jj_3R_197()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_85()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_460()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_335()
+ inline bool jj_3_26()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_81()) return true;
     return false;
   }
 
- inline bool jj_3R_305()
+ inline bool jj_3R_380()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_3R_178()) return true;
+    if (jj_3R_332()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_304()
+ inline bool jj_3R_567()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_303()) return true;
+    if (jj_3R_333()) return true;
     return false;
   }
 
- inline bool jj_3R_478()
+ inline bool jj_3R_382()
  {
     if (jj_done) return true;
     if (jj_scan_token(USE_T)) return true;
-    if (jj_3R_540()) return true;
+    if (jj_3R_473()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_541()) { jj_scanpos = xsp; break; }
+      if (jj_3R_474()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_167()
+ inline bool jj_3R_566()
+ {
+    if (jj_done) return true;
+    if (jj_3R_81()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_502()
  {
     if (jj_done) return true;
-    if (jj_3R_303()) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_304()) { jj_scanpos = xsp; break; }
-    }
     xsp = jj_scanpos;
-    if (jj_3R_305()) jj_scanpos = xsp;
+    if (jj_3R_566()) {
+    jj_scanpos = xsp;
+    if (jj_3R_567()) return true;
+    }
     return false;
   }
 
@@ -4924,11 +4691,11 @@ void parseInline();
     if (jj_done) return true;
     if (jj_scan_token(ARRAY_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_153()) return true;
+    if (jj_3R_155()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_154()) { jj_scanpos = xsp; break; }
+      if (jj_3R_156()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     if (jj_scan_token(OF_T)) return true;
@@ -4936,97 +4703,71 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_156()
+ inline bool jj_3R_158()
  {
     if (jj_done) return true;
     if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_72()
- {
-    if (jj_done) return true;
-    if (jj_3R_115()) return true;
-    if (jj_scan_token(LESSTHAN_T)) return true;
-    if (jj_3R_166()) return true;
-    if (jj_3R_167()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_668()
- {
-    if (jj_done) return true;
-    if (jj_3R_678()) return true;
-    return false;
-  }
-
- inline bool jj_3R_350()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(UNTIL_T)) return true;
-    if (jj_3R_80()) return true;
-    return false;
-  }
-
- inline bool jj_3_100()
+ inline bool jj_3R_633()
  {
     if (jj_done) return true;
-    if (jj_3R_137()) return true;
+    if (jj_3R_655()) return true;
     return false;
   }
 
- inline bool jj_3R_667()
+ inline bool jj_3_101()
  {
     if (jj_done) return true;
-    if (jj_3R_677()) return true;
+    if (jj_3R_138()) return true;
     return false;
   }
 
- inline bool jj_3R_666()
+ inline bool jj_3R_632()
  {
     if (jj_done) return true;
-    if (jj_3R_676()) return true;
+    if (jj_3R_654()) return true;
     return false;
   }
 
- inline bool jj_3R_665()
+ inline bool jj_3R_631()
  {
     if (jj_done) return true;
-    if (jj_3R_675()) return true;
+    if (jj_3R_653()) return true;
     return false;
   }
 
- inline bool jj_3R_80()
+ inline bool jj_3R_630()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_652()) return true;
     return false;
   }
 
- inline bool jj_3R_664()
+ inline bool jj_3R_629()
  {
     if (jj_done) return true;
-    if (jj_3R_674()) return true;
+    if (jj_3R_651()) return true;
     return false;
   }
 
- inline bool jj_3R_619()
+ inline bool jj_3R_577()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_664()) {
+    if (jj_3R_629()) {
     jj_scanpos = xsp;
-    if (jj_3R_665()) {
+    if (jj_3R_630()) {
     jj_scanpos = xsp;
-    if (jj_3R_666()) {
+    if (jj_3R_631()) {
     jj_scanpos = xsp;
-    if (jj_3R_667()) {
+    if (jj_3R_632()) {
     jj_scanpos = xsp;
-    if (jj_3_100()) {
+    if (jj_3_101()) {
     jj_scanpos = xsp;
-    if (jj_3R_668()) return true;
+    if (jj_3R_633()) return true;
     }
     }
     }
@@ -5035,57 +4776,61 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_558()
+ inline bool jj_3_25()
  {
     if (jj_done) return true;
-    if (jj_3R_602()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_80()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
     return false;
   }
 
- inline bool jj_3_23()
+ inline bool jj_3R_350()
  {
     if (jj_done) return true;
-    if (jj_3R_79()) return true;
+    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3_96()
+ inline bool jj_3_97()
  {
     if (jj_done) return true;
-    if (jj_3R_133()) return true;
+    if (jj_3R_134()) return true;
     return false;
   }
 
- inline bool jj_3_22()
+ inline bool jj_3R_459()
  {
     if (jj_done) return true;
-    if (jj_3R_78()) return true;
+    if (jj_3R_526()) return true;
     return false;
   }
 
- inline bool jj_3_99()
+ inline bool jj_3_100()
  {
     if (jj_done) return true;
-    if (jj_3R_136()) return true;
+    if (jj_3R_137()) return true;
     return false;
   }
 
- inline bool jj_3R_517()
+ inline bool jj_3R_371()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_99()) {
+    if (jj_3_100()) {
     jj_scanpos = xsp;
-    if (jj_3R_558()) return true;
+    if (jj_3R_459()) return true;
     }
     return false;
   }
 
- inline bool jj_3_21()
+ inline bool jj_3R_320()
  {
     if (jj_done) return true;
-    if (jj_3R_77()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_80()) return true;
     return false;
   }
 
@@ -5099,90 +4844,46 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_76()
+ inline bool jj_3R_319()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_80()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
+    if (jj_3R_318()) return true;
     return false;
   }
 
- inline bool jj_3_98()
+ inline bool jj_3_99()
  {
     if (jj_done) return true;
-    if (jj_3R_134()) return true;
     if (jj_3R_135()) return true;
-    return false;
-  }
-
- inline bool jj_3_20()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_76()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(78)) jj_scanpos = xsp;
-    if (jj_scan_token(ASSERT_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_389()
- {
-    if (jj_done) return true;
-    if (jj_3R_79()) return true;
+    if (jj_3R_136()) return true;
     return false;
   }
 
  inline bool jj_3R_185()
  {
     if (jj_done) return true;
-    if (jj_3R_133()) return true;
-    return false;
-  }
-
- inline bool jj_3R_388()
- {
-    if (jj_done) return true;
-    if (jj_3R_78()) return true;
-    return false;
-  }
-
- inline bool jj_3_19()
- {
-    if (jj_done) return true;
-    if (jj_3R_75()) return true;
-    return false;
-  }
-
- inline bool jj_3R_74()
- {
-    if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_387()
- {
-    if (jj_done) return true;
-    if (jj_3R_77()) return true;
+    if (jj_3R_134()) return true;
     return false;
   }
 
- inline bool jj_3_18()
+ inline bool jj_3R_168()
  {
     if (jj_done) return true;
+    if (jj_3R_318()) return true;
     Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_319()) { jj_scanpos = xsp; break; }
+    }
     xsp = jj_scanpos;
-    if (jj_3R_74()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(78)) jj_scanpos = xsp;
-    if (jj_scan_token(PROCESS_T)) return true;
+    if (jj_3R_320()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_351()
+ inline bool jj_3R_366()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
@@ -5190,57 +4891,29 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_73()
- {
-    if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_386()
- {
-    if (jj_done) return true;
-    if (jj_3R_88()) return true;
-    return false;
-  }
-
- inline bool jj_3_17()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_73()) jj_scanpos = xsp;
-    if (jj_scan_token(BLOCK_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_385()
+ inline bool jj_3R_72()
  {
     if (jj_done) return true;
-    if (jj_3R_474()) return true;
+    if (jj_3R_115()) return true;
+    if (jj_scan_token(LESSTHAN_T)) return true;
+    if (jj_3R_167()) return true;
+    if (jj_3R_168()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_161()
+ inline bool jj_3R_130()
  {
     if (jj_done) return true;
-    if (jj_3R_135()) return true;
+    if (jj_3R_136()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_98()) { jj_scanpos = xsp; break; }
+      if (jj_3_99()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_384()
- {
-    if (jj_done) return true;
-    if (jj_3R_75()) return true;
-    return false;
-  }
-
  inline bool jj_3R_247()
  {
     if (jj_done) return true;
@@ -5248,10 +4921,11 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_383()
+ inline bool jj_3R_365()
  {
     if (jj_done) return true;
-    if (jj_3R_89()) return true;
+    if (jj_scan_token(UNTIL_T)) return true;
+    if (jj_3R_80()) return true;
     return false;
   }
 
@@ -5267,7 +4941,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_97()
+ inline bool jj_3_98()
  {
     if (jj_done) return true;
     if (jj_3R_60()) return true;
@@ -5281,82 +4955,45 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_309()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_382()) {
-    jj_scanpos = xsp;
-    if (jj_3R_383()) {
-    jj_scanpos = xsp;
-    if (jj_3R_384()) {
-    jj_scanpos = xsp;
-    if (jj_3R_385()) {
-    jj_scanpos = xsp;
-    if (jj_3R_386()) {
-    jj_scanpos = xsp;
-    if (jj_3R_387()) {
-    jj_scanpos = xsp;
-    if (jj_3R_388()) {
-    jj_scanpos = xsp;
-    if (jj_3R_389()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    return false;
-  }
-
- inline bool jj_3R_382()
- {
-    if (jj_done) return true;
-    if (jj_3R_473()) return true;
-    return false;
-  }
-
- inline bool jj_3_95()
+ inline bool jj_3_96()
  {
     if (jj_done) return true;
     if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3_16()
+ inline bool jj_3R_218()
  {
     if (jj_done) return true;
-    if (jj_3R_72()) return true;
+    if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_218()
+ inline bool jj_3R_80()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
  inline bool jj_3R_217()
  {
     if (jj_done) return true;
-    if (jj_3R_295()) return true;
+    if (jj_3R_310()) return true;
     return false;
   }
 
  inline bool jj_3R_216()
  {
     if (jj_done) return true;
-    if (jj_3R_337()) return true;
+    if (jj_3R_352()) return true;
     return false;
   }
 
- inline bool jj_3R_173()
+ inline bool jj_3_24()
  {
     if (jj_done) return true;
-    if (jj_3R_310()) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
@@ -5385,18 +5022,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_172()
- {
-    if (jj_done) return true;
-    if (jj_3R_72()) return true;
-    return false;
-  }
-
- inline bool jj_3_15()
+ inline bool jj_3_23()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_78()) return true;
     return false;
   }
 
@@ -5407,19 +5036,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_77()
+ inline bool jj_3_22()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3_15()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(78)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_172()) {
-    jj_scanpos = xsp;
-    if (jj_3R_173()) return true;
-    }
+    if (jj_3R_77()) return true;
     return false;
   }
 
@@ -5435,582 +5055,643 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_14()
+ inline bool jj_3R_76()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_79()
+ inline bool jj_3_21()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_14()) jj_scanpos = xsp;
+    if (jj_3R_76()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(78)) jj_scanpos = xsp;
-    if (jj_3R_177()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_scan_token(ASSERT_T)) return true;
     return false;
   }
 
- inline bool jj_3_13()
+ inline bool jj_3R_561()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
- inline bool jj_3_12()
+ inline bool jj_3R_560()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_78()) return true;
     return false;
   }
 
- inline bool jj_3R_88()
+ inline bool jj_3_20()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3_13()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(78)) jj_scanpos = xsp;
-    if (jj_3R_188()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_75()) return true;
     return false;
   }
 
- inline bool jj_3R_518()
+ inline bool jj_3R_559()
+ {
+    if (jj_done) return true;
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_74()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_372()
  {
     if (jj_done) return true;
     if (jj_scan_token(SUBTYPE_T)) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(IS_T)) return true;
     if (jj_3R_85()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_592()
+ inline bool jj_3_19()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_74()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_scan_token(PROCESS_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_627()
  {
     if (jj_done) return true;
     if (jj_3R_113()) return true;
     return false;
   }
 
- inline bool jj_3R_683()
+ inline bool jj_3R_572()
  {
     if (jj_done) return true;
-    if (jj_3R_693()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_627()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_569()
+ inline bool jj_3R_558()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_88()) return true;
     return false;
   }
 
- inline bool jj_3R_548()
+ inline bool jj_3R_73()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3_18()
  {
     if (jj_done) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_592()) { jj_scanpos = xsp; break; }
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_73()) jj_scanpos = xsp;
+    if (jj_scan_token(BLOCK_T)) return true;
     return false;
   }
 
- inline bool jj_3_94()
+ inline bool jj_3_95()
  {
     if (jj_done) return true;
-    if (jj_3R_132()) return true;
+    if (jj_3R_133()) return true;
     return false;
   }
 
- inline bool jj_3R_493()
+ inline bool jj_3R_516()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_298()) return true;
+    if (jj_3R_313()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_682()
+ inline bool jj_3R_557()
  {
     if (jj_done) return true;
-    if (jj_3R_692()) return true;
+    if (jj_3R_615()) return true;
     return false;
   }
 
- inline bool jj_3R_675()
+ inline bool jj_3_94()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_682()) {
-    jj_scanpos = xsp;
-    if (jj_3R_683()) return true;
-    }
+    if (jj_3R_132()) return true;
     return false;
   }
 
- inline bool jj_3R_176()
+ inline bool jj_3R_556()
  {
     if (jj_done) return true;
-    if (jj_3R_314()) return true;
+    if (jj_3R_75()) return true;
     return false;
   }
 
- inline bool jj_3_93()
+ inline bool jj_3R_555()
  {
     if (jj_done) return true;
-    if (jj_3R_131()) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
- inline bool jj_3R_175()
+ inline bool jj_3R_554()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_614()) return true;
     return false;
   }
 
- inline bool jj_3R_178()
+ inline bool jj_3R_498()
  {
     if (jj_done) return true;
-    if (jj_3R_316()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_60()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_554()) {
+    jj_scanpos = xsp;
+    if (jj_3R_555()) {
+    jj_scanpos = xsp;
+    if (jj_3R_556()) {
+    jj_scanpos = xsp;
+    if (jj_3R_557()) {
+    jj_scanpos = xsp;
+    if (jj_3R_558()) {
+    jj_scanpos = xsp;
+    if (jj_3R_559()) {
+    jj_scanpos = xsp;
+    if (jj_3R_560()) {
+    jj_scanpos = xsp;
+    if (jj_3R_561()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(186)) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_495()
+ inline bool jj_3R_518()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_546()) return true;
+    if (jj_3R_570()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_78()
+ inline bool jj_3_17()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_174()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_175()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_176()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_72()) return true;
     return false;
   }
 
- inline bool jj_3R_494()
+ inline bool jj_3R_173()
+ {
+    if (jj_done) return true;
+    if (jj_3R_325()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_517()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(83)) {
+    if (jj_scan_token(84)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(51)) return true;
+    if (jj_scan_token(52)) return true;
     }
     return false;
   }
 
- inline bool jj_3R_412()
+ inline bool jj_3R_172()
+ {
+    if (jj_done) return true;
+    if (jj_3R_72()) return true;
+    return false;
+  }
+
+ inline bool jj_3_16()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_434()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_494()) jj_scanpos = xsp;
+    if (jj_3R_517()) jj_scanpos = xsp;
     if (jj_scan_token(FUNCTION_T)) return true;
-    if (jj_3R_492()) return true;
+    if (jj_3R_515()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_495()) jj_scanpos = xsp;
+    if (jj_3R_518()) jj_scanpos = xsp;
     if (jj_scan_token(RETURN_T)) return true;
-    if (jj_3R_156()) return true;
+    if (jj_3R_158()) return true;
     return false;
   }
 
- inline bool jj_3R_568()
+ inline bool jj_3R_77()
  {
     if (jj_done) return true;
-    if (jj_3R_608()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3_16()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_172()) {
+    jj_scanpos = xsp;
+    if (jj_3R_173()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_567()
+ inline bool jj_3_15()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_180()
+ inline bool jj_3R_79()
  {
     if (jj_done) return true;
-    if (jj_3R_318()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3_15()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_3R_177()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_179()
+ inline bool jj_3_14()
  {
     if (jj_done) return true;
-    if (jj_3R_317()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_187()
+ inline bool jj_3_13()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BAR_T)) return true;
-    if (jj_3R_186()) return true;
+    if (jj_3R_71()) return true;
     return false;
   }
 
- inline bool jj_3R_524()
+ inline bool jj_3R_88()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMPONENT_T)) return true;
-    if (jj_3R_71()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(55)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_567()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_568()) jj_scanpos = xsp;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(COMPONENT_T)) return true;
+    if (jj_3_14()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_569()) jj_scanpos = xsp;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_3R_188()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_81()
+ inline bool jj_3R_678()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_178()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_179()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_180()) jj_scanpos = xsp;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_693()) return true;
     return false;
   }
 
- inline bool jj_3R_332()
+ inline bool jj_3R_470()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_347()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_411()) {
+    if (jj_3R_433()) {
     jj_scanpos = xsp;
-    if (jj_3R_412()) return true;
+    if (jj_3R_434()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_411()
+ inline bool jj_3R_433()
  {
     if (jj_done) return true;
     if (jj_scan_token(PROCEDURE_T)) return true;
-    if (jj_3R_492()) return true;
+    if (jj_3R_515()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_493()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3_93()) jj_scanpos = xsp;
+    if (jj_3R_516()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3_94()) jj_scanpos = xsp;
-    if (jj_3R_403()) return true;
+    xsp = jj_scanpos;
+    if (jj_3_95()) jj_scanpos = xsp;
+    if (jj_3R_425()) return true;
     return false;
   }
 
- inline bool jj_3_11()
+ inline bool jj_3R_677()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_692()) return true;
     return false;
   }
 
- inline bool jj_3R_593()
+ inline bool jj_3R_652()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(45)) {
+    if (jj_3R_677()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(79)) return true;
-    }
-    return false;
-  }
-
- inline bool jj_3R_86()
- {
-    if (jj_done) return true;
-    if (jj_3R_186()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_187()) { jj_scanpos = xsp; break; }
+    if (jj_3R_678()) return true;
     }
     return false;
   }
 
- inline bool jj_3_10()
+ inline bool jj_3R_176()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_329()) return true;
     return false;
   }
 
- inline bool jj_3R_591()
+ inline bool jj_3R_175()
  {
     if (jj_done) return true;
-    if (jj_3R_618()) return true;
+    if (jj_3R_71()) return true;
     return false;
   }
 
- inline bool jj_3R_589()
+ inline bool jj_3R_628()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(46)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(80)) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_547()
+ inline bool jj_3R_178()
  {
     if (jj_done) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_591()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_331()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_322()
+ inline bool jj_3R_626()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OTHER_T)) return true;
+    if (jj_3R_650()) return true;
     return false;
   }
 
- inline bool jj_3R_321()
+ inline bool jj_3R_571()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_626()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3_91()
+ inline bool jj_3_92()
  {
     if (jj_done) return true;
     if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_663()
+ inline bool jj_3R_674()
  {
     if (jj_done) return true;
-    if (jj_3R_528()) return true;
+    if (jj_3R_383()) return true;
     return false;
   }
 
- inline bool jj_3R_320()
+ inline bool jj_3R_673()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3R_186()
+ inline bool jj_3R_78()
  {
     if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_174()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_319()) {
-    jj_scanpos = xsp;
-    if (jj_3R_320()) {
-    jj_scanpos = xsp;
-    if (jj_3R_321()) {
-    jj_scanpos = xsp;
-    if (jj_3R_322()) return true;
-    }
-    }
-    }
+    if (jj_3R_175()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_176()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_319()
+ inline bool jj_3_93()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3R_662()
+ inline bool jj_3R_672()
  {
     if (jj_done) return true;
-    if (jj_3R_478()) return true;
+    if (jj_3R_379()) return true;
     return false;
   }
 
- inline bool jj_3_92()
+ inline bool jj_3R_671()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_661()
+ inline bool jj_3R_670()
  {
     if (jj_done) return true;
-    if (jj_3R_525()) return true;
+    if (jj_3R_377()) return true;
     return false;
   }
 
- inline bool jj_3R_533()
+ inline bool jj_3R_669()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
- inline bool jj_3R_337()
+ inline bool jj_3R_668()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CHARACTER_LITERAL)) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
- inline bool jj_3R_660()
+ inline bool jj_3R_574()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_515()) return true;
     return false;
   }
 
- inline bool jj_3R_659()
+ inline bool jj_3R_667()
  {
     if (jj_done) return true;
-    if (jj_3R_523()) return true;
+    if (jj_3R_373()) return true;
     return false;
   }
 
- inline bool jj_3R_658()
+ inline bool jj_3R_469()
  {
     if (jj_done) return true;
-    if (jj_3R_522()) return true;
+    if (jj_3R_532()) return true;
     return false;
   }
 
- inline bool jj_3R_529()
+ inline bool jj_3R_666()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3R_657()
+ inline bool jj_3R_665()
  {
     if (jj_done) return true;
-    if (jj_3R_521()) return true;
+    if (jj_3R_519()) return true;
     return false;
   }
 
- inline bool jj_3R_550()
+ inline bool jj_3R_468()
  {
     if (jj_done) return true;
-    if (jj_3R_492()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_656()
+ inline bool jj_3R_180()
  {
     if (jj_done) return true;
-    if (jj_3R_519()) return true;
+    if (jj_3R_333()) return true;
     return false;
   }
 
- inline bool jj_3R_655()
+ inline bool jj_3R_179()
  {
     if (jj_done) return true;
-    if (jj_3R_518()) return true;
+    if (jj_3R_332()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_654()
+ inline bool jj_3R_664()
  {
     if (jj_done) return true;
-    if (jj_3R_496()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
- inline bool jj_3R_653()
+ inline bool jj_3R_187()
  {
     if (jj_done) return true;
-    if (jj_3R_517()) return true;
+    if (jj_scan_token(BAR_T)) return true;
+    if (jj_3R_186()) return true;
     return false;
   }
 
- inline bool jj_3R_652()
+ inline bool jj_3R_663()
  {
     if (jj_done) return true;
     if (jj_3R_93()) return true;
     return false;
   }
 
- inline bool jj_3R_618()
+ inline bool jj_3R_650()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_652()) {
+    if (jj_3R_663()) {
     jj_scanpos = xsp;
-    if (jj_3R_653()) {
+    if (jj_3R_664()) {
     jj_scanpos = xsp;
-    if (jj_3R_654()) {
+    if (jj_3R_665()) {
     jj_scanpos = xsp;
-    if (jj_3R_655()) {
+    if (jj_3R_666()) {
     jj_scanpos = xsp;
-    if (jj_3R_656()) {
+    if (jj_3R_667()) {
     jj_scanpos = xsp;
-    if (jj_3R_657()) {
+    if (jj_3R_668()) {
     jj_scanpos = xsp;
-    if (jj_3R_658()) {
+    if (jj_3R_669()) {
     jj_scanpos = xsp;
-    if (jj_3R_659()) {
+    if (jj_3R_670()) {
     jj_scanpos = xsp;
-    if (jj_3R_660()) {
+    if (jj_3R_671()) {
     jj_scanpos = xsp;
-    if (jj_3R_661()) {
+    if (jj_3R_672()) {
     jj_scanpos = xsp;
-    if (jj_3R_662()) {
+    if (jj_3R_673()) {
     jj_scanpos = xsp;
-    if (jj_3_92()) {
+    if (jj_3_93()) {
     jj_scanpos = xsp;
-    if (jj_3R_663()) return true;
+    if (jj_3R_674()) return true;
     }
     }
     }
@@ -6026,17 +5707,27 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_587()
+ inline bool jj_3R_378()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
-    if (jj_3R_259()) return true;
+    if (jj_scan_token(COMPONENT_T)) return true;
+    if (jj_3R_70()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(56)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_468()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_469()) jj_scanpos = xsp;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(COMPONENT_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_470()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_561()
+ inline bool jj_3R_462()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
@@ -6044,66 +5735,107 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_588()
+ inline bool jj_3R_81()
  {
     if (jj_done) return true;
-    if (jj_3R_587()) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_3R_178()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_179()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_180()) jj_scanpos = xsp;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_616()
+ inline bool jj_3_91()
+ {
+    if (jj_done) return true;
+    if (jj_3R_131()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_348()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_435()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(137)) return true;
+    }
+    return false;
+  }
+
+ inline bool jj_3R_435()
+ {
+    if (jj_done) return true;
+    if (jj_3R_519()) return true;
+    return false;
+  }
+
+ inline bool jj_3_12()
  {
     if (jj_done) return true;
     if (jj_3R_70()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_90()
+ inline bool jj_3_11()
  {
     if (jj_done) return true;
-    if (jj_3R_130()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_333()
+ inline bool jj_3R_86()
  {
     if (jj_done) return true;
+    if (jj_3R_186()) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_413()) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(136)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_187()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_413()
+ inline bool jj_3R_201()
  {
     if (jj_done) return true;
-    if (jj_3R_496()) return true;
+    if (jj_3R_347()) return true;
+    if (jj_3R_348()) return true;
     return false;
   }
 
- inline bool jj_3R_201()
+ inline bool jj_3_10()
  {
     if (jj_done) return true;
-    if (jj_3R_332()) return true;
-    if (jj_3R_333()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_549()
+ inline bool jj_3R_337()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(OTHER_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_573()
  {
     if (jj_done) return true;
-    if (jj_3R_593()) return true;
+    if (jj_3R_628()) return true;
     return false;
   }
 
  inline bool jj_3R_200()
  {
     if (jj_done) return true;
-    if (jj_3R_130()) return true;
+    if (jj_3R_131()) return true;
     return false;
   }
 
@@ -6119,775 +5851,829 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_89()
+ inline bool jj_3_90()
  {
     if (jj_done) return true;
     if (jj_3R_129()) return true;
+    if (jj_3R_130()) return true;
     return false;
   }
 
- inline bool jj_3R_256()
+ inline bool jj_3R_624()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_122()
+ inline bool jj_3R_336()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_335()
+ {
+    if (jj_done) return true;
+    if (jj_3R_69()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_186()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_256()) jj_scanpos = xsp;
-    if (jj_scan_token(CASE_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_587()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_588()) { jj_scanpos = xsp; break; }
+    if (jj_3R_334()) {
+    jj_scanpos = xsp;
+    if (jj_3R_335()) {
+    jj_scanpos = xsp;
+    if (jj_3R_336()) {
+    jj_scanpos = xsp;
+    if (jj_3R_337()) return true;
+    }
+    }
     }
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(CASE_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_589()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_577()
+ inline bool jj_3R_334()
  {
     if (jj_done) return true;
-    if (jj_3R_309()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_560()
+ inline bool jj_3R_461()
  {
     if (jj_done) return true;
-    if (jj_3R_603()) return true;
+    if (jj_3R_527()) return true;
     return false;
   }
 
- inline bool jj_3R_532()
+ inline bool jj_3R_161()
  {
     if (jj_done) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_577()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_129()) return true;
+    if (jj_3R_130()) return true;
     return false;
   }
 
- inline bool jj_3R_162()
+ inline bool jj_3R_648()
  {
     if (jj_done) return true;
-    if (jj_3R_129()) return true;
-    if (jj_3R_161()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_617()
+ inline bool jj_3R_352()
  {
     if (jj_done) return true;
-    if (jj_3R_314()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(CHARACTER_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_477()
+ inline bool jj_3R_644()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_539()) return true;
+    if (jj_3R_59()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_473()
+ inline bool jj_3R_519()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_scan_token(BLOCK_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_529()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(55)) jj_scanpos = xsp;
-    if (jj_3R_530()) return true;
-    if (jj_3R_531()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_571()) return true;
     if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_532()) return true;
+    if (jj_3R_572()) return true;
     if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(BLOCK_T)) return true;
+    Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_533()) jj_scanpos = xsp;
+    if (jj_3R_573()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_574()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_496()
+ inline bool jj_3R_622()
  {
     if (jj_done) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_547()) return true;
-    if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_548()) return true;
-    if (jj_scan_token(END_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_549()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_550()) jj_scanpos = xsp;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_86()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_3R_259()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_623()
+ {
+    if (jj_done) return true;
+    if (jj_3R_622()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_685()
+ {
+    if (jj_done) return true;
+    if (jj_3R_71()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_9()
+ inline bool jj_3R_356()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    if (jj_scan_token(STRINGLITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_398()
+ inline bool jj_3R_436()
  {
     if (jj_done) return true;
+    if (jj_scan_token(COMMA_T)) return true;
     if (jj_3R_60()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_477()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_341()
+ inline bool jj_3R_160()
  {
     if (jj_done) return true;
-    if (jj_scan_token(STRINGLITERAL)) return true;
+    if (jj_3R_314()) return true;
     return false;
   }
 
- inline bool jj_3R_575()
+ inline bool jj_3R_256()
  {
     if (jj_done) return true;
-    if (jj_3R_608()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_617()) jj_scanpos = xsp;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_574()
+ inline bool jj_3R_68()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_616()) jj_scanpos = xsp;
+    if (jj_3R_160()) jj_scanpos = xsp;
+    if (jj_3R_130()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_161()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_530()
+ inline bool jj_3R_122()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_574()) jj_scanpos = xsp;
+    if (jj_3R_256()) jj_scanpos = xsp;
+    if (jj_scan_token(CASE_T)) return true;
+    if (jj_3R_59()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_622()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_623()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(CASE_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_575()) jj_scanpos = xsp;
+    if (jj_3R_624()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_576()
+ inline bool jj_3R_660()
  {
     if (jj_done) return true;
-    if (jj_3R_381()) return true;
+    if (jj_3R_498()) return true;
     return false;
   }
 
- inline bool jj_3R_531()
+ inline bool jj_3R_647()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_576()) { jj_scanpos = xsp; break; }
+      if (jj_3R_660()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_414()
+ inline bool jj_3R_358()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_scan_token(RETURN_T)) return true;
     if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_160()
+ inline bool jj_3R_635()
  {
     if (jj_done) return true;
-    if (jj_3R_299()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_472()
+ inline bool jj_3R_357()
  {
     if (jj_done) return true;
-    if (jj_3R_528()) return true;
+    if (jj_3R_60()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_436()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_69()
+ inline bool jj_3R_234()
  {
     if (jj_done) return true;
+    if (jj_scan_token(LBRACKET_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_160()) jj_scanpos = xsp;
-    if (jj_3R_161()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_162()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_357()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_358()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET_T)) return true;
     return false;
   }
 
- inline bool jj_3_7()
+ inline bool jj_3R_686()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_329()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_8()
+ inline bool jj_3R_605()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_471()
+ inline bool jj_3R_604()
  {
     if (jj_done) return true;
-    if (jj_3R_478()) return true;
+    if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_343()
+ inline bool jj_3R_603()
  {
     if (jj_done) return true;
-    if (jj_scan_token(RETURN_T)) return true;
     if (jj_3R_60()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_635()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_670()
+ inline bool jj_3R_535()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_60()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_603()) {
+    jj_scanpos = xsp;
+    if (jj_3R_604()) {
+    jj_scanpos = xsp;
+    if (jj_3R_605()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_470()
+ inline bool jj_3R_501()
  {
     if (jj_done) return true;
-    if (jj_3R_527()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_565()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_342()
+ inline bool jj_3R_579()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_414()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(BUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_469()
+ inline bool jj_3R_614()
  {
     if (jj_done) return true;
-    if (jj_3R_526()) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_scan_token(BLOCK_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_644()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(56)) jj_scanpos = xsp;
+    if (jj_3R_645()) return true;
+    if (jj_3R_646()) return true;
+    if (jj_scan_token(BEGIN_T)) return true;
+    if (jj_3R_647()) return true;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(BLOCK_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_648()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_468()
+ inline bool jj_3R_578()
  {
     if (jj_done) return true;
-    if (jj_3R_525()) return true;
+    if (jj_scan_token(REGISTER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_234()
+ inline bool jj_3R_527()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LBRACKET_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_342()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_343()) jj_scanpos = xsp;
-    if (jj_scan_token(RBRACKET_T)) return true;
+    if (jj_3R_578()) {
+    jj_scanpos = xsp;
+    if (jj_3R_579()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_466()
+ inline bool jj_3_9()
  {
     if (jj_done) return true;
-    if (jj_3R_524()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_467()
+ inline bool jj_3R_420()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_60()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_501()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_647()
+ inline bool jj_3R_658()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
+    if (jj_3R_532()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_686()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_465()
+ inline bool jj_3R_657()
  {
     if (jj_done) return true;
-    if (jj_3R_523()) return true;
+    if (jj_3R_67()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_685()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_646()
+ inline bool jj_3R_645()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OTHER_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_657()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_658()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_464()
+ inline bool jj_3R_659()
  {
     if (jj_done) return true;
-    if (jj_3R_522()) return true;
+    if (jj_3R_141()) return true;
     return false;
   }
 
- inline bool jj_3R_463()
+ inline bool jj_3R_374()
  {
     if (jj_done) return true;
-    if (jj_3R_521()) return true;
+    if (jj_scan_token(SIGNAL_T)) return true;
+    if (jj_3R_197()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_85()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_461()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_462()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_645()
+ inline bool jj_3R_646()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_670()) { jj_scanpos = xsp; break; }
+      if (jj_3R_659()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_611()
+ inline bool jj_3R_300()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_645()) {
-    jj_scanpos = xsp;
-    if (jj_3R_646()) {
-    jj_scanpos = xsp;
-    if (jj_3R_647()) return true;
-    }
-    }
+    if (jj_3R_383()) return true;
     return false;
   }
 
- inline bool jj_3R_462()
+ inline bool jj_3_89()
  {
     if (jj_done) return true;
-    if (jj_3R_520()) return true;
+    if (jj_3R_128()) return true;
     return false;
   }
 
- inline bool jj_3R_461()
+ inline bool jj_3_7()
  {
     if (jj_done) return true;
-    if (jj_3R_519()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_621()
+ inline bool jj_3_88()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BUS_T)) return true;
+    if (jj_3R_127()) return true;
     return false;
   }
 
- inline bool jj_3R_460()
+ inline bool jj_3_8()
  {
     if (jj_done) return true;
-    if (jj_3R_518()) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3R_400()
+ inline bool jj_3R_299()
  {
     if (jj_done) return true;
-    if (jj_3R_479()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3R_459()
+ inline bool jj_3R_520()
  {
     if (jj_done) return true;
-    if (jj_3R_517()) return true;
+    if (jj_3R_405()) return true;
     return false;
   }
 
- inline bool jj_3R_399()
+ inline bool jj_3R_298()
  {
     if (jj_done) return true;
-    if (jj_3R_478()) return true;
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3R_620()
+ inline bool jj_3R_297()
  {
     if (jj_done) return true;
-    if (jj_scan_token(REGISTER_T)) return true;
+    if (jj_3R_380()) return true;
     return false;
   }
 
- inline bool jj_3R_603()
+ inline bool jj_3_87()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_620()) {
-    jj_scanpos = xsp;
-    if (jj_3R_621()) return true;
-    }
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_381()
+ inline bool jj_3R_296()
+ {
+    if (jj_done) return true;
+    if (jj_3R_379()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_439()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_458()) {
-    jj_scanpos = xsp;
-    if (jj_3R_459()) {
-    jj_scanpos = xsp;
-    if (jj_3R_460()) {
-    jj_scanpos = xsp;
-    if (jj_3R_461()) {
-    jj_scanpos = xsp;
-    if (jj_3R_462()) {
-    jj_scanpos = xsp;
-    if (jj_3R_463()) {
-    jj_scanpos = xsp;
-    if (jj_3R_464()) {
-    jj_scanpos = xsp;
-    if (jj_3R_465()) {
-    jj_scanpos = xsp;
-    if (jj_3R_466()) {
-    jj_scanpos = xsp;
-    if (jj_3R_467()) {
-    jj_scanpos = xsp;
-    if (jj_3R_468()) {
-    jj_scanpos = xsp;
-    if (jj_3R_469()) {
-    jj_scanpos = xsp;
-    if (jj_3R_470()) {
-    jj_scanpos = xsp;
-    if (jj_3R_471()) {
-    jj_scanpos = xsp;
-    if (jj_3_8()) {
-    jj_scanpos = xsp;
-    if (jj_3R_472()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3_87()) jj_scanpos = xsp;
+    if (jj_3R_115()) return true;
+    if (jj_scan_token(LESSTHAN_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_520()) jj_scanpos = xsp;
+    if (jj_3R_318()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_458()
+ inline bool jj_3R_438()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_128()) return true;
     return false;
   }
 
- inline bool jj_3R_318()
+ inline bool jj_3R_294()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_398()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_399()) { jj_scanpos = xsp; break; }
-    }
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_400()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
- inline bool jj_3R_520()
+ inline bool jj_3R_295()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SIGNAL_T)) return true;
-    if (jj_3R_197()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_560()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_561()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3_88()
+ inline bool jj_3R_387()
  {
     if (jj_done) return true;
-    if (jj_3R_128()) return true;
+    if (jj_3R_478()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_95()
+ inline bool jj_3R_293()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BIT_STRING_LITERAL)) return true;
+    if (jj_3R_377()) return true;
     return false;
   }
 
- inline bool jj_3R_240()
+ inline bool jj_3R_292()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
- inline bool jj_3_87()
+ inline bool jj_3R_361()
  {
     if (jj_done) return true;
-    if (jj_3R_127()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_437()) {
+    jj_scanpos = xsp;
+    if (jj_3R_438()) {
+    jj_scanpos = xsp;
+    if (jj_3R_439()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_397()
+ inline bool jj_3R_437()
  {
     if (jj_done) return true;
-    if (jj_3R_314()) return true;
+    if (jj_3R_127()) return true;
     return false;
   }
 
- inline bool jj_3R_497()
+ inline bool jj_3R_291()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
- inline bool jj_3R_396()
+ inline bool jj_3R_290()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_374()) return true;
     return false;
   }
 
- inline bool jj_3_86()
+ inline bool jj_3R_289()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_373()) return true;
     return false;
   }
 
- inline bool jj_3R_395()
+ inline bool jj_3R_288()
  {
     if (jj_done) return true;
-    if (jj_scan_token(USE_T)) return true;
-    if (jj_3R_476()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3R_417()
+ inline bool jj_3R_287()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3_86()) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
-    if (jj_scan_token(LESSTHAN_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_497()) jj_scanpos = xsp;
-    if (jj_3R_303()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
- inline bool jj_3R_317()
+ inline bool jj_3R_422()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_395()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_396()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_397()) jj_scanpos = xsp;
+    if (jj_3R_502()) return true;
     return false;
   }
 
- inline bool jj_3R_416()
+ inline bool jj_3R_402()
  {
     if (jj_done) return true;
-    if (jj_3R_128()) return true;
+    if (jj_scan_token(MINUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_359()
+ inline bool jj_3R_421()
  {
     if (jj_done) return true;
-    if (jj_3R_437()) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3R_346()
+ inline bool jj_3R_141()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_415()) {
+    if (jj_3R_286()) {
+    jj_scanpos = xsp;
+    if (jj_3R_287()) {
+    jj_scanpos = xsp;
+    if (jj_3R_288()) {
+    jj_scanpos = xsp;
+    if (jj_3R_289()) {
+    jj_scanpos = xsp;
+    if (jj_3R_290()) {
+    jj_scanpos = xsp;
+    if (jj_3R_291()) {
+    jj_scanpos = xsp;
+    if (jj_3R_292()) {
+    jj_scanpos = xsp;
+    if (jj_3R_293()) {
+    jj_scanpos = xsp;
+    if (jj_3R_294()) {
     jj_scanpos = xsp;
-    if (jj_3R_416()) {
+    if (jj_3R_295()) {
     jj_scanpos = xsp;
-    if (jj_3R_417()) return true;
+    if (jj_3R_296()) {
+    jj_scanpos = xsp;
+    if (jj_3R_297()) {
+    jj_scanpos = xsp;
+    if (jj_3R_298()) {
+    jj_scanpos = xsp;
+    if (jj_3R_299()) {
+    jj_scanpos = xsp;
+    if (jj_3_8()) {
+    jj_scanpos = xsp;
+    if (jj_3R_300()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(186)) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     }
     }
     return false;
   }
 
- inline bool jj_3R_415()
- {
-    if (jj_done) return true;
-    if (jj_3R_127()) return true;
-    return false;
-  }
-
- inline bool jj_3R_374()
+ inline bool jj_3R_286()
  {
     if (jj_done) return true;
-    if (jj_scan_token(MINUS_T)) return true;
+    if (jj_3R_93()) return true;
     return false;
   }
 
- inline bool jj_3R_299()
+ inline bool jj_3R_314()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_373()) {
+    if (jj_3R_401()) {
     jj_scanpos = xsp;
-    if (jj_3R_374()) return true;
+    if (jj_3R_402()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_373()
+ inline bool jj_3R_401()
  {
     if (jj_done) return true;
     if (jj_scan_token(PLUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_509()
+ inline bool jj_3R_546()
  {
     if (jj_done) return true;
     if (jj_scan_token(ROR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_508()
+ inline bool jj_3R_545()
  {
     if (jj_done) return true;
     if (jj_scan_token(ROL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_507()
+ inline bool jj_3R_544()
  {
     if (jj_done) return true;
     if (jj_scan_token(SRA_T)) return true;
     return false;
   }
 
- inline bool jj_3R_506()
+ inline bool jj_3R_543()
  {
     if (jj_done) return true;
     if (jj_scan_token(SLA_T)) return true;
     return false;
   }
 
- inline bool jj_3R_505()
+ inline bool jj_3R_333()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_3R_420()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_421()) { jj_scanpos = xsp; break; }
+    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_422()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_542()
  {
     if (jj_done) return true;
     if (jj_scan_token(SRL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_437()
+ inline bool jj_3R_541()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(SLL_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_478()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_504()) {
+    if (jj_3R_541()) {
     jj_scanpos = xsp;
-    if (jj_3R_505()) {
+    if (jj_3R_542()) {
     jj_scanpos = xsp;
-    if (jj_3R_506()) {
+    if (jj_3R_543()) {
     jj_scanpos = xsp;
-    if (jj_3R_507()) {
+    if (jj_3R_544()) {
     jj_scanpos = xsp;
-    if (jj_3R_508()) {
+    if (jj_3R_545()) {
     jj_scanpos = xsp;
-    if (jj_3R_509()) return true;
+    if (jj_3R_546()) return true;
     }
     }
     }
@@ -6896,140 +6682,136 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_504()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(SLL_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_245()
  {
     if (jj_done) return true;
-    if (jj_3R_348()) return true;
+    if (jj_3R_363()) return true;
     return false;
   }
 
- inline bool jj_3R_292()
+ inline bool jj_3R_307()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_359()) jj_scanpos = xsp;
+    if (jj_3R_387()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3_84()
+ inline bool jj_3R_95()
  {
     if (jj_done) return true;
-    if (jj_3R_125()) return true;
+    if (jj_scan_token(BIT_STRING_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_324()
+ inline bool jj_3R_240()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SEVERITY_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
     if (jj_3R_59()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
  inline bool jj_3_85()
  {
     if (jj_done) return true;
+    if (jj_3R_125()) return true;
+    return false;
+  }
+
+ inline bool jj_3_86()
+ {
+    if (jj_done) return true;
     if (jj_3R_126()) return true;
     return false;
   }
 
- inline bool jj_3_83()
+ inline bool jj_3_84()
  {
     if (jj_done) return true;
     if (jj_3R_124()) return true;
     return false;
   }
 
- inline bool jj_3_82()
+ inline bool jj_3R_419()
  {
     if (jj_done) return true;
-    if (jj_3R_123()) return true;
+    if (jj_3R_329()) return true;
     return false;
   }
 
- inline bool jj_3R_119()
+ inline bool jj_3R_418()
  {
     if (jj_done) return true;
     if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3_81()
+ inline bool jj_3R_417()
  {
     if (jj_done) return true;
-    if (jj_3R_122()) return true;
+    if (jj_scan_token(USE_T)) return true;
+    if (jj_3R_500()) return true;
     return false;
   }
 
- inline bool jj_3R_525()
+ inline bool jj_3_83()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ATTRIBUTE_T)) return true;
-    if (jj_3R_220()) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_570()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_123()) return true;
     return false;
   }
 
- inline bool jj_3_78()
+ inline bool jj_3R_332()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_119()) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_417()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_418()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_419()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3_80()
+ inline bool jj_3R_119()
  {
     if (jj_done) return true;
-    if (jj_3R_121()) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_301()
+ inline bool jj_3_82()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_300()) return true;
+    if (jj_3R_122()) return true;
     return false;
   }
 
- inline bool jj_3R_111()
+ inline bool jj_3_79()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(APOSTROPHE_T)) return true;
-    if (jj_3R_60()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_240()) jj_scanpos = xsp;
+    if (jj_3R_119()) jj_scanpos = xsp;
+    if (jj_3R_115()) return true;
+    if (jj_scan_token(VARASSIGN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_340()
+ inline bool jj_3_81()
  {
     if (jj_done) return true;
-    if (jj_scan_token(RANGE_T)) return true;
+    if (jj_3R_121()) return true;
     return false;
   }
 
- inline bool jj_3_79()
+ inline bool jj_3_80()
  {
     if (jj_done) return true;
     if (jj_3R_120()) return true;
@@ -7039,45 +6821,26 @@ void parseInline();
  inline bool jj_3R_114()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3_77()
+ inline bool jj_3_78()
  {
     if (jj_done) return true;
     if (jj_3R_118()) return true;
     return false;
   }
 
- inline bool jj_3R_220()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_339()) {
-    jj_scanpos = xsp;
-    if (jj_3R_340()) return true;
-    }
-    return false;
-  }
-
- inline bool jj_3R_339()
- {
-    if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    return false;
-  }
-
  inline bool jj_3R_244()
  {
     if (jj_done) return true;
-    if (jj_3R_347()) return true;
+    if (jj_3R_362()) return true;
     return false;
   }
 
- inline bool jj_3_74()
+ inline bool jj_3_75()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -7088,57 +6851,30 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_76()
+ inline bool jj_3_77()
  {
     if (jj_done) return true;
     if (jj_3R_117()) return true;
     return false;
   }
 
- inline bool jj_3_75()
+ inline bool jj_3_76()
  {
     if (jj_done) return true;
     if (jj_3R_116()) return true;
     return false;
   }
 
- inline bool jj_3R_475()
+ inline bool jj_3R_499()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_303()) return true;
+    if (jj_3R_318()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     if (jj_3R_86()) return true;
     return false;
   }
 
- inline bool jj_3_6()
- {
-    if (jj_done) return true;
-    if (jj_3R_64()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_65()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(ATTRIBUTE_T)) return true;
-    if (jj_3R_71()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_156()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_323()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(REPORT_T)) return true;
-    if (jj_3R_59()) return true;
-    return false;
-  }
-
  inline bool jj_3R_113()
  {
     if (jj_done) return true;
@@ -7146,15 +6882,13 @@ void parseInline();
     xsp = jj_scanpos;
     if (jj_3R_243()) {
     jj_scanpos = xsp;
-    if (jj_3_75()) {
-    jj_scanpos = xsp;
     if (jj_3_76()) {
     jj_scanpos = xsp;
     if (jj_3_77()) {
     jj_scanpos = xsp;
-    if (jj_3R_244()) {
+    if (jj_3_78()) {
     jj_scanpos = xsp;
-    if (jj_3_79()) {
+    if (jj_3R_244()) {
     jj_scanpos = xsp;
     if (jj_3_80()) {
     jj_scanpos = xsp;
@@ -7168,6 +6902,8 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3_85()) {
     jj_scanpos = xsp;
+    if (jj_3_86()) {
+    jj_scanpos = xsp;
     if (jj_3R_245()) return true;
     }
     }
@@ -7187,11 +6923,11 @@ void parseInline();
  inline bool jj_3R_243()
  {
     if (jj_done) return true;
-    if (jj_3R_346()) return true;
+    if (jj_3R_361()) return true;
     return false;
   }
 
- inline bool jj_3R_480()
+ inline bool jj_3R_503()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
@@ -7199,54 +6935,32 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_163()
+ inline bool jj_3R_339()
  {
     if (jj_done) return true;
-    if (jj_3R_300()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_301()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(SEVERITY_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3_73()
+ inline bool jj_3_74()
  {
     if (jj_done) return true;
     if (jj_3R_113()) return true;
     return false;
   }
 
- inline bool jj_3R_375()
- {
-    if (jj_done) return true;
-    if (jj_3R_64()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_259()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_73()) { jj_scanpos = xsp; break; }
+      if (jj_3_74()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_300()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_375()) jj_scanpos = xsp;
-    if (jj_3R_376()) return true;
-    return false;
-  }
-
  inline bool jj_3R_267()
  {
     if (jj_done) return true;
@@ -7254,93 +6968,106 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_401()
+ inline bool jj_3R_423()
  {
     if (jj_done) return true;
     if (jj_3R_60()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_480()) { jj_scanpos = xsp; break; }
+      if (jj_3R_503()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_248()
+ inline bool jj_3R_379()
  {
     if (jj_done) return true;
-    if (jj_3R_139()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_scan_token(ATTRIBUTE_T)) return true;
+    if (jj_3R_220()) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_471()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_59()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_116()
+ inline bool jj_3R_316()
  {
     if (jj_done) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_315()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_111()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(APOSTROPHE_T)) return true;
+    if (jj_3R_60()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_248()) jj_scanpos = xsp;
-    if (jj_3R_188()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_240()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3_72()
+ inline bool jj_3_73()
  {
     if (jj_done) return true;
     if (jj_3R_112()) return true;
     return false;
   }
 
- inline bool jj_3R_349()
+ inline bool jj_3R_364()
  {
     if (jj_done) return true;
     if (jj_scan_token(ON_T)) return true;
-    if (jj_3R_401()) return true;
+    if (jj_3R_423()) return true;
     return false;
   }
 
- inline bool jj_3R_188()
+ inline bool jj_3R_355()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(RANGE_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_220()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ASSERT_T)) return true;
-    if (jj_3R_80()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_323()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_324()) jj_scanpos = xsp;
+    if (jj_3R_354()) {
+    jj_scanpos = xsp;
+    if (jj_3R_355()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_5()
+ inline bool jj_3R_354()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_390()
+ inline bool jj_3R_412()
  {
     if (jj_done) return true;
-    if (jj_3R_303()) return true;
+    if (jj_3R_318()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     if (jj_3R_86()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_475()) { jj_scanpos = xsp; break; }
+      if (jj_3R_499()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_700()
- {
-    if (jj_done) return true;
-    if (jj_3R_705()) return true;
-    return false;
-  }
-
  inline bool jj_3R_691()
  {
     if (jj_done) return true;
@@ -7348,7 +7075,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_310()
+ inline bool jj_3R_325()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
@@ -7356,58 +7083,97 @@ void parseInline();
     if (jj_scan_token(SELECT_T)) return true;
     if (jj_3R_115()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
-    if (jj_3R_166()) return true;
-    if (jj_3R_390()) return true;
+    if (jj_3R_167()) return true;
+    if (jj_3R_412()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_699()
+ inline bool jj_3_6()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    if (jj_3R_64()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_692()
+ inline bool jj_3R_65()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_699()) {
-    jj_scanpos = xsp;
-    if (jj_3R_700()) return true;
-    }
+    if (jj_scan_token(ATTRIBUTE_T)) return true;
+    if (jj_3R_70()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_158()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_540()
+ inline bool jj_3R_338()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_scan_token(REPORT_T)) return true;
+    if (jj_3R_59()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_473()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(DOT_T)) return true;
     if (jj_3R_100()) return true;
     return false;
   }
 
- inline bool jj_3R_345()
+ inline bool jj_3R_166()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_315()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_316()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+ inline bool jj_3R_360()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(EQU_T)) return true;
     if (jj_3R_103()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_566()
+ inline bool jj_3R_403()
  {
     if (jj_done) return true;
-    if (jj_3R_234()) return true;
+    if (jj_3R_64()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_681()
+ inline bool jj_3R_315()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_403()) jj_scanpos = xsp;
+    if (jj_3R_404()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_248()
+ {
+    if (jj_done) return true;
+    if (jj_3R_140()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_676()
  {
     if (jj_done) return true;
     if (jj_3R_82()) return true;
@@ -7417,21 +7183,32 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_680()
+ inline bool jj_3R_116()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_248()) jj_scanpos = xsp;
+    if (jj_3R_188()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_675()
  {
     if (jj_done) return true;
     if (jj_3R_690()) return true;
     return false;
   }
 
- inline bool jj_3R_674()
+ inline bool jj_3R_651()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_680()) {
+    if (jj_3R_675()) {
     jj_scanpos = xsp;
-    if (jj_3R_681()) return true;
+    if (jj_3R_676()) return true;
     }
     return false;
   }
@@ -7439,16 +7216,21 @@ void parseInline();
  inline bool jj_3R_266()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_237()
+ inline bool jj_3R_188()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_236()) return true;
+    if (jj_scan_token(ASSERT_T)) return true;
+    if (jj_3R_80()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_338()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_339()) jj_scanpos = xsp;
     return false;
   }
 
@@ -7465,6 +7247,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_5()
+ {
+    if (jj_done) return true;
+    if (jj_3R_63()) return true;
+    return false;
+  }
+
  inline bool jj_3R_250()
  {
     if (jj_done) return true;
@@ -7473,45 +7262,43 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_293()
+ inline bool jj_3R_701()
  {
     if (jj_done) return true;
-    if (jj_3R_360()) return true;
-    if (jj_3R_292()) return true;
+    if (jj_3R_706()) return true;
     return false;
   }
 
- inline bool jj_3R_552()
+ inline bool jj_3R_308()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_388()) return true;
+    if (jj_3R_307()) return true;
     return false;
   }
 
- inline bool jj_3R_702()
+ inline bool jj_3R_703()
  {
     if (jj_done) return true;
     if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3_4()
+ inline bool jj_3R_700()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_62()) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
- inline bool jj_3R_502()
+ inline bool jj_3R_692()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_4()) {
+    if (jj_3R_700()) {
     jj_scanpos = xsp;
-    if (jj_3R_552()) return true;
+    if (jj_3R_701()) return true;
     }
     return false;
   }
@@ -7519,7 +7306,7 @@ void parseInline();
  inline bool jj_3R_249()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
@@ -7538,93 +7325,57 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_607()
- {
-    if (jj_done) return true;
-    if (jj_3R_295()) return true;
-    return false;
-  }
-
- inline bool jj_3R_606()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(CHARACTER_LITERAL)) return true;
-    return false;
-  }
-
- inline bool jj_3R_443()
+ inline bool jj_3R_484()
  {
     if (jj_done) return true;
     if (jj_scan_token(NOTEQU_T)) return true;
     return false;
   }
 
- inline bool jj_3R_605()
- {
-    if (jj_done) return true;
-    if (jj_3R_71()) return true;
-    return false;
-  }
-
- inline bool jj_3R_564()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_605()) {
-    jj_scanpos = xsp;
-    if (jj_3R_606()) {
-    jj_scanpos = xsp;
-    if (jj_3R_607()) return true;
-    }
-    }
-    return false;
-  }
-
- inline bool jj_3R_442()
+ inline bool jj_3R_483()
  {
     if (jj_done) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_441()
+ inline bool jj_3R_482()
  {
     if (jj_done) return true;
     if (jj_scan_token(GREATERTHAN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_440()
+ inline bool jj_3R_481()
  {
     if (jj_done) return true;
     if (jj_scan_token(EQU_T)) return true;
     return false;
   }
 
- inline bool jj_3R_439()
+ inline bool jj_3R_480()
  {
     if (jj_done) return true;
     if (jj_scan_token(GT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_360()
+ inline bool jj_3R_388()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_438()) {
+    if (jj_3R_479()) {
     jj_scanpos = xsp;
-    if (jj_3R_439()) {
+    if (jj_3R_480()) {
     jj_scanpos = xsp;
-    if (jj_3R_440()) {
+    if (jj_3R_481()) {
     jj_scanpos = xsp;
-    if (jj_3R_441()) {
+    if (jj_3R_482()) {
     jj_scanpos = xsp;
-    if (jj_3R_442()) {
+    if (jj_3R_483()) {
     jj_scanpos = xsp;
-    if (jj_3R_443()) return true;
+    if (jj_3R_484()) return true;
     }
     }
     }
@@ -7633,51 +7384,34 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_438()
+ inline bool jj_3R_479()
  {
     if (jj_done) return true;
     if (jj_scan_token(LT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_701()
- {
-    if (jj_done) return true;
-    if (jj_3R_706()) return true;
-    return false;
-  }
-
- inline bool jj_3R_144()
+ inline bool jj_3R_702()
  {
     if (jj_done) return true;
-    if (jj_3R_292()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_293()) jj_scanpos = xsp;
+    if (jj_3R_707()) return true;
     return false;
   }
 
- inline bool jj_3R_565()
+ inline bool jj_3R_467()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_234()) return true;
     return false;
   }
 
- inline bool jj_3R_523()
+ inline bool jj_3R_146()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALIAS_T)) return true;
-    if (jj_3R_564()) return true;
+    if (jj_3R_307()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_565()) jj_scanpos = xsp;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_60()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_566()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_308()) jj_scanpos = xsp;
     return false;
   }
 
@@ -7686,81 +7420,39 @@ void parseInline();
     if (jj_done) return true;
     if (jj_scan_token(RECORD_T)) return true;
     Token * xsp;
-    if (jj_3R_701()) return true;
+    if (jj_3R_702()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_701()) { jj_scanpos = xsp; break; }
+      if (jj_3R_702()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(RECORD_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_702()) jj_scanpos = xsp;
+    if (jj_3R_703()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_109()
+ inline bool jj_3R_237()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_scan_token(COMMA_T)) return true;
     if (jj_3R_236()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_237()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RPAREN_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_273()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(MINUS_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_274()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(AMPERSAND_T)) return true;
     return false;
   }
 
  inline bool jj_3_71()
  {
     if (jj_done) return true;
-    if (jj_3R_111()) return true;
-    return false;
-  }
-
- inline bool jj_3_70()
- {
-    if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     if (jj_3R_110()) return true;
-    if (jj_3R_69()) return true;
-    return false;
-  }
-
- inline bool jj_3R_129()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_272()) {
-    jj_scanpos = xsp;
-    if (jj_3R_273()) {
-    jj_scanpos = xsp;
-    if (jj_3R_274()) return true;
-    }
-    }
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_272()
+ inline bool jj_3_72()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PLUS_T)) return true;
+    if (jj_3R_111()) return true;
     return false;
   }
 
@@ -7772,14 +7464,15 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_3()
+ inline bool jj_3R_576()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
- inline bool jj_3_69()
+ inline bool jj_3_70()
  {
     if (jj_done) return true;
     if (jj_3R_109()) return true;
@@ -7793,23 +7486,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_453()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(BOX_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_454()
- {
-    if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_61()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_228()
  {
     if (jj_done) return true;
@@ -7822,9 +7498,9 @@ void parseInline();
  inline bool jj_3R_182()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     if (jj_3R_110()) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
@@ -7840,67 +7516,80 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_376()
+ inline bool jj_3R_525()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_452()) {
-    jj_scanpos = xsp;
-    if (jj_3R_453()) {
+    if (jj_3_4()) {
     jj_scanpos = xsp;
-    if (jj_3R_454()) return true;
-    }
+    if (jj_3R_576()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_452()
+ inline bool jj_3_4()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_62()) return true;
     return false;
   }
 
- inline bool jj_3_2()
+ inline bool jj_3R_531()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_310()) return true;
     return false;
   }
 
- inline bool jj_3R_227()
+ inline bool jj_3R_530()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_scan_token(CHARACTER_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_226()
+ inline bool jj_3R_529()
  {
     if (jj_done) return true;
-    if (jj_3R_163()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_193()
+ inline bool jj_3R_465()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_529()) {
+    jj_scanpos = xsp;
+    if (jj_3R_530()) {
+    jj_scanpos = xsp;
+    if (jj_3R_531()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3_1()
+ inline bool jj_3R_227()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_109()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_193()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
  inline bool jj_3R_62()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(APOSTROPHE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
@@ -7911,129 +7600,197 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_327()
+ inline bool jj_3R_342()
  {
     if (jj_done) return true;
     if (jj_3R_113()) return true;
     return false;
   }
 
- inline bool jj_3R_152()
+ inline bool jj_3R_192()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_342()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_192()
+ inline bool jj_3R_466()
  {
     if (jj_done) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_85()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_377()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ALIAS_T)) return true;
+    if (jj_3R_465()) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_327()) { jj_scanpos = xsp; break; }
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_466()) jj_scanpos = xsp;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_60()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_467()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_151()
+ inline bool jj_3R_340()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_423()) return true;
     return false;
   }
 
- inline bool jj_3R_325()
+ inline bool jj_3R_109()
  {
     if (jj_done) return true;
-    if (jj_3R_401()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_236()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_237()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_150()
+ inline bool jj_3R_273()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
+    if (jj_scan_token(MINUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_61()
+ inline bool jj_3R_274()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(AMPERSAND_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_129()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_150()) {
+    if (jj_3R_272()) {
     jj_scanpos = xsp;
-    if (jj_3R_151()) {
+    if (jj_3R_273()) {
     jj_scanpos = xsp;
-    if (jj_3R_152()) return true;
+    if (jj_3R_274()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_676()
+ inline bool jj_3R_272()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ACCESS_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_scan_token(PLUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_225()
+ inline bool jj_3_3()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BASED_LITERAL)) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3R_224()
+ inline bool jj_3R_493()
  {
     if (jj_done) return true;
-    if (jj_scan_token(INTEGER)) return true;
+    if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
- inline bool jj_3R_223()
+ inline bool jj_3R_494()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DECIMAL_LITERAL)) return true;
+    if (jj_3R_60()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_61()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_104()
+ inline bool jj_3R_404()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_223()) {
+    if (jj_3R_492()) {
     jj_scanpos = xsp;
-    if (jj_3R_224()) {
+    if (jj_3R_493()) {
     jj_scanpos = xsp;
-    if (jj_3R_225()) return true;
+    if (jj_3R_494()) return true;
     }
     }
     return false;
   }
 
+ inline bool jj_3R_492()
+ {
+    if (jj_done) return true;
+    if (jj_3R_61()) return true;
+    return false;
+  }
+
+ inline bool jj_3_2()
+ {
+    if (jj_done) return true;
+    if (jj_3R_60()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_226()
+ {
+    if (jj_done) return true;
+    if (jj_3R_166()) return true;
+    return false;
+  }
+
  inline bool jj_3R_190()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(14)) {
+    if (jj_scan_token(15)) {
     jj_scanpos = xsp;
-    if (jj_3R_325()) return true;
+    if (jj_3R_340()) return true;
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
+ inline bool jj_3_1()
+ {
+    if (jj_done) return true;
+    if (jj_3R_59()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_154()
+ {
+    if (jj_done) return true;
+    if (jj_3R_60()) return true;
+    return false;
+  }
+
  inline bool jj_3R_189()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
@@ -8045,18 +7802,18 @@ void parseInline();
     xsp = jj_scanpos;
     if (jj_3R_189()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(78)) jj_scanpos = xsp;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
     if (jj_scan_token(PROCESS_T)) return true;
     xsp = jj_scanpos;
     if (jj_3R_190()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(55)) jj_scanpos = xsp;
+    if (jj_scan_token(56)) jj_scanpos = xsp;
     if (jj_3R_191()) return true;
     if (jj_scan_token(BEGIN_T)) return true;
     if (jj_3R_192()) return true;
     if (jj_scan_token(END_T)) return true;
     xsp = jj_scanpos;
-    if (jj_scan_token(78)) jj_scanpos = xsp;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
     if (jj_scan_token(PROCESS_T)) return true;
     xsp = jj_scanpos;
     if (jj_3R_193()) jj_scanpos = xsp;
@@ -8064,10 +7821,39 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_326()
+ inline bool jj_3R_153()
  {
     if (jj_done) return true;
-    if (jj_3R_402()) return true;
+    if (jj_3R_59()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_341()
+ {
+    if (jj_done) return true;
+    if (jj_3R_424()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_152()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(OPEN_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_61()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_152()) {
+    jj_scanpos = xsp;
+    if (jj_3R_153()) {
+    jj_scanpos = xsp;
+    if (jj_3R_154()) return true;
+    }
+    }
     return false;
   }
 
@@ -8077,116 +7863,160 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_326()) { jj_scanpos = xsp; break; }
+      if (jj_3R_341()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_490()
+ inline bool jj_3R_513()
  {
     if (jj_done) return true;
-    if (jj_3R_528()) return true;
+    if (jj_3R_383()) return true;
     return false;
   }
 
- inline bool jj_3_68()
+ inline bool jj_3R_653()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ACCESS_T)) return true;
+    if (jj_3R_85()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_225()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(BASED_LITERAL)) return true;
+    return false;
+  }
+
+ inline bool jj_3_69()
  {
     if (jj_done) return true;
     if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3R_489()
+ inline bool jj_3R_512()
  {
     if (jj_done) return true;
-    if (jj_3R_478()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3R_488()
+ inline bool jj_3R_224()
  {
     if (jj_done) return true;
-    if (jj_3R_525()) return true;
+    if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
- inline bool jj_3_67()
+ inline bool jj_3R_511()
+ {
+    if (jj_done) return true;
+    if (jj_3R_379()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_223()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(DECIMAL_LITERAL)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_104()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_223()) {
+    jj_scanpos = xsp;
+    if (jj_3R_224()) {
+    jj_scanpos = xsp;
+    if (jj_3R_225()) return true;
+    }
+    }
+    return false;
+  }
+
+ inline bool jj_3_68()
  {
     if (jj_done) return true;
     if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_487()
+ inline bool jj_3R_510()
  {
     if (jj_done) return true;
-    if (jj_3R_523()) return true;
+    if (jj_3R_377()) return true;
     return false;
   }
 
- inline bool jj_3R_486()
+ inline bool jj_3R_509()
  {
     if (jj_done) return true;
-    if (jj_3R_522()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
- inline bool jj_3R_485()
+ inline bool jj_3R_508()
  {
     if (jj_done) return true;
-    if (jj_3R_521()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
- inline bool jj_3R_484()
+ inline bool jj_3R_507()
  {
     if (jj_done) return true;
-    if (jj_3R_519()) return true;
+    if (jj_3R_373()) return true;
     return false;
   }
 
- inline bool jj_3R_483()
+ inline bool jj_3R_506()
  {
     if (jj_done) return true;
-    if (jj_3R_518()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3R_482()
+ inline bool jj_3R_505()
  {
     if (jj_done) return true;
-    if (jj_3R_517()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
- inline bool jj_3R_402()
+ inline bool jj_3R_424()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_481()) {
+    if (jj_3R_504()) {
     jj_scanpos = xsp;
-    if (jj_3R_482()) {
+    if (jj_3R_505()) {
     jj_scanpos = xsp;
-    if (jj_3R_483()) {
+    if (jj_3R_506()) {
     jj_scanpos = xsp;
-    if (jj_3R_484()) {
+    if (jj_3R_507()) {
     jj_scanpos = xsp;
-    if (jj_3R_485()) {
+    if (jj_3R_508()) {
     jj_scanpos = xsp;
-    if (jj_3R_486()) {
+    if (jj_3R_509()) {
     jj_scanpos = xsp;
-    if (jj_3R_487()) {
+    if (jj_3R_510()) {
     jj_scanpos = xsp;
-    if (jj_3_67()) {
+    if (jj_3_68()) {
     jj_scanpos = xsp;
-    if (jj_3R_488()) {
+    if (jj_3R_511()) {
     jj_scanpos = xsp;
-    if (jj_3R_489()) {
+    if (jj_3R_512()) {
     jj_scanpos = xsp;
-    if (jj_3_68()) {
+    if (jj_3_69()) {
     jj_scanpos = xsp;
-    if (jj_3R_490()) return true;
+    if (jj_3R_513()) return true;
     }
     }
     }
@@ -8201,14 +8031,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_481()
+ inline bool jj_3R_504()
  {
     if (jj_done) return true;
     if (jj_3R_93()) return true;
     return false;
   }
 
- inline bool jj_3R_315()
+ inline bool jj_3R_330()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -8217,10 +8047,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_66()
+ inline bool jj_3_67()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
@@ -8230,7 +8060,7 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_66()) jj_scanpos = xsp;
+    if (jj_3_67()) jj_scanpos = xsp;
     if (jj_3R_177()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
@@ -8242,11 +8072,11 @@ void parseInline();
     if (jj_3R_60()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_315()) jj_scanpos = xsp;
+    if (jj_3R_330()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3_64()
+ inline bool jj_3_65()
  {
     if (jj_done) return true;
     if (jj_3R_87()) return true;
@@ -8256,11 +8086,11 @@ void parseInline();
  inline bool jj_3R_205()
  {
     if (jj_done) return true;
-    if (jj_3R_336()) return true;
+    if (jj_3R_351()) return true;
     return false;
   }
 
- inline bool jj_3_65()
+ inline bool jj_3_66()
  {
     if (jj_done) return true;
     if (jj_3R_108()) return true;
@@ -8277,14 +8107,14 @@ void parseInline();
  inline bool jj_3R_203()
  {
     if (jj_done) return true;
-    if (jj_3R_335()) return true;
+    if (jj_3R_350()) return true;
     return false;
   }
 
  inline bool jj_3R_202()
  {
     if (jj_done) return true;
-    if (jj_3R_334()) return true;
+    if (jj_3R_349()) return true;
     return false;
   }
 
@@ -8299,7 +8129,7 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3R_204()) {
     jj_scanpos = xsp;
-    if (jj_3_65()) {
+    if (jj_3_66()) {
     jj_scanpos = xsp;
     if (jj_3R_205()) return true;
     }
@@ -8309,28 +8139,28 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_63()
+ inline bool jj_3_64()
  {
     if (jj_done) return true;
     if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3_62()
+ inline bool jj_3_63()
  {
     if (jj_done) return true;
     if (jj_3R_107()) return true;
     return false;
   }
 
- inline bool jj_3R_435()
+ inline bool jj_3R_458()
  {
     if (jj_done) return true;
     if (jj_3R_109()) return true;
     return false;
   }
 
- inline bool jj_3_61()
+ inline bool jj_3_62()
  {
     if (jj_done) return true;
     if (jj_3R_106()) return true;
@@ -8344,28 +8174,28 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_434()
+ inline bool jj_3R_457()
  {
     if (jj_done) return true;
-    if (jj_3R_502()) return true;
+    if (jj_3R_525()) return true;
     return false;
   }
 
- inline bool jj_3_60()
+ inline bool jj_3_61()
  {
     if (jj_done) return true;
     if (jj_3R_62()) return true;
     return false;
   }
 
- inline bool jj_3R_433()
+ inline bool jj_3R_456()
  {
     if (jj_done) return true;
     if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3_59()
+ inline bool jj_3_60()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -8374,35 +8204,35 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_432()
+ inline bool jj_3R_455()
  {
     if (jj_done) return true;
     if (jj_3R_107()) return true;
     return false;
   }
 
- inline bool jj_3_58()
+ inline bool jj_3_59()
  {
     if (jj_done) return true;
     if (jj_3R_105()) return true;
     return false;
   }
 
- inline bool jj_3R_431()
+ inline bool jj_3R_454()
  {
     if (jj_done) return true;
     if (jj_3R_106()) return true;
     return false;
   }
 
- inline bool jj_3R_430()
+ inline bool jj_3R_453()
  {
     if (jj_done) return true;
     if (jj_3R_62()) return true;
     return false;
   }
 
- inline bool jj_3R_429()
+ inline bool jj_3R_452()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -8411,26 +8241,26 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_355()
+ inline bool jj_3R_370()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_428()) {
+    if (jj_3R_451()) {
     jj_scanpos = xsp;
-    if (jj_3R_429()) {
+    if (jj_3R_452()) {
     jj_scanpos = xsp;
-    if (jj_3R_430()) {
+    if (jj_3R_453()) {
     jj_scanpos = xsp;
-    if (jj_3R_431()) {
+    if (jj_3R_454()) {
     jj_scanpos = xsp;
-    if (jj_3R_432()) {
+    if (jj_3R_455()) {
     jj_scanpos = xsp;
-    if (jj_3R_433()) {
+    if (jj_3R_456()) {
     jj_scanpos = xsp;
-    if (jj_3R_434()) {
+    if (jj_3R_457()) {
     jj_scanpos = xsp;
-    if (jj_3R_435()) return true;
+    if (jj_3R_458()) return true;
     }
     }
     }
@@ -8441,37 +8271,37 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_428()
+ inline bool jj_3R_451()
  {
     if (jj_done) return true;
     if (jj_3R_105()) return true;
     return false;
   }
 
- inline bool jj_3R_314()
+ inline bool jj_3R_329()
  {
     if (jj_done) return true;
     if (jj_scan_token(PORT_T)) return true;
     if (jj_scan_token(MAP_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_163()) return true;
+    if (jj_3R_166()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_624()
+ inline bool jj_3R_582()
  {
     if (jj_done) return true;
-    if (jj_3R_298()) return true;
+    if (jj_3R_313()) return true;
     return false;
   }
 
- inline bool jj_3R_608()
+ inline bool jj_3R_532()
  {
     if (jj_done) return true;
     if (jj_scan_token(PORT_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_624()) return true;
+    if (jj_3R_582()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
@@ -8480,7 +8310,7 @@ void parseInline();
  inline bool jj_3R_241()
  {
     if (jj_done) return true;
-    if (jj_3R_345()) return true;
+    if (jj_3R_360()) return true;
     return false;
   }
 
@@ -8488,7 +8318,7 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(UNITS_T)) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     Token * xsp;
     while (true) {
@@ -8502,7 +8332,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_57()
+ inline bool jj_3_58()
  {
     if (jj_done) return true;
     if (jj_3R_104()) return true;
@@ -8526,98 +8356,98 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_380()
+ inline bool jj_3R_408()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(IN_T)) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3_56()
+ inline bool jj_3_57()
  {
     if (jj_done) return true;
     if (jj_3R_87()) return true;
     return false;
   }
 
- inline bool jj_3_54()
+ inline bool jj_3_55()
  {
     if (jj_done) return true;
     if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3_55()
+ inline bool jj_3_56()
  {
     if (jj_done) return true;
     if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3R_336()
+ inline bool jj_3R_351()
  {
     if (jj_done) return true;
     if (jj_scan_token(PACKAGE_T)) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3_53()
+ inline bool jj_3_54()
  {
     if (jj_done) return true;
     if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3R_302()
+ inline bool jj_3R_317()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_405()) return true;
     return false;
   }
 
  inline bool jj_3R_261()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_166()
+ inline bool jj_3R_167()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(49)) jj_scanpos = xsp;
+    if (jj_scan_token(50)) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_302()) jj_scanpos = xsp;
+    if (jj_3R_317()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_295()
+ inline bool jj_3R_310()
  {
     if (jj_done) return true;
     if (jj_scan_token(STRINGLITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_601()
+ inline bool jj_3R_643()
  {
     if (jj_done) return true;
     if (jj_scan_token(TYPE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_600()
+ inline bool jj_3R_642()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_599()
+ inline bool jj_3R_641()
  {
     if (jj_done) return true;
     if (jj_scan_token(SHARED_T)) return true;
@@ -8625,58 +8455,50 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_52()
+ inline bool jj_3_53()
  {
     if (jj_done) return true;
     if (jj_3R_103()) return true;
     return false;
   }
 
- inline bool jj_3R_598()
+ inline bool jj_3R_640()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_597()
+ inline bool jj_3R_639()
  {
     if (jj_done) return true;
     if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_338()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_59()) return true;
-    return false;
-  }
-
- inline bool jj_3R_596()
+ inline bool jj_3R_638()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_557()
+ inline bool jj_3R_613()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_596()) {
+    if (jj_3R_638()) {
     jj_scanpos = xsp;
-    if (jj_3R_597()) {
+    if (jj_3R_639()) {
     jj_scanpos = xsp;
-    if (jj_3R_598()) {
+    if (jj_3R_640()) {
     jj_scanpos = xsp;
-    if (jj_3R_599()) {
+    if (jj_3R_641()) {
     jj_scanpos = xsp;
-    if (jj_3R_600()) {
+    if (jj_3R_642()) {
     jj_scanpos = xsp;
-    if (jj_3R_601()) return true;
+    if (jj_3R_643()) return true;
     }
     }
     }
@@ -8685,6 +8507,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_353()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_59()) return true;
+    return false;
+  }
+
  inline bool jj_3R_207()
  {
     if (jj_done) return true;
@@ -8711,20 +8541,20 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_420()
+ inline bool jj_3R_442()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_348()
+ inline bool jj_3R_363()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_420()) jj_scanpos = xsp;
+    if (jj_3R_442()) jj_scanpos = xsp;
     if (jj_scan_token(NULL_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
@@ -8746,7 +8576,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_51()
+ inline bool jj_3_52()
  {
     if (jj_done) return true;
     if (jj_scan_token(LBRACKET_T)) return true;
@@ -8756,7 +8586,7 @@ void parseInline();
  inline bool jj_3R_260()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
@@ -8792,7 +8622,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_50()
+ inline bool jj_3_51()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -8819,22 +8649,231 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_46()
+ inline bool jj_3_47()
  {
     if (jj_done) return true;
     if (jj_3R_99()) return true;
     return false;
   }
 
+ inline bool jj_3_50()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    return false;
+  }
+
  inline bool jj_3_49()
  {
     if (jj_done) return true;
+    if (jj_3R_101()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_214()
+ {
+    if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_59()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_353()) { jj_scanpos = xsp; break; }
+    }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
+ inline bool jj_3_48()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_210()
+ {
+    if (jj_done) return true;
+    if (jj_3R_99()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_213()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_150()
+ {
+    if (jj_done) return true;
+    if (jj_3R_311()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_212()
+ {
+    if (jj_done) return true;
+    if (jj_3R_101()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_211()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_99()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_211()) {
+    jj_scanpos = xsp;
+    if (jj_3R_212()) {
+    jj_scanpos = xsp;
+    if (jj_3R_213()) {
+    jj_scanpos = xsp;
+    if (jj_3R_214()) return true;
+    }
+    }
+    }
+    return false;
+  }
+
+ inline bool jj_3_46()
+ {
+    if (jj_done) return true;
+    if (jj_3R_98()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_98()
+ {
+    if (jj_done) return true;
+    if (jj_3R_99()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_210()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+ inline bool jj_3R_149()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_151()
+ {
+    if (jj_done) return true;
+    if (jj_3R_98()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_148()
+ {
+    if (jj_done) return true;
+    if (jj_3R_310()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_60()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_148()) {
+    jj_scanpos = xsp;
+    if (jj_3R_149()) {
+    jj_scanpos = xsp;
+    if (jj_3R_150()) return true;
+    }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_151()) jj_scanpos = xsp;
+    return false;
+  }
+
+ inline bool jj_3R_625()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_281()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(REM_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_280()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(MOD_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_279()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(SLASH_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_135()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_278()) {
+    jj_scanpos = xsp;
+    if (jj_3R_279()) {
+    jj_scanpos = xsp;
+    if (jj_3R_280()) {
+    jj_scanpos = xsp;
+    if (jj_3R_281()) return true;
+    }
+    }
+    }
+    return false;
+  }
+
+ inline bool jj_3R_278()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(MULT_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_432()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(LINKAGE_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_431()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(BUFFER_T)) return true;
+    return false;
+  }
+
   public: TokenManager *token_source;
   public: CharStream *jj_input_stream;
   /** Current token. */
@@ -8842,7 +8881,7 @@ void parseInline();
   /** Next token. */
   public: Token *jj_nt;
   private: int jj_ntk;
-  private: JJCalls jj_2_rtns[113];
+  private: JJCalls jj_2_rtns[115];
   private: bool jj_rescan;
   private: int jj_gc;
   private: Token *jj_scanpos, *jj_lastpos;
@@ -8851,7 +8890,7 @@ void parseInline();
   private: bool jj_lookingAhead;
   private: bool jj_semLA;
   private: int jj_gen;
-  private: int jj_la1[296];
+  private: int jj_la1[295];
   private: ErrorHandler *errorHandler;
   private: bool errorHandlerCreated;
   protected: bool hasError;
@@ -8928,6 +8967,7 @@ static void createFunction(const char *impure,uint64 spec,const char *fname);
 static void addVhdlType(const char *n,int startLine,int section, uint64 spec,const char* args,const char* type,Protection prot);
 static void addCompInst(char *n, char* instName, char* comp,int iLine);
 static void handleCommentBlock(const char* doc,bool brief);
+static void handleFlowComment(const char*);
 static void initEntry(Entry *e);
 static  void newEntry();
 static  bool isFuncProcProced();
diff --git a/vhdlparser/VhdlParserConstants.h b/vhdlparser/VhdlParserConstants.h
index 1428805..0c2c0e5 100644
--- a/vhdlparser/VhdlParserConstants.h
+++ b/vhdlparser/VhdlParserConstants.h
@@ -6,6 +6,7 @@
  */
 #ifndef VHDLPARSERCONSTANTS_H
 #define VHDLPARSERCONSTANTS_H
+#include "JavaCC.h"
 
 namespace vhdl {
 namespace parser {
@@ -16,363 +17,365 @@ const  int DOXYGEN_VHDL_COMMENT = 5;
   /** RegularExpression Id. */
 const  int MULT_DOXYGEN_COMMENT = 6;
   /** RegularExpression Id. */
-const  int VHDL_COMMENT = 7;
+const  int VHDL_FLOWCHART_COMMENT = 7;
   /** RegularExpression Id. */
-const  int MULT_DOXYGEN_VHDL_COMMENT_2008 = 8;
+const  int VHDL_COMMENT = 8;
   /** RegularExpression Id. */
-const  int MULT_VHDL_2008_COMMENT = 9;
+const  int MULT_DOXYGEN_VHDL_COMMENT_2008 = 9;
   /** RegularExpression Id. */
-const  int ABS_T = 10;
+const  int MULT_VHDL_2008_COMMENT = 10;
   /** RegularExpression Id. */
-const  int ACCESS_T = 11;
+const  int ABS_T = 11;
   /** RegularExpression Id. */
-const  int AFTER_T = 12;
+const  int ACCESS_T = 12;
   /** RegularExpression Id. */
-const  int ALIAS_T = 13;
+const  int AFTER_T = 13;
   /** RegularExpression Id. */
-const  int ALL_T = 14;
+const  int ALIAS_T = 14;
   /** RegularExpression Id. */
-const  int AND_T = 15;
+const  int ALL_T = 15;
   /** RegularExpression Id. */
-const  int ARCHITECTURE_T = 16;
+const  int AND_T = 16;
   /** RegularExpression Id. */
-const  int ARRAY_T = 17;
+const  int ARCHITECTURE_T = 17;
   /** RegularExpression Id. */
-const  int ASSERT_T = 18;
+const  int ARRAY_T = 18;
   /** RegularExpression Id. */
-const  int ASSUME_T = 19;
+const  int ASSERT_T = 19;
   /** RegularExpression Id. */
-const  int ASSUME_GUARANTEE_T = 20;
+const  int ASSUME_T = 20;
   /** RegularExpression Id. */
-const  int ATTRIBUTE_T = 21;
+const  int ASSUME_GUARANTEE_T = 21;
   /** RegularExpression Id. */
-const  int BEGIN_T = 22;
+const  int ATTRIBUTE_T = 22;
   /** RegularExpression Id. */
-const  int BLOCK_T = 23;
+const  int BEGIN_T = 23;
   /** RegularExpression Id. */
-const  int BODY_T = 24;
+const  int BLOCK_T = 24;
   /** RegularExpression Id. */
-const  int BUFFER_T = 25;
+const  int BODY_T = 25;
   /** RegularExpression Id. */
-const  int BUS_T = 26;
+const  int BUFFER_T = 26;
   /** RegularExpression Id. */
-const  int COMPONENT_T = 27;
+const  int BUS_T = 27;
   /** RegularExpression Id. */
-const  int CASE_T = 28;
+const  int COMPONENT_T = 28;
   /** RegularExpression Id. */
-const  int CONFIGURATION_T = 29;
+const  int CASE_T = 29;
   /** RegularExpression Id. */
-const  int CONSTANT_T = 30;
+const  int CONFIGURATION_T = 30;
   /** RegularExpression Id. */
-const  int CONTEXT_T = 31;
+const  int CONSTANT_T = 31;
   /** RegularExpression Id. */
-const  int COVER_T = 32;
+const  int CONTEXT_T = 32;
   /** RegularExpression Id. */
-const  int DEFAULT_T = 33;
+const  int COVER_T = 33;
   /** RegularExpression Id. */
-const  int DISCONNECT_T = 34;
+const  int DEFAULT_T = 34;
   /** RegularExpression Id. */
-const  int DOWNTO_T = 35;
+const  int DISCONNECT_T = 35;
   /** RegularExpression Id. */
-const  int ELSE_T = 36;
+const  int DOWNTO_T = 36;
   /** RegularExpression Id. */
-const  int ELSIF_T = 37;
+const  int ELSE_T = 37;
   /** RegularExpression Id. */
-const  int END_T = 38;
+const  int ELSIF_T = 38;
   /** RegularExpression Id. */
-const  int ENTITY_T = 39;
+const  int END_T = 39;
   /** RegularExpression Id. */
-const  int EXIT_T = 40;
+const  int ENTITY_T = 40;
   /** RegularExpression Id. */
-const  int FAIRNESS_T = 41;
+const  int EXIT_T = 41;
   /** RegularExpression Id. */
-const  int FILE_T = 42;
+const  int FAIRNESS_T = 42;
   /** RegularExpression Id. */
-const  int FOR_T = 43;
+const  int FILE_T = 43;
   /** RegularExpression Id. */
-const  int FORCE_T = 44;
+const  int FOR_T = 44;
   /** RegularExpression Id. */
-const  int FUNCTION_T = 45;
+const  int FORCE_T = 45;
   /** RegularExpression Id. */
-const  int GENERATE_T = 46;
+const  int FUNCTION_T = 46;
   /** RegularExpression Id. */
-const  int GENERIC_T = 47;
+const  int GENERATE_T = 47;
   /** RegularExpression Id. */
-const  int GROUP_T = 48;
+const  int GENERIC_T = 48;
   /** RegularExpression Id. */
-const  int GUARDED_T = 49;
+const  int GROUP_T = 49;
   /** RegularExpression Id. */
-const  int IF_T = 50;
+const  int GUARDED_T = 50;
   /** RegularExpression Id. */
-const  int IMPURE_T = 51;
+const  int IF_T = 51;
   /** RegularExpression Id. */
-const  int IN_T = 52;
+const  int IMPURE_T = 52;
   /** RegularExpression Id. */
-const  int INERTIAL_T = 53;
+const  int IN_T = 53;
   /** RegularExpression Id. */
-const  int INOUT_T = 54;
+const  int INERTIAL_T = 54;
   /** RegularExpression Id. */
-const  int IS_T = 55;
+const  int INOUT_T = 55;
   /** RegularExpression Id. */
-const  int LABEL_T = 56;
+const  int IS_T = 56;
   /** RegularExpression Id. */
-const  int LIBRARY_T = 57;
+const  int LABEL_T = 57;
   /** RegularExpression Id. */
-const  int LINKAGE_T = 58;
+const  int LIBRARY_T = 58;
   /** RegularExpression Id. */
-const  int LITERAL_T = 59;
+const  int LINKAGE_T = 59;
   /** RegularExpression Id. */
-const  int LOOP_T = 60;
+const  int LITERAL_T = 60;
   /** RegularExpression Id. */
-const  int MAP_T = 61;
+const  int LOOP_T = 61;
   /** RegularExpression Id. */
-const  int MOD_T = 62;
+const  int MAP_T = 62;
   /** RegularExpression Id. */
-const  int NAND_T = 63;
+const  int MOD_T = 63;
   /** RegularExpression Id. */
-const  int NEW_T = 64;
+const  int NAND_T = 64;
   /** RegularExpression Id. */
-const  int NEXT_T = 65;
+const  int NEW_T = 65;
   /** RegularExpression Id. */
-const  int NOR_T = 66;
+const  int NEXT_T = 66;
   /** RegularExpression Id. */
-const  int NOT_T = 67;
+const  int NOR_T = 67;
   /** RegularExpression Id. */
-const  int NULL_T = 68;
+const  int NOT_T = 68;
   /** RegularExpression Id. */
-const  int OF_T = 69;
+const  int NULL_T = 69;
   /** RegularExpression Id. */
-const  int ON_T = 70;
+const  int OF_T = 70;
   /** RegularExpression Id. */
-const  int OPEN_T = 71;
+const  int ON_T = 71;
   /** RegularExpression Id. */
-const  int OR_T = 72;
+const  int OPEN_T = 72;
   /** RegularExpression Id. */
-const  int OTHER_T = 73;
+const  int OR_T = 73;
   /** RegularExpression Id. */
-const  int OUT_T = 74;
+const  int OTHER_T = 74;
   /** RegularExpression Id. */
-const  int PACKAGE_T = 75;
+const  int OUT_T = 75;
   /** RegularExpression Id. */
-const  int PARAMETER_T = 76;
+const  int PACKAGE_T = 76;
   /** RegularExpression Id. */
-const  int PORT_T = 77;
+const  int PARAMETER_T = 77;
   /** RegularExpression Id. */
-const  int POSTPONED_T = 78;
+const  int PORT_T = 78;
   /** RegularExpression Id. */
-const  int PROCEDURE_T = 79;
+const  int POSTPONED_T = 79;
   /** RegularExpression Id. */
-const  int PROCESS_T = 80;
+const  int PROCEDURE_T = 80;
   /** RegularExpression Id. */
-const  int PROPERTY_T = 81;
+const  int PROCESS_T = 81;
   /** RegularExpression Id. */
-const  int PROTECTED_T = 82;
+const  int PROPERTY_T = 82;
   /** RegularExpression Id. */
-const  int PURE_T = 83;
+const  int PROTECTED_T = 83;
   /** RegularExpression Id. */
-const  int RANGE_T = 84;
+const  int PURE_T = 84;
   /** RegularExpression Id. */
-const  int RECORD_T = 85;
+const  int RANGE_T = 85;
   /** RegularExpression Id. */
-const  int REGISTER_T = 86;
+const  int RECORD_T = 86;
   /** RegularExpression Id. */
-const  int REJECT_T = 87;
+const  int REGISTER_T = 87;
   /** RegularExpression Id. */
-const  int RELEASE_T = 88;
+const  int REJECT_T = 88;
   /** RegularExpression Id. */
-const  int RESTRICT_T = 89;
+const  int RELEASE_T = 89;
   /** RegularExpression Id. */
-const  int RESTRICT_GUARANTEE_T = 90;
+const  int RESTRICT_T = 90;
   /** RegularExpression Id. */
-const  int REM_T = 91;
+const  int RESTRICT_GUARANTEE_T = 91;
   /** RegularExpression Id. */
-const  int REPORT_T = 92;
+const  int REM_T = 92;
   /** RegularExpression Id. */
-const  int ROL_T = 93;
+const  int REPORT_T = 93;
   /** RegularExpression Id. */
-const  int ROR_T = 94;
+const  int ROL_T = 94;
   /** RegularExpression Id. */
-const  int RETURN_T = 95;
+const  int ROR_T = 95;
   /** RegularExpression Id. */
-const  int SELECT_T = 96;
+const  int RETURN_T = 96;
   /** RegularExpression Id. */
-const  int SEQUENCE_T = 97;
+const  int SELECT_T = 97;
   /** RegularExpression Id. */
-const  int SEVERITY_T = 98;
+const  int SEQUENCE_T = 98;
   /** RegularExpression Id. */
-const  int SIGNAL_T = 99;
+const  int SEVERITY_T = 99;
   /** RegularExpression Id. */
-const  int SHARED_T = 100;
+const  int SIGNAL_T = 100;
   /** RegularExpression Id. */
-const  int SLA_T = 101;
+const  int SHARED_T = 101;
   /** RegularExpression Id. */
-const  int SLL_T = 102;
+const  int SLA_T = 102;
   /** RegularExpression Id. */
-const  int SRA_T = 103;
+const  int SLL_T = 103;
   /** RegularExpression Id. */
-const  int SRL_T = 104;
+const  int SRA_T = 104;
   /** RegularExpression Id. */
-const  int STRONG_T = 105;
+const  int SRL_T = 105;
   /** RegularExpression Id. */
-const  int SUBTYPE_T = 106;
+const  int STRONG_T = 106;
   /** RegularExpression Id. */
-const  int THEN_T = 107;
+const  int SUBTYPE_T = 107;
   /** RegularExpression Id. */
-const  int TO_T = 108;
+const  int THEN_T = 108;
   /** RegularExpression Id. */
-const  int TRANSPORT_T = 109;
+const  int TO_T = 109;
   /** RegularExpression Id. */
-const  int TYPE_T = 110;
+const  int TRANSPORT_T = 110;
   /** RegularExpression Id. */
-const  int UNAFFECTED_T = 111;
+const  int TYPE_T = 111;
   /** RegularExpression Id. */
-const  int UNITS_T = 112;
+const  int UNAFFECTED_T = 112;
   /** RegularExpression Id. */
-const  int UNTIL_T = 113;
+const  int UNITS_T = 113;
   /** RegularExpression Id. */
-const  int USE_T = 114;
+const  int UNTIL_T = 114;
   /** RegularExpression Id. */
-const  int VARIABLE_T = 115;
+const  int USE_T = 115;
   /** RegularExpression Id. */
-const  int VMODE_T = 116;
+const  int VARIABLE_T = 116;
   /** RegularExpression Id. */
-const  int VPROP_T = 117;
+const  int VMODE_T = 117;
   /** RegularExpression Id. */
-const  int VUNIT_T = 118;
+const  int VPROP_T = 118;
   /** RegularExpression Id. */
-const  int WAIT_T = 119;
+const  int VUNIT_T = 119;
   /** RegularExpression Id. */
-const  int WHEN_T = 120;
+const  int WAIT_T = 120;
   /** RegularExpression Id. */
-const  int WHILE_T = 121;
+const  int WHEN_T = 121;
   /** RegularExpression Id. */
-const  int WITH_T = 122;
+const  int WHILE_T = 122;
   /** RegularExpression Id. */
-const  int XOR_T = 123;
+const  int WITH_T = 123;
   /** RegularExpression Id. */
-const  int XNOR_T = 124;
+const  int XOR_T = 124;
   /** RegularExpression Id. */
-const  int AMPERSAND_T = 125;
+const  int XNOR_T = 125;
   /** RegularExpression Id. */
-const  int APOSTROPHE_T = 126;
+const  int AMPERSAND_T = 126;
   /** RegularExpression Id. */
-const  int LPAREN_T = 127;
+const  int APOSTROPHE_T = 127;
   /** RegularExpression Id. */
-const  int RPAREN_T = 128;
+const  int LPAREN_T = 128;
   /** RegularExpression Id. */
-const  int DOUBLEMULT_T = 129;
+const  int RPAREN_T = 129;
   /** RegularExpression Id. */
-const  int MULT_T = 130;
+const  int DOUBLEMULT_T = 130;
   /** RegularExpression Id. */
-const  int PLUS_T = 131;
+const  int MULT_T = 131;
   /** RegularExpression Id. */
-const  int MINUS_T = 132;
+const  int PLUS_T = 132;
   /** RegularExpression Id. */
-const  int COMMA_T = 133;
+const  int MINUS_T = 133;
   /** RegularExpression Id. */
-const  int VARASSIGN_T = 134;
+const  int COMMA_T = 134;
   /** RegularExpression Id. */
-const  int COLON_T = 135;
+const  int VARASSIGN_T = 135;
   /** RegularExpression Id. */
-const  int SEMI_T = 136;
+const  int COLON_T = 136;
   /** RegularExpression Id. */
-const  int LESSTHAN_T = 137;
+const  int SEMI_T = 137;
   /** RegularExpression Id. */
-const  int GREATERTHAN_T = 138;
+const  int LESSTHAN_T = 138;
   /** RegularExpression Id. */
-const  int LT_T = 139;
+const  int GREATERTHAN_T = 139;
   /** RegularExpression Id. */
-const  int GT_T = 140;
+const  int LT_T = 140;
   /** RegularExpression Id. */
-const  int EQU_T = 141;
+const  int GT_T = 141;
   /** RegularExpression Id. */
-const  int NOTEQU_T = 142;
+const  int EQU_T = 142;
   /** RegularExpression Id. */
-const  int ARROW_T = 143;
+const  int NOTEQU_T = 143;
   /** RegularExpression Id. */
-const  int BOX_T = 144;
+const  int ARROW_T = 144;
   /** RegularExpression Id. */
-const  int SLSL_T = 145;
+const  int BOX_T = 145;
   /** RegularExpression Id. */
-const  int RSRS_T = 146;
+const  int SLSL_T = 146;
   /** RegularExpression Id. */
-const  int QQ_T = 147;
+const  int RSRS_T = 147;
   /** RegularExpression Id. */
-const  int QGT_T = 148;
+const  int QQ_T = 148;
   /** RegularExpression Id. */
-const  int QLT_T = 149;
+const  int QGT_T = 149;
   /** RegularExpression Id. */
-const  int QG_T = 150;
+const  int QLT_T = 150;
   /** RegularExpression Id. */
-const  int QL_T = 151;
+const  int QG_T = 151;
   /** RegularExpression Id. */
-const  int QEQU_T = 152;
+const  int QL_T = 152;
   /** RegularExpression Id. */
-const  int QNEQU_T = 153;
+const  int QEQU_T = 153;
   /** RegularExpression Id. */
-const  int Q_T = 154;
+const  int QNEQU_T = 154;
   /** RegularExpression Id. */
-const  int BAR_T = 155;
+const  int Q_T = 155;
   /** RegularExpression Id. */
-const  int DOT_T = 156;
+const  int BAR_T = 156;
   /** RegularExpression Id. */
-const  int SLASH_T = 157;
+const  int DOT_T = 157;
   /** RegularExpression Id. */
-const  int AT_T = 158;
+const  int SLASH_T = 158;
   /** RegularExpression Id. */
-const  int NEG_T = 159;
+const  int AT_T = 159;
   /** RegularExpression Id. */
-const  int LBRACKET_T = 160;
+const  int NEG_T = 160;
   /** RegularExpression Id. */
-const  int RBRACKET_T = 161;
+const  int LBRACKET_T = 161;
   /** RegularExpression Id. */
-const  int LBRACE = 162;
+const  int RBRACKET_T = 162;
   /** RegularExpression Id. */
-const  int RBRACE = 163;
+const  int LBRACE = 163;
   /** RegularExpression Id. */
-const  int INTEGER = 164;
+const  int RBRACE = 164;
   /** RegularExpression Id. */
-const  int STRINGLITERAL = 165;
+const  int INTEGER = 165;
   /** RegularExpression Id. */
-const  int BASIC_IDENTIFIER = 166;
+const  int STRINGLITERAL = 166;
   /** RegularExpression Id. */
-const  int EXTENDED_CHARACTER = 167;
+const  int BASIC_IDENTIFIER = 167;
   /** RegularExpression Id. */
-const  int CHARACTER_LITERAL = 168;
+const  int EXTENDED_CHARACTER = 168;
   /** RegularExpression Id. */
-const  int DECIMAL_LITERAL = 169;
+const  int CHARACTER_LITERAL = 169;
   /** RegularExpression Id. */
-const  int BASED_INTEGER = 170;
+const  int DECIMAL_LITERAL = 170;
   /** RegularExpression Id. */
-const  int BASED_LITERAL = 171;
+const  int BASED_INTEGER = 171;
   /** RegularExpression Id. */
-const  int EXPONENT = 172;
+const  int BASED_LITERAL = 172;
   /** RegularExpression Id. */
-const  int BASIC_GRAPHIC_CHARACTER = 173;
+const  int EXPONENT = 173;
   /** RegularExpression Id. */
-const  int GRAPHIC_CHARACTER = 174;
+const  int BASIC_GRAPHIC_CHARACTER = 174;
   /** RegularExpression Id. */
-const  int LETTER_OR_DIGIT = 175;
+const  int GRAPHIC_CHARACTER = 175;
   /** RegularExpression Id. */
-const  int LETTER = 176;
+const  int LETTER_OR_DIGIT = 176;
   /** RegularExpression Id. */
-const  int UPPER_CASE_LETTER = 177;
+const  int LETTER = 177;
   /** RegularExpression Id. */
-const  int BIT_STRING_LITERAL = 178;
+const  int UPPER_CASE_LETTER = 178;
   /** RegularExpression Id. */
-const  int BASE_SPECIFIER = 179;
+const  int BIT_STRING_LITERAL = 179;
   /** RegularExpression Id. */
-const  int DIGIT = 180;
+const  int BASE_SPECIFIER = 180;
   /** RegularExpression Id. */
-const  int SPECIAL_CHARACTER = 181;
+const  int DIGIT = 181;
   /** RegularExpression Id. */
-const  int OTHER_SPECIAL_CHARACTER = 182;
+const  int SPECIAL_CHARACTER = 182;
   /** RegularExpression Id. */
-const  int SPACE_CHARACTER = 183;
+const  int OTHER_SPECIAL_CHARACTER = 183;
   /** RegularExpression Id. */
-const  int LOWER_CASE_LETTER = 184;
+const  int SPACE_CHARACTER = 184;
   /** RegularExpression Id. */
-const  int VHDL2008TOOLDIR = 185;
+const  int LOWER_CASE_LETTER = 185;
+  /** RegularExpression Id. */
+const  int VHDL2008TOOLDIR = 186;
 
   /** Lexical state. */
 const  int DEFAULT = 0;
@@ -393,362 +396,364 @@ const  int DEFAULT = 0;
   static JAVACC_CHAR_TYPE tokenImage_arr_6[] = 
 {0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_7[] = 
-{0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x46, 0x4c, 0x4f, 0x57, 0x43, 0x48, 0x41, 0x52, 0x54, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_8[] = 
-{0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x32, 0x30, 0x30, 0x38, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_9[] = 
-{0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x32, 0x30, 0x30, 0x38, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x32, 0x30, 0x30, 0x38, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_10[] = 
-{0x22, 0x61, 0x62, 0x73, 0x22, 0};
+{0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x32, 0x30, 0x30, 0x38, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_11[] = 
-{0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0};
+{0x22, 0x61, 0x62, 0x73, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_12[] = 
-{0x22, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0};
+{0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_13[] = 
-{0x22, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x22, 0};
+{0x22, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_14[] = 
-{0x22, 0x61, 0x6c, 0x6c, 0x22, 0};
+{0x22, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_15[] = 
-{0x22, 0x61, 0x6e, 0x64, 0x22, 0};
+{0x22, 0x61, 0x6c, 0x6c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_16[] = 
-{0x22, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x22, 0};
+{0x22, 0x61, 0x6e, 0x64, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_17[] = 
-{0x22, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0};
+{0x22, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_18[] = 
-{0x22, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x22, 0};
+{0x22, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_19[] = 
-{0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x22, 0};
+{0x22, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_20[] = 
-{0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
+{0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_21[] = 
-{0x22, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x22, 0};
+{0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_22[] = 
-{0x22, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x22, 0};
+{0x22, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_23[] = 
-{0x22, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0};
+{0x22, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_24[] = 
-{0x22, 0x62, 0x6f, 0x64, 0x79, 0x22, 0};
+{0x22, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_25[] = 
-{0x22, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x22, 0};
+{0x22, 0x62, 0x6f, 0x64, 0x79, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_26[] = 
-{0x22, 0x62, 0x75, 0x73, 0x22, 0};
+{0x22, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_27[] = 
-{0x22, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x22, 0};
+{0x22, 0x62, 0x75, 0x73, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_28[] = 
-{0x22, 0x63, 0x61, 0x73, 0x65, 0x22, 0};
+{0x22, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_29[] = 
-{0x22, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0};
+{0x22, 0x63, 0x61, 0x73, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_30[] = 
-{0x22, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x22, 0};
+{0x22, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_31[] = 
-{0x22, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0};
+{0x22, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_32[] = 
-{0x22, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x22, 0};
+{0x22, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_33[] = 
-{0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0};
+{0x22, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_34[] = 
-{0x22, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x22, 0};
+{0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_35[] = 
-{0x22, 0x64, 0x6f, 0x77, 0x6e, 0x74, 0x6f, 0x22, 0};
+{0x22, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_36[] = 
-{0x22, 0x65, 0x6c, 0x73, 0x65, 0x22, 0};
+{0x22, 0x64, 0x6f, 0x77, 0x6e, 0x74, 0x6f, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_37[] = 
-{0x22, 0x65, 0x6c, 0x73, 0x69, 0x66, 0x22, 0};
+{0x22, 0x65, 0x6c, 0x73, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_38[] = 
-{0x22, 0x65, 0x6e, 0x64, 0x22, 0};
+{0x22, 0x65, 0x6c, 0x73, 0x69, 0x66, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_39[] = 
-{0x22, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0};
+{0x22, 0x65, 0x6e, 0x64, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_40[] = 
-{0x22, 0x65, 0x78, 0x69, 0x74, 0x22, 0};
+{0x22, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_41[] = 
-{0x22, 0x66, 0x61, 0x69, 0x72, 0x6e, 0x65, 0x73, 0x73, 0x22, 0};
+{0x22, 0x65, 0x78, 0x69, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_42[] = 
-{0x22, 0x66, 0x69, 0x6c, 0x65, 0x22, 0};
+{0x22, 0x66, 0x61, 0x69, 0x72, 0x6e, 0x65, 0x73, 0x73, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_43[] = 
-{0x22, 0x66, 0x6f, 0x72, 0x22, 0};
+{0x22, 0x66, 0x69, 0x6c, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_44[] = 
-{0x22, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0};
+{0x22, 0x66, 0x6f, 0x72, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_45[] = 
-{0x22, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0};
+{0x22, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_46[] = 
-{0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x22, 0};
+{0x22, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_47[] = 
-{0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x22, 0};
+{0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_48[] = 
-{0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0};
+{0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_49[] = 
-{0x22, 0x67, 0x75, 0x61, 0x72, 0x64, 0x65, 0x64, 0x22, 0};
+{0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_50[] = 
-{0x22, 0x69, 0x66, 0x22, 0};
+{0x22, 0x67, 0x75, 0x61, 0x72, 0x64, 0x65, 0x64, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_51[] = 
-{0x22, 0x69, 0x6d, 0x70, 0x75, 0x72, 0x65, 0x22, 0};
+{0x22, 0x69, 0x66, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_52[] = 
-{0x22, 0x69, 0x6e, 0x22, 0};
+{0x22, 0x69, 0x6d, 0x70, 0x75, 0x72, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_53[] = 
-{0x22, 0x69, 0x6e, 0x65, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x22, 0};
+{0x22, 0x69, 0x6e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_54[] = 
-{0x22, 0x69, 0x6e, 0x6f, 0x75, 0x74, 0x22, 0};
+{0x22, 0x69, 0x6e, 0x65, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_55[] = 
-{0x22, 0x69, 0x73, 0x22, 0};
+{0x22, 0x69, 0x6e, 0x6f, 0x75, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_56[] = 
-{0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0};
+{0x22, 0x69, 0x73, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_57[] = 
-{0x22, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x22, 0};
+{0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_58[] = 
-{0x22, 0x6c, 0x69, 0x6e, 0x6b, 0x61, 0x67, 0x65, 0x22, 0};
+{0x22, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_59[] = 
-{0x22, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x22, 0};
+{0x22, 0x6c, 0x69, 0x6e, 0x6b, 0x61, 0x67, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_60[] = 
-{0x22, 0x6c, 0x6f, 0x6f, 0x70, 0x22, 0};
+{0x22, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_61[] = 
-{0x22, 0x6d, 0x61, 0x70, 0x22, 0};
+{0x22, 0x6c, 0x6f, 0x6f, 0x70, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_62[] = 
-{0x22, 0x6d, 0x6f, 0x64, 0x22, 0};
+{0x22, 0x6d, 0x61, 0x70, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_63[] = 
-{0x22, 0x6e, 0x61, 0x6e, 0x64, 0x22, 0};
+{0x22, 0x6d, 0x6f, 0x64, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_64[] = 
-{0x22, 0x6e, 0x65, 0x77, 0x22, 0};
+{0x22, 0x6e, 0x61, 0x6e, 0x64, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_65[] = 
-{0x22, 0x6e, 0x65, 0x78, 0x74, 0x22, 0};
+{0x22, 0x6e, 0x65, 0x77, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_66[] = 
-{0x22, 0x6e, 0x6f, 0x72, 0x22, 0};
+{0x22, 0x6e, 0x65, 0x78, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_67[] = 
-{0x22, 0x6e, 0x6f, 0x74, 0x22, 0};
+{0x22, 0x6e, 0x6f, 0x72, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_68[] = 
-{0x22, 0x6e, 0x75, 0x6c, 0x6c, 0x22, 0};
+{0x22, 0x6e, 0x6f, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_69[] = 
-{0x22, 0x6f, 0x66, 0x22, 0};
+{0x22, 0x6e, 0x75, 0x6c, 0x6c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_70[] = 
-{0x22, 0x6f, 0x6e, 0x22, 0};
+{0x22, 0x6f, 0x66, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_71[] = 
-{0x22, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0};
+{0x22, 0x6f, 0x6e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_72[] = 
-{0x22, 0x6f, 0x72, 0x22, 0};
+{0x22, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_73[] = 
-{0x22, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x73, 0x22, 0};
+{0x22, 0x6f, 0x72, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_74[] = 
-{0x22, 0x6f, 0x75, 0x74, 0x22, 0};
+{0x22, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x73, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_75[] = 
-{0x22, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x22, 0};
+{0x22, 0x6f, 0x75, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_76[] = 
-{0x22, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x22, 0};
+{0x22, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_77[] = 
-{0x22, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
+{0x22, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_78[] = 
-{0x22, 0x70, 0x6f, 0x73, 0x74, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x22, 0};
+{0x22, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_79[] = 
-{0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x22, 0};
+{0x22, 0x70, 0x6f, 0x73, 0x74, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_80[] = 
-{0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x22, 0};
+{0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_81[] = 
-{0x22, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x22, 0};
+{0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_82[] = 
-{0x22, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x22, 0};
+{0x22, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_83[] = 
-{0x22, 0x70, 0x75, 0x72, 0x65, 0x22, 0};
+{0x22, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_84[] = 
-{0x22, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x22, 0};
+{0x22, 0x70, 0x75, 0x72, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_85[] = 
-{0x22, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0};
+{0x22, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_86[] = 
-{0x22, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x22, 0};
+{0x22, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_87[] = 
-{0x22, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x22, 0};
+{0x22, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_88[] = 
-{0x22, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x22, 0};
+{0x22, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_89[] = 
-{0x22, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x22, 0};
+{0x22, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_90[] = 
-{0x22, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
+{0x22, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_91[] = 
-{0x22, 0x72, 0x65, 0x6d, 0x22, 0};
+{0x22, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_92[] = 
-{0x22, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
+{0x22, 0x72, 0x65, 0x6d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_93[] = 
-{0x22, 0x72, 0x6f, 0x6c, 0x22, 0};
+{0x22, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_94[] = 
-{0x22, 0x72, 0x6f, 0x72, 0x22, 0};
+{0x22, 0x72, 0x6f, 0x6c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_95[] = 
-{0x22, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x22, 0};
+{0x22, 0x72, 0x6f, 0x72, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_96[] = 
-{0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x22, 0};
+{0x22, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_97[] = 
-{0x22, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x22, 0};
+{0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_98[] = 
-{0x22, 0x73, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x22, 0};
+{0x22, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_99[] = 
-{0x22, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x22, 0};
+{0x22, 0x73, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_100[] = 
-{0x22, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x22, 0};
+{0x22, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_101[] = 
-{0x22, 0x73, 0x6c, 0x61, 0x22, 0};
+{0x22, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_102[] = 
-{0x22, 0x73, 0x6c, 0x6c, 0x22, 0};
+{0x22, 0x73, 0x6c, 0x61, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_103[] = 
-{0x22, 0x73, 0x72, 0x61, 0x22, 0};
+{0x22, 0x73, 0x6c, 0x6c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_104[] = 
-{0x22, 0x73, 0x72, 0x6c, 0x22, 0};
+{0x22, 0x73, 0x72, 0x61, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_105[] = 
-{0x22, 0x73, 0x74, 0x72, 0x6f, 0x6e, 0x67, 0x22, 0};
+{0x22, 0x73, 0x72, 0x6c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_106[] = 
-{0x22, 0x73, 0x75, 0x62, 0x74, 0x79, 0x70, 0x65, 0x22, 0};
+{0x22, 0x73, 0x74, 0x72, 0x6f, 0x6e, 0x67, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_107[] = 
-{0x22, 0x74, 0x68, 0x65, 0x6e, 0x22, 0};
+{0x22, 0x73, 0x75, 0x62, 0x74, 0x79, 0x70, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_108[] = 
-{0x22, 0x74, 0x6f, 0x22, 0};
+{0x22, 0x74, 0x68, 0x65, 0x6e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_109[] = 
-{0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
+{0x22, 0x74, 0x6f, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_110[] = 
-{0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0};
+{0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_111[] = 
-{0x22, 0x75, 0x6e, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x22, 0};
+{0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_112[] = 
-{0x22, 0x75, 0x6e, 0x69, 0x74, 0x73, 0x22, 0};
+{0x22, 0x75, 0x6e, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_113[] = 
-{0x22, 0x75, 0x6e, 0x74, 0x69, 0x6c, 0x22, 0};
+{0x22, 0x75, 0x6e, 0x69, 0x74, 0x73, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_114[] = 
-{0x22, 0x75, 0x73, 0x65, 0x22, 0};
+{0x22, 0x75, 0x6e, 0x74, 0x69, 0x6c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_115[] = 
-{0x22, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x22, 0};
+{0x22, 0x75, 0x73, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_116[] = 
-{0x22, 0x76, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0};
+{0x22, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_117[] = 
-{0x22, 0x76, 0x70, 0x72, 0x6f, 0x70, 0x22, 0};
+{0x22, 0x76, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_118[] = 
-{0x22, 0x76, 0x75, 0x6e, 0x69, 0x74, 0x22, 0};
+{0x22, 0x76, 0x70, 0x72, 0x6f, 0x70, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_119[] = 
-{0x22, 0x77, 0x61, 0x69, 0x74, 0x22, 0};
+{0x22, 0x76, 0x75, 0x6e, 0x69, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_120[] = 
-{0x22, 0x77, 0x68, 0x65, 0x6e, 0x22, 0};
+{0x22, 0x77, 0x61, 0x69, 0x74, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_121[] = 
-{0x22, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x22, 0};
+{0x22, 0x77, 0x68, 0x65, 0x6e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_122[] = 
-{0x22, 0x77, 0x69, 0x74, 0x68, 0x22, 0};
+{0x22, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_123[] = 
-{0x22, 0x78, 0x6f, 0x72, 0x22, 0};
+{0x22, 0x77, 0x69, 0x74, 0x68, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_124[] = 
-{0x22, 0x78, 0x6e, 0x6f, 0x72, 0x22, 0};
+{0x22, 0x78, 0x6f, 0x72, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_125[] = 
-{0x22, 0x26, 0x22, 0};
+{0x22, 0x78, 0x6e, 0x6f, 0x72, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_126[] = 
-{0x22, 0x27, 0x22, 0};
+{0x22, 0x26, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_127[] = 
-{0x22, 0x28, 0x22, 0};
+{0x22, 0x27, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_128[] = 
-{0x22, 0x29, 0x22, 0};
+{0x22, 0x28, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_129[] = 
-{0x22, 0x2a, 0x2a, 0x22, 0};
+{0x22, 0x29, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_130[] = 
-{0x22, 0x2a, 0x22, 0};
+{0x22, 0x2a, 0x2a, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_131[] = 
-{0x22, 0x2b, 0x22, 0};
+{0x22, 0x2a, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_132[] = 
-{0x22, 0x2d, 0x22, 0};
+{0x22, 0x2b, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_133[] = 
-{0x22, 0x2c, 0x22, 0};
+{0x22, 0x2d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_134[] = 
-{0x22, 0x3a, 0x3d, 0x22, 0};
+{0x22, 0x2c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_135[] = 
-{0x22, 0x3a, 0x22, 0};
+{0x22, 0x3a, 0x3d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_136[] = 
-{0x22, 0x3b, 0x22, 0};
+{0x22, 0x3a, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_137[] = 
-{0x22, 0x3c, 0x3d, 0x22, 0};
+{0x22, 0x3b, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_138[] = 
-{0x22, 0x3e, 0x3d, 0x22, 0};
+{0x22, 0x3c, 0x3d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_139[] = 
-{0x22, 0x3c, 0x22, 0};
+{0x22, 0x3e, 0x3d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_140[] = 
-{0x22, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_141[] = 
-{0x22, 0x3d, 0x22, 0};
+{0x22, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_142[] = 
-{0x22, 0x2f, 0x3d, 0x22, 0};
+{0x22, 0x3d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_143[] = 
-{0x22, 0x3d, 0x3e, 0x22, 0};
+{0x22, 0x2f, 0x3d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_144[] = 
-{0x22, 0x3c, 0x3e, 0x22, 0};
+{0x22, 0x3d, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_145[] = 
-{0x22, 0x3c, 0x3c, 0x22, 0};
+{0x22, 0x3c, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_146[] = 
-{0x22, 0x3e, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x3c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_147[] = 
-{0x22, 0x3f, 0x3f, 0x22, 0};
+{0x22, 0x3e, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_148[] = 
-{0x22, 0x3f, 0x3e, 0x3d, 0x22, 0};
+{0x22, 0x3f, 0x3f, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_149[] = 
-{0x22, 0x3f, 0x3c, 0x3d, 0x22, 0};
+{0x22, 0x3f, 0x3e, 0x3d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_150[] = 
-{0x22, 0x3f, 0x3e, 0x22, 0};
+{0x22, 0x3f, 0x3c, 0x3d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_151[] = 
-{0x22, 0x3f, 0x3c, 0x22, 0};
+{0x22, 0x3f, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_152[] = 
-{0x22, 0x3f, 0x3d, 0x22, 0};
+{0x22, 0x3f, 0x3c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_153[] = 
-{0x22, 0x3f, 0x2f, 0x3d, 0x22, 0};
+{0x22, 0x3f, 0x3d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_154[] = 
-{0x22, 0x3f, 0x22, 0};
+{0x22, 0x3f, 0x2f, 0x3d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_155[] = 
-{0x22, 0x7c, 0x22, 0};
+{0x22, 0x3f, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_156[] = 
-{0x22, 0x2e, 0x22, 0};
+{0x22, 0x7c, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_157[] = 
-{0x22, 0x2f, 0x22, 0};
+{0x22, 0x2e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_158[] = 
-{0x22, 0x40, 0x22, 0};
+{0x22, 0x2f, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_159[] = 
-{0x22, 0x5e, 0x22, 0};
+{0x22, 0x40, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_160[] = 
-{0x22, 0x5b, 0x22, 0};
+{0x22, 0x5e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_161[] = 
-{0x22, 0x5d, 0x22, 0};
+{0x22, 0x5b, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_162[] = 
-{0x22, 0x7b, 0x22, 0};
+{0x22, 0x5d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_163[] = 
-{0x22, 0x7d, 0x22, 0};
+{0x22, 0x7b, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_164[] = 
-{0x22, 0x3c, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x7d, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_165[] = 
-{0x22, 0x3c, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_166[] = 
-{0x22, 0x3c, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_167[] = 
-{0x22, 0x3c, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x44, 0x45, 0x44, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_168[] = 
-{0x22, 0x3c, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x44, 0x45, 0x44, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_169[] = 
-{0x22, 0x3c, 0x44, 0x45, 0x43, 0x49, 0x4d, 0x41, 0x4c, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_170[] = 
-{0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x44, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x44, 0x45, 0x43, 0x49, 0x4d, 0x41, 0x4c, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_171[] = 
-{0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x44, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x44, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_172[] = 
-{0x22, 0x3c, 0x45, 0x58, 0x50, 0x4f, 0x4e, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x44, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_173[] = 
-{0x22, 0x3c, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x47, 0x52, 0x41, 0x50, 0x48, 0x49, 0x43, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x45, 0x58, 0x50, 0x4f, 0x4e, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_174[] = 
-{0x22, 0x3c, 0x47, 0x52, 0x41, 0x50, 0x48, 0x49, 0x43, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x47, 0x52, 0x41, 0x50, 0x48, 0x49, 0x43, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_175[] = 
-{0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x5f, 0x4f, 0x52, 0x5f, 0x44, 0x49, 0x47, 0x49, 0x54, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x47, 0x52, 0x41, 0x50, 0x48, 0x49, 0x43, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_176[] = 
-{0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x5f, 0x4f, 0x52, 0x5f, 0x44, 0x49, 0x47, 0x49, 0x54, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_177[] = 
-{0x22, 0x3c, 0x55, 0x50, 0x50, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_178[] = 
-{0x22, 0x3c, 0x42, 0x49, 0x54, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x55, 0x50, 0x50, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_179[] = 
-{0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x42, 0x49, 0x54, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_180[] = 
-{0x22, 0x3c, 0x44, 0x49, 0x47, 0x49, 0x54, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_181[] = 
-{0x22, 0x3c, 0x53, 0x50, 0x45, 0x43, 0x49, 0x41, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x44, 0x49, 0x47, 0x49, 0x54, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_182[] = 
-{0x22, 0x3c, 0x4f, 0x54, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x41, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x53, 0x50, 0x45, 0x43, 0x49, 0x41, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_183[] = 
-{0x22, 0x3c, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x4f, 0x54, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x41, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_184[] = 
-{0x22, 0x3c, 0x4c, 0x4f, 0x57, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
+{0x22, 0x3c, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
   static JAVACC_CHAR_TYPE tokenImage_arr_185[] = 
+{0x22, 0x3c, 0x4c, 0x4f, 0x57, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
+  static JAVACC_CHAR_TYPE tokenImage_arr_186[] = 
 {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x32, 0x30, 0x30, 0x38, 0x54, 0x4f, 0x4f, 0x4c, 0x44, 0x49, 0x52, 0x3e, 0x22, 0};
   static JAVACC_STRING_TYPE tokenImage[] = {
 tokenImage_arr_0, 
@@ -937,6 +942,7 @@ tokenImage_arr_182,
 tokenImage_arr_183, 
 tokenImage_arr_184, 
 tokenImage_arr_185, 
+tokenImage_arr_186, 
   };
 
 }
diff --git a/vhdlparser/VhdlParserErrorHandler.hpp b/vhdlparser/VhdlParserErrorHandler.hpp
index ba9a260..d98f029 100644
--- a/vhdlparser/VhdlParserErrorHandler.hpp
+++ b/vhdlparser/VhdlParserErrorHandler.hpp
@@ -6,6 +6,7 @@
 #include <exception>
 #include "VhdlParser.h"
 #include "ErrorHandler.h"
+#include "vhdlstring.h"
 
 namespace vhdl { namespace parser {
 
diff --git a/vhdlparser/VhdlParserIF.cpp b/vhdlparser/VhdlParserIF.cpp
index 1369b73..e8768ee 100644
--- a/vhdlparser/VhdlParserIF.cpp
+++ b/vhdlparser/VhdlParserIF.cpp
@@ -7,7 +7,7 @@
 
 using namespace vhdl::parser;
 
-static VhdlParser * myParser;
+static VhdlParser * myParser=0;
 
 void  VhdlParserIF::parseVhdlfile(const char* inputBuffer,bool inLine) 
 {
@@ -28,13 +28,11 @@ void  VhdlParserIF::parseVhdlfile(const char* inputBuffer,bool inLine)
       myParser->design_file();
     }
   }
-  catch( std::exception &)
-  {
-    /* fprintf(stderr,"\n[%s]",e.what()); */
-  }
+  catch( std::exception &){ /* fprintf(stderr,"\n[%s]",e.what()); */ }
   //  fprintf(stderr,"\n\nparsed lines: %d\n",yyLineNr);
   //  fprintf(stderr,"\n\nerrors : %d\n\n",myErr->getErrorCount());
   delete myParser;
+ 
 }
 
 void VhdlParser::error_skipto(int kind)
@@ -42,8 +40,9 @@ void VhdlParser::error_skipto(int kind)
   Token *op;
   do
   {
-    op=myParser->getToken(1);
-    if (op==0) break;
+     Token *t = myParser->getNextToken();// step to next token
+	 op=myParser->getToken(1);           // get first token
+     if (op==0) break;
     //fprintf(stderr,"\n %s",t->image.data());
   } while (op->kind != kind);
   myParser->hasError=false;
diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc
index 58f525c..a35deb2 100644
--- a/vhdlparser/VhdlParserTokenManager.cc
+++ b/vhdlparser/VhdlParserTokenManager.cc
@@ -3,24 +3,26 @@
 namespace vhdl {
 namespace parser {
 static const unsigned long long jjbitVec0[] = {
-   0x0ULL, 0x0ULL, 0xffffffff00000000ULL, 0xffffffffffffffffULL
-};
-static const unsigned long long jjbitVec1[] = {
    0xfffffffffffffffeULL, 0xffffffffffffffffULL, 0xffffffffffffffffULL, 0xffffffffffffffffULL
 };
-static const unsigned long long jjbitVec3[] = {
+static const unsigned long long jjbitVec2[] = {
    0x0ULL, 0x0ULL, 0xffffffffffffffffULL, 0xffffffffffffffffULL
 };
+static const unsigned long long jjbitVec3[] = {
+   0x0ULL, 0x0ULL, 0xffffffff00000000ULL, 0xffffffffffffffffULL
+};
 static const int jjnextStates[] = {
-   43, 44, 45, 46, 47, 50, 54, 55, 56, 37, 38, 4, 5, 7, 8, 22, 
-   23, 24, 26, 28, 29, 31, 45, 46, 47, 50, 49, 48, 50, 54, 55, 56, 
-   57, 58, 60, 1, 2, 15, 16, 34, 36, 39, 41, 
+   53, 54, 55, 56, 57, 60, 64, 65, 66, 47, 48, 2, 36, 37, 0, 3, 
+   4, 5, 7, 12, 13, 15, 16, 32, 33, 35, 38, 39, 41, 55, 56, 57, 
+   60, 59, 58, 60, 64, 65, 66, 67, 68, 70, 9, 10, 23, 24, 27, 28, 
+   44, 46, 49, 51, 26, 29, 
 };
 static JAVACC_CHAR_TYPE jjstrLiteralChars_0[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_1[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_2[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_3[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_4[] = {0};
+
 static JAVACC_CHAR_TYPE jjstrLiteralChars_5[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_6[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_7[] = {0};
@@ -29,13 +31,13 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_9[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_10[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_11[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_12[] = {0};
-
 static JAVACC_CHAR_TYPE jjstrLiteralChars_13[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_14[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_15[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_16[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_17[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_18[] = {0};
+
 static JAVACC_CHAR_TYPE jjstrLiteralChars_19[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_20[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_21[] = {0};
@@ -44,13 +46,13 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_23[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_24[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_25[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_26[] = {0};
-
 static JAVACC_CHAR_TYPE jjstrLiteralChars_27[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_28[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_29[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_30[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_31[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_32[] = {0};
+
 static JAVACC_CHAR_TYPE jjstrLiteralChars_33[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_34[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_35[] = {0};
@@ -59,13 +61,13 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_37[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_38[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_39[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_40[] = {0};
-
 static JAVACC_CHAR_TYPE jjstrLiteralChars_41[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_42[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_43[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_44[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_45[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_46[] = {0};
+
 static JAVACC_CHAR_TYPE jjstrLiteralChars_47[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_48[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_49[] = {0};
@@ -74,13 +76,13 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_51[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_52[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_53[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_54[] = {0};
-
 static JAVACC_CHAR_TYPE jjstrLiteralChars_55[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_56[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_57[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_58[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_59[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_60[] = {0};
+
 static JAVACC_CHAR_TYPE jjstrLiteralChars_61[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_62[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_63[] = {0};
@@ -89,13 +91,13 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_65[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_66[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_67[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_68[] = {0};
-
 static JAVACC_CHAR_TYPE jjstrLiteralChars_69[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_70[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_71[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_72[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_73[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_74[] = {0};
+
 static JAVACC_CHAR_TYPE jjstrLiteralChars_75[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_76[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_77[] = {0};
@@ -104,13 +106,13 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_79[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_80[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_81[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_82[] = {0};
-
 static JAVACC_CHAR_TYPE jjstrLiteralChars_83[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_84[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_85[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_86[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_87[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_88[] = {0};
+
 static JAVACC_CHAR_TYPE jjstrLiteralChars_89[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_90[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_91[] = {0};
@@ -119,13 +121,13 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_93[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_94[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_95[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_96[] = {0};
-
 static JAVACC_CHAR_TYPE jjstrLiteralChars_97[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_98[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_99[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_100[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_101[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_102[] = {0};
+
 static JAVACC_CHAR_TYPE jjstrLiteralChars_103[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_104[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_105[] = {0};
@@ -134,13 +136,13 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_107[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_108[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_109[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_110[] = {0};
-
 static JAVACC_CHAR_TYPE jjstrLiteralChars_111[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_112[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_113[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_114[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_115[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_116[] = {0};
+
 static JAVACC_CHAR_TYPE jjstrLiteralChars_117[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_118[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_119[] = {0};
@@ -149,52 +151,68 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_121[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_122[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_123[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_124[] = {0};
-
 static JAVACC_CHAR_TYPE jjstrLiteralChars_125[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_126[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_127[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_128[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_129[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_130[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_131[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_132[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_133[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_134[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_135[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_136[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_137[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_138[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_139[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_140[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_141[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_142[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_143[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_144[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_145[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_146[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_147[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_148[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_149[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_150[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_151[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_152[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_153[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_154[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_155[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_156[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_157[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_158[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_159[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_160[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_161[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_162[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_163[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_164[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_126[] = {0x26, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_127[] = {0x27, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_128[] = {0x28, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_129[] = {0x29, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_130[] = {0x2a, 0x2a, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_131[] = {0x2a, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_132[] = {0x2b, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_133[] = {0x2d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_134[] = {0x2c, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_135[] = {0x3a, 0x3d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_136[] = {0x3a, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_137[] = {0x3b, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_138[] = {0x3c, 0x3d, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_139[] = {0x3e, 0x3d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_140[] = {0x3c, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_141[] = {0x3e, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_142[] = {0x3d, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_143[] = {0x2f, 0x3d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_144[] = {0x3d, 0x3e, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_145[] = {0x3c, 0x3e, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_146[] = {0x3c, 0x3c, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_147[] = {0x3e, 0x3e, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_148[] = {0x3f, 0x3f, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_149[] = {0x3f, 0x3e, 0x3d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_150[] = {0x3f, 0x3c, 0x3d, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_151[] = {0x3f, 0x3e, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_152[] = {0x3f, 0x3c, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_153[] = {0x3f, 0x3d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_154[] = {0x3f, 0x2f, 0x3d, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_155[] = {0x3f, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_156[] = {0x7c, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_157[] = {0x2e, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_158[] = {0x2f, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_159[] = {0x40, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_160[] = {0x5e, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_161[] = {0x5b, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_162[] = {0x5d, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_163[] = {0x7b, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_164[] = {0x7d, 0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_165[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_166[] = {0};
-
 static JAVACC_CHAR_TYPE jjstrLiteralChars_167[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_168[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_169[] = {0};
@@ -206,15 +224,16 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_174[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_175[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_176[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_177[] = {0};
+
 static JAVACC_CHAR_TYPE jjstrLiteralChars_178[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_179[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_180[] = {0};
-
 static JAVACC_CHAR_TYPE jjstrLiteralChars_181[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_182[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_183[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_184[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_185[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_186[] = {0};
 static const JAVACC_STRING_TYPE jjstrLiteralImages[] = {
 jjstrLiteralChars_0, 
 jjstrLiteralChars_1, 
@@ -402,6 +421,7 @@ jjstrLiteralChars_182,
 jjstrLiteralChars_183, 
 jjstrLiteralChars_184, 
 jjstrLiteralChars_185, 
+jjstrLiteralChars_186, 
 };
 
 /** Lexer state names. */
@@ -411,10 +431,10 @@ static const JAVACC_STRING_TYPE lexStateNames[] = {
 lexStateNames_arr_0, 
 };
 static const unsigned long long jjtoToken[] = {
-   0xfffffffffffffc01ULL, 0xffffffffffffffffULL, 0x2040fffffffffffULL, 
+   0xfffffffffffff801ULL, 0xffffffffffffffffULL, 0x4081fffffffffffULL, 
 };
 static const unsigned long long jjtoSkip[] = {
-   0x1eULL, 0x0ULL, 0x0ULL, 
+   0x7deULL, 0x0ULL, 0x0ULL, 
 };
 
 void  VhdlParserTokenManager::setDebugStream(FILE *ds){ debugStream = ds; }
@@ -430,2225 +450,2225 @@ void  VhdlParserTokenManager::setDebugStream(FILE *ds){ debugStream = ds; }
    {
       case 9:
          jjmatchedKind = 2;
-         return jjMoveNfa_0(3, 0);
+         return jjMoveNfa_0(11, 0);
       case 10:
          jjmatchedKind = 3;
-         return jjMoveNfa_0(3, 0);
+         return jjMoveNfa_0(11, 0);
       case 13:
          jjmatchedKind = 4;
-         return jjMoveNfa_0(3, 0);
+         return jjMoveNfa_0(11, 0);
       case 32:
          jjmatchedKind = 1;
-         return jjMoveNfa_0(3, 0);
+         return jjMoveNfa_0(11, 0);
       case 38:
-         jjmatchedKind = 125;
-         return jjMoveNfa_0(3, 0);
-      case 39:
          jjmatchedKind = 126;
-         return jjMoveNfa_0(3, 0);
-      case 40:
+         return jjMoveNfa_0(11, 0);
+      case 39:
          jjmatchedKind = 127;
-         return jjMoveNfa_0(3, 0);
-      case 41:
+         return jjMoveNfa_0(11, 0);
+      case 40:
          jjmatchedKind = 128;
-         return jjMoveNfa_0(3, 0);
+         return jjMoveNfa_0(11, 0);
+      case 41:
+         jjmatchedKind = 129;
+         return jjMoveNfa_0(11, 0);
       case 42:
-         jjmatchedKind = 130;
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x2ULL);
-      case 43:
          jjmatchedKind = 131;
-         return jjMoveNfa_0(3, 0);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x4ULL);
+      case 43:
+         jjmatchedKind = 132;
+         return jjMoveNfa_0(11, 0);
       case 44:
-         jjmatchedKind = 133;
-         return jjMoveNfa_0(3, 0);
+         jjmatchedKind = 134;
+         return jjMoveNfa_0(11, 0);
       case 45:
-         jjmatchedKind = 132;
-         return jjMoveNfa_0(3, 0);
+         jjmatchedKind = 133;
+         return jjMoveNfa_0(11, 0);
       case 46:
-         jjmatchedKind = 156;
-         return jjMoveNfa_0(3, 0);
-      case 47:
          jjmatchedKind = 157;
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x4000ULL);
+         return jjMoveNfa_0(11, 0);
+      case 47:
+         jjmatchedKind = 158;
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x8000ULL);
       case 58:
-         jjmatchedKind = 135;
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x40ULL);
-      case 59:
          jjmatchedKind = 136;
-         return jjMoveNfa_0(3, 0);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x80ULL);
+      case 59:
+         jjmatchedKind = 137;
+         return jjMoveNfa_0(11, 0);
       case 60:
-         jjmatchedKind = 139;
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x30200ULL);
+         jjmatchedKind = 140;
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x60400ULL);
       case 61:
-         jjmatchedKind = 141;
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x8000ULL);
+         jjmatchedKind = 142;
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x10000ULL);
       case 62:
-         jjmatchedKind = 140;
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x40400ULL);
+         jjmatchedKind = 141;
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x80800ULL);
       case 63:
-         jjmatchedKind = 154;
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x3f80000ULL);
+         jjmatchedKind = 155;
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x0ULL, 0x7f00000ULL);
       case 64:
-         jjmatchedKind = 158;
-         return jjMoveNfa_0(3, 0);
+         jjmatchedKind = 159;
+         return jjMoveNfa_0(11, 0);
       case 65:
-         return jjMoveStringLiteralDfa1_0(0x3ffc00ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x7ff800ULL, 0x0ULL, 0x0ULL);
       case 66:
-         return jjMoveStringLiteralDfa1_0(0x7c00000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0xf800000ULL, 0x0ULL, 0x0ULL);
       case 67:
-         return jjMoveStringLiteralDfa1_0(0x1f8000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x3f0000000ULL, 0x0ULL, 0x0ULL);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0xe00000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x1c00000000ULL, 0x0ULL, 0x0ULL);
       case 69:
-         return jjMoveStringLiteralDfa1_0(0x1f000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x3e000000000ULL, 0x0ULL, 0x0ULL);
       case 70:
-         return jjMoveStringLiteralDfa1_0(0x3e0000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x7c0000000000ULL, 0x0ULL, 0x0ULL);
       case 71:
-         return jjMoveStringLiteralDfa1_0(0x3c00000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x7800000000000ULL, 0x0ULL, 0x0ULL);
       case 73:
-         return jjMoveStringLiteralDfa1_0(0xfc000000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x1f8000000000000ULL, 0x0ULL, 0x0ULL);
       case 76:
-         return jjMoveStringLiteralDfa1_0(0x1f00000000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x3e00000000000000ULL, 0x0ULL, 0x0ULL);
       case 77:
-         return jjMoveStringLiteralDfa1_0(0x6000000000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0xc000000000000000ULL, 0x0ULL, 0x0ULL);
       case 78:
-         return jjMoveStringLiteralDfa1_0(0x8000000000000000ULL, 0x1fULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x3fULL, 0x0ULL);
       case 79:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x7e0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xfc0ULL, 0x0ULL);
       case 80:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xff800ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x1ff000ULL, 0x0ULL);
       case 82:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xfff00000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x1ffe00000ULL, 0x0ULL);
       case 83:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x7ff00000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xffe00000000ULL, 0x0ULL);
       case 84:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x780000000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xf00000000000ULL, 0x0ULL);
       case 85:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x7800000000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xf000000000000ULL, 0x0ULL);
       case 86:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x78000000000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xf0000000000000ULL, 0x0ULL);
       case 87:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x780000000000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xf00000000000000ULL, 0x0ULL);
       case 88:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x1800000000000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x3000000000000000ULL, 0x0ULL);
       case 91:
-         jjmatchedKind = 160;
-         return jjMoveNfa_0(3, 0);
-      case 93:
          jjmatchedKind = 161;
-         return jjMoveNfa_0(3, 0);
+         return jjMoveNfa_0(11, 0);
+      case 93:
+         jjmatchedKind = 162;
+         return jjMoveNfa_0(11, 0);
       case 94:
-         jjmatchedKind = 159;
-         return jjMoveNfa_0(3, 0);
+         jjmatchedKind = 160;
+         return jjMoveNfa_0(11, 0);
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x3ffc00ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x7ff800ULL, 0x0ULL, 0x0ULL);
       case 98:
-         return jjMoveStringLiteralDfa1_0(0x7c00000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0xf800000ULL, 0x0ULL, 0x0ULL);
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x1f8000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x3f0000000ULL, 0x0ULL, 0x0ULL);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0xe00000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x1c00000000ULL, 0x0ULL, 0x0ULL);
       case 101:
-         return jjMoveStringLiteralDfa1_0(0x1f000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x3e000000000ULL, 0x0ULL, 0x0ULL);
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x3e0000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x7c0000000000ULL, 0x0ULL, 0x0ULL);
       case 103:
-         return jjMoveStringLiteralDfa1_0(0x3c00000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x7800000000000ULL, 0x0ULL, 0x0ULL);
       case 105:
-         return jjMoveStringLiteralDfa1_0(0xfc000000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x1f8000000000000ULL, 0x0ULL, 0x0ULL);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x1f00000000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x3e00000000000000ULL, 0x0ULL, 0x0ULL);
       case 109:
-         return jjMoveStringLiteralDfa1_0(0x6000000000000000ULL, 0x0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0xc000000000000000ULL, 0x0ULL, 0x0ULL);
       case 110:
-         return jjMoveStringLiteralDfa1_0(0x8000000000000000ULL, 0x1fULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x3fULL, 0x0ULL);
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x7e0ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xfc0ULL, 0x0ULL);
       case 112:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xff800ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x1ff000ULL, 0x0ULL);
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xfff00000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x1ffe00000ULL, 0x0ULL);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x7ff00000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xffe00000000ULL, 0x0ULL);
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x780000000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xf00000000000ULL, 0x0ULL);
       case 117:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x7800000000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xf000000000000ULL, 0x0ULL);
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x78000000000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xf0000000000000ULL, 0x0ULL);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x780000000000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0xf00000000000000ULL, 0x0ULL);
       case 120:
-         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x1800000000000000ULL, 0x0ULL);
+         return jjMoveStringLiteralDfa1_0(0x0ULL, 0x3000000000000000ULL, 0x0ULL);
       case 123:
-         jjmatchedKind = 162;
-         return jjMoveNfa_0(3, 0);
+         jjmatchedKind = 163;
+         return jjMoveNfa_0(11, 0);
       case 124:
-         jjmatchedKind = 155;
-         return jjMoveNfa_0(3, 0);
+         jjmatchedKind = 156;
+         return jjMoveNfa_0(11, 0);
       case 125:
-         jjmatchedKind = 163;
-         return jjMoveNfa_0(3, 0);
+         jjmatchedKind = 164;
+         return jjMoveNfa_0(11, 0);
       default :
-         return jjMoveNfa_0(3, 0);
+         return jjMoveNfa_0(11, 0);
    }
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa1_0(unsigned long long active0, unsigned long long active1, unsigned long long active2){
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 0);
+   return jjMoveNfa_0(11, 0);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 42:
-         if ((active2 & 0x2ULL) != 0L)
+         if ((active2 & 0x4ULL) != 0L)
          {
-            jjmatchedKind = 129;
+            jjmatchedKind = 130;
             jjmatchedPos = 1;
          }
          break;
       case 47:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x2000000ULL);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x4000000ULL);
       case 60:
-         if ((active2 & 0x20000ULL) != 0L)
+         if ((active2 & 0x40000ULL) != 0L)
          {
-            jjmatchedKind = 145;
+            jjmatchedKind = 146;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x800000ULL) != 0L)
+         else if ((active2 & 0x1000000ULL) != 0L)
          {
-            jjmatchedKind = 151;
+            jjmatchedKind = 152;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x200000ULL);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x400000ULL);
       case 61:
-         if ((active2 & 0x40ULL) != 0L)
+         if ((active2 & 0x80ULL) != 0L)
          {
-            jjmatchedKind = 134;
+            jjmatchedKind = 135;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x200ULL) != 0L)
+         else if ((active2 & 0x400ULL) != 0L)
          {
-            jjmatchedKind = 137;
+            jjmatchedKind = 138;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x400ULL) != 0L)
+         else if ((active2 & 0x800ULL) != 0L)
          {
-            jjmatchedKind = 138;
+            jjmatchedKind = 139;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x4000ULL) != 0L)
+         else if ((active2 & 0x8000ULL) != 0L)
          {
-            jjmatchedKind = 142;
+            jjmatchedKind = 143;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x1000000ULL) != 0L)
+         else if ((active2 & 0x2000000ULL) != 0L)
          {
-            jjmatchedKind = 152;
+            jjmatchedKind = 153;
             jjmatchedPos = 1;
          }
          break;
       case 62:
-         if ((active2 & 0x8000ULL) != 0L)
+         if ((active2 & 0x10000ULL) != 0L)
          {
-            jjmatchedKind = 143;
+            jjmatchedKind = 144;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x10000ULL) != 0L)
+         else if ((active2 & 0x20000ULL) != 0L)
          {
-            jjmatchedKind = 144;
+            jjmatchedKind = 145;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x40000ULL) != 0L)
+         else if ((active2 & 0x80000ULL) != 0L)
          {
-            jjmatchedKind = 146;
+            jjmatchedKind = 147;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x400000ULL) != 0L)
+         else if ((active2 & 0x800000ULL) != 0L)
          {
-            jjmatchedKind = 150;
+            jjmatchedKind = 151;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x100000ULL);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x200000ULL);
       case 63:
-         if ((active2 & 0x80000ULL) != 0L)
+         if ((active2 & 0x100000ULL) != 0L)
          {
-            jjmatchedKind = 147;
+            jjmatchedKind = 148;
             jjmatchedPos = 1;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0xa100020010000000ULL, active1, 0x88000000101800ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4200040020000000ULL, active1, 0x110000000203001ULL, active2, 0L);
       case 66:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400ULL, active1, 0L, active2, 0L);
-      case 67:
          return jjMoveStringLiteralDfa2_0(active0, 0x800ULL, active1, 0L, active2, 0L);
+      case 67:
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000ULL, active1, 0L, active2, 0L);
       case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0xc00200400000ULL, active1, 0x79fe00003ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1800400800000ULL, active1, 0xf3fc00006ULL, active2, 0L);
       case 70:
-         if ((active0 & 0x4000000000000ULL) != 0L)
+         if ((active0 & 0x8000000000000ULL) != 0L)
          {
-            jjmatchedKind = 50;
+            jjmatchedKind = 51;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x20ULL) != 0L)
+         else if ((active1 & 0x40ULL) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000ULL, active1, 0L, active2, 0L);
       case 72:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x300081000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x600102000000000ULL, active2, 0L);
       case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0xe00040400000000ULL, active1, 0x400000800000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1c00080800000000ULL, active1, 0x800001000000000ULL, active2, 0L);
       case 76:
-         return jjMoveStringLiteralDfa2_0(active0, 0x3000806000ULL, active1, 0x6000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x600100c000ULL, active1, 0xc000000000ULL, active2, 0L);
       case 77:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000ULL, active1, 0x10000000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000ULL, active1, 0x20000000000000ULL, active2, 0L);
       case 78:
-         if ((active0 & 0x10000000000000ULL) != 0L)
+         if ((active0 & 0x20000000000000ULL) != 0L)
          {
-            jjmatchedKind = 52;
+            jjmatchedKind = 53;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x40ULL) != 0L)
+         else if ((active1 & 0x80ULL) != 0L)
          {
-            jjmatchedKind = 70;
+            jjmatchedKind = 71;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x6000c000008000ULL, active1, 0x1003800000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xc0018000010000ULL, active1, 0x2007000000000000ULL, active2, 0L);
       case 79:
-         if ((active1 & 0x100000000000ULL) != 0L)
+         if ((active1 & 0x200000000000ULL) != 0L)
          {
-            jjmatchedKind = 108;
+            jjmatchedKind = 109;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x50001809e9000000ULL, active1, 0x80000006000600cULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xa0003013d2000000ULL, active1, 0x10000000c000c018ULL, active2, 0L);
       case 80:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20000000000080ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000000000100ULL, active2, 0L);
       case 82:
-         if ((active1 & 0x100ULL) != 0L)
+         if ((active1 & 0x200ULL) != 0L)
          {
-            jjmatchedKind = 72;
+            jjmatchedKind = 73;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000000030000ULL, active1, 0x218000078000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000060000ULL, active1, 0x4300000f0000ULL, active2, 0L);
       case 83:
-         if ((active0 & 0x80000000000000ULL) != 0L)
+         if ((active0 & 0x100000000000000ULL) != 0L)
          {
-            jjmatchedKind = 55;
+            jjmatchedKind = 56;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x1c0000ULL, active1, 0x4000000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x380000ULL, active1, 0x8000000000000ULL, active2, 0L);
       case 84:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000ULL, active1, 0x20000000200ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400000ULL, active1, 0x40000000400ULL, active2, 0L);
       case 85:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2200006000000ULL, active1, 0x40040000080410ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x440000c000000ULL, active1, 0x80080000100820ULL, active2, 0L);
       case 88:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x20000000000ULL, active1, 0L, active2, 0L);
       case 89:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800000000000ULL, active2, 0L);
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0xa100020010000000ULL, active1, 0x88000000101800ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4200040020000000ULL, active1, 0x110000000203001ULL, active2, 0L);
       case 98:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400ULL, active1, 0L, active2, 0L);
-      case 99:
          return jjMoveStringLiteralDfa2_0(active0, 0x800ULL, active1, 0L, active2, 0L);
+      case 99:
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000ULL, active1, 0L, active2, 0L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0xc00200400000ULL, active1, 0x79fe00003ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1800400800000ULL, active1, 0xf3fc00006ULL, active2, 0L);
       case 102:
-         if ((active0 & 0x4000000000000ULL) != 0L)
+         if ((active0 & 0x8000000000000ULL) != 0L)
          {
-            jjmatchedKind = 50;
+            jjmatchedKind = 51;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x20ULL) != 0L)
+         else if ((active1 & 0x40ULL) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000ULL, active1, 0L, active2, 0L);
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x300081000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x600102000000000ULL, active2, 0L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0xe00040400000000ULL, active1, 0x400000800000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1c00080800000000ULL, active1, 0x800001000000000ULL, active2, 0L);
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0x3000806000ULL, active1, 0x6000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x600100c000ULL, active1, 0xc000000000ULL, active2, 0L);
       case 109:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000ULL, active1, 0x10000000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000ULL, active1, 0x20000000000000ULL, active2, 0L);
       case 110:
-         if ((active0 & 0x10000000000000ULL) != 0L)
+         if ((active0 & 0x20000000000000ULL) != 0L)
          {
-            jjmatchedKind = 52;
+            jjmatchedKind = 53;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x40ULL) != 0L)
+         else if ((active1 & 0x80ULL) != 0L)
          {
-            jjmatchedKind = 70;
+            jjmatchedKind = 71;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x6000c000008000ULL, active1, 0x1003800000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xc0018000010000ULL, active1, 0x2007000000000000ULL, active2, 0L);
       case 111:
-         if ((active1 & 0x100000000000ULL) != 0L)
+         if ((active1 & 0x200000000000ULL) != 0L)
          {
-            jjmatchedKind = 108;
+            jjmatchedKind = 109;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x50001809e9000000ULL, active1, 0x80000006000600cULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xa0003013d2000000ULL, active1, 0x10000000c000c018ULL, active2, 0L);
       case 112:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20000000000080ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000000000100ULL, active2, 0L);
       case 114:
-         if ((active1 & 0x100ULL) != 0L)
+         if ((active1 & 0x200ULL) != 0L)
          {
-            jjmatchedKind = 72;
+            jjmatchedKind = 73;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000000030000ULL, active1, 0x218000078000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000060000ULL, active1, 0x4300000f0000ULL, active2, 0L);
       case 115:
-         if ((active0 & 0x80000000000000ULL) != 0L)
+         if ((active0 & 0x100000000000000ULL) != 0L)
          {
-            jjmatchedKind = 55;
+            jjmatchedKind = 56;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x1c0000ULL, active1, 0x4000000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x380000ULL, active1, 0x8000000000000ULL, active2, 0L);
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000ULL, active1, 0x20000000200ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400000ULL, active1, 0x40000000400ULL, active2, 0L);
       case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2200006000000ULL, active1, 0x40040000080410ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x440000c000000ULL, active1, 0x80080000100820ULL, active2, 0L);
       case 120:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x20000000000ULL, active1, 0L, active2, 0L);
       case 121:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800000000000ULL, active2, 0L);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 1);
+   return jjMoveNfa_0(11, 1);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa2_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1, unsigned long long old2, unsigned long long active2){
    if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
-      return jjMoveNfa_0(3, 1);
+      return jjMoveNfa_0(11, 1);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 1);
+   return jjMoveNfa_0(11, 1);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 61:
-         if ((active2 & 0x100000ULL) != 0L)
+         if ((active2 & 0x200000ULL) != 0L)
          {
-            jjmatchedKind = 148;
+            jjmatchedKind = 149;
             jjmatchedPos = 2;
          }
-         else if ((active2 & 0x200000ULL) != 0L)
+         else if ((active2 & 0x400000ULL) != 0L)
          {
-            jjmatchedKind = 149;
+            jjmatchedKind = 150;
             jjmatchedPos = 2;
          }
-         else if ((active2 & 0x2000000ULL) != 0L)
+         else if ((active2 & 0x4000000ULL) != 0L)
          {
-            jjmatchedKind = 153;
+            jjmatchedKind = 154;
             jjmatchedPos = 2;
          }
          break;
       case 65:
-         if ((active1 & 0x2000000000ULL) != 0L)
+         if ((active1 & 0x4000000000ULL) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 102;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x8000000000ULL) != 0L)
+         else if ((active1 & 0x10000000000ULL) != 0L)
          {
-            jjmatchedKind = 103;
+            jjmatchedKind = 104;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000ULL, active1, 0xa01000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000ULL, active1, 0x1402000000000ULL, active2, 0L);
       case 66:
-         return jjMoveStringLiteralDfa3_0(active0, 0x300000000000000ULL, active1, 0x40000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x600000000000000ULL, active1, 0x80000000000ULL, active2, 0L);
       case 67:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10800ULL, active1, 0x200800ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x21000ULL, active1, 0x401000ULL, active2, 0L);
       case 68:
-         if ((active0 & 0x8000ULL) != 0L)
+         if ((active0 & 0x10000ULL) != 0L)
          {
-            jjmatchedKind = 15;
+            jjmatchedKind = 16;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x4000000000ULL) != 0L)
+         else if ((active0 & 0x8000000000ULL) != 0L)
          {
-            jjmatchedKind = 38;
+            jjmatchedKind = 39;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x4000000000000000ULL) != 0L)
+         else if ((active0 & 0x8000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 63;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000ULL, active1, 0L, active2, 0L);
       case 69:
-         if ((active1 & 0x4000000000000ULL) != 0L)
+         if ((active1 & 0x8000000000000ULL) != 0L)
          {
-            jjmatchedKind = 114;
+            jjmatchedKind = 115;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000ULL, active1, 0x100080000000080ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000ULL, active1, 0x200100000000100ULL, active2, 0L);
       case 70:
-         return jjMoveStringLiteralDfa3_0(active0, 0x202000000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x404000000ULL, active1, 0L, active2, 0L);
       case 71:
-         return jjMoveStringLiteralDfa3_0(active0, 0x400000ULL, active1, 0x800400000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x800000ULL, active1, 0x1000800000ULL, active2, 0L);
       case 72:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400ULL, active2, 0L);
       case 73:
-         return jjMoveStringLiteralDfa3_0(active0, 0x30000002000ULL, active1, 0x281000000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x60000004000ULL, active1, 0x502000000000000ULL, active2, 0L);
       case 74:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x800000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1000000ULL, active2, 0L);
       case 76:
-         if ((active0 & 0x4000ULL) != 0L)
+         if ((active0 & 0x8000ULL) != 0L)
          {
-            jjmatchedKind = 14;
+            jjmatchedKind = 15;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x20000000ULL) != 0L)
+         else if ((active1 & 0x40000000ULL) != 0L)
          {
-            jjmatchedKind = 93;
+            jjmatchedKind = 94;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x4000000000ULL) != 0L)
+         else if ((active1 & 0x8000000000ULL) != 0L)
          {
-            jjmatchedKind = 102;
+            jjmatchedKind = 103;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x10000000000ULL) != 0L)
+         else if ((active1 & 0x20000000000ULL) != 0L)
          {
-            jjmatchedKind = 104;
+            jjmatchedKind = 105;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000ULL, active1, 0x101000010ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000ULL, active1, 0x202000020ULL, active2, 0L);
       case 77:
-         if ((active1 & 0x8000000ULL) != 0L)
+         if ((active1 & 0x10000000ULL) != 0L)
          {
-            jjmatchedKind = 91;
+            jjmatchedKind = 92;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000ULL, active1, 0L, active2, 0L);
       case 78:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8400e000e0000000ULL, active1, 0x40000000100000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x801c001c0000000ULL, active1, 0x80000000200001ULL, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1041000000800000ULL, active1, 0x1010000000078000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2082000001000000ULL, active1, 0x20200000000f0000ULL, active2, 0L);
       case 80:
-         if ((active0 & 0x2000000000000000ULL) != 0L)
+         if ((active0 & 0x4000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 62;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000ULL, active1, 0x400010000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000ULL, active1, 0x800020000000ULL, active2, 0L);
       case 81:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400000000ULL, active2, 0L);
       case 82:
-         if ((active0 & 0x80000000000ULL) != 0L)
+         if ((active0 & 0x100000000000ULL) != 0L)
          {
-            jjmatchedKind = 43;
+            jjmatchedKind = 44;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x4ULL) != 0L)
+         else if ((active1 & 0x8ULL) != 0L)
          {
-            jjmatchedKind = 66;
+            jjmatchedKind = 67;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x40000000ULL) != 0L)
+         else if ((active1 & 0x80000000ULL) != 0L)
          {
-            jjmatchedKind = 94;
+            jjmatchedKind = 95;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x800000000000000ULL) != 0L)
+         else if ((active1 & 0x1000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 123;
+            jjmatchedKind = 124;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000020000ULL, active1, 0x28020000083000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200000040000ULL, active1, 0x50040000106000ULL, active2, 0L);
       case 83:
-         if ((active0 & 0x400ULL) != 0L)
+         if ((active0 & 0x800ULL) != 0L)
          {
-            jjmatchedKind = 10;
+            jjmatchedKind = 11;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x4000000ULL) != 0L)
+         else if ((active0 & 0x8000000ULL) != 0L)
          {
-            jjmatchedKind = 26;
+            jjmatchedKind = 27;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x34101c0000ULL, active1, 0x6004000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x6820380000ULL, active1, 0xc008000ULL, active2, 0L);
       case 84:
-         if ((active1 & 0x8ULL) != 0L)
+         if ((active1 & 0x10ULL) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 68;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x400ULL) != 0L)
+         else if ((active1 & 0x800ULL) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 75;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x800008000201000ULL, active1, 0x402000080000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000010000402000ULL, active1, 0x804000100000000ULL, active2, 0L);
       case 86:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000ULL, active1, 0x400000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200000000ULL, active1, 0x800000000ULL, active2, 0L);
       case 87:
-         if ((active1 & 0x1ULL) != 0L)
+         if ((active1 & 0x2ULL) != 0L)
          {
-            jjmatchedKind = 64;
+            jjmatchedKind = 65;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000ULL, active1, 0L, active2, 0L);
       case 88:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4ULL, active2, 0L);
       case 97:
-         if ((active1 & 0x2000000000ULL) != 0L)
+         if ((active1 & 0x4000000000ULL) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 102;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x8000000000ULL) != 0L)
+         else if ((active1 & 0x10000000000ULL) != 0L)
          {
-            jjmatchedKind = 103;
+            jjmatchedKind = 104;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000ULL, active1, 0xa01000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000ULL, active1, 0x1402000000000ULL, active2, 0L);
       case 98:
-         return jjMoveStringLiteralDfa3_0(active0, 0x300000000000000ULL, active1, 0x40000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x600000000000000ULL, active1, 0x80000000000ULL, active2, 0L);
       case 99:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10800ULL, active1, 0x200800ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x21000ULL, active1, 0x401000ULL, active2, 0L);
       case 100:
-         if ((active0 & 0x8000ULL) != 0L)
+         if ((active0 & 0x10000ULL) != 0L)
          {
-            jjmatchedKind = 15;
+            jjmatchedKind = 16;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x4000000000ULL) != 0L)
+         else if ((active0 & 0x8000000000ULL) != 0L)
          {
-            jjmatchedKind = 38;
+            jjmatchedKind = 39;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x4000000000000000ULL) != 0L)
+         else if ((active0 & 0x8000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 63;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000ULL, active1, 0L, active2, 0L);
       case 101:
-         if ((active1 & 0x4000000000000ULL) != 0L)
+         if ((active1 & 0x8000000000000ULL) != 0L)
          {
-            jjmatchedKind = 114;
+            jjmatchedKind = 115;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000ULL, active1, 0x100080000000080ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000ULL, active1, 0x200100000000100ULL, active2, 0L);
       case 102:
-         return jjMoveStringLiteralDfa3_0(active0, 0x202000000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x404000000ULL, active1, 0L, active2, 0L);
       case 103:
-         return jjMoveStringLiteralDfa3_0(active0, 0x400000ULL, active1, 0x800400000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x800000ULL, active1, 0x1000800000ULL, active2, 0L);
       case 104:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400ULL, active2, 0L);
       case 105:
-         return jjMoveStringLiteralDfa3_0(active0, 0x30000002000ULL, active1, 0x281000000000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x60000004000ULL, active1, 0x502000000000000ULL, active2, 0L);
       case 106:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x800000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1000000ULL, active2, 0L);
       case 108:
-         if ((active0 & 0x4000ULL) != 0L)
+         if ((active0 & 0x8000ULL) != 0L)
          {
-            jjmatchedKind = 14;
+            jjmatchedKind = 15;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x20000000ULL) != 0L)
+         else if ((active1 & 0x40000000ULL) != 0L)
          {
-            jjmatchedKind = 93;
+            jjmatchedKind = 94;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x4000000000ULL) != 0L)
+         else if ((active1 & 0x8000000000ULL) != 0L)
          {
-            jjmatchedKind = 102;
+            jjmatchedKind = 103;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x10000000000ULL) != 0L)
+         else if ((active1 & 0x20000000000ULL) != 0L)
          {
-            jjmatchedKind = 104;
+            jjmatchedKind = 105;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000ULL, active1, 0x101000010ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000ULL, active1, 0x202000020ULL, active2, 0L);
       case 109:
-         if ((active1 & 0x8000000ULL) != 0L)
+         if ((active1 & 0x10000000ULL) != 0L)
          {
-            jjmatchedKind = 91;
+            jjmatchedKind = 92;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000ULL, active1, 0L, active2, 0L);
       case 110:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8400e000e0000000ULL, active1, 0x40000000100000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x801c001c0000000ULL, active1, 0x80000000200001ULL, active2, 0L);
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1041000000800000ULL, active1, 0x1010000000078000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2082000001000000ULL, active1, 0x20200000000f0000ULL, active2, 0L);
       case 112:
-         if ((active0 & 0x2000000000000000ULL) != 0L)
+         if ((active0 & 0x4000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 62;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000ULL, active1, 0x400010000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000ULL, active1, 0x800020000000ULL, active2, 0L);
       case 113:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400000000ULL, active2, 0L);
       case 114:
-         if ((active0 & 0x80000000000ULL) != 0L)
+         if ((active0 & 0x100000000000ULL) != 0L)
          {
-            jjmatchedKind = 43;
+            jjmatchedKind = 44;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x4ULL) != 0L)
+         else if ((active1 & 0x8ULL) != 0L)
          {
-            jjmatchedKind = 66;
+            jjmatchedKind = 67;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x40000000ULL) != 0L)
+         else if ((active1 & 0x80000000ULL) != 0L)
          {
-            jjmatchedKind = 94;
+            jjmatchedKind = 95;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x800000000000000ULL) != 0L)
+         else if ((active1 & 0x1000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 123;
+            jjmatchedKind = 124;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000020000ULL, active1, 0x28020000083000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200000040000ULL, active1, 0x50040000106000ULL, active2, 0L);
       case 115:
-         if ((active0 & 0x400ULL) != 0L)
+         if ((active0 & 0x800ULL) != 0L)
          {
-            jjmatchedKind = 10;
+            jjmatchedKind = 11;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x4000000ULL) != 0L)
+         else if ((active0 & 0x8000000ULL) != 0L)
          {
-            jjmatchedKind = 26;
+            jjmatchedKind = 27;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x34101c0000ULL, active1, 0x6004000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x6820380000ULL, active1, 0xc008000ULL, active2, 0L);
       case 116:
-         if ((active1 & 0x8ULL) != 0L)
+         if ((active1 & 0x10ULL) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 68;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x400ULL) != 0L)
+         else if ((active1 & 0x800ULL) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 75;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x800008000201000ULL, active1, 0x402000080000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000010000402000ULL, active1, 0x804000100000000ULL, active2, 0L);
       case 118:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000ULL, active1, 0x400000000ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200000000ULL, active1, 0x800000000ULL, active2, 0L);
       case 119:
-         if ((active1 & 0x1ULL) != 0L)
+         if ((active1 & 0x2ULL) != 0L)
          {
-            jjmatchedKind = 64;
+            jjmatchedKind = 65;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000ULL, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000ULL, active1, 0L, active2, 0L);
       case 120:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2ULL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4ULL, active2, 0L);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 2);
+   return jjMoveNfa_0(11, 2);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa3_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1, unsigned long long old2, unsigned long long active2){
    if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
-      return jjMoveNfa_0(3, 2);
+      return jjMoveNfa_0(11, 2);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 2);
+   return jjMoveNfa_0(11, 2);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200022000ULL, active1, 0x1000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x400044000ULL, active1, 0x2000ULL);
       case 67:
-         return jjMoveStringLiteralDfa4_0(active0, 0x300400800000ULL, active1, 0x18000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x600801000000ULL, active1, 0x30000ULL);
       case 68:
-         if ((active0 & 0x8000000000000000ULL) != 0L)
+         if ((active1 & 0x1ULL) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 64;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10000000000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20000000000000ULL);
       case 69:
-         if ((active0 & 0x10000000ULL) != 0L)
+         if ((active0 & 0x20000000ULL) != 0L)
          {
-            jjmatchedKind = 28;
+            jjmatchedKind = 29;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x1000000000ULL) != 0L)
+         else if ((active0 & 0x2000000000ULL) != 0L)
          {
-            jjmatchedKind = 36;
+            jjmatchedKind = 37;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x40000000000ULL) != 0L)
+         else if ((active0 & 0x80000000000ULL) != 0L)
          {
-            jjmatchedKind = 42;
+            jjmatchedKind = 43;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x80000ULL) != 0L)
+         else if ((active1 & 0x100000ULL) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 84;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x400000000000ULL) != 0L)
+         else if ((active1 & 0x800000000000ULL) != 0L)
          {
-            jjmatchedKind = 110;
+            jjmatchedKind = 111;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x900c00100041800ULL, active1, 0x501800200ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1201800200083000ULL, active1, 0xa03000400ULL);
       case 70:
-         return jjMoveStringLiteralDfa4_0(active0, 0x22000000ULL, active1, 0x800000000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x44000000ULL, active1, 0x1000000000000ULL);
       case 71:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000ULL);
       case 72:
-         if ((active1 & 0x400000000000000ULL) != 0L)
+         if ((active1 & 0x800000000000000ULL) != 0L)
          {
-            jjmatchedKind = 122;
+            jjmatchedKind = 123;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x10000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000ULL, active1, 0L);
       case 73:
-         return jjMoveStringLiteralDfa4_0(active0, 0xa000400000ULL, active1, 0x4a000000400000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x14000800000ULL, active1, 0x94000000800000ULL);
       case 75:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400000000000000ULL, active1, 0x800ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x800000000000000ULL, active1, 0x1000ULL);
       case 76:
-         if ((active1 & 0x10ULL) != 0L)
+         if ((active1 & 0x20ULL) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 69;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400000000000000ULL);
       case 78:
-         if ((active1 & 0x80ULL) != 0L)
+         if ((active1 & 0x100ULL) != 0L)
          {
-            jjmatchedKind = 71;
+            jjmatchedKind = 72;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x80000000000ULL) != 0L)
+         else if ((active1 & 0x100000000000ULL) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 108;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x100000000000000ULL) != 0L)
+         else if ((active1 & 0x200000000000000ULL) != 0L)
          {
-            jjmatchedKind = 120;
+            jjmatchedKind = 121;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x800000000ULL, active1, 0x200800000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000ULL, active1, 0x401000000000ULL);
       case 79:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20020010200000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40040020400000ULL);
       case 80:
-         if ((active0 & 0x1000000000000000ULL) != 0L)
+         if ((active0 & 0x2000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000ULL, active1, 0x20000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10000000ULL, active1, 0x40000ULL);
       case 82:
-         if ((active1 & 0x1000000000000000ULL) != 0L)
+         if ((active1 & 0x2000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 125;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x222020000200000ULL, active1, 0x1000000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x444040000400000ULL, active1, 0x2000000000ULL);
       case 83:
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000ULL, active1, 0L);
       case 84:
-         if ((active0 & 0x10000000000ULL) != 0L)
+         if ((active0 & 0x20000000000ULL) != 0L)
          {
-            jjmatchedKind = 40;
+            jjmatchedKind = 41;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x2ULL) != 0L)
+         else if ((active1 & 0x4ULL) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 66;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x2000ULL) != 0L)
+         else if ((active1 & 0x4000ULL) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 78;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x80000000000000ULL) != 0L)
+         else if ((active1 & 0x100000000000000ULL) != 0L)
          {
-            jjmatchedKind = 119;
+            jjmatchedKind = 120;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000000ULL, active1, 0x1040006044000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000000ULL, active1, 0x208000c088000ULL);
       case 85:
-         return jjMoveStringLiteralDfa4_0(active0, 0x49000000180000ULL, active1, 0x280000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x92000000300000ULL, active1, 0x500000000ULL);
       case 89:
-         if ((active0 & 0x1000000ULL) != 0L)
+         if ((active0 & 0x2000000ULL) != 0L)
          {
-            jjmatchedKind = 24;
+            jjmatchedKind = 25;
             jjmatchedPos = 3;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200022000ULL, active1, 0x1000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x400044000ULL, active1, 0x2000ULL);
       case 99:
-         return jjMoveStringLiteralDfa4_0(active0, 0x300400800000ULL, active1, 0x18000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x600801000000ULL, active1, 0x30000ULL);
       case 100:
-         if ((active0 & 0x8000000000000000ULL) != 0L)
+         if ((active1 & 0x1ULL) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 64;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10000000000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20000000000000ULL);
       case 101:
-         if ((active0 & 0x10000000ULL) != 0L)
+         if ((active0 & 0x20000000ULL) != 0L)
          {
-            jjmatchedKind = 28;
+            jjmatchedKind = 29;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x1000000000ULL) != 0L)
+         else if ((active0 & 0x2000000000ULL) != 0L)
          {
-            jjmatchedKind = 36;
+            jjmatchedKind = 37;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x40000000000ULL) != 0L)
+         else if ((active0 & 0x80000000000ULL) != 0L)
          {
-            jjmatchedKind = 42;
+            jjmatchedKind = 43;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x80000ULL) != 0L)
+         else if ((active1 & 0x100000ULL) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 84;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x400000000000ULL) != 0L)
+         else if ((active1 & 0x800000000000ULL) != 0L)
          {
-            jjmatchedKind = 110;
+            jjmatchedKind = 111;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x900c00100041800ULL, active1, 0x501800200ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1201800200083000ULL, active1, 0xa03000400ULL);
       case 102:
-         return jjMoveStringLiteralDfa4_0(active0, 0x22000000ULL, active1, 0x800000000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x44000000ULL, active1, 0x1000000000000ULL);
       case 103:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000ULL);
       case 104:
-         if ((active1 & 0x400000000000000ULL) != 0L)
+         if ((active1 & 0x800000000000000ULL) != 0L)
          {
-            jjmatchedKind = 122;
+            jjmatchedKind = 123;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x10000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000ULL, active1, 0L);
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0xa000400000ULL, active1, 0x4a000000400000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x14000800000ULL, active1, 0x94000000800000ULL);
       case 107:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400000000000000ULL, active1, 0x800ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x800000000000000ULL, active1, 0x1000ULL);
       case 108:
-         if ((active1 & 0x10ULL) != 0L)
+         if ((active1 & 0x20ULL) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 69;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400000000000000ULL);
       case 110:
-         if ((active1 & 0x80ULL) != 0L)
+         if ((active1 & 0x100ULL) != 0L)
          {
-            jjmatchedKind = 71;
+            jjmatchedKind = 72;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x80000000000ULL) != 0L)
+         else if ((active1 & 0x100000000000ULL) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 108;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x100000000000000ULL) != 0L)
+         else if ((active1 & 0x200000000000000ULL) != 0L)
          {
-            jjmatchedKind = 120;
+            jjmatchedKind = 121;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x800000000ULL, active1, 0x200800000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000ULL, active1, 0x401000000000ULL);
       case 111:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20020010200000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40040020400000ULL);
       case 112:
-         if ((active0 & 0x1000000000000000ULL) != 0L)
+         if ((active0 & 0x2000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000ULL, active1, 0x20000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10000000ULL, active1, 0x40000ULL);
       case 114:
-         if ((active1 & 0x1000000000000000ULL) != 0L)
+         if ((active1 & 0x2000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 125;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x222020000200000ULL, active1, 0x1000000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x444040000400000ULL, active1, 0x2000000000ULL);
       case 115:
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000ULL, active1, 0L);
       case 116:
-         if ((active0 & 0x10000000000ULL) != 0L)
+         if ((active0 & 0x20000000000ULL) != 0L)
          {
-            jjmatchedKind = 40;
+            jjmatchedKind = 41;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x2ULL) != 0L)
+         else if ((active1 & 0x4ULL) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 66;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x2000ULL) != 0L)
+         else if ((active1 & 0x4000ULL) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 78;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x80000000000000ULL) != 0L)
+         else if ((active1 & 0x100000000000000ULL) != 0L)
          {
-            jjmatchedKind = 119;
+            jjmatchedKind = 120;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000000ULL, active1, 0x1040006044000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000000ULL, active1, 0x208000c088000ULL);
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x49000000180000ULL, active1, 0x280000000ULL);
+         return jjMoveStringLiteralDfa4_0(active0, 0x92000000300000ULL, active1, 0x500000000ULL);
       case 121:
-         if ((active0 & 0x1000000ULL) != 0L)
+         if ((active0 & 0x2000000ULL) != 0L)
          {
-            jjmatchedKind = 24;
+            jjmatchedKind = 25;
             jjmatchedPos = 3;
          }
          break;
       default :
          break;
    }
-   return jjMoveNfa_0(3, 3);
+   return jjMoveNfa_0(11, 3);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa4_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 3);
+      return jjMoveNfa_0(11, 3);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 3);
+   return jjMoveNfa_0(11, 3);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa5_0(active0, 0x600000000000000ULL, active1, 0x8000801000800ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0xc00000000000000ULL, active1, 0x10001002001000ULL);
       case 67:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100800000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x201000000ULL);
       case 68:
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000ULL, active1, 0L);
       case 69:
-         if ((active0 & 0x100000000000ULL) != 0L)
+         if ((active0 & 0x200000000000ULL) != 0L)
          {
-            jjmatchedKind = 44;
+            jjmatchedKind = 45;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x100000ULL) != 0L)
+         else if ((active1 & 0x200000ULL) != 0L)
          {
-            jjmatchedKind = 84;
+            jjmatchedKind = 85;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x10000000000000ULL) != 0L)
+         else if ((active1 & 0x20000000000000ULL) != 0L)
          {
-            jjmatchedKind = 116;
+            jjmatchedKind = 117;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000000000000ULL) != 0L)
+         else if ((active1 & 0x400000000000000ULL) != 0L)
          {
-            jjmatchedKind = 121;
+            jjmatchedKind = 122;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x82000000ULL, active1, 0x1200078000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0x104000000ULL, active1, 0x24000f0000ULL);
       case 70:
-         if ((active0 & 0x2000000000ULL) != 0L)
+         if ((active0 & 0x4000000000ULL) != 0L)
          {
-            jjmatchedKind = 37;
+            jjmatchedKind = 38;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000000000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000000000ULL);
       case 73:
-         return jjMoveStringLiteralDfa5_0(active0, 0x20210000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40420000ULL, active1, 0L);
       case 75:
-         if ((active0 & 0x800000ULL) != 0L)
+         if ((active0 & 0x1000000ULL) != 0L)
          {
-            jjmatchedKind = 23;
+            jjmatchedKind = 24;
             jjmatchedPos = 4;
          }
          break;
       case 76:
-         if ((active0 & 0x100000000000000ULL) != 0L)
+         if ((active0 & 0x200000000000000ULL) != 0L)
          {
-            jjmatchedKind = 56;
+            jjmatchedKind = 57;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x2000000000000ULL) != 0L)
+         else if ((active1 & 0x4000000000000ULL) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 114;
             jjmatchedPos = 4;
          }
          break;
       case 77:
-         return jjMoveStringLiteralDfa5_0(active0, 0x180000ULL, active1, 0x1000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0x300000ULL, active1, 0x2000ULL);
       case 78:
-         if ((active0 & 0x400000ULL) != 0L)
+         if ((active0 & 0x800000ULL) != 0L)
          {
-            jjmatchedKind = 22;
+            jjmatchedKind = 23;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x20000000000ULL, active1, 0x20000000000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000ULL, active1, 0x40000000000ULL);
       case 79:
-         return jjMoveStringLiteralDfa5_0(active0, 0x408000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x810000000ULL, active1, 0L);
       case 80:
-         if ((active0 & 0x1000000000000ULL) != 0L)
+         if ((active0 & 0x2000000000000ULL) != 0L)
          {
-            jjmatchedKind = 48;
+            jjmatchedKind = 49;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x20000000000000ULL) != 0L)
+         else if ((active1 & 0x40000000000000ULL) != 0L)
          {
-            jjmatchedKind = 117;
+            jjmatchedKind = 118;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000ULL);
       case 82:
-         if ((active0 & 0x1000ULL) != 0L)
+         if ((active0 & 0x2000ULL) != 0L)
          {
-            jjmatchedKind = 12;
+            jjmatchedKind = 13;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x100000000ULL) != 0L)
+         else if ((active0 & 0x200000000ULL) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 33;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x808c00000040000ULL, active1, 0x496200200ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1011800000080000ULL, active1, 0x92c400400ULL);
       case 83:
-         if ((active0 & 0x2000ULL) != 0L)
+         if ((active0 & 0x4000ULL) != 0L)
          {
-            jjmatchedKind = 13;
+            jjmatchedKind = 14;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x1000000000000ULL) != 0L)
+         else if ((active1 & 0x2000000000000ULL) != 0L)
          {
-            jjmatchedKind = 112;
+            jjmatchedKind = 113;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x800ULL, active1, 0x200000400000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1000ULL, active1, 0x400000800000ULL);
       case 84:
-         if ((active0 & 0x40000000000000ULL) != 0L)
+         if ((active0 & 0x80000000000000ULL) != 0L)
          {
-            jjmatchedKind = 54;
+            jjmatchedKind = 55;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x40000000000000ULL) != 0L)
+         else if ((active1 & 0x80000000000000ULL) != 0L)
          {
-            jjmatchedKind = 118;
+            jjmatchedKind = 119;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x20208840000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40411080000000ULL, active1, 0L);
       case 85:
-         return jjMoveStringLiteralDfa5_0(active0, 0x200000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x400000000ULL, active1, 0L);
       case 89:
-         if ((active0 & 0x20000ULL) != 0L)
+         if ((active0 & 0x40000ULL) != 0L)
          {
-            jjmatchedKind = 17;
+            jjmatchedKind = 18;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000000ULL);
       case 97:
-         return jjMoveStringLiteralDfa5_0(active0, 0x600000000000000ULL, active1, 0x8000801000800ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0xc00000000000000ULL, active1, 0x10001002001000ULL);
       case 99:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100800000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x201000000ULL);
       case 100:
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000ULL, active1, 0L);
       case 101:
-         if ((active0 & 0x100000000000ULL) != 0L)
+         if ((active0 & 0x200000000000ULL) != 0L)
          {
-            jjmatchedKind = 44;
+            jjmatchedKind = 45;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x100000ULL) != 0L)
+         else if ((active1 & 0x200000ULL) != 0L)
          {
-            jjmatchedKind = 84;
+            jjmatchedKind = 85;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x10000000000000ULL) != 0L)
+         else if ((active1 & 0x20000000000000ULL) != 0L)
          {
-            jjmatchedKind = 116;
+            jjmatchedKind = 117;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000000000000ULL) != 0L)
+         else if ((active1 & 0x400000000000000ULL) != 0L)
          {
-            jjmatchedKind = 121;
+            jjmatchedKind = 122;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x82000000ULL, active1, 0x1200078000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0x104000000ULL, active1, 0x24000f0000ULL);
       case 102:
-         if ((active0 & 0x2000000000ULL) != 0L)
+         if ((active0 & 0x4000000000ULL) != 0L)
          {
-            jjmatchedKind = 37;
+            jjmatchedKind = 38;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000000000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000000000ULL);
       case 105:
-         return jjMoveStringLiteralDfa5_0(active0, 0x20210000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40420000ULL, active1, 0L);
       case 107:
-         if ((active0 & 0x800000ULL) != 0L)
+         if ((active0 & 0x1000000ULL) != 0L)
          {
-            jjmatchedKind = 23;
+            jjmatchedKind = 24;
             jjmatchedPos = 4;
          }
          break;
       case 108:
-         if ((active0 & 0x100000000000000ULL) != 0L)
+         if ((active0 & 0x200000000000000ULL) != 0L)
          {
-            jjmatchedKind = 56;
+            jjmatchedKind = 57;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x2000000000000ULL) != 0L)
+         else if ((active1 & 0x4000000000000ULL) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 114;
             jjmatchedPos = 4;
          }
          break;
       case 109:
-         return jjMoveStringLiteralDfa5_0(active0, 0x180000ULL, active1, 0x1000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0x300000ULL, active1, 0x2000ULL);
       case 110:
-         if ((active0 & 0x400000ULL) != 0L)
+         if ((active0 & 0x800000ULL) != 0L)
          {
-            jjmatchedKind = 22;
+            jjmatchedKind = 23;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x20000000000ULL, active1, 0x20000000000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000ULL, active1, 0x40000000000ULL);
       case 111:
-         return jjMoveStringLiteralDfa5_0(active0, 0x408000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x810000000ULL, active1, 0L);
       case 112:
-         if ((active0 & 0x1000000000000ULL) != 0L)
+         if ((active0 & 0x2000000000000ULL) != 0L)
          {
-            jjmatchedKind = 48;
+            jjmatchedKind = 49;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x20000000000000ULL) != 0L)
+         else if ((active1 & 0x40000000000000ULL) != 0L)
          {
-            jjmatchedKind = 117;
+            jjmatchedKind = 118;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000ULL);
       case 114:
-         if ((active0 & 0x1000ULL) != 0L)
+         if ((active0 & 0x2000ULL) != 0L)
          {
-            jjmatchedKind = 12;
+            jjmatchedKind = 13;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x100000000ULL) != 0L)
+         else if ((active0 & 0x200000000ULL) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 33;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x808c00000040000ULL, active1, 0x496200200ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1011800000080000ULL, active1, 0x92c400400ULL);
       case 115:
-         if ((active0 & 0x2000ULL) != 0L)
+         if ((active0 & 0x4000ULL) != 0L)
          {
-            jjmatchedKind = 13;
+            jjmatchedKind = 14;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x1000000000000ULL) != 0L)
+         else if ((active1 & 0x2000000000000ULL) != 0L)
          {
-            jjmatchedKind = 112;
+            jjmatchedKind = 113;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x800ULL, active1, 0x200000400000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1000ULL, active1, 0x400000800000ULL);
       case 116:
-         if ((active0 & 0x40000000000000ULL) != 0L)
+         if ((active0 & 0x80000000000000ULL) != 0L)
          {
-            jjmatchedKind = 54;
+            jjmatchedKind = 55;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x40000000000000ULL) != 0L)
+         else if ((active1 & 0x80000000000000ULL) != 0L)
          {
-            jjmatchedKind = 118;
+            jjmatchedKind = 119;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x20208840000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40411080000000ULL, active1, 0L);
       case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0x200000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x400000000ULL, active1, 0L);
       case 121:
-         if ((active0 & 0x20000ULL) != 0L)
+         if ((active0 & 0x40000ULL) != 0L)
          {
-            jjmatchedKind = 17;
+            jjmatchedKind = 18;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000000ULL);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000000ULL);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 4);
+   return jjMoveNfa_0(11, 4);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa5_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 4);
+      return jjMoveNfa_0(11, 4);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 4);
+   return jjMoveNfa_0(11, 4);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa6_0(active0, 0x800400040000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000800080000000ULL, active1, 0L);
       case 66:
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000ULL, active1, 0x8000000000000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x400000ULL, active1, 0x10000000000000ULL);
       case 67:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000ULL);
       case 68:
-         if ((active1 & 0x200000ULL) != 0L)
+         if ((active1 & 0x400000ULL) != 0L)
          {
-            jjmatchedKind = 85;
+            jjmatchedKind = 86;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x1000000000ULL) != 0L)
+         else if ((active1 & 0x2000000000ULL) != 0L)
          {
-            jjmatchedKind = 100;
+            jjmatchedKind = 101;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10000ULL);
       case 69:
-         if ((active0 & 0x80000ULL) != 0L)
+         if ((active0 & 0x100000ULL) != 0L)
          {
-            jjmatchedKind = 19;
+            jjmatchedKind = 20;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x8000000000000ULL) != 0L)
+         else if ((active0 & 0x10000000000000ULL) != 0L)
          {
-            jjmatchedKind = 51;
+            jjmatchedKind = 52;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x2020000100000ULL, active1, 0x800000001000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4040000200000ULL, active1, 0x1000000002000ULL);
       case 71:
-         if ((active1 & 0x20000000000ULL) != 0L)
+         if ((active1 & 0x40000000000ULL) != 0L)
          {
-            jjmatchedKind = 105;
+            jjmatchedKind = 106;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x400000020000000ULL, active1, 0x800ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000040000000ULL, active1, 0x1000ULL);
       case 73:
-         return jjMoveStringLiteralDfa6_0(active0, 0x20a00000000000ULL, active1, 0x406000000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x41400000000000ULL, active1, 0x80c000000ULL);
       case 76:
-         if ((active1 & 0x800000000ULL) != 0L)
+         if ((active1 & 0x1000000000ULL) != 0L)
          {
-            jjmatchedKind = 99;
+            jjmatchedKind = 100;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x400000000ULL, active1, 0L);
       case 78:
-         if ((active1 & 0x80000000ULL) != 0L)
+         if ((active1 & 0x100000000ULL) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 96;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x408000000ULL, active1, 0x200000000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x810000000ULL, active1, 0x400000000ULL);
       case 79:
-         if ((active0 & 0x800000000ULL) != 0L)
+         if ((active0 & 0x1000000000ULL) != 0L)
          {
-            jjmatchedKind = 35;
+            jjmatchedKind = 36;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000ULL);
       case 80:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x240000000000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x480000000000ULL);
       case 82:
-         if ((active0 & 0x2000000ULL) != 0L)
+         if ((active0 & 0x4000000ULL) != 0L)
          {
-            jjmatchedKind = 25;
+            jjmatchedKind = 26;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000000000000ULL, active1, 0x20000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x400000000000000ULL, active1, 0x40000ULL);
       case 83:
-         if ((active0 & 0x800ULL) != 0L)
+         if ((active0 & 0x1000ULL) != 0L)
          {
-            jjmatchedKind = 11;
+            jjmatchedKind = 12;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x200ULL) != 0L)
+         else if ((active1 & 0x400ULL) != 0L)
          {
-            jjmatchedKind = 73;
+            jjmatchedKind = 74;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1010000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2020000ULL);
       case 84:
-         if ((active0 & 0x40000ULL) != 0L)
+         if ((active0 & 0x80000ULL) != 0L)
          {
-            jjmatchedKind = 18;
+            jjmatchedKind = 19;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x800000ULL) != 0L)
+         else if ((active1 & 0x1000000ULL) != 0L)
          {
-            jjmatchedKind = 87;
+            jjmatchedKind = 88;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x10000000ULL) != 0L)
+         else if ((active1 & 0x20000000ULL) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 93;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x100000000ULL) != 0L)
+         else if ((active1 & 0x200000000ULL) != 0L)
          {
-            jjmatchedKind = 96;
+            jjmatchedKind = 97;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x10000ULL, active1, 0x400000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000ULL, active1, 0x800000ULL);
       case 88:
-         return jjMoveStringLiteralDfa6_0(active0, 0x80000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x100000000ULL, active1, 0L);
       case 89:
-         if ((active0 & 0x8000000000ULL) != 0L)
+         if ((active0 & 0x10000000000ULL) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 40;
             jjmatchedPos = 5;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa6_0(active0, 0x800400040000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000800080000000ULL, active1, 0L);
       case 98:
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000ULL, active1, 0x8000000000000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x400000ULL, active1, 0x10000000000000ULL);
       case 99:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000ULL);
       case 100:
-         if ((active1 & 0x200000ULL) != 0L)
+         if ((active1 & 0x400000ULL) != 0L)
          {
-            jjmatchedKind = 85;
+            jjmatchedKind = 86;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x1000000000ULL) != 0L)
+         else if ((active1 & 0x2000000000ULL) != 0L)
          {
-            jjmatchedKind = 100;
+            jjmatchedKind = 101;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10000ULL);
       case 101:
-         if ((active0 & 0x80000ULL) != 0L)
+         if ((active0 & 0x100000ULL) != 0L)
          {
-            jjmatchedKind = 19;
+            jjmatchedKind = 20;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x8000000000000ULL) != 0L)
+         else if ((active0 & 0x10000000000000ULL) != 0L)
          {
-            jjmatchedKind = 51;
+            jjmatchedKind = 52;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x2020000100000ULL, active1, 0x800000001000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4040000200000ULL, active1, 0x1000000002000ULL);
       case 103:
-         if ((active1 & 0x20000000000ULL) != 0L)
+         if ((active1 & 0x40000000000ULL) != 0L)
          {
-            jjmatchedKind = 105;
+            jjmatchedKind = 106;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x400000020000000ULL, active1, 0x800ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000040000000ULL, active1, 0x1000ULL);
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x20a00000000000ULL, active1, 0x406000000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x41400000000000ULL, active1, 0x80c000000ULL);
       case 108:
-         if ((active1 & 0x800000000ULL) != 0L)
+         if ((active1 & 0x1000000000ULL) != 0L)
          {
-            jjmatchedKind = 99;
+            jjmatchedKind = 100;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x400000000ULL, active1, 0L);
       case 110:
-         if ((active1 & 0x80000000ULL) != 0L)
+         if ((active1 & 0x100000000ULL) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 96;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x408000000ULL, active1, 0x200000000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x810000000ULL, active1, 0x400000000ULL);
       case 111:
-         if ((active0 & 0x800000000ULL) != 0L)
+         if ((active0 & 0x1000000000ULL) != 0L)
          {
-            jjmatchedKind = 35;
+            jjmatchedKind = 36;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000ULL);
       case 112:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x240000000000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x480000000000ULL);
       case 114:
-         if ((active0 & 0x2000000ULL) != 0L)
+         if ((active0 & 0x4000000ULL) != 0L)
          {
-            jjmatchedKind = 25;
+            jjmatchedKind = 26;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000000000000ULL, active1, 0x20000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x400000000000000ULL, active1, 0x40000ULL);
       case 115:
-         if ((active0 & 0x800ULL) != 0L)
+         if ((active0 & 0x1000ULL) != 0L)
          {
-            jjmatchedKind = 11;
+            jjmatchedKind = 12;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x200ULL) != 0L)
+         else if ((active1 & 0x400ULL) != 0L)
          {
-            jjmatchedKind = 73;
+            jjmatchedKind = 74;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1010000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2020000ULL);
       case 116:
-         if ((active0 & 0x40000ULL) != 0L)
+         if ((active0 & 0x80000ULL) != 0L)
          {
-            jjmatchedKind = 18;
+            jjmatchedKind = 19;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x800000ULL) != 0L)
+         else if ((active1 & 0x1000000ULL) != 0L)
          {
-            jjmatchedKind = 87;
+            jjmatchedKind = 88;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x10000000ULL) != 0L)
+         else if ((active1 & 0x20000000ULL) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 93;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x100000000ULL) != 0L)
+         else if ((active1 & 0x200000000ULL) != 0L)
          {
-            jjmatchedKind = 96;
+            jjmatchedKind = 97;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x10000ULL, active1, 0x400000ULL);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000ULL, active1, 0x800000ULL);
       case 120:
-         return jjMoveStringLiteralDfa6_0(active0, 0x80000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x100000000ULL, active1, 0L);
       case 121:
-         if ((active0 & 0x8000000000ULL) != 0L)
+         if ((active0 & 0x10000000000ULL) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 40;
             jjmatchedPos = 5;
          }
          break;
       default :
          break;
    }
-   return jjMoveNfa_0(3, 5);
+   return jjMoveNfa_0(11, 5);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa6_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 5);
+      return jjMoveNfa_0(11, 5);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 5);
+   return jjMoveNfa_0(11, 5);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000ULL, active1, 0L);
       case 67:
-         if ((active0 & 0x800000000000ULL) != 0L)
+         if ((active0 & 0x1000000000000ULL) != 0L)
          {
-            jjmatchedKind = 47;
+            jjmatchedKind = 48;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800206000000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100040c000000ULL);
       case 68:
-         if ((active0 & 0x2000000000000ULL) != 0L)
+         if ((active0 & 0x4000000000000ULL) != 0L)
          {
-            jjmatchedKind = 49;
+            jjmatchedKind = 50;
             jjmatchedPos = 6;
          }
          break;
       case 69:
-         if ((active0 & 0x400000000000000ULL) != 0L)
+         if ((active0 & 0x800000000000000ULL) != 0L)
          {
-            jjmatchedKind = 58;
+            jjmatchedKind = 59;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x800ULL) != 0L)
+         else if ((active1 & 0x1000ULL) != 0L)
          {
-            jjmatchedKind = 75;
+            jjmatchedKind = 76;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x1000000ULL) != 0L)
+         else if ((active1 & 0x2000000ULL) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x40000000000ULL) != 0L)
+         else if ((active1 & 0x80000000000ULL) != 0L)
          {
-            jjmatchedKind = 106;
+            jjmatchedKind = 107;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x8010000ULL, active1, 0x400000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0x10020000ULL, active1, 0x800000ULL);
       case 76:
-         if ((active0 & 0x800000000000000ULL) != 0L)
+         if ((active0 & 0x1000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8000000000000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10000000000000ULL);
       case 78:
-         return jjMoveStringLiteralDfa7_0(active0, 0x440000000ULL, active1, 0x4000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0x880000000ULL, active1, 0x8000ULL);
       case 79:
-         return jjMoveStringLiteralDfa7_0(active0, 0x200000000000ULL, active1, 0x200000000000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0x400000000000ULL, active1, 0x400000000000ULL);
       case 83:
-         if ((active1 & 0x10000ULL) != 0L)
+         if ((active1 & 0x20000ULL) != 0L)
          {
-            jjmatchedKind = 80;
+            jjmatchedKind = 81;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x20000000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x40000000000ULL, active1, 0L);
       case 84:
-         if ((active0 & 0x80000000ULL) != 0L)
+         if ((active0 & 0x100000000ULL) != 0L)
          {
-            jjmatchedKind = 31;
+            jjmatchedKind = 32;
             jjmatchedPos = 6;
          }
-         else if ((active0 & 0x200000000ULL) != 0L)
+         else if ((active0 & 0x400000000ULL) != 0L)
          {
-            jjmatchedKind = 33;
+            jjmatchedKind = 34;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x400000000000ULL, active1, 0x400061000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0x800000000000ULL, active1, 0x8000c2000ULL);
       case 85:
-         return jjMoveStringLiteralDfa7_0(active0, 0x20200000ULL, active1, 0x8000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0x40400000ULL, active1, 0x10000ULL);
       case 89:
-         if ((active0 & 0x200000000000000ULL) != 0L)
+         if ((active0 & 0x400000000000000ULL) != 0L)
          {
-            jjmatchedKind = 57;
+            jjmatchedKind = 58;
             jjmatchedPos = 6;
          }
          break;
       case 95:
-         return jjMoveStringLiteralDfa7_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x200000ULL, active1, 0L);
       case 97:
-         return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000ULL, active1, 0L);
       case 99:
-         if ((active0 & 0x800000000000ULL) != 0L)
+         if ((active0 & 0x1000000000000ULL) != 0L)
          {
-            jjmatchedKind = 47;
+            jjmatchedKind = 48;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800206000000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100040c000000ULL);
       case 100:
-         if ((active0 & 0x2000000000000ULL) != 0L)
+         if ((active0 & 0x4000000000000ULL) != 0L)
          {
-            jjmatchedKind = 49;
+            jjmatchedKind = 50;
             jjmatchedPos = 6;
          }
          break;
       case 101:
-         if ((active0 & 0x400000000000000ULL) != 0L)
+         if ((active0 & 0x800000000000000ULL) != 0L)
          {
-            jjmatchedKind = 58;
+            jjmatchedKind = 59;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x800ULL) != 0L)
+         else if ((active1 & 0x1000ULL) != 0L)
          {
-            jjmatchedKind = 75;
+            jjmatchedKind = 76;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x1000000ULL) != 0L)
+         else if ((active1 & 0x2000000ULL) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x40000000000ULL) != 0L)
+         else if ((active1 & 0x80000000000ULL) != 0L)
          {
-            jjmatchedKind = 106;
+            jjmatchedKind = 107;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x8010000ULL, active1, 0x400000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0x10020000ULL, active1, 0x800000ULL);
       case 108:
-         if ((active0 & 0x800000000000000ULL) != 0L)
+         if ((active0 & 0x1000000000000000ULL) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8000000000000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10000000000000ULL);
       case 110:
-         return jjMoveStringLiteralDfa7_0(active0, 0x440000000ULL, active1, 0x4000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0x880000000ULL, active1, 0x8000ULL);
       case 111:
-         return jjMoveStringLiteralDfa7_0(active0, 0x200000000000ULL, active1, 0x200000000000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0x400000000000ULL, active1, 0x400000000000ULL);
       case 115:
-         if ((active1 & 0x10000ULL) != 0L)
+         if ((active1 & 0x20000ULL) != 0L)
          {
-            jjmatchedKind = 80;
+            jjmatchedKind = 81;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x20000000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x40000000000ULL, active1, 0L);
       case 116:
-         if ((active0 & 0x80000000ULL) != 0L)
+         if ((active0 & 0x100000000ULL) != 0L)
          {
-            jjmatchedKind = 31;
+            jjmatchedKind = 32;
             jjmatchedPos = 6;
          }
-         else if ((active0 & 0x200000000ULL) != 0L)
+         else if ((active0 & 0x400000000ULL) != 0L)
          {
-            jjmatchedKind = 33;
+            jjmatchedKind = 34;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x400000000000ULL, active1, 0x400061000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0x800000000000ULL, active1, 0x8000c2000ULL);
       case 117:
-         return jjMoveStringLiteralDfa7_0(active0, 0x20200000ULL, active1, 0x8000ULL);
+         return jjMoveStringLiteralDfa7_0(active0, 0x40400000ULL, active1, 0x10000ULL);
       case 121:
-         if ((active0 & 0x200000000000000ULL) != 0L)
+         if ((active0 & 0x400000000000000ULL) != 0L)
          {
-            jjmatchedKind = 57;
+            jjmatchedKind = 58;
             jjmatchedPos = 6;
          }
          break;
       default :
          break;
    }
-   return jjMoveNfa_0(3, 6);
+   return jjMoveNfa_0(11, 6);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa7_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 6);
+      return jjMoveNfa_0(11, 6);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 6);
+   return jjMoveNfa_0(11, 6);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 67:
-         return jjMoveStringLiteralDfa8_0(active0, 0x10000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x20000ULL, active1, 0L);
       case 69:
-         if ((active0 & 0x400000000000ULL) != 0L)
+         if ((active0 & 0x800000000000ULL) != 0L)
          {
-            jjmatchedKind = 46;
+            jjmatchedKind = 47;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x200000000ULL) != 0L)
+         else if ((active1 & 0x400000000ULL) != 0L)
          {
-            jjmatchedKind = 97;
+            jjmatchedKind = 98;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x8000000000000ULL) != 0L)
+         else if ((active1 & 0x10000000000000ULL) != 0L)
          {
-            jjmatchedKind = 115;
+            jjmatchedKind = 116;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x400000000ULL, active1, 0x45000ULL);
+         return jjMoveStringLiteralDfa8_0(active0, 0x800000000ULL, active1, 0x8a000ULL);
       case 71:
-         return jjMoveStringLiteralDfa8_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x200000ULL, active1, 0L);
       case 76:
-         if ((active0 & 0x20000000000000ULL) != 0L)
+         if ((active0 & 0x40000000000000ULL) != 0L)
          {
-            jjmatchedKind = 53;
+            jjmatchedKind = 54;
             jjmatchedPos = 7;
          }
          break;
       case 78:
-         if ((active0 & 0x200000000000ULL) != 0L)
+         if ((active0 & 0x400000000000ULL) != 0L)
          {
-            jjmatchedKind = 45;
+            jjmatchedKind = 46;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x8000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x10000000ULL, active1, 0L);
       case 82:
-         if ((active1 & 0x400000ULL) != 0L)
+         if ((active1 & 0x800000ULL) != 0L)
          {
-            jjmatchedKind = 86;
+            jjmatchedKind = 87;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x20000000ULL, active1, 0x200000008000ULL);
+         return jjMoveStringLiteralDfa8_0(active0, 0x40000000ULL, active1, 0x400000010000ULL);
       case 83:
-         if ((active0 & 0x20000000000ULL) != 0L)
+         if ((active0 & 0x40000000000ULL) != 0L)
          {
-            jjmatchedKind = 41;
+            jjmatchedKind = 42;
             jjmatchedPos = 7;
          }
          break;
       case 84:
-         if ((active0 & 0x40000000ULL) != 0L)
+         if ((active0 & 0x80000000ULL) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x2000000ULL) != 0L)
+         else if ((active1 & 0x4000000ULL) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x200000ULL, active1, 0x800004000000ULL);
+         return jjMoveStringLiteralDfa8_0(active0, 0x400000ULL, active1, 0x1000008000000ULL);
       case 89:
-         if ((active1 & 0x20000ULL) != 0L)
+         if ((active1 & 0x40000ULL) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 82;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x400000000ULL) != 0L)
+         else if ((active1 & 0x800000000ULL) != 0L)
          {
-            jjmatchedKind = 98;
+            jjmatchedKind = 99;
             jjmatchedPos = 7;
          }
          break;
       case 99:
-         return jjMoveStringLiteralDfa8_0(active0, 0x10000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x20000ULL, active1, 0L);
       case 101:
-         if ((active0 & 0x400000000000ULL) != 0L)
+         if ((active0 & 0x800000000000ULL) != 0L)
          {
-            jjmatchedKind = 46;
+            jjmatchedKind = 47;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x200000000ULL) != 0L)
+         else if ((active1 & 0x400000000ULL) != 0L)
          {
-            jjmatchedKind = 97;
+            jjmatchedKind = 98;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x8000000000000ULL) != 0L)
+         else if ((active1 & 0x10000000000000ULL) != 0L)
          {
-            jjmatchedKind = 115;
+            jjmatchedKind = 116;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x400000000ULL, active1, 0x45000ULL);
+         return jjMoveStringLiteralDfa8_0(active0, 0x800000000ULL, active1, 0x8a000ULL);
       case 103:
-         return jjMoveStringLiteralDfa8_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x200000ULL, active1, 0L);
       case 108:
-         if ((active0 & 0x20000000000000ULL) != 0L)
+         if ((active0 & 0x40000000000000ULL) != 0L)
          {
-            jjmatchedKind = 53;
+            jjmatchedKind = 54;
             jjmatchedPos = 7;
          }
          break;
       case 110:
-         if ((active0 & 0x200000000000ULL) != 0L)
+         if ((active0 & 0x400000000000ULL) != 0L)
          {
-            jjmatchedKind = 45;
+            jjmatchedKind = 46;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x8000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x10000000ULL, active1, 0L);
       case 114:
-         if ((active1 & 0x400000ULL) != 0L)
+         if ((active1 & 0x800000ULL) != 0L)
          {
-            jjmatchedKind = 86;
+            jjmatchedKind = 87;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x20000000ULL, active1, 0x200000008000ULL);
+         return jjMoveStringLiteralDfa8_0(active0, 0x40000000ULL, active1, 0x400000010000ULL);
       case 115:
-         if ((active0 & 0x20000000000ULL) != 0L)
+         if ((active0 & 0x40000000000ULL) != 0L)
          {
-            jjmatchedKind = 41;
+            jjmatchedKind = 42;
             jjmatchedPos = 7;
          }
          break;
       case 116:
-         if ((active0 & 0x40000000ULL) != 0L)
+         if ((active0 & 0x80000000ULL) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x2000000ULL) != 0L)
+         else if ((active1 & 0x4000000ULL) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 90;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x200000ULL, active1, 0x800004000000ULL);
+         return jjMoveStringLiteralDfa8_0(active0, 0x400000ULL, active1, 0x1000008000000ULL);
       case 121:
-         if ((active1 & 0x20000ULL) != 0L)
+         if ((active1 & 0x40000ULL) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 82;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x400000000ULL) != 0L)
+         else if ((active1 & 0x800000000ULL) != 0L)
          {
-            jjmatchedKind = 98;
+            jjmatchedKind = 99;
             jjmatchedPos = 7;
          }
          break;
       default :
          break;
    }
-   return jjMoveNfa_0(3, 7);
+   return jjMoveNfa_0(11, 7);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa8_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 7);
+      return jjMoveNfa_0(11, 7);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 7);
+   return jjMoveNfa_0(11, 7);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa9_0(active0, 0x20000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x40000000ULL, active1, 0L);
       case 67:
-         return jjMoveStringLiteralDfa9_0(active0, 0x400000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x800000000ULL, active1, 0L);
       case 68:
-         if ((active1 & 0x4000ULL) != 0L)
+         if ((active1 & 0x8000ULL) != 0L)
          {
-            jjmatchedKind = 78;
+            jjmatchedKind = 79;
             jjmatchedPos = 8;
          }
-         else if ((active1 & 0x40000ULL) != 0L)
+         else if ((active1 & 0x80000ULL) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 83;
             jjmatchedPos = 8;
          }
          break;
       case 69:
-         if ((active0 & 0x200000ULL) != 0L)
+         if ((active0 & 0x400000ULL) != 0L)
          {
-            jjmatchedKind = 21;
+            jjmatchedKind = 22;
             jjmatchedPos = 8;
          }
-         else if ((active1 & 0x8000ULL) != 0L)
+         else if ((active1 & 0x10000ULL) != 0L)
          {
-            jjmatchedKind = 79;
+            jjmatchedKind = 80;
             jjmatchedPos = 8;
          }
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x800000000000ULL);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x1000000000000ULL);
       case 82:
-         if ((active1 & 0x1000ULL) != 0L)
+         if ((active1 & 0x2000ULL) != 0L)
          {
-            jjmatchedKind = 76;
+            jjmatchedKind = 77;
             jjmatchedPos = 8;
          }
          break;
       case 84:
-         if ((active0 & 0x8000000ULL) != 0L)
+         if ((active0 & 0x10000000ULL) != 0L)
          {
-            jjmatchedKind = 27;
+            jjmatchedKind = 28;
             jjmatchedPos = 8;
          }
-         else if ((active1 & 0x200000000000ULL) != 0L)
+         else if ((active1 & 0x400000000000ULL) != 0L)
          {
-            jjmatchedKind = 109;
+            jjmatchedKind = 110;
             jjmatchedPos = 8;
          }
-         return jjMoveStringLiteralDfa9_0(active0, 0x10000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x20000ULL, active1, 0L);
       case 85:
-         return jjMoveStringLiteralDfa9_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x200000ULL, active1, 0L);
       case 95:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x8000000ULL);
       case 97:
-         return jjMoveStringLiteralDfa9_0(active0, 0x20000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x40000000ULL, active1, 0L);
       case 99:
-         return jjMoveStringLiteralDfa9_0(active0, 0x400000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x800000000ULL, active1, 0L);
       case 100:
-         if ((active1 & 0x4000ULL) != 0L)
+         if ((active1 & 0x8000ULL) != 0L)
          {
-            jjmatchedKind = 78;
+            jjmatchedKind = 79;
             jjmatchedPos = 8;
          }
-         else if ((active1 & 0x40000ULL) != 0L)
+         else if ((active1 & 0x80000ULL) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 83;
             jjmatchedPos = 8;
          }
          break;
       case 101:
-         if ((active0 & 0x200000ULL) != 0L)
+         if ((active0 & 0x400000ULL) != 0L)
          {
-            jjmatchedKind = 21;
+            jjmatchedKind = 22;
             jjmatchedPos = 8;
          }
-         else if ((active1 & 0x8000ULL) != 0L)
+         else if ((active1 & 0x10000ULL) != 0L)
          {
-            jjmatchedKind = 79;
+            jjmatchedKind = 80;
             jjmatchedPos = 8;
          }
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x800000000000ULL);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x1000000000000ULL);
       case 114:
-         if ((active1 & 0x1000ULL) != 0L)
+         if ((active1 & 0x2000ULL) != 0L)
          {
-            jjmatchedKind = 76;
+            jjmatchedKind = 77;
             jjmatchedPos = 8;
          }
          break;
       case 116:
-         if ((active0 & 0x8000000ULL) != 0L)
+         if ((active0 & 0x10000000ULL) != 0L)
          {
-            jjmatchedKind = 27;
+            jjmatchedKind = 28;
             jjmatchedPos = 8;
          }
-         else if ((active1 & 0x200000000000ULL) != 0L)
+         else if ((active1 & 0x400000000000ULL) != 0L)
          {
-            jjmatchedKind = 109;
+            jjmatchedKind = 110;
             jjmatchedPos = 8;
          }
-         return jjMoveStringLiteralDfa9_0(active0, 0x10000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x20000ULL, active1, 0L);
       case 117:
-         return jjMoveStringLiteralDfa9_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x200000ULL, active1, 0L);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 8);
+   return jjMoveNfa_0(11, 8);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa9_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 8);
+      return jjMoveNfa_0(11, 8);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 8);
+   return jjMoveNfa_0(11, 8);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa10_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x200000ULL, active1, 0L);
       case 68:
-         if ((active1 & 0x800000000000ULL) != 0L)
+         if ((active1 & 0x1000000000000ULL) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 112;
             jjmatchedPos = 9;
          }
          break;
       case 71:
-         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x8000000ULL);
       case 84:
-         if ((active0 & 0x400000000ULL) != 0L)
+         if ((active0 & 0x800000000ULL) != 0L)
          {
-            jjmatchedKind = 34;
+            jjmatchedKind = 35;
             jjmatchedPos = 9;
          }
-         return jjMoveStringLiteralDfa10_0(active0, 0x20000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x40000000ULL, active1, 0L);
       case 85:
-         return jjMoveStringLiteralDfa10_0(active0, 0x10000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x20000ULL, active1, 0L);
       case 97:
-         return jjMoveStringLiteralDfa10_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x200000ULL, active1, 0L);
       case 100:
-         if ((active1 & 0x800000000000ULL) != 0L)
+         if ((active1 & 0x1000000000000ULL) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 112;
             jjmatchedPos = 9;
          }
          break;
       case 103:
-         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x8000000ULL);
       case 116:
-         if ((active0 & 0x400000000ULL) != 0L)
+         if ((active0 & 0x800000000ULL) != 0L)
          {
-            jjmatchedKind = 34;
+            jjmatchedKind = 35;
             jjmatchedPos = 9;
          }
-         return jjMoveStringLiteralDfa10_0(active0, 0x20000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x40000000ULL, active1, 0L);
       case 117:
-         return jjMoveStringLiteralDfa10_0(active0, 0x10000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x20000ULL, active1, 0L);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 9);
+   return jjMoveNfa_0(11, 9);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa10_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 9);
+      return jjMoveNfa_0(11, 9);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 9);
+   return jjMoveNfa_0(11, 9);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 73:
-         return jjMoveStringLiteralDfa11_0(active0, 0x20000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x40000000ULL, active1, 0L);
       case 82:
-         return jjMoveStringLiteralDfa11_0(active0, 0x110000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x220000ULL, active1, 0L);
       case 85:
-         return jjMoveStringLiteralDfa11_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa11_0(active0, 0L, active1, 0x8000000ULL);
       case 105:
-         return jjMoveStringLiteralDfa11_0(active0, 0x20000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x40000000ULL, active1, 0L);
       case 114:
-         return jjMoveStringLiteralDfa11_0(active0, 0x110000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x220000ULL, active1, 0L);
       case 117:
-         return jjMoveStringLiteralDfa11_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa11_0(active0, 0L, active1, 0x8000000ULL);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 10);
+   return jjMoveNfa_0(11, 10);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa11_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 10);
+      return jjMoveNfa_0(11, 10);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 10);
+   return jjMoveNfa_0(11, 10);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x8000000ULL);
       case 69:
-         if ((active0 & 0x10000ULL) != 0L)
+         if ((active0 & 0x20000ULL) != 0L)
          {
-            jjmatchedKind = 16;
+            jjmatchedKind = 17;
             jjmatchedPos = 11;
          }
-         return jjMoveStringLiteralDfa12_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x200000ULL, active1, 0L);
       case 79:
-         return jjMoveStringLiteralDfa12_0(active0, 0x20000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x40000000ULL, active1, 0L);
       case 97:
-         return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x8000000ULL);
       case 101:
-         if ((active0 & 0x10000ULL) != 0L)
+         if ((active0 & 0x20000ULL) != 0L)
          {
-            jjmatchedKind = 16;
+            jjmatchedKind = 17;
             jjmatchedPos = 11;
          }
-         return jjMoveStringLiteralDfa12_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x200000ULL, active1, 0L);
       case 111:
-         return jjMoveStringLiteralDfa12_0(active0, 0x20000000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa12_0(active0, 0x40000000ULL, active1, 0L);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 11);
+   return jjMoveNfa_0(11, 11);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa12_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 11);
+      return jjMoveNfa_0(11, 11);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 11);
+   return jjMoveNfa_0(11, 11);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 78:
-         if ((active0 & 0x20000000ULL) != 0L)
+         if ((active0 & 0x40000000ULL) != 0L)
          {
-            jjmatchedKind = 29;
+            jjmatchedKind = 30;
             jjmatchedPos = 12;
          }
-         return jjMoveStringLiteralDfa13_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa13_0(active0, 0x200000ULL, active1, 0L);
       case 82:
-         return jjMoveStringLiteralDfa13_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa13_0(active0, 0L, active1, 0x8000000ULL);
       case 110:
-         if ((active0 & 0x20000000ULL) != 0L)
+         if ((active0 & 0x40000000ULL) != 0L)
          {
-            jjmatchedKind = 29;
+            jjmatchedKind = 30;
             jjmatchedPos = 12;
          }
-         return jjMoveStringLiteralDfa13_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa13_0(active0, 0x200000ULL, active1, 0L);
       case 114:
-         return jjMoveStringLiteralDfa13_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa13_0(active0, 0L, active1, 0x8000000ULL);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 12);
+   return jjMoveNfa_0(11, 12);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa13_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 12);
+      return jjMoveNfa_0(11, 12);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 12);
+   return jjMoveNfa_0(11, 12);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa14_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa14_0(active0, 0L, active1, 0x8000000ULL);
       case 84:
-         return jjMoveStringLiteralDfa14_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa14_0(active0, 0x200000ULL, active1, 0L);
       case 97:
-         return jjMoveStringLiteralDfa14_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa14_0(active0, 0L, active1, 0x8000000ULL);
       case 116:
-         return jjMoveStringLiteralDfa14_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa14_0(active0, 0x200000ULL, active1, 0L);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 13);
+   return jjMoveNfa_0(11, 13);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa14_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 13);
+      return jjMoveNfa_0(11, 13);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 13);
+   return jjMoveNfa_0(11, 13);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 69:
-         return jjMoveStringLiteralDfa15_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa15_0(active0, 0x200000ULL, active1, 0L);
       case 78:
-         return jjMoveStringLiteralDfa15_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa15_0(active0, 0L, active1, 0x8000000ULL);
       case 101:
-         return jjMoveStringLiteralDfa15_0(active0, 0x100000ULL, active1, 0L);
+         return jjMoveStringLiteralDfa15_0(active0, 0x200000ULL, active1, 0L);
       case 110:
-         return jjMoveStringLiteralDfa15_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa15_0(active0, 0L, active1, 0x8000000ULL);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 14);
+   return jjMoveNfa_0(11, 14);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa15_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 14);
+      return jjMoveNfa_0(11, 14);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 14);
+   return jjMoveNfa_0(11, 14);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 69:
-         if ((active0 & 0x100000ULL) != 0L)
+         if ((active0 & 0x200000ULL) != 0L)
          {
-            jjmatchedKind = 20;
+            jjmatchedKind = 21;
             jjmatchedPos = 15;
          }
          break;
       case 84:
-         return jjMoveStringLiteralDfa16_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa16_0(active0, 0L, active1, 0x8000000ULL);
       case 101:
-         if ((active0 & 0x100000ULL) != 0L)
+         if ((active0 & 0x200000ULL) != 0L)
          {
-            jjmatchedKind = 20;
+            jjmatchedKind = 21;
             jjmatchedPos = 15;
          }
          break;
       case 116:
-         return jjMoveStringLiteralDfa16_0(active0, 0L, active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa16_0(active0, 0L, active1, 0x8000000ULL);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 15);
+   return jjMoveNfa_0(11, 15);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa16_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 15);
+      return jjMoveNfa_0(11, 15);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 15);
+   return jjMoveNfa_0(11, 15);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 69:
-         return jjMoveStringLiteralDfa17_0(active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa17_0(active1, 0x8000000ULL);
       case 101:
-         return jjMoveStringLiteralDfa17_0(active1, 0x4000000ULL);
+         return jjMoveStringLiteralDfa17_0(active1, 0x8000000ULL);
       default :
          break;
    }
-   return jjMoveNfa_0(3, 16);
+   return jjMoveNfa_0(11, 16);
 }
 
  int  VhdlParserTokenManager::jjMoveStringLiteralDfa17_0(unsigned long long old1, unsigned long long active1){
    if (((active1 &= old1)) == 0L)
-      return jjMoveNfa_0(3, 16);
+      return jjMoveNfa_0(11, 16);
    if (input_stream->endOfInput()) {
-   return jjMoveNfa_0(3, 16);
+   return jjMoveNfa_0(11, 16);
    }
    curChar = input_stream->readChar();
    switch(curChar)
    {
       case 69:
-         if ((active1 & 0x4000000ULL) != 0L)
+         if ((active1 & 0x8000000ULL) != 0L)
          {
-            jjmatchedKind = 90;
+            jjmatchedKind = 91;
             jjmatchedPos = 17;
          }
          break;
       case 101:
-         if ((active1 & 0x4000000ULL) != 0L)
+         if ((active1 & 0x8000000ULL) != 0L)
          {
-            jjmatchedKind = 90;
+            jjmatchedKind = 91;
             jjmatchedPos = 17;
          }
          break;
       default :
          break;
    }
-   return jjMoveNfa_0(3, 17);
+   return jjMoveNfa_0(11, 17);
 }
 
 int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
@@ -2660,7 +2680,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
    curChar = input_stream->readChar();
    curPos = 0;
    int startsAt = 0;
-   jjnewStateCnt = 65;
+   jjnewStateCnt = 75;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -2671,285 +2691,336 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
       if (curChar < 64)
       {
          unsigned long long l = 1ULL << curChar;
-         if (l == 1);
+         (void)l;
          do
          {
             switch(jjstateSet[--i])
             {
-               case 3:
+               case 11:
                   if ((0x3ff000000000000ULL & l) != 0L)
                   {
-                     if (kind > 164)
-                        kind = 164;
+                     if (kind > 165)
+                        kind = 165;
                      { jjCheckNAddStates(0, 8); }
                   }
+                  else if ((0x100000200ULL & l) != 0L)
+                     { jjCheckNAddTwoStates(0, 3); }
                   else if (curChar == 47)
                      { jjAddStates(9, 10); }
                   else if (curChar == 45)
-                     { jjCheckNAddTwoStates(21, 27); }
+                     { jjCheckNAddStates(11, 13); }
                   else if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 10;
+                     jjstateSet[jjnewStateCnt++] = 18;
                   else if (curChar == 34)
-                     { jjCheckNAddTwoStates(1, 2); }
+                     { jjCheckNAddTwoStates(9, 10); }
                   if ((0x3ff000000000000ULL & l) != 0L)
                   {
-                     if (kind > 170)
-                        kind = 170;
-                     { jjCheckNAdd(12); }
+                     if (kind > 171)
+                        kind = 171;
+                     { jjCheckNAdd(20); }
                   }
                   break;
                case 0:
-                  if (curChar == 34)
-                     { jjCheckNAddTwoStates(1, 2); }
+                  if ((0x100000200ULL & l) != 0L)
+                     { jjCheckNAddTwoStates(0, 3); }
                   break;
                case 1:
-                  if ((0xfffffffb00000200ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(1, 2); }
+                  if (curChar != 33)
+                     break;
+                  if (kind > 6)
+                     kind = 6;
+                  { jjCheckNAddStates(14, 18); }
                   break;
                case 2:
-                  if (curChar != 34)
+                  if (curChar == 45)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 3:
+                  if (curChar == 45)
+                     { jjCheckNAdd(2); }
+                  break;
+               case 4:
+                  if ((0xffffffffffffdbffULL & l) == 0L)
                      break;
-                  if (kind > 165)
-                     kind = 165;
-                  jjstateSet[jjnewStateCnt++] = 0;
+                  if (kind > 6)
+                     kind = 6;
+                  { jjCheckNAddStates(14, 18); }
                   break;
                case 5:
-                  if ((0x3ff000000000000ULL & l) == 0L)
+                  if ((0x2400ULL & l) == 0L)
                      break;
-                  if (kind > 166)
-                     kind = 166;
-                  { jjAddStates(11, 12); }
+                  if (kind > 6)
+                     kind = 6;
+                  { jjCheckNAddTwoStates(0, 3); }
+                  break;
+               case 6:
+                  if (curChar != 10)
+                     break;
+                  if (kind > 6)
+                     kind = 6;
+                  { jjCheckNAddTwoStates(0, 3); }
                   break;
                case 7:
-                  if ((0xfffffffb00000200ULL & l) != 0L)
-                     { jjAddStates(13, 14); }
+                  if (curChar == 13)
+                     jjstateSet[jjnewStateCnt++] = 6;
                   break;
-               case 9:
-                  if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 10;
+               case 8:
+                  if (curChar == 34)
+                     { jjCheckNAddTwoStates(9, 10); }
                   break;
-               case 10:
+               case 9:
                   if ((0xfffffffb00000200ULL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 11;
+                     { jjCheckNAddTwoStates(9, 10); }
                   break;
-               case 11:
-                  if (curChar == 39 && kind > 168)
-                     kind = 168;
+               case 10:
+                  if (curChar != 34)
+                     break;
+                  if (kind > 166)
+                     kind = 166;
+                  jjstateSet[jjnewStateCnt++] = 8;
                   break;
-               case 12:
+               case 13:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
-                  if (kind > 170)
-                     kind = 170;
-                  { jjCheckNAdd(12); }
-                  break;
-               case 14:
-                  if (curChar == 34)
-                     { jjCheckNAddTwoStates(15, 16); }
+                  if (kind > 167)
+                     kind = 167;
+                  { jjAddStates(19, 20); }
                   break;
                case 15:
-                  if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(15, 16); }
+                  if ((0xfffffffb00000200ULL & l) != 0L)
+                     { jjAddStates(21, 22); }
                   break;
-               case 16:
-                  if (curChar == 34 && kind > 178)
-                     kind = 178;
+               case 17:
+                  if (curChar == 39)
+                     jjstateSet[jjnewStateCnt++] = 18;
                   break;
                case 18:
-                  if ((0xfffffffb00000200ULL & l) == 0L)
-                     break;
-                  if (kind > 185)
-                     kind = 185;
-                  jjstateSet[jjnewStateCnt++] = 18;
+                  if ((0xfffffffb00000200ULL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 19;
                   break;
                case 19:
-                  if (curChar == 45)
-                     { jjCheckNAddTwoStates(21, 27); }
+                  if (curChar == 39 && kind > 169)
+                     kind = 169;
                   break;
                case 20:
-                  if (curChar != 33)
+                  if ((0x3ff000000000000ULL & l) == 0L)
                      break;
-                  if (kind > 6)
-                     kind = 6;
-                  { jjCheckNAddStates(15, 18); }
-                  break;
-               case 21:
-                  if (curChar == 45)
-                     jjstateSet[jjnewStateCnt++] = 20;
+                  if (kind > 171)
+                     kind = 171;
+                  { jjCheckNAdd(20); }
                   break;
                case 22:
-                  if (curChar == 45)
-                     { jjCheckNAdd(21); }
+                  if (curChar == 34)
+                     { jjCheckNAddTwoStates(23, 24); }
                   break;
                case 23:
-                  if ((0xffffffffffffdbffULL & l) == 0L)
-                     break;
-                  if (kind > 6)
-                     kind = 6;
-                  { jjCheckNAddStates(15, 18); }
+                  if ((0x3ff000000000000ULL & l) != 0L)
+                     { jjCheckNAddTwoStates(23, 24); }
                   break;
                case 24:
-                  if ((0x2400ULL & l) == 0L)
+                  if (curChar == 34 && kind > 179)
+                     kind = 179;
+                  break;
+               case 26:
+                  if (curChar == 34)
+                     { jjCheckNAddTwoStates(27, 28); }
+                  break;
+               case 27:
+                  if ((0xfffffffb00000200ULL & l) != 0L)
+                     { jjCheckNAddTwoStates(27, 28); }
+                  break;
+               case 28:
+                  if (curChar != 34)
                      break;
-                  if (kind > 6)
-                     kind = 6;
-                  { jjCheckNAdd(22); }
+                  if (kind > 186)
+                     kind = 186;
+                  { jjCheckNAddTwoStates(26, 29); }
                   break;
-               case 25:
-                  if (curChar != 10)
+               case 29:
+                  if ((0xfffffffb00000200ULL & l) == 0L)
                      break;
-                  if (kind > 6)
-                     kind = 6;
-                  { jjCheckNAdd(22); }
+                  if (kind > 186)
+                     kind = 186;
+                  { jjCheckNAddTwoStates(26, 29); }
                   break;
-               case 26:
-                  if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 25;
+               case 30:
+                  if (curChar == 45)
+                     { jjCheckNAddStates(11, 13); }
                   break;
-               case 27:
-                  if (curChar != 45)
+               case 31:
+                  if (curChar != 35)
                      break;
                   if (kind > 7)
                      kind = 7;
-                  { jjCheckNAddStates(19, 21); }
+                  { jjCheckNAddStates(23, 25); }
                   break;
-               case 28:
+               case 32:
                   if ((0xffffffffffffdbffULL & l) == 0L)
                      break;
                   if (kind > 7)
                      kind = 7;
-                  { jjCheckNAddStates(19, 21); }
+                  { jjCheckNAddStates(23, 25); }
                   break;
-               case 29:
+               case 33:
                   if ((0x2400ULL & l) != 0L && kind > 7)
                      kind = 7;
                   break;
-               case 30:
+               case 34:
                   if (curChar == 10 && kind > 7)
                      kind = 7;
                   break;
-               case 31:
+               case 35:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 30;
+                     jjstateSet[jjnewStateCnt++] = 34;
                   break;
-               case 32:
+               case 36:
+                  if (curChar == 45)
+                     jjstateSet[jjnewStateCnt++] = 31;
+                  break;
+               case 37:
+                  if (curChar != 45)
+                     break;
+                  if (kind > 8)
+                     kind = 8;
+                  { jjCheckNAddStates(26, 28); }
+                  break;
+               case 38:
+                  if ((0xffffffffffffdbffULL & l) == 0L)
+                     break;
+                  if (kind > 8)
+                     kind = 8;
+                  { jjCheckNAddStates(26, 28); }
+                  break;
+               case 39:
+                  if ((0x2400ULL & l) != 0L && kind > 8)
+                     kind = 8;
+                  break;
+               case 40:
+                  if (curChar == 10 && kind > 8)
+                     kind = 8;
+                  break;
+               case 41:
+                  if (curChar == 13)
+                     jjstateSet[jjnewStateCnt++] = 40;
+                  break;
+               case 42:
                   if (curChar == 47)
                      { jjAddStates(9, 10); }
                   break;
-               case 33:
+               case 43:
                   if (curChar == 33)
-                     { jjCheckNAddTwoStates(34, 36); }
+                     { jjCheckNAddTwoStates(44, 46); }
                   break;
-               case 34:
-                  { jjCheckNAddTwoStates(34, 36); }
+               case 44:
+                  { jjCheckNAddTwoStates(44, 46); }
                   break;
-               case 35:
-                  if (curChar == 47 && kind > 8)
-                     kind = 8;
+               case 45:
+                  if (curChar == 47 && kind > 9)
+                     kind = 9;
                   break;
-               case 36:
+               case 46:
                   if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 35;
+                     jjstateSet[jjnewStateCnt++] = 45;
                   break;
-               case 37:
+               case 47:
                   if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 33;
+                     jjstateSet[jjnewStateCnt++] = 43;
                   break;
-               case 38:
+               case 48:
                   if (curChar == 42)
-                     { jjCheckNAddTwoStates(39, 41); }
+                     { jjCheckNAddTwoStates(49, 51); }
                   break;
-               case 39:
-                  { jjCheckNAddTwoStates(39, 41); }
+               case 49:
+                  { jjCheckNAddTwoStates(49, 51); }
                   break;
-               case 40:
-                  if (curChar == 47 && kind > 9)
-                     kind = 9;
+               case 50:
+                  if (curChar == 47 && kind > 10)
+                     kind = 10;
                   break;
-               case 41:
+               case 51:
                   if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 40;
+                     jjstateSet[jjnewStateCnt++] = 50;
                   break;
-               case 42:
+               case 52:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
-                  if (kind > 164)
-                     kind = 164;
+                  if (kind > 165)
+                     kind = 165;
                   { jjCheckNAddStates(0, 8); }
                   break;
-               case 44:
+               case 54:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
-                  if (kind > 164)
-                     kind = 164;
-                  { jjCheckNAddTwoStates(43, 44); }
+                  if (kind > 165)
+                     kind = 165;
+                  { jjCheckNAddTwoStates(53, 54); }
                   break;
-               case 46:
+               case 56:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
-                  if (kind > 169)
-                     kind = 169;
-                  { jjCheckNAddStates(22, 25); }
+                  if (kind > 170)
+                     kind = 170;
+                  { jjCheckNAddStates(29, 32); }
                   break;
-               case 47:
+               case 57:
                   if (curChar == 46)
-                     { jjCheckNAdd(48); }
+                     { jjCheckNAdd(58); }
                   break;
-               case 48:
+               case 58:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
-                  if (kind > 169)
-                     kind = 169;
-                  { jjCheckNAddStates(26, 28); }
+                  if (kind > 170)
+                     kind = 170;
+                  { jjCheckNAddStates(33, 35); }
                   break;
-               case 51:
+               case 61:
                   if ((0x280000000000ULL & l) != 0L)
-                     { jjCheckNAdd(52); }
+                     { jjCheckNAdd(62); }
                   break;
-               case 52:
+               case 62:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
-                  if (kind > 169)
-                     kind = 169;
-                  { jjCheckNAddTwoStates(53, 52); }
+                  if (kind > 170)
+                     kind = 170;
+                  { jjCheckNAddTwoStates(63, 62); }
                   break;
-               case 55:
+               case 65:
                   if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddStates(29, 31); }
+                     { jjCheckNAddStates(36, 38); }
                   break;
-               case 56:
+               case 66:
                   if (curChar == 35)
-                     { jjCheckNAdd(57); }
+                     { jjCheckNAdd(67); }
                   break;
-               case 57:
+               case 67:
                   if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddStates(32, 34); }
+                     { jjCheckNAddStates(39, 41); }
                   break;
-               case 58:
+               case 68:
                   if (curChar == 46)
-                     { jjCheckNAdd(59); }
+                     { jjCheckNAdd(69); }
                   break;
-               case 59:
+               case 69:
                   if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(59, 60); }
+                     { jjCheckNAddTwoStates(69, 70); }
                   break;
-               case 60:
+               case 70:
                   if (curChar != 35)
                      break;
-                  if (kind > 171)
-                     kind = 171;
-                  jjstateSet[jjnewStateCnt++] = 61;
+                  if (kind > 172)
+                     kind = 172;
+                  jjstateSet[jjnewStateCnt++] = 71;
                   break;
-               case 62:
+               case 72:
                   if ((0x280000000000ULL & l) != 0L)
-                     { jjCheckNAdd(63); }
+                     { jjCheckNAdd(73); }
                   break;
-               case 63:
+               case 73:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
-                  if (kind > 171)
-                     kind = 171;
-                  { jjCheckNAddTwoStates(64, 63); }
+                  if (kind > 172)
+                     kind = 172;
+                  { jjCheckNAddTwoStates(74, 73); }
                   break;
                default : break;
             }
@@ -2958,143 +3029,152 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
       else if (curChar < 128)
       {
          unsigned long long l = 1ULL << (curChar & 077);
-         if (l == 1);
+         (void)l;
          do
          {
             switch(jjstateSet[--i])
             {
-               case 3:
+               case 11:
                   if ((0x7fffffe07fffffeULL & l) != 0L)
                   {
-                     if (kind > 170)
-                        kind = 170;
-                     { jjCheckNAdd(12); }
+                     if (kind > 171)
+                        kind = 171;
+                     { jjCheckNAdd(20); }
                   }
                   else if (curChar == 96)
-                     { jjCheckNAdd(18); }
+                     { jjCheckNAddTwoStates(26, 29); }
                   else if (curChar == 92)
-                     { jjCheckNAddTwoStates(7, 8); }
+                     { jjCheckNAddTwoStates(15, 16); }
                   if ((0x7fffffe07fffffeULL & l) != 0L)
                   {
-                     if (kind > 166)
-                        kind = 166;
-                     { jjCheckNAddTwoStates(4, 5); }
+                     if (kind > 167)
+                        kind = 167;
+                     { jjCheckNAddTwoStates(12, 13); }
                   }
                   if ((0x100800401008004ULL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 14;
+                     jjstateSet[jjnewStateCnt++] = 22;
                   break;
-               case 1:
+               case 4:
+                  if (kind > 6)
+                     kind = 6;
+                  { jjAddStates(14, 18); }
+                  break;
+               case 9:
                   if ((0x7fffffffffffffffULL & l) != 0L)
-                     { jjAddStates(35, 36); }
+                     { jjAddStates(42, 43); }
                   break;
-               case 4:
+               case 12:
                   if (curChar == 95)
-                     { jjCheckNAddTwoStates(4, 5); }
+                     { jjCheckNAddTwoStates(12, 13); }
                   break;
-               case 5:
+               case 13:
                   if ((0x7fffffe07fffffeULL & l) == 0L)
                      break;
-                  if (kind > 166)
-                     kind = 166;
-                  { jjCheckNAddTwoStates(4, 5); }
+                  if (kind > 167)
+                     kind = 167;
+                  { jjCheckNAddTwoStates(12, 13); }
                   break;
-               case 6:
+               case 14:
                   if (curChar == 92)
-                     { jjCheckNAddTwoStates(7, 8); }
+                     { jjCheckNAddTwoStates(15, 16); }
                   break;
-               case 7:
+               case 15:
                   if ((0x7fffffffffffffffULL & l) != 0L)
-                     { jjCheckNAddTwoStates(7, 8); }
+                     { jjCheckNAddTwoStates(15, 16); }
                   break;
-               case 8:
-                  if (curChar == 92 && kind > 167)
-                     kind = 167;
+               case 16:
+                  if (curChar == 92 && kind > 168)
+                     kind = 168;
                   break;
-               case 10:
+               case 18:
                   if ((0x7fffffffffffffffULL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 11;
+                     jjstateSet[jjnewStateCnt++] = 19;
                   break;
-               case 12:
+               case 20:
                   if ((0x7fffffe07fffffeULL & l) == 0L)
                      break;
-                  if (kind > 170)
-                     kind = 170;
-                  { jjCheckNAdd(12); }
+                  if (kind > 171)
+                     kind = 171;
+                  { jjCheckNAdd(20); }
                   break;
-               case 13:
+               case 21:
                   if ((0x100800401008004ULL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 14;
+                     jjstateSet[jjnewStateCnt++] = 22;
                   break;
-               case 15:
+               case 23:
                   if ((0x7fffffe07fffffeULL & l) != 0L)
-                     { jjAddStates(37, 38); }
+                     { jjAddStates(44, 45); }
                   break;
-               case 17:
+               case 25:
                   if (curChar == 96)
-                     { jjCheckNAdd(18); }
+                     { jjCheckNAddTwoStates(26, 29); }
                   break;
-               case 18:
+               case 27:
+                  if ((0x7fffffffffffffffULL & l) != 0L)
+                     { jjAddStates(46, 47); }
+                  break;
+               case 29:
                   if ((0x7fffffffffffffffULL & l) == 0L)
                      break;
-                  if (kind > 185)
-                     kind = 185;
-                  { jjCheckNAdd(18); }
+                  if (kind > 186)
+                     kind = 186;
+                  { jjCheckNAddTwoStates(26, 29); }
                   break;
-               case 23:
-                  if (kind > 6)
-                     kind = 6;
-                  { jjAddStates(15, 18); }
-                  break;
-               case 28:
+               case 32:
                   if (kind > 7)
                      kind = 7;
-                  { jjAddStates(19, 21); }
+                  { jjAddStates(23, 25); }
                   break;
-               case 34:
-                  { jjAddStates(39, 40); }
+               case 38:
+                  if (kind > 8)
+                     kind = 8;
+                  { jjAddStates(26, 28); }
                   break;
-               case 39:
-                  { jjAddStates(41, 42); }
+               case 44:
+                  { jjAddStates(48, 49); }
                   break;
-               case 43:
+               case 49:
+                  { jjAddStates(50, 51); }
+                  break;
+               case 53:
                   if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 44;
+                     jjstateSet[jjnewStateCnt++] = 54;
                   break;
-               case 45:
+               case 55:
                   if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 46;
+                     jjstateSet[jjnewStateCnt++] = 56;
                   break;
-               case 49:
+               case 59:
                   if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 48;
+                     jjstateSet[jjnewStateCnt++] = 58;
                   break;
-               case 50:
+               case 60:
                   if ((0x2000000020ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(51, 52); }
+                     { jjCheckNAddTwoStates(61, 62); }
                   break;
-               case 53:
+               case 63:
                   if (curChar == 95)
-                     { jjCheckNAdd(52); }
+                     { jjCheckNAdd(62); }
                   break;
-               case 54:
+               case 64:
                   if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 55;
+                     jjstateSet[jjnewStateCnt++] = 65;
                   break;
-               case 57:
+               case 67:
                   if ((0x7fffffe07fffffeULL & l) != 0L)
-                     { jjCheckNAddStates(32, 34); }
+                     { jjCheckNAddStates(39, 41); }
                   break;
-               case 59:
+               case 69:
                   if ((0x7fffffe07fffffeULL & l) != 0L)
-                     { jjCheckNAddTwoStates(59, 60); }
+                     { jjCheckNAddTwoStates(69, 70); }
                   break;
-               case 61:
+               case 71:
                   if ((0x2000000020ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(62, 63); }
+                     { jjCheckNAddTwoStates(72, 73); }
                   break;
-               case 64:
+               case 74:
                   if (curChar == 95)
-                     { jjCheckNAdd(63); }
+                     { jjCheckNAdd(73); }
                   break;
                default : break;
             }
@@ -3111,48 +3191,59 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
          {
             switch(jjstateSet[--i])
             {
-               case 1:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(35, 36); }
+               case 4:
+                  if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     break;
+                  if (kind > 6)
+                     kind = 6;
+                  { jjAddStates(14, 18); }
                   break;
-               case 7:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(13, 14); }
+               case 9:
+                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
+                     { jjAddStates(42, 43); }
                   break;
-               case 10:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     jjstateSet[jjnewStateCnt++] = 11;
+               case 15:
+                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
+                     { jjAddStates(21, 22); }
                   break;
                case 18:
-                  if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     break;
-                  if (kind > 185)
-                     kind = 185;
-                  jjstateSet[jjnewStateCnt++] = 18;
+                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
+                     jjstateSet[jjnewStateCnt++] = 19;
                   break;
-               case 23:
+               case 27:
+                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
+                     { jjAddStates(46, 47); }
+                  break;
+               case 29:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 6)
-                     kind = 6;
-                  { jjAddStates(15, 18); }
+                  if (kind > 186)
+                     kind = 186;
+                  { jjAddStates(52, 53); }
                   break;
-               case 28:
-                  if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
+               case 32:
+                  if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 7)
                      kind = 7;
-                  { jjAddStates(19, 21); }
+                  { jjAddStates(23, 25); }
                   break;
-               case 34:
-                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(39, 40); }
+               case 38:
+                  if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     break;
+                  if (kind > 8)
+                     kind = 8;
+                  { jjAddStates(26, 28); }
                   break;
-               case 39:
-                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(41, 42); }
+               case 44:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjAddStates(48, 49); }
                   break;
-               default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;
+               case 49:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjAddStates(50, 51); }
+                  break;
+               default : if (i1 == 0 || l1 == 0 || i2 == 0 ||  l2 == 0) break; else break;
             }
          } while(i != startsAt);
       }
@@ -3163,7 +3254,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt), (jjnewStateCnt = startsAt), (i == (startsAt = 65 - startsAt)))
+      if ((i = jjnewStateCnt), (jjnewStateCnt = startsAt), (i == (startsAt = 75 - startsAt)))
          break;
       if (input_stream->endOfInput()) { break; }
       curChar = input_stream->readChar();
@@ -3193,8 +3284,10 @@ bool VhdlParserTokenManager::jjCanMove_0(int hiByte, int i1, int i2, unsigned lo
    switch(hiByte)
    {
       case 0:
-         return ((jjbitVec0[i2] & l2) != 0L);
+         return ((jjbitVec2[i2] & l2) != 0L);
       default :
+         if ((jjbitVec0[i1] & l1) != 0L)
+            return true;
          return false;
    }
 }
@@ -3205,8 +3298,6 @@ bool VhdlParserTokenManager::jjCanMove_1(int hiByte, int i1, int i2, unsigned lo
       case 0:
          return ((jjbitVec3[i2] & l2) != 0L);
       default :
-         if ((jjbitVec1[i1] & l1) != 0L)
-            return true;
          return false;
    }
 }
@@ -3263,11 +3354,9 @@ Token * VhdlParserTokenManager::getNextToken(){
    image.clear();
    jjimageLen = 0;
 
-   for (;;)
-   {
-     jjmatchedKind = 0x7fffffff;
-     jjmatchedPos = 0;
-     curPos = jjMoveStringLiteralDfa0_0();
+   jjmatchedKind = 0x7fffffff;
+   jjmatchedPos = 0;
+   curPos = jjMoveStringLiteralDfa0_0();
    if (jjmatchedKind != 0x7fffffff)
    {
       if (jjmatchedPos + 1 < curPos)
@@ -3278,18 +3367,11 @@ Token * VhdlParserTokenManager::getNextToken(){
          TokenLexicalActions(matchedToken);
          return matchedToken;
       }
-      else if ((jjtoSkip[jjmatchedKind >> 6] & (1ULL << (jjmatchedKind & 077))) != 0L)
+      else
       {
          SkipLexicalActions(NULL);
          goto EOFLoop;
       }
-      MoreLexicalActions();
-      curPos = 0;
-      jjmatchedKind = 0x7fffffff;
-   if (!input_stream->endOfInput()) {
-         curChar = input_stream->readChar();
-   continue;
- }
    }
    int error_line = input_stream->getEndLine();
    int error_column = input_stream->getEndColumn();
@@ -3308,8 +3390,7 @@ Token * VhdlParserTokenManager::getNextToken(){
    if (!EOFSeen) {
       error_after = curPos <= 1 ? EMPTY : input_stream->GetImage();
    }
-   lexicalError();
- }
+   errorHandler->lexicalError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, this);
   }
 }
 
@@ -3317,39 +3398,39 @@ Token * VhdlParserTokenManager::getNextToken(){
 void  VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){
    switch(jjmatchedKind)
    {
-      case 3 :
+      case 3 : {
          image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
         ::vhdl::parser::VhdlParser::lineCount();
          break;
-      default :
+       }
+      case 6 : {
+         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+                                                          ::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),TRUE);
          break;
-   }
-}
-
-void  VhdlParserTokenManager::MoreLexicalActions(){
-   jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
-   switch(jjmatchedKind)
-   {
-      case 6 :
-         image.append(input_stream->GetSuffix(jjimageLen));
-         jjimageLen = 0;
-                                                                                         ::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),TRUE);image.clear();
-         break;
-      case 7 :
-         image.append(input_stream->GetSuffix(jjimageLen));
-         jjimageLen = 0;
-                                                                    ::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();
-         break;
-      case 8 :
-         image.append(input_stream->GetSuffix(jjimageLen));
-         jjimageLen = 0;
-                                                          ::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),TRUE);image.clear();
-         break;
-      case 9 :
-         image.append(input_stream->GetSuffix(jjimageLen));
-         jjimageLen = 0;
+       }
+      case 7 : {
+         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+                                                                               ::vhdl::parser::VhdlParser::handleFlowComment(image.data());
+         break;
+       }
+      case 8 : {
+         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+                                                                   ::vhdl::parser::VhdlParser::lineCount(image.data());
+         break;
+       }
+      case 9 : {
+         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+   QCString q(image.data());
+   q.stripPrefix("/*!");
+   q.resize(q.length()-2);
+  ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear();
+         break;
+       }
+      case 10 : {
+         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                                                     ::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();
          break;
+       }
       default :
          break;
    }
@@ -3358,98 +3439,121 @@ void  VhdlParserTokenManager::MoreLexicalActions(){
 void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
    switch(jjmatchedKind)
    {
-      case 16 :
+      case 17 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                                     ::vhdl::parser::VhdlParser::setLineParsed(ARCHITECTURE_T);
          break;
-      case 17 :
+       }
+      case 18 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                      ::vhdl::parser::VhdlParser::setLineParsed(ARRAY_T);
+                      VhdlParser::setLineParsed(ARRAY_T);
          break;
-      case 21 :
+       }
+      case 22 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                               ::vhdl::parser::VhdlParser::setLineParsed(ATTRIBUTE_T);
          break;
-      case 24 :
+       }
+      case 25 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                     ::vhdl::parser::VhdlParser::setLineParsed(BODY_T);
          break;
-      case 27 :
+       }
+      case 28 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                              ::vhdl::parser::VhdlParser::setLineParsed(COMPONENT_T);
+                              VhdlParser::setLineParsed(COMPONENT_T);
          break;
-      case 29 :
+       }
+      case 30 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                                      ::vhdl::parser::VhdlParser::setLineParsed(CONFIGURATION_T);
+                                      VhdlParser::setLineParsed(CONFIGURATION_T);
          break;
-      case 30 :
+       }
+      case 31 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                             ::vhdl::parser::VhdlParser::setLineParsed(CONSTANT_T);
+                             VhdlParser::setLineParsed(CONSTANT_T);
          break;
-      case 31 :
+       }
+      case 32 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                          ::vhdl::parser::VhdlParser::setLineParsed(CONTEXT_T);
+                          VhdlParser::setLineParsed(CONTEXT_T);
          break;
-      case 38 :
+       }
+      case 39 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                  ::vhdl::parser::VhdlParser::setLineParsed(END_T);
+                  VhdlParser::setLineParsed(END_T);
          break;
-      case 39 :
+       }
+      case 40 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                        ::vhdl::parser::VhdlParser::setLineParsed(ENTITY_T);
+                        VhdlParser::setLineParsed(ENTITY_T);
          break;
-      case 42 :
+       }
+      case 43 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                    ::vhdl::parser::VhdlParser::setLineParsed(FILE_T);
+                    VhdlParser::setLineParsed(FILE_T);
          break;
-      case 45 :
+       }
+      case 46 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                             ::vhdl::parser::VhdlParser::setLineParsed(FUNCTION_T);
+                             VhdlParser::setLineParsed(FUNCTION_T);
          break;
-      case 48 :
+       }
+      case 49 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                      ::vhdl::parser::VhdlParser::setLineParsed(GROUP_T);
+                      VhdlParser::setLineParsed(GROUP_T);
          break;
-      case 57 :
+       }
+      case 58 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                          ::vhdl::parser::VhdlParser::setLineParsed(LIBRARY_T);
+                          VhdlParser::setLineParsed(LIBRARY_T);
          break;
-      case 75 :
+       }
+      case 76 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                           ::vhdl::parser::VhdlParser::setLineParsed(PACKAGE_T);
          break;
-      case 77 :
+       }
+      case 78 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                     ::vhdl::parser::VhdlParser::setLineParsed(PORT_T);
          break;
-      case 79 :
+       }
+      case 80 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                               ::vhdl::parser::VhdlParser::setLineParsed(PROCEDURE_T);
          break;
-      case 80 :
+       }
+      case 81 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                           ::vhdl::parser::VhdlParser::setLineParsed(PROCESS_T);
          break;
-      case 85 :
+       }
+      case 86 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                         ::vhdl::parser::VhdlParser::setLineParsed(RECORD_T);
          break;
-      case 99 :
+       }
+      case 100 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                         ::vhdl::parser::VhdlParser::setLineParsed(SIGNAL_T);
          break;
-      case 106 :
+       }
+      case 107 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                           ::vhdl::parser::VhdlParser::setLineParsed(SUBTYPE_T);
          break;
-      case 110 :
+       }
+      case 111 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                     ::vhdl::parser::VhdlParser::setLineParsed(TYPE_T);
          break;
-      case 112 :
+       }
+      case 113 : {
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                       ::vhdl::parser::VhdlParser::setLineParsed(UNITS_T);
          break;
+       }
       default :
          break;
    }
@@ -3464,12 +3568,14 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
     debugStream = stdout; // init
     SwitchTo(lexState);
     parser = parserArg;
+    errorHandler = new TokenManagerErrorHandler();
+    errorHandlerCreated = true;
   }
 
   void VhdlParserTokenManager::ReInitRounds() {
     int i;
     jjround = 0x80000001;
-    for (i = 65; i-- > 0;)
+    for (i = 75; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
@@ -3492,6 +3598,8 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
   // Destructor
   VhdlParserTokenManager::~VhdlParserTokenManager () {
     if (input_stream) delete input_stream;
+    if (errorHandlerCreated) delete errorHandler;
   }
+
 }
 }
diff --git a/vhdlparser/VhdlParserTokenManager.h b/vhdlparser/VhdlParserTokenManager.h
index 68eb51b..3916069 100644
--- a/vhdlparser/VhdlParserTokenManager.h
+++ b/vhdlparser/VhdlParserTokenManager.h
@@ -3,6 +3,7 @@
 #include "JavaCC.h"
 #include "CharStream.h"
 #include "Token.h"
+#include "ErrorHandler.h"
 #include "TokenManager.h"
 #include "VhdlParserConstants.h"
 #include "VhdlParser.h"
@@ -78,8 +79,6 @@ Token * getNextToken();
 
 void  SkipLexicalActions(Token *matchedToken);
 
-void  MoreLexicalActions();
-
 void  TokenLexicalActions(Token *matchedToken);
 #define jjCheckNAdd(state)\
 {\
@@ -120,13 +119,20 @@ void  TokenLexicalActions(Token *matchedToken);
   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[65];
-    int jjstateSet[2 * 65];
+    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;
+    }
 };
 }
 }
diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj
index daeceed..7a4283f 100644
--- a/vhdlparser/vhdlparser.jj
+++ b/vhdlparser/vhdlparser.jj
@@ -14,11 +14,11 @@ options {
   OUTPUT_LANGUAGE = "c++";
   NAMESPACE = "vhdl::parser";
   STATIC=false;
-  PARSER_INCLUDES="VhdlParser.h";
+  PARSER_INCLUDES="vhdljjparser.h";
   TOKEN_MANAGER_INCLUDES="VhdlParser.h";
 
  //OUTPUT_DIRECTORY = ".";
- //DEBUG_PARSER=true;
+// DEBUG_PARSER=true;
  //DEBUG_LOOKAHEAD=true;
  
   }
@@ -58,6 +58,7 @@ static void createFunction(const char *impure,uint64 spec,const char *fname);
 static void addVhdlType(const char *n,int startLine,int section, uint64 spec,const char* args,const char* type,Protection prot);
 static void addCompInst(char *n, char* instName, char* comp,int iLine);
 static void handleCommentBlock(const char* doc,bool brief);
+static void handleFlowComment(const char*);
 static void initEntry(Entry *e);
 static  void newEntry();
 static  bool isFuncProcProced();
@@ -78,20 +79,27 @@ SKIP :
 | "\r"
 }
 
-MORE :
+SKIP:
 {
   // VHDL comment -- ......
-  // VHDL doxygen comment --! .... 
-  <#DOXYGEN_VHDL_COMMENT: "--!" (~["\n", "\r"])* ("\n" | "\r" | "\r\n")?> 
-  | <MULT_DOXYGEN_COMMENT: (<DOXYGEN_VHDL_COMMENT>)+ >                                  {::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),TRUE);image.clear();}
-  | <VHDL_COMMENT: "--" (~["\n", "\r"])* ("\n" | "\r" | "\r\n")?> { ::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();}
-}
+  // VHDL doxygen line comment --! .... 
+  <#DOXYGEN_VHDL_COMMENT: (" "|"\t")*"--!"(~["\n", "\r"])* ("\n" | "\r" | "\r\n")?> 
+  | <MULT_DOXYGEN_COMMENT: (<DOXYGEN_VHDL_COMMENT>)+ >  { ::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),TRUE); }
+  |<VHDL_FLOWCHART_COMMENT: "--#" (~["\n", "\r"])* ("\n" | "\r" | "\r\n")?>  { ::vhdl::parser::VhdlParser::handleFlowComment(image.data());}
+  |<VHDL_COMMENT: "--" (~["\n", "\r"])* ("\n" | "\r" | "\r\n")?> { ::vhdl::parser::VhdlParser::lineCount(image.data());}
+ }
 
 // VHDL 2008  comment /* .... */
 // VHDL 2008 doxygen comment /*! .... */
-MORE :
+SKIP :
 {
-  <MULT_DOXYGEN_VHDL_COMMENT_2008 : "/*!"  (~[])* "*/" > {::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),TRUE);image.clear();} 
+  <MULT_DOXYGEN_VHDL_COMMENT_2008 : "/*!"  (~[])* "*/" > 
+  {
+   QCString q(image.data());
+   q.stripPrefix("/*!"); 
+   q.resize(q.length()-2);   
+  ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear();
+  } 
   | <MULT_VHDL_2008_COMMENT : "/*"  (~[])* "*/" >  {::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();}
 }
 
@@ -106,7 +114,7 @@ TOKEN [IGNORE_CASE] :
 | <ALL_T: "all">
 | <AND_T: "and">
 | <ARCHITECTURE_T: "architecture"> {::vhdl::parser::VhdlParser::setLineParsed(ARCHITECTURE_T);}
-| <ARRAY_T: "array"> {::vhdl::parser::VhdlParser::setLineParsed(ARRAY_T);}
+| <ARRAY_T: "array"> {VhdlParser::setLineParsed(ARRAY_T);}
 | <ASSERT_T: "assert"> 
 | <ASSUME_T: "assume"> 
 | <ASSUME_GUARANTEE_T: "assume_guarentee"> 
@@ -116,28 +124,28 @@ TOKEN [IGNORE_CASE] :
 | <BODY_T: "body"> {::vhdl::parser::VhdlParser::setLineParsed(BODY_T);}
 | <BUFFER_T: "buffer">
 | <BUS_T: "bus"> 
-| <COMPONENT_T: "component"> {::vhdl::parser::VhdlParser::setLineParsed(COMPONENT_T);}
+| <COMPONENT_T: "component"> {VhdlParser::setLineParsed(COMPONENT_T);}
 | <CASE_T: "case"> 
-| <CONFIGURATION_T: "configuration"> {::vhdl::parser::VhdlParser::setLineParsed(CONFIGURATION_T);}
-| <CONSTANT_T: "constant">  {::vhdl::parser::VhdlParser::setLineParsed(CONSTANT_T);}
-| <CONTEXT_T: "context"> {::vhdl::parser::VhdlParser::setLineParsed(CONTEXT_T);}
+| <CONFIGURATION_T: "configuration"> {VhdlParser::setLineParsed(CONFIGURATION_T);}
+| <CONSTANT_T: "constant">  {VhdlParser::setLineParsed(CONSTANT_T);}
+| <CONTEXT_T: "context"> {VhdlParser::setLineParsed(CONTEXT_T);}
 | <COVER_T: "cover"> 
 | <DEFAULT_T: "default"> 
 | <DISCONNECT_T: "disconnect"> 
 | <DOWNTO_T: "downto"> 
 | <ELSE_T: "else"> 
 | <ELSIF_T: "elsif"> 
-| <END_T: "end"> {::vhdl::parser::VhdlParser::setLineParsed(END_T);}
-| <ENTITY_T: "entity"> {::vhdl::parser::VhdlParser::setLineParsed(ENTITY_T);}
+| <END_T: "end"> {VhdlParser::setLineParsed(END_T);}
+| <ENTITY_T: "entity"> {VhdlParser::setLineParsed(ENTITY_T);}
 | <EXIT_T: "exit"> 
 | <FAIRNESS_T: "fairness"> 
-| <FILE_T: "file"> {::vhdl::parser::VhdlParser::setLineParsed(FILE_T);}
+| <FILE_T: "file"> {VhdlParser::setLineParsed(FILE_T);}
 | <FOR_T: "for"> 
 | <FORCE_T: "force">
-| <FUNCTION_T: "function">  {::vhdl::parser::VhdlParser::setLineParsed(FUNCTION_T);}
+| <FUNCTION_T: "function">  {VhdlParser::setLineParsed(FUNCTION_T);}
 | <GENERATE_T: "generate"> 
 | <GENERIC_T: "generic">  
-| <GROUP_T: "group"> {::vhdl::parser::VhdlParser::setLineParsed(GROUP_T);}
+| <GROUP_T: "group"> {VhdlParser::setLineParsed(GROUP_T);}
 | <GUARDED_T: "guarded"> 
 | <IF_T: "if"> 
 | <IMPURE_T: "impure"> 
@@ -146,7 +154,7 @@ TOKEN [IGNORE_CASE] :
 | <INOUT_T: "inout"> 
 | <IS_T: "is"> 
 | <LABEL_T: "label">
-| <LIBRARY_T: "library"> {::vhdl::parser::VhdlParser::setLineParsed(LIBRARY_T);}
+| <LIBRARY_T: "library"> {VhdlParser::setLineParsed(LIBRARY_T);}
 | <LINKAGE_T: "linkage">  
 | <LITERAL_T: "literal"> 
 | <LOOP_T: "loop"> 
@@ -285,9 +293,8 @@ TOKEN:
  | < #OTHER_SPECIAL_CHARACTER: ["%","!","$","@","?","[","\\","]","^","`","{","}","~","\u00A0"-"\u00FF"]>
  | < #SPACE_CHARACTER: [" ","\t"] >
  | < #LOWER_CASE_LETTER: ["a"-"z"] >
- | <VHDL2008TOOLDIR  : ["`"](<GRAPHIC_CHARACTER>)+ >
-   
-
+ | <VHDL2008TOOLDIR  : ["`"](<GRAPHIC_CHARACTER>|<STRINGLITERAL>)+ >
+ 
 }
 
 QCString abstract_literal() : 
@@ -344,7 +351,7 @@ QCString adding_operator () :
 
 QCString aggregate() :  {QCString s,s1,s2;}
 {
-  <LPAREN_T> s=element_association() (LOOKAHEAD(1)<COMMA_T> s1=element_association(){s+=","+s1;})* <RPAREN_T> { return s;}
+  <LPAREN_T> s=element_association() (<COMMA_T> s1=element_association(){s+=","+s1;})* <RPAREN_T> { return "("+s+")";}
 }
 
 QCString alias_declaration() :  {QCString s,s1,s2;}
@@ -397,11 +404,13 @@ void architecture_body() : {QCString s,s1;}
 void architecture_declarative_part() : {}
 {
   (block_declarative_item() )*
+ // | (<VHDL2008TOOLDIR>)
 }
 
 void architecture_statement_part() :  {}
 {
   (concurrent_statement())*
+ // | (<VHDL2008TOOLDIR>)
 }
 
 QCString array_type_definition ():  { QCString s;}
@@ -433,10 +442,10 @@ QCString assertion_statement() :  {QCString s,s1,s2;Token *t=0;}
 	return s+s1+";";
   }
 }
-QCString association_element() : {}
+QCString association_element() : {QCString s,s1;}
 {
- [LOOKAHEAD(formal_part() <ARROW_T>) formal_part() <ARROW_T> ] actual_part()
- { return " ";}
+ [LOOKAHEAD(formal_part() <ARROW_T>) s=formal_part() <ARROW_T> ] s1=actual_part()
+ { return s+" => "+s1;}
 }
 
 QCString association_list ():  {QCString s,s1;}
@@ -555,6 +564,7 @@ attribute_declaration()
 LOOKAHEAD(3)
 group_template_declaration()
 | group_declaration()
+| <VHDL2008TOOLDIR>
 }
 
 void block_declarative_part() : {}
@@ -606,7 +616,7 @@ void  case_statement() : {QCString s;}
 		<END_T> <CASE_T> [ identifier() ] <SEMI_T>
 		{
          FlowChart::moveToPrevLevel();
-         FlowChart::addFlowChart(FlowChart::END_CASE,0,0);
+         FlowChart::addFlowChart(FlowChart::END_CASE,"end case",0);
       	}
 }
 
@@ -628,18 +638,20 @@ QCString character_literal() :  {Token *tok;}
 
 QCString choice() : {QCString s;}
 {
+   LOOKAHEAD(simple_expression())
+  s=simple_expression(){ return s; }
+  | 
   LOOKAHEAD(discrete_range())
   s=discrete_range(){ return s; }
   |
-  LOOKAHEAD(simple_expression())
-  s=simple_expression(){ return s; }
-  | s=identifier(){ return s; }
+  LOOKAHEAD(identifier())
+  s=identifier(){ return s; }
   | <OTHER_T> { return " others "; }
 }
  
 QCString choices() :  {QCString s,s1;}
 {
-  s=choice() (<BAR_T> choice(){s+="|";s+=s1;})* { return s; } 
+  s=choice() (<BAR_T> s1=choice(){s+="|";s+=s1;})* { return s; } 
 }
 
 void component_configuration () :{}
@@ -733,8 +745,8 @@ component_instantiation_statement()
 |
 LOOKAHEAD(concurrent_procedure_call_statement())
 concurrent_procedure_call_statement()
+| <VHDL2008TOOLDIR>
  /*
- }
   catch( ParseException e )
   {
     error_skipto(SEMI_T, "syntax error in declarative item");
@@ -911,7 +923,12 @@ QCString discrete_range() : {QCString s;}
 
 QCString element_association() :  {QCString s,s1;}
 {
- [LOOKAHEAD(choices() <ARROW_T>) choices() <ARROW_T>  ] s1=expression() { return s1;}
+[LOOKAHEAD(choices() <ARROW_T>) s=choices() <ARROW_T> ]  s1=expression() 
+ { 
+if(!s.isEmpty()) 
+ return s+"=>"+s1;
+return s1; 
+ }
 }
 
 QCString element_declaration() :  {QCString s,s1;}
@@ -960,7 +977,7 @@ QCString entity_class_entry_list() :  {QCString s,s1,s2;}
 
 void entity_declaration() :  {QCString s;}
 {
-    try{
+   // try{
 	<ENTITY_T> s=identifier()  <IS_T>
 	         {
                 lastEntity=current;
@@ -971,7 +988,7 @@ void entity_declaration() :  {QCString s;}
         entity_declarative_part ()
       [ <BEGIN_T> entity_statement_part() ] 
        <END_T> [ <ENTITY_T> ] [ name() ]
-     	}catch(...){error_skipto(SEMI_T);}  
+     //	}catch(...){error_skipto(SEMI_T);}  
 	 <SEMI_T>
 	 { lastEntity=0;lastCompound=0; genLabels.resize(0); }
 }
@@ -1001,6 +1018,7 @@ group_template_declaration()
 LOOKAHEAD(5)
  package_instantiation_declaration()
 |package_declaration()
+| <VHDL2008TOOLDIR>
 }
 
 void entity_declarative_part() : {}
@@ -1071,8 +1089,11 @@ QCString exit_statement() :  {QCString s,s1,s2;Token *t=0;Token *t1=0;}
 [ s=identifier() t=<COLON_T> ] <EXIT_T> [ s1=identifier() ] 
 [ t1=<WHEN_T> s2=condition() ] <SEMI_T>
 {
+  lab.resize(0);         
   if(t) s+=":";
   if(t1) s2.prepend(" when ");
+   FlowChart::addFlowChart(FlowChart::EXIT_NO,"exit",s2.data(),s1.data()); 
+ 
   return s+s1+s2+";";
 }
 }
@@ -1091,8 +1112,7 @@ QCString logop() : {}
   |<XNOR_T> { return "xnor" ;}
   |<XOR_T> { return "xor" ;}
   |<OR_T> { return "or" ;}
- 
-}
+ }
 
 QCString extended_identifier ():  {Token *t;}
 {
@@ -1177,7 +1197,7 @@ s=identifier() <COLON_T>
           try{
 		generate_scheme() <GENERATE_T> 
         { pushLabel(genLabels,s); }
-        [ (block_declarative_item() )* <BEGIN_T> ]  (concurrent_statement())*  
+          generate_statement_body1()
 		<END_T> 
 			     }catch(...){error_skipto(GENERATE_T);}  
 		<GENERATE_T> [ identifier() ] <SEMI_T> {genLabels=popLabel(genLabels); }
@@ -1392,7 +1412,7 @@ QCString interface_variable_declaration() :  {Token *tok=0;Token *tok1=0;Token *
                     {
                       if (currP==VhdlDocGen::FUNCTION || currP==VhdlDocGen::PROCEDURE)
                       {
-                        addProto(s5.data(),s.data(),s2.data(),s3.data(),0,s4.data());
+                        addProto(s5.data(),s.data(),s1.data(),s2.data(),s3.data(),s4.data());
                       }
                       else
                       {
@@ -1408,10 +1428,22 @@ QCString interface_variable_declaration() :  {Token *tok=0;Token *tok1=0;Token *
 			}
 }
 
-void iteration_scheme() :  {}
+QCString iteration_scheme() :  {QCString s;}
 {
-<WHILE_T> condition()
-| <FOR_T> parameter_specification()
+<WHILE_T> s=condition()
+{
+   s.prepend("while ");
+   FlowChart::addFlowChart(FlowChart::WHILE_NO,0,s.data(),lab.data());
+   lab="";    
+  return s;   
+}
+| <FOR_T> s=parameter_specification()
+{
+    QCString q=lab+" for "+s;
+    FlowChart::addFlowChart(FlowChart::FOR_NO,0,q.data(),lab.data());
+    lab="";
+	return q;
+}
 }
 
 QCString label() :  {QCString s;}
@@ -1463,12 +1495,25 @@ QCString logical_operator() :  {QCString s;}
  s=logop() { return s;}
 }
 
-void loop_statement() :  {}
+QCString loop_statement() :  {QCString s,s1,s2,s3;}
 {
-[ identifier() <COLON_T> ]
-    [ iteration_scheme() ] <LOOP_T>
-        sequence_of_statement() 
-		<END_T> <LOOP_T> [ identifier() ] <SEMI_T> 
+[ s=identifier() <COLON_T> {s+=":";} ]
+    [ s1=iteration_scheme()  ]
+	  {
+	   if(s1.isEmpty())
+ 	   FlowChart::addFlowChart(FlowChart::LOOP_NO,0,"infinite");
+	   }
+	  <LOOP_T>
+        s2=sequence_of_statement() 
+		<END_T> <LOOP_T> [ s3=identifier() ] <SEMI_T> 
+		{
+		 QCString q = s+" loop "+s2+" end loop" +s3;
+         QCString endLoop="end loop" + s3;
+         FlowChart::moveToPrevLevel();
+         FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop.data(),0);
+		return q;
+		}
+		
 }
 
 
@@ -1550,8 +1595,10 @@ QCString next_statement() :  {QCString s,s1,s2;Token *t=0;Token *t1=0;}
 [LOOKAHEAD(1)  t1=<WHEN_T> s2=condition() ] <SEMI_T>
 {
   if(t) s+=":";
-  if(t1) s2.prepend("when "); 
-   return s+s1+s2+";";
+   FlowChart::addFlowChart(FlowChart::NEXT_NO,"next ",s2.data(),s1.data()); 
+    lab.resize(0);
+  if(t1) s2.prepend("when ");                
+  return s+s1+s2+";";
 }
 }
 
@@ -1813,7 +1860,7 @@ void process_statement() : {QCString s,s1,s2;Token *tok=0;}
                current->bodyLine=getLine();
   }
  <PROCESS_T>
- try{
+ //try{
  [ <LPAREN_T> (tok=<ALL_T> | s1=sensitivity_list()) <RPAREN_T> ] [ <IS_T> ]
         s2=process_declarative_part() 
 		     {
@@ -1824,7 +1871,7 @@ void process_statement() : {QCString s,s1,s2;Token *tok=0;}
 		<BEGIN_T>
         process_statement_part()
 		<END_T> [ <POSTPONED_T> ] 
-		  }catch(...){error_skipto(PROCESS_T);}  
+		 // }catch(...){error_skipto(PROCESS_T);}  
 		<PROCESS_T> [ identifier() ] <SEMI_T>
  { 
   if(s.isEmpty())
@@ -1878,9 +1925,9 @@ QCString range_constraint() :  {QCString s,s1;}
 void record_type_definition() : {}
 {
     <RECORD_T>
-       try{
+     //  try{
 	   (element_declaration())+ 
-	   	     }catch(...){error_skipto(END_T);}  
+	   	 //    }catch(...){error_skipto(END_T);}  
        <END_T> 
 	   <RECORD_T> [ name()] 
 }
@@ -1969,50 +2016,50 @@ QCString sensitivity_list() :  {QCString s,s1;}
  s=name() (<COMMA_T> s1=name(){s+=",";s+=s1;} )* { return s;}
 }
 
-void sequence_of_statement() : {}
+QCString sequence_of_statement() : {QCString s,s1;}
 {
- ( LOOKAHEAD(3)sequential_statement())*
+ ( LOOKAHEAD(3) s1=sequential_statement() {s+=s1;} )* { return s;}
 }
 
-void sequential_statement() :{QCString s;}
+QCString sequential_statement() :{QCString s;}
 {
     LOOKAHEAD( [ identifier() ":" ] target() "<=")
-	s=signal_assignment_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);}
+	s=signal_assignment_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
     | 
 	LOOKAHEAD(3)
-	s=assertion_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);}
+	s=assertion_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
     | 
 	 LOOKAHEAD(3)
-	s=report_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);}
+	s=report_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
     | 
 	LOOKAHEAD(3)
-	s=wait_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);}
+	s=wait_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
     | 
     LOOKAHEAD(  [ identifier() ":" ] target() ":=" )
-	s=variable_assignment_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);}
+	s=variable_assignment_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
     | 
     LOOKAHEAD(3)
-	s=procedure_call_statement(){ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0); }
+	s=procedure_call_statement(){ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; }
     | 
 	 LOOKAHEAD(3)
-	if_statement()
+	if_statement(){return s;}
     | 
 	 LOOKAHEAD(3)
-	case_statement()
+	case_statement(){return s;}
     | 
 	LOOKAHEAD(3)
-	loop_statement()
+	loop_statement(){return s;}
     | 
 	LOOKAHEAD(3)
-	s=next_statement()  
+	s=next_statement() {return s;} 
 	| 
 	LOOKAHEAD(3)	
-	s=exit_statement()
+	s=exit_statement(){return s;}
     | 
     LOOKAHEAD(3)
-	s=return_statement(){FlowChart::addFlowChart(FlowChart::RETURN_NO,s.data(),0);}
+	s=return_statement(){FlowChart::addFlowChart(FlowChart::RETURN_NO,s.data(),0);return s;}
     | 
-	s=null_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);}
+	s=null_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
 }
 
 QCString shift_expression() :  {QCString s,s1,s2;}
@@ -2059,10 +2106,12 @@ void semi() :  {}
 <SEMI_T> 
 }
 
-void signal_declaration() :  {QCString s,s1,s2,s3,s4;}
+void signal_declaration() :  { Token* tok=0;QCString s,s1,s2,s3,s4;}
 {
-<SIGNAL_T> s=identifier_list() <COLON_T> s1=subtype_indication() [ s2=signal_kind() ] [ <VARASSIGN_T> s3=expression() ] <SEMI_T> 
+<SIGNAL_T> s=identifier_list() <COLON_T> s1=subtype_indication() [ s2=signal_kind() ] [ tok=<VARASSIGN_T> s3=expression() ] <SEMI_T> 
      {
+	 if(tok)
+	  s3.prepend(":=");
 	 s4=s1+s2+s3;
 	 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SIGNAL,0,s4.data(),Public);
      }
@@ -2091,7 +2140,7 @@ QCString signature() : {QCString s,s1,s2;}
 
 QCString simple_expression():  {QCString s,s1,s2;}
 {
-[ s=sign() ] s1=term() {s+=s1;} ( LOOKAHEAD(adding_operator()) s1=adding_operator() s2=term() {s+=s1;s+=s2;})* { return s;}
+[ s=sign() ] s1=term() {s+=s1;} ( LOOKAHEAD(adding_operator() term()) s1=adding_operator() s2=term() {s+=s1;s+=s2;})* { return s;}
 }
 
 void simple_name() :  {}
@@ -2113,7 +2162,7 @@ tok=<STRINGLITERAL> {return tok->image.c_str();}
 {
 //subprogram_specification() 
 <IS_T>
- try{
+ //try{
  s=subprogram_declarative_part()
    {
       if (s.data())
@@ -2122,7 +2171,7 @@ tok=<STRINGLITERAL> {return tok->image.c_str();}
       }
       FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
     } 
-  }catch(...){error_skipto(BEGIN_T);}  
+ // }catch(...){error_skipto(BEGIN_T);}  
 <BEGIN_T>
 subprogram_statement_part()
 <END_T> [ subprogram_kind() ] [ designator() ] <SEMI_T> 
@@ -2309,10 +2358,11 @@ QCString unconstraint_array_definition() :  {QCString s,s1,s2,s3;}
                    QStringList ql1=QStringList::split(",",s,FALSE);
                    for (uint j=0;j<ql1.count();j++)
                    {
-                     QCString it=ql1[j].utf8();
+                    QStringList ql=QStringList::split(".",ql1[j],FALSE);                    
+					QCString it=ql[1].utf8();
                      if ( parse_sec==0 && Config_getBool("SHOW_INCLUDE_FILES") )
                      {
-                       ::vhdl::parser::VhdlParser::addVhdlType(it.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::USE,it.data(),"_use_",Public);
+                       VhdlParser::addVhdlType(it.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::USE,it.data(),"_use_",Public);
                      }
                    }
                    s1="use "+s;
@@ -2329,15 +2379,17 @@ QCString variable_assignment_statement() :  {QCString s,s1,s2;}
  selected_variable_assignment() { return "";  } 
 }
 
-QCString variable_declaration() :  {Token *tok=0;QCString s,s1,s2;}
+QCString variable_declaration() :  {Token *tok=0;Token *t1=0;QCString s,s1,s2;}
 {
 [ tok=<SHARED_T> ] <VARIABLE_T> s=identifier_list() <COLON_T> s1=subtype_indication() 
-[ <VARASSIGN_T> s2=expression() ] <SEMI_T> 
+[ t1=<VARASSIGN_T> s2=expression() ] <SEMI_T> 
 
 {
     int spec;
-	QCString val=" variable "+s+":"+s1+":="+s2+";";
-	QCString it=s1+" "+s2;
+	if(t1)
+	 s2.prepend(":=");
+	QCString val=" variable "+s+":"+s1+s2+";";
+	QCString it=s1;
 	if(tok != 0)
 	{
 	 it.prepend(" shared ");
@@ -2347,6 +2399,10 @@ QCString variable_declaration() :  {Token *tok=0;QCString s,s1,s2;}
 	 else
 	 spec=VhdlDocGen::SHAREDVARIABLE;
     
+	if(t1){
+	 it+=":=";
+     it+=s2;
+	 }
 	addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,spec,0,it.data(),Public);
     return val;
  }
@@ -2355,7 +2411,7 @@ QCString variable_declaration() :  {Token *tok=0;QCString s,s1,s2;}
 
 QCString wait_statement() :  {QCString s,s1,s2,s3;Token *t=0;}
 {
-[ s=identifier() <COLON_T> ] <WAIT_T> [ s1=sensitivity_clause() ] [ s2=condition_clause() ] [ s3=timeout_clause() ] <SEMI_T> 
+[ s=identifier() t=<COLON_T> ] <WAIT_T> [ s1=sensitivity_clause() ] [ s2=condition_clause() ] [ s3=timeout_clause() ] <SEMI_T> 
 {
   if(t) s.append(":");
   return s+" wait "+s1+s2+s3+";";
@@ -2364,7 +2420,7 @@ QCString wait_statement() :  {QCString s,s1,s2,s3;Token *t=0;}
 
 QCString waveform() :  {QCString s,s1;}
 {
-s=waveform_element() (<COMMA_T> s1=waveform_element(){s+=","; s+=s1;})* { return s;}
+s=waveform_element() (LOOKAHEAD(1) <COMMA_T> s1=waveform_element(){s+=","; s+=s1;})* { return s;}
 | 
 <UNAFFECTED_T> { return " unaffected ";}
 
@@ -2383,11 +2439,11 @@ QCString waveform_element() :  {QCString s,s1;}
 
 QCString protected_type_body() :{ }
 {
-   try{
+  // try{
    <PROTECTED_T> <BODY_T> 
           protected_type_body_declarative_part()    
    
-	}catch(...){error_skipto(END_T);} 
+	//}catch(...){error_skipto(END_T);} 
 	<END_T><PROTECTED_T> <BODY_T>   [identifier()]  {return "";}  
 }
 
@@ -2452,7 +2508,6 @@ QCString context_ref() : {QCString s;}
  }
 }
 
-
 void context_declaration(): {QCString s,s1;}
 {
  <CONTEXT_T> s=identifier() <IS_T> { parse_sec=CONTEXT_SEC; }  (s1=libustcont_stats())* <END_T> [ <CONTEXT_T> ][identifier()] <SEMI_T>
@@ -2531,17 +2586,22 @@ void when_stats() : {}
    )+
 }
 
-
 void ttend(): {}
 {
   <END_T> [identifier()] <SEMI_T>
  } 
 
-
-
+ 
 void generate_statement_body() : {}
 {
-   <BEGIN_T> [block_declarative_part()  <BEGIN_T>] (concurrent_statement())*
+   <BEGIN_T> generate_statement_body()
+}
+ 
+void generate_statement_body1() : {}
+{
+   LOOKAHEAD(block_declarative_item()<BEGIN_T> )
+   (block_declarative_item() )*  <BEGIN_T> (concurrent_statement())*
+   | (concurrent_statement())*
 }
 
 QCString external_name(): {QCString s,s1,s2;}
@@ -2675,8 +2735,6 @@ void sel_wave_list() : {}
   // |  sel_wave_list_1()
 }
 
-
-
 void inout_stat(): {}
 { 
   <IN_T>
author	Dimitri van Heesch <dimitri@stack.nl>	2014-08-11 08:26:44 (GMT)
committer	Dimitri van Heesch <dimitri@stack.nl>	2014-08-11 08:26:44 (GMT)
commit	3b8fea2f1f7f2e6a83a35626e6dec9d114a78c9e (patch)
tree	ee911a840e38f46d7388237c019866efa191e15d /vhdlparser
parent	7506404e646f1fcc5a26ca6fca91a7f65154f05a (diff)
download	Doxygen-3b8fea2f1f7f2e6a83a35626e6dec9d114a78c9e.zip Doxygen-3b8fea2f1f7f2e6a83a35626e6dec9d114a78c9e.tar.gz Doxygen-3b8fea2f1f7f2e6a83a35626e6dec9d114a78c9e.tar.bz2