Various VHDL related fixes

author: Dimitri van Heesch <dimitri@stack.nl> 2015-01-02 16:28:03 (GMT)
committer: Dimitri van Heesch <dimitri@stack.nl> 2015-01-02 16:28:03 (GMT)
commit: 34b00c442308efe169cc89fad62588fdce1d84e8 (patch)
tree: 19ceab12fa37beece4a9a94a0dff26ed14a28779 /vhdlparser
parent: 981515820134a2171d2b6a912275e919f56532b4 (diff)
download: Doxygen-34b00c442308efe169cc89fad62588fdce1d84e8.zip
Doxygen-34b00c442308efe169cc89fad62588fdce1d84e8.tar.gz
Doxygen-34b00c442308efe169cc89fad62588fdce1d84e8.tar.bz2
17 files changed, 2248 insertions, 2398 deletions
diff --git a/vhdlparser/CharStream.cc b/vhdlparser/CharStream.cc
index 65179f5..8cc17c3 100644
--- a/vhdlparser/CharStream.cc
+++ b/vhdlparser/CharStream.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 6.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "CharStream.h"
 
@@ -209,4 +209,4 @@ void CharStream::UpdateLineColumn(JAVACC_CHAR_TYPE c) {
 
 }
 }
-/* JavaCC - OriginalChecksum=ade3c1b57a731a003629de593814ffa6 (do not edit this line) */
+/* JavaCC - OriginalChecksum=e709b9ee1adf0fcb6b1c5e1641f10348 (do not edit this line) */
diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h
index f901e38..b0e74b6 100644
--- a/vhdlparser/CharStream.h
+++ b/vhdlparser/CharStream.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 6.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef CHARSTREAM_H
 #define CHARSTREAM_H
@@ -28,17 +28,17 @@ namespace parser {
 
 
 class CharStream {
-public:
-          void setTabSize(int i) { tabSize = i; }
-          int  getTabSize(int)   { return tabSize; }
-  virtual int  getColumn()       { return trackLineColumn ? bufcolumn[bufpos] : -1; }
-  virtual int  getLine()         { return trackLineColumn ? bufline[bufpos] : -1; }
-  virtual int  getEndColumn()    { return trackLineColumn ? bufcolumn[bufpos] : -1; }
-  virtual int  getEndLine()      { return trackLineColumn ? bufline[bufpos] : -1; }
-  virtual int  getBeginColumn()  { return trackLineColumn ? bufcolumn[tokenBegin] : -1; }
-  virtual int  getBeginLine()    { return trackLineColumn ? bufline[tokenBegin] : -1; }
-
-  virtual bool getTrackLineColumn()         { return trackLineColumn; }
+ public:
+  void setTabSize(int i) { tabSize = i; }
+  int getTabSize(int) { return tabSize; }
+  virtual int getColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; }
+  virtual int getLine() { return trackLineColumn ? bufline[bufpos] : -1; }
+  virtual int getEndColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; }
+  virtual int getEndLine() { return trackLineColumn ? bufline[bufpos] : -1; }
+  virtual int getBeginColumn() { return trackLineColumn ? bufcolumn[tokenBegin] : -1; }
+  virtual int getBeginLine() { return trackLineColumn ? bufline[tokenBegin] : -1; }
+
+  virtual bool getTrackLineColumn() { return trackLineColumn; }
   virtual void setTrackLineColumn(bool val) { trackLineColumn = val; }
 
 /**
@@ -47,25 +47,25 @@ public:
  * (longer) token. So, they will be used again as the prefix of the next
  * token and it is the implemetation's responsibility to do this right.
  */
-  virtual inline void backup(int amount) {
-    inBuf += amount;
-    bufpos -= amount;
-    if (bufpos < 0) {
-      bufpos += bufsize;
-    }
+virtual inline void backup(int amount) {
+  inBuf += amount;
+  bufpos -= amount;
+  if (bufpos < 0) {
+    bufpos += bufsize;
   }
+}
 
 /**
  * Returns the next character that marks the beginning of the next token.
  * All characters must remain in the buffer between two successive calls
  * to this method to implement backup correctly.
  */
-  virtual inline JAVACC_CHAR_TYPE BeginToken() {
-    tokenBegin = -1;
-    JAVACC_CHAR_TYPE c = readChar();
-    tokenBegin = bufpos;
-    return c;
-  }
+virtual inline JAVACC_CHAR_TYPE BeginToken() {
+  tokenBegin = -1;
+  JAVACC_CHAR_TYPE c = readChar();
+  tokenBegin = bufpos;
+  return c;
+}
 
 
 /**
@@ -73,30 +73,31 @@ public:
  * of selecting the input is the responsibility of the class
  * implementing this class.
  */
-  virtual inline JAVACC_CHAR_TYPE readChar() {
-    if (inBuf > 0) {
-      --inBuf;
-      ++bufpos;
-      if (bufpos == bufsize) {
-        bufpos = 0;
-      }
-      return buffer[bufpos];
-    }
-
+virtual inline JAVACC_CHAR_TYPE readChar() {
+  if (inBuf > 0) {
+    --inBuf;
     ++bufpos;
-    if (bufpos >= maxNextCharInd) {
-      FillBuff();
+    if (bufpos == bufsize) {
+      bufpos = 0;
     }
 
-    JAVACC_CHAR_TYPE c = buffer[bufpos];
+    return buffer[bufpos];
+  }
+
+  ++bufpos;
+  if (bufpos >= maxNextCharInd) {
+    FillBuff();
+  }
 
-    if (trackLineColumn) {
-      UpdateLineColumn(c);
-    }
+  JAVACC_CHAR_TYPE c = buffer[bufpos];
 
-    return c;
+  if (trackLineColumn) {
+    UpdateLineColumn(c);
   }
 
+  return c;
+}
+
 
   virtual void ExpandBuff(bool wrapAround);
   virtual void FillBuff();
@@ -111,7 +112,8 @@ public:
     if (bufpos >= tokenBegin)
       return JAVACC_STRING_TYPE(buffer + tokenBegin, bufpos - tokenBegin + 1);
     else
-      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufsize - tokenBegin).append(buffer, bufpos + 1);
+      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufsize - tokenBegin)
+             .append(buffer, bufpos + 1);
   }
 
   /**
@@ -124,7 +126,8 @@ public:
     if ((bufpos + 1) >= len) {
       return JAVACC_STRING_TYPE(buffer + bufpos - len + 1, len);
     }
-    return JAVACC_STRING_TYPE(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1).append(buffer, bufpos + 1);
+    return JAVACC_STRING_TYPE(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1)
+           .append(buffer, bufpos + 1);
   }
 
   /**
@@ -141,71 +144,74 @@ public:
   }
 
   bool endOfInput() {
-    return inBuf == 0 && bufpos + 1 >= maxNextCharInd && inputStream->endOfInput();
+    return inBuf == 0 && bufpos + 1 >= maxNextCharInd &&
+           inputStream->endOfInput();
   }
 
   CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline,
                       int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(8), trackLineColumn(true) {
     ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, buffersize);
   }
 
   CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(8), trackLineColumn(true) {
     ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(const JAVACC_STRING_TYPE& str, int startline,
                       int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(8), trackLineColumn(true) {
     ReInit(str, startline, startcolumn, buffersize);
   }
 
   CharStream(const JAVACC_STRING_TYPE& str, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0) ,tabSize(8), trackLineColumn(true){
     ReInit(str, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline,
-             int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
-    ReInit(input_stream, startline, startcolumn, buffersize);
+             int startcolumn, int) :
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(8), trackLineColumn(true) {
+    ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(8), trackLineColumn(true) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(8), trackLineColumn(true) {
     ReInit(input_stream, 1, 1, INITIAL_BUFFER_SIZE);
   }
 
-  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn, int buffersize);
+  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn,
+                      int buffersize);
 
-  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn) {
+  virtual void ReInit(ReaderStream *input_stream, int startline,
+                      int startcolumn) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
@@ -226,26 +232,26 @@ public:
  protected:
   virtual void UpdateLineColumn(JAVACC_CHAR_TYPE c);
 
-  int*               bufline;
-  int*               bufcolumn;
-  JAVACC_CHAR_TYPE*  buffer;
-  int                bufpos;
-  int                bufsize;
-  int                tokenBegin;
-  int                column;
-  int                line;
-  bool               prevCharIsCR;
-  bool               prevCharIsLF;
-  int                available;
-  int                maxNextCharInd;
-  int                inBuf;
-  int                tabSize;
-  bool               trackLineColumn;
-  ReaderStream*      inputStream;
-  bool               deleteStream;
+  int *bufline;
+  int *bufcolumn;
+  ReaderStream *inputStream;
+  bool deleteStream;
+  JAVACC_CHAR_TYPE * buffer;
+  int bufpos;
+  int bufsize;
+  int tokenBegin;
+  int column;
+  int line;
+  bool prevCharIsCR ;
+  bool prevCharIsLF ;
+  int available;
+  int maxNextCharInd;
+  int inBuf ;
+  int tabSize ;
+  bool trackLineColumn;
 };
 
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=89f4cb30f0d3487ee809cca18a2924f2 (do not edit this line) */
+/* JavaCC - OriginalChecksum=5eaf75ef6a2c7859369c80cf6fd037e0 (do not edit this line) */
diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h
index f5e53e4..9f0d38c 100644
--- a/vhdlparser/ErrorHandler.h
+++ b/vhdlparser/ErrorHandler.h
@@ -1,21 +1,15 @@
-/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.2 */
-/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,BUILD_PARSER=true,BUILD_TOKEN_MANAGER=true */
+/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.0 */
+/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef ERRORHANDLER_H
 #define ERRORHANDLER_H
-#include <stdio.h>
 #include <string>
 #include "JavaCC.h"
 #include "Token.h"
 
 namespace vhdl {
 namespace parser {
-
-JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
-
-  class VhdlParser;
+class VhdlParser;
   class ErrorHandler {
-    friend class VhdlParserTokenManager;
-    friend class VhdlParser;
     protected:
       int error_count;
     public:
@@ -24,56 +18,26 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
       // 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 /*expectedKind*/, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser * /*parser*/) {
+      virtual void handleUnexpectedToken(int, JAVACC_STRING_TYPE expectedToken, Token *actual, 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());
       }
       // 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 occurs.
-      virtual void handleParseError(Token * /*last*/, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser * /*parser*/) {
+      // production - the production in which this error occurrs.
+      virtual void handleParseError(Token *, Token *unexpected, JAVACC_SIMPLE_STRING production, 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());
       }
       virtual int getErrorCount() {
         return error_count;
       }
-      virtual void handleOtherError(JAVACC_STRING_TYPE message, VhdlParser * /*parser*/) {
-        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* /*token_manager*/) {
-        // 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* /*token_manager*/) {
-        fprintf(stderr, "%s\n", (char*)errorMessage.c_str());
-      }
-      virtual ~TokenManagerErrorHandler() {}
-  };
-
 }
 }
 
 #endif
-/* JavaCC - OriginalChecksum=c18f1105ba178be8e21cc9f279f94496 (do not edit this line) */
+/* JavaCC - OriginalChecksum=282223c3bcb53b7ff385aed35944d185 (do not edit this line) */
diff --git a/vhdlparser/ParseException.cc b/vhdlparser/ParseException.cc
index 6ef9738..31ee7a3 100644
--- a/vhdlparser/ParseException.cc
+++ b/vhdlparser/ParseException.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 6.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "ParseException.h"
 
@@ -141,6 +141,8 @@ namespace parser {
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))
         {
+           case 0 :
+              continue;
            case '\b':
               retval.append("\\b");
               continue;
@@ -181,4 +183,4 @@ namespace parser {
 
 }
 }
-/* JavaCC - OriginalChecksum=9f6af8fd72f5fe3e4210cf02acbd8387 (do not edit this line) */
+/* JavaCC - OriginalChecksum=99d488e13335cf377284c90700f070ed (do not edit this line) */
diff --git a/vhdlparser/ParseException.h b/vhdlparser/ParseException.h
index c36613f..1f3a3dc 100644
--- a/vhdlparser/ParseException.h
+++ b/vhdlparser/ParseException.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.h Version 6.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef _PARSE_EXCEPTION_H
 #define _PARSE_EXCEPTION_H
@@ -96,4 +96,4 @@ class ParseException {
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=bd87c2fc11a4306bd2c2482fd1025b7c (do not edit this line) */
+/* JavaCC - OriginalChecksum=8c47c56fc2030f05b43e20cae6ca5d66 (do not edit this line) */
diff --git a/vhdlparser/Token.cc b/vhdlparser/Token.cc
index 735091d..62a8169 100644
--- a/vhdlparser/Token.cc
+++ b/vhdlparser/Token.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. Token.cc Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. Token.cc Version 6.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
 #include "Token.h"
 
@@ -89,4 +89,4 @@ namespace parser {
 
 }
 }
-/* JavaCC - OriginalChecksum=dcb0f64486aa6455ae5af05d6bb539ec (do not edit this line) */
+/* JavaCC - OriginalChecksum=9db9ca693072c4c37bb7cc933c0c5e35 (do not edit this line) */
diff --git a/vhdlparser/Token.h b/vhdlparser/Token.h
index 040899e..5fce69f 100644
--- a/vhdlparser/Token.h
+++ b/vhdlparser/Token.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. Token.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. Token.h Version 6.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
 #ifndef TOKEN_H
 #define TOKEN_H
@@ -86,13 +86,12 @@ class Token
    */
   Token(int kind, JAVACC_STRING_TYPE image);
 
-  virtual ~Token();
-
   /**
    * Returns the image.
    */
   JAVACC_STRING_TYPE toString();
 
+  public: virtual ~Token();
 
   /**
    * Returns a new Token void *, by default. However, if you want, you
@@ -114,4 +113,4 @@ class Token
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=4748c3d6443aa3445d3c95ab54f14c2a (do not edit this line) */
+/* JavaCC - OriginalChecksum=2f5eb1c937adc983dfa2008c4fe383a7 (do not edit this line) */
diff --git a/vhdlparser/TokenManager.h b/vhdlparser/TokenManager.h
index 39353ba..b0b8b98 100644
--- a/vhdlparser/TokenManager.h
+++ b/vhdlparser/TokenManager.h
@@ -1,11 +1,10 @@
-/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 6.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef TOKENMANAGER_H
 #define TOKENMANAGER_H
 #include "JavaCC.h"
 #include "Token.h"
 
-using namespace std;
 
 namespace vhdl {
 namespace parser {
@@ -20,9 +19,10 @@ public:
   /** This gets the next token from the input stream.
    *  A token of kind 0 (<EOF>) should be returned on EOF.
    */
-  virtual       ~TokenManager() { }
-  virtual Token *getNextToken() = 0;
-  virtual void   lexicalError() {
+  public: virtual Token *getNextToken() = 0;
+  public: virtual ~TokenManager() { }
+  public: virtual void lexicalError() {
+    fprintf(stderr, "Lexical error encountered");
   }
 
 };
@@ -30,4 +30,4 @@ public:
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=918e2eba53e028d6c4142283ce3f498f (do not edit this line) */
+/* JavaCC - OriginalChecksum=d4725ee75465725057819b3b07fadaa7 (do not edit this line) */
diff --git a/vhdlparser/TokenMgrError.cc b/vhdlparser/TokenMgrError.cc
index 6231196..0be1213 100644
--- a/vhdlparser/TokenMgrError.cc
+++ b/vhdlparser/TokenMgrError.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 6.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "TokenMgrError.h"
 
@@ -61,8 +61,11 @@ namespace parser {
    errorCode = reason;
   }
 
+}
+}
+
 // i < 16 - guaranteed
-char hexChar(int i) {
+static char hexChar(int i) {
   if (i < 10) {
     return i - '0';
   }
@@ -79,6 +82,9 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) {
     JAVACC_CHAR_TYPE ch = str[i];
     switch (ch)
     {
+      case 0 :
+        retval += EMPTY[0];
+        continue;
       case '\b':
         retval.append("\\b");
         continue;
@@ -112,7 +118,4 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) {
   }
   return retval;
 }
-
-}
-}
-/* JavaCC - OriginalChecksum=2fe11435e6701b2fca885354b08bfdf6 (do not edit this line) */
+/* JavaCC - OriginalChecksum=7f80e3c4eac120168f5e81d4ddb72e4b (do not edit this line) */
diff --git a/vhdlparser/TokenMgrError.h b/vhdlparser/TokenMgrError.h
index abb305d..2702b29 100644
--- a/vhdlparser/TokenMgrError.h
+++ b/vhdlparser/TokenMgrError.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 6.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef _TOKENMGRERROR_H
 #define _TOKENMGRERROR_H
@@ -8,7 +8,7 @@
 namespace vhdl {
 namespace parser {
 
-enum LexerErrors {
+ enum LexerErrors {
   /**
    * Lexical error occurred.
    */
@@ -28,10 +28,11 @@ enum LexerErrors {
    * Detected (and bailed out of) an infinite loop in the token manager.
    */
   LOOP_DETECTED = 3,
-};
+  };
 
-class TokenMgrError {
-public:
+class TokenMgrError
+{
+  public:
   /*
    * Ordinals for various reasons why an Error of this type can be thrown.
    */
@@ -56,8 +57,7 @@ public:
    */
     JAVACC_STRING_TYPE LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar);
 
-private:
-   JAVACC_STRING_TYPE message;
+  private: JAVACC_STRING_TYPE message;
 
   /**
    * You can also modify the body of this method to customize your error messages.
@@ -68,7 +68,6 @@ private:
    *
    * from this method for such cases in the release version of your parser.
    */
-public:
   JAVACC_STRING_TYPE getMessage() ;
 
   /*
@@ -76,16 +75,16 @@ public:
    */
 
   /** No arg constructor. */
-  TokenMgrError() ;
+  public: TokenMgrError() ;
 
   /** Constructor with message and reason. */
-  TokenMgrError(JAVACC_STRING_TYPE message, int reason) ;
+  public: TokenMgrError(JAVACC_STRING_TYPE message, int reason) ;
 
   /** Full Constructor. */
-  TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) ;
+  public: TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) ;
 };
 
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=c22a1b25630ec91deb47dcba22b6b39d (do not edit this line) */
+/* JavaCC - OriginalChecksum=c7d825cb4d037b031ae43569d383f738 (do not edit this line) */
diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index 5c8b004..39a1308 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -1,20 +1,19 @@
 /* VhdlParser.cc */
-#include "VhdlParser.h"
-#include "TokenMgrError.h"
+#include "./VhdlParser.h"
 namespace vhdl {
 namespace parser {
   unsigned int jj_la1_0[] = {
-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,};
+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,0x90c04000,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,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,};
+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,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,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,};
+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,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,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,};
+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,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,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,};
+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,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[] = {
-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,};
+0x1420,0x0,0x1c0,0x0,0x0,0x0,0x2,0x3c0,0x0,0x0,0x1c0,0x0,0x80001c0,0x0,0x0,0x0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x80001c0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,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,0x8000000,0x8000000,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,0x0,0x80001c0,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. */
 
@@ -552,8 +551,7 @@ void VhdlParser::architecture_declarative_part() {if (!hasError) {
       case SUBTYPE_T:
       case TYPE_T:
       case USE_T:
-      case VARIABLE_T:
-      case VHDL2008TOOLDIR:{
+      case VARIABLE_T:{
         ;
         break;
         }
@@ -1253,13 +1251,6 @@ 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);
@@ -1293,8 +1284,7 @@ void VhdlParser::block_declarative_part() {if (!hasError) {
       case SUBTYPE_T:
       case TYPE_T:
       case USE_T:
-      case VARIABLE_T:
-      case VHDL2008TOOLDIR:{
+      case VARIABLE_T:{
         ;
         break;
         }
@@ -11497,35 +11487,33 @@ void VhdlParser::generate_statement_body() {if (!hasError) {
   }
 
 
-void VhdlParser::generate_statement_body1() {
-    if (jj_2_107(2147483647)) {if (!hasError) {
+void VhdlParser::generate_statement_body1() {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:
-        case VHDL2008TOOLDIR:{
+        if (jj_2_107(2147483647)) {
           ;
-          break;
-          }
-        default:
-          jj_la1[259] = jj_gen;
+        } else {
           goto end_label_51;
         }if (!hasError) {
         
@@ -11539,67 +11527,44 @@ void VhdlParser::generate_statement_body1() {
       
       jj_consume_token(BEGIN_T);
       }
-      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[260] = jj_gen;
-          goto end_label_52;
-        }if (!hasError) {
-        
-        concurrent_statement();
-        }
-        
-      }
-      end_label_52: ;
+      break;
       }
-      
-    } 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();
+    default:
+      jj_la1[259] = 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:
+      case VHDL2008TOOLDIR:{
+        ;
+        break;
         }
-        
-      }
-      end_label_53: ;
+      default:
+        jj_la1[260] = jj_gen;
+        goto end_label_52;
+      }if (!hasError) {
+      
+      concurrent_statement();
       }
       
     }
+    end_label_52: ;
+    }
+    
   }
 
 
@@ -11671,7 +11636,7 @@ return t->image.data();
       break;
       }
     default:
-      jj_la1[262] = jj_gen;
+      jj_la1[261] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -11715,7 +11680,7 @@ return s;
       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;
     }
@@ -11759,7 +11724,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;
       }
@@ -11814,11 +11779,11 @@ s+="^.";
         break;
         }
       default:
-        jj_la1[265] = jj_gen;
-        goto end_label_54;
+        jj_la1[264] = jj_gen;
+        goto end_label_53;
       }
     }
-    end_label_54: ;
+    end_label_53: ;
     }
     
 return s;
@@ -11849,7 +11814,7 @@ QCString VhdlParser::pathname_element() {QCString s,s1;if (!hasError) {
       break;
       }
     default:
-      jj_la1[266] = jj_gen;
+      jj_la1[265] = jj_gen;
       ;
     }
     }
@@ -11883,7 +11848,7 @@ s+=".";
       if (jj_2_110(2147483647)) {
         ;
       } else {
-        goto end_label_55;
+        goto end_label_54;
       }if (!hasError) {
       
       s1 = pathname_element();
@@ -11898,7 +11863,7 @@ s2+=s1;s2+=".";
       }
       
     }
-    end_label_55: ;
+    end_label_54: ;
     }
     
 return s+s2;
@@ -11940,7 +11905,7 @@ void VhdlParser::conditional_signal_assignment_wave() {
         break;
         }
       default:
-        jj_la1[267] = jj_gen;
+        jj_la1[266] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -11969,7 +11934,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[268] = jj_gen;
+      jj_la1[267] = jj_gen;
       ;
     }
     }
@@ -11996,7 +11961,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[269] = jj_gen;
+      jj_la1[268] = jj_gen;
       ;
     }
     }
@@ -12031,7 +11996,7 @@ void VhdlParser::else_wave_list() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[270] = jj_gen;
+      jj_la1[269] = jj_gen;
       ;
     }
     }
@@ -12063,7 +12028,7 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[271] = jj_gen;
+      jj_la1[270] = jj_gen;
       ;
     }
     }
@@ -12105,7 +12070,7 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[272] = jj_gen;
+      jj_la1[271] = jj_gen;
       ;
     }
     }
@@ -12133,7 +12098,7 @@ void VhdlParser::selected_signal_assignment_wave() {
         break;
         }
       default:
-        jj_la1[273] = jj_gen;
+        jj_la1[272] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -12164,7 +12129,7 @@ void VhdlParser::selected_variable_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[274] = jj_gen;
+      jj_la1[273] = jj_gen;
       ;
     }
     }
@@ -12203,7 +12168,7 @@ void VhdlParser::select_name() {
         break;
         }
       default:
-        jj_la1[275] = jj_gen;
+        jj_la1[274] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -12234,7 +12199,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[276] = jj_gen;
+      jj_la1[275] = jj_gen;
       ;
     }
     }
@@ -12259,7 +12224,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[277] = jj_gen;
+      jj_la1[276] = jj_gen;
       ;
     }
     }
@@ -12294,7 +12259,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[278] = jj_gen;
+      jj_la1[277] = jj_gen;
       ;
     }
     }
@@ -12322,7 +12287,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[279] = jj_gen;
+      jj_la1[278] = jj_gen;
       ;
     }
     }
@@ -12365,7 +12330,7 @@ void VhdlParser::sel_var_list() {if (!hasError) {
       break;
       }
     default:
-      jj_la1[280] = jj_gen;
+      jj_la1[279] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12378,7 +12343,7 @@ void VhdlParser::sel_var_list() {if (!hasError) {
       if (jj_2_114(2147483647)) {
         ;
       } else {
-        goto end_label_56;
+        goto end_label_55;
       }if (!hasError) {
       
       expression();
@@ -12409,14 +12374,14 @@ 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;
       }
       }
       
     }
-    end_label_56: ;
+    end_label_55: ;
     }
     
   }
@@ -12443,8 +12408,8 @@ void VhdlParser::sel_wave_list() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[282] = jj_gen;
-        goto end_label_57;
+        jj_la1[281] = jj_gen;
+        goto end_label_56;
       }if (!hasError) {
       
       jj_consume_token(COMMA_T);
@@ -12455,7 +12420,7 @@ void VhdlParser::sel_wave_list() {if (!hasError) {
       }
       
     }
-    end_label_57: ;
+    end_label_56: ;
     }
     if (!hasError) {
     
@@ -12482,7 +12447,7 @@ void VhdlParser::inout_stat() {
       break;
       }
     default:
-      jj_la1[283] = jj_gen;
+      jj_la1[282] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12514,7 +12479,7 @@ void VhdlParser::else_stat() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[284] = jj_gen;
+        jj_la1[283] = jj_gen;
         ;
       }
       }
@@ -12525,11 +12490,11 @@ void VhdlParser::else_stat() {if (!hasError) {
         break;
         }
       default:
-        jj_la1[285] = jj_gen;
-        goto end_label_58;
+        jj_la1[284] = jj_gen;
+        goto end_label_57;
       }
     }
-    end_label_58: ;
+    end_label_57: ;
     }
     
   }
@@ -12562,7 +12527,7 @@ return s;
       break;
       }
     default:
-      jj_la1[286] = jj_gen;
+      jj_la1[285] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12610,14 +12575,14 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
         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;
       }
       break;
       }
     default:
-      jj_la1[288] = jj_gen;
+      jj_la1[287] = jj_gen;
       ;
     }
     }
@@ -12667,7 +12632,7 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
         break;
         }
       default:
-        jj_la1[289] = jj_gen;
+        jj_la1[288] = jj_gen;
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
@@ -12676,7 +12641,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;
       ;
     }
     }
@@ -12714,7 +12679,7 @@ QCString VhdlParser::param() {QCString s,s1;Token *tok=0;if (!hasError) {
       break;
       }
     default:
-      jj_la1[291] = jj_gen;
+      jj_la1[290] = jj_gen;
       ;
     }
     }
@@ -12741,7 +12706,7 @@ param_sec=PARAM_SEC;
       break;
       }
     default:
-      jj_la1[292] = jj_gen;
+      jj_la1[291] = jj_gen;
       ;
     }
     }
@@ -12779,7 +12744,7 @@ void VhdlParser::parseInline() {
       break;
       }
     default:
-      jj_la1[293] = jj_gen;
+      jj_la1[292] = jj_gen;
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
@@ -12788,16 +12753,26 @@ void VhdlParser::parseInline() {
 
  VhdlParser::VhdlParser(TokenManager *tm){
     head = NULL;
-    errorHandlerCreated = false;
     ReInit(tm);
 }
-VhdlParser::~VhdlParser()
+   VhdlParser::~VhdlParser()
 {
-  clear();
+  if (token_source) delete token_source;
+  if (head) {
+    Token *next, *t = head;
+    while (t) {
+      next = t->next;
+      delete t;
+      t = next;
+    }
+  }
+  if (errorHandlerCreated) {
+    delete errorHandler;
+  }
 }
 
 void VhdlParser::ReInit(TokenManager *tm){
-    clear();
+    if (head) delete head;
     errorHandler = new ErrorHandler();
     errorHandlerCreated = true;
     hasError = false;
@@ -12815,26 +12790,8 @@ void VhdlParser::ReInit(TokenManager *tm){
     trace_enabled = false;
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 294; i++) jj_la1[i] = -1;
-  }
-
-
-void VhdlParser::clear(){
-  //Since token manager was generate from outside,
-  //parser should not take care of deleting
-  //if (token_source) delete token_source;
-  if (head) {
-    Token *next, *t = head;
-    while (t) {
-      next = t->next;
-      delete t;
-      t = next;
-    }
+    for (int i = 0; i < 293; i++) jj_la1[i] = -1;
   }
-  if (errorHandlerCreated) {
-    delete errorHandler;
-  }
-}
 
 
 Token * VhdlParser::jj_consume_token(int kind)  {
@@ -12916,23 +12873,26 @@ int VhdlParser::jj_ntk_f(){
   }
 
 
-  void VhdlParser::jj_add_error_token(int kind, int pos)  {
+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());
    }
 
 
-  void VhdlParser::enable_tracing()  {
+ void VhdlParser::enable_tracing()  {
   }
 
-  void VhdlParser::disable_tracing()  {
+  /** Disable tracing. */
+
+ void VhdlParser::disable_tracing()  {
   }
 
 
-  void VhdlParser::jj_rescan_token(){
+void VhdlParser::jj_rescan_token(){
     jj_rescan = true;
     for (int i = 0; i < 114; i++) {
       JJCalls *p = &jj_2_rtns[i];
@@ -13063,7 +13023,7 @@ int VhdlParser::jj_ntk_f(){
   }
 
 
-  void VhdlParser::jj_save(int index, int xla){
+void VhdlParser::jj_save(int index, int xla){
     JJCalls *p = &jj_2_rtns[index];
     while (p->gen > jj_gen) {
       if (p->next == NULL) { p = p->next = new JJCalls(); break; }
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index e4c92d0..4d41c74 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -12,12 +12,12 @@
 namespace vhdl {
 namespace parser {
   struct JJCalls {
-    int        gen;
-    int        arg;
-    JJCalls*   next;
-    Token*     first;
+    int gen;
+    Token *first;
+    int arg;
+    JJCalls *next;
     ~JJCalls() { if (next) delete next; }
-     JJCalls() { next = NULL; arg = 0; gen = -1; first = NULL; }
+    JJCalls() { next = NULL; arg = 0; gen = -1; first = NULL; }
   };
 
 class VhdlParser {
@@ -583,7 +583,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_1() || jj_done;
- { jj_save(0, xla); }
+    finally { 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;
- { jj_save(1, xla); }
+    finally { 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;
- { jj_save(2, xla); }
+    finally { 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;
- { jj_save(3, xla); }
+    finally { 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;
- { jj_save(4, xla); }
+    finally { 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;
- { jj_save(5, xla); }
+    finally { 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;
- { jj_save(6, xla); }
+    finally { 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;
- { jj_save(7, xla); }
+    finally { 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;
- { jj_save(8, xla); }
+    finally { 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;
- { jj_save(9, xla); }
+    finally { 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;
- { jj_save(10, xla); }
+    finally { 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;
- { jj_save(11, xla); }
+    finally { 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;
- { jj_save(12, xla); }
+    finally { 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;
- { jj_save(13, xla); }
+    finally { 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;
- { jj_save(14, xla); }
+    finally { 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;
- { jj_save(15, xla); }
+    finally { 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;
- { jj_save(16, xla); }
+    finally { 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;
- { jj_save(17, xla); }
+    finally { 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;
- { jj_save(18, xla); }
+    finally { 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;
- { jj_save(19, xla); }
+    finally { 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;
- { jj_save(20, xla); }
+    finally { 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;
- { jj_save(21, xla); }
+    finally { 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;
- { jj_save(22, xla); }
+    finally { 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;
- { jj_save(23, xla); }
+    finally { 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;
- { jj_save(24, xla); }
+    finally { 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;
- { jj_save(25, xla); }
+    finally { 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;
- { jj_save(26, xla); }
+    finally { 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;
- { jj_save(27, xla); }
+    finally { 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;
- { jj_save(28, xla); }
+    finally { 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;
- { jj_save(29, xla); }
+    finally { 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;
- { jj_save(30, xla); }
+    finally { 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;
- { jj_save(31, xla); }
+    finally { 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;
- { jj_save(32, xla); }
+    finally { 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;
- { jj_save(33, xla); }
+    finally { 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;
- { jj_save(34, xla); }
+    finally { 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;
- { jj_save(35, xla); }
+    finally { 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;
- { jj_save(36, xla); }
+    finally { 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;
- { jj_save(37, xla); }
+    finally { 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;
- { jj_save(38, xla); }
+    finally { 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;
- { jj_save(39, xla); }
+    finally { 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;
- { jj_save(40, xla); }
+    finally { 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;
- { jj_save(41, xla); }
+    finally { 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;
- { jj_save(42, xla); }
+    finally { 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;
- { jj_save(43, xla); }
+    finally { 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;
- { jj_save(44, xla); }
+    finally { 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;
- { jj_save(45, xla); }
+    finally { 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;
- { jj_save(46, xla); }
+    finally { 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;
- { jj_save(47, xla); }
+    finally { 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;
- { jj_save(48, xla); }
+    finally { 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;
- { jj_save(49, xla); }
+    finally { 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;
- { jj_save(50, xla); }
+    finally { 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;
- { jj_save(51, xla); }
+    finally { 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;
- { jj_save(52, xla); }
+    finally { 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;
- { jj_save(53, xla); }
+    finally { 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;
- { jj_save(54, xla); }
+    finally { 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;
- { jj_save(55, xla); }
+    finally { 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;
- { jj_save(56, xla); }
+    finally { 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;
- { jj_save(57, xla); }
+    finally { 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;
- { jj_save(58, xla); }
+    finally { 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;
- { jj_save(59, xla); }
+    finally { 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;
- { jj_save(60, xla); }
+    finally { 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;
- { jj_save(61, xla); }
+    finally { 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;
- { jj_save(62, xla); }
+    finally { 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;
- { jj_save(63, xla); }
+    finally { 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;
- { jj_save(64, xla); }
+    finally { 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;
- { jj_save(65, xla); }
+    finally { 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;
- { jj_save(66, xla); }
+    finally { 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;
- { jj_save(67, xla); }
+    finally { 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;
- { jj_save(68, xla); }
+    finally { 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;
- { jj_save(69, xla); }
+    finally { 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;
- { jj_save(70, xla); }
+    finally { 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;
- { jj_save(71, xla); }
+    finally { 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;
- { jj_save(72, xla); }
+    finally { 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;
- { jj_save(73, xla); }
+    finally { 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;
- { jj_save(74, xla); }
+    finally { 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;
- { jj_save(75, xla); }
+    finally { 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;
- { jj_save(76, xla); }
+    finally { 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;
- { jj_save(77, xla); }
+    finally { 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;
- { jj_save(78, xla); }
+    finally { 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;
- { jj_save(79, xla); }
+    finally { 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;
- { jj_save(80, xla); }
+    finally { 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;
- { jj_save(81, xla); }
+    finally { 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;
- { jj_save(82, xla); }
+    finally { 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;
- { jj_save(83, xla); }
+    finally { 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;
- { jj_save(84, xla); }
+    finally { 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;
- { jj_save(85, xla); }
+    finally { 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;
- { jj_save(86, xla); }
+    finally { 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;
- { jj_save(87, xla); }
+    finally { 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;
- { jj_save(88, xla); }
+    finally { 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;
- { jj_save(89, xla); }
+    finally { 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;
- { jj_save(90, xla); }
+    finally { 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;
- { jj_save(91, xla); }
+    finally { 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;
- { jj_save(92, xla); }
+    finally { 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;
- { jj_save(93, xla); }
+    finally { 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;
- { jj_save(94, xla); }
+    finally { 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;
- { jj_save(95, xla); }
+    finally { 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;
- { jj_save(96, xla); }
+    finally { 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;
- { jj_save(97, xla); }
+    finally { 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;
- { jj_save(98, xla); }
+    finally { 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;
- { jj_save(99, xla); }
+    finally { 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;
- { jj_save(100, xla); }
+    finally { 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;
- { jj_save(101, xla); }
+    finally { 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;
- { jj_save(102, xla); }
+    finally { 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;
- { jj_save(103, xla); }
+    finally { 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;
- { jj_save(104, xla); }
+    finally { 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;
- { jj_save(105, xla); }
+    finally { 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;
- { jj_save(106, xla); }
+    finally { 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;
- { jj_save(107, xla); }
+    finally { 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;
- { jj_save(108, xla); }
+    finally { 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;
- { jj_save(109, xla); }
+    finally { 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;
- { jj_save(110, xla); }
+    finally { jj_save(110, xla); }
   }
 
  inline bool jj_2_112(int xla)
@@ -1471,7 +1471,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_112() || jj_done;
- { jj_save(111, xla); }
+    finally { jj_save(111, xla); }
   }
 
  inline bool jj_2_113(int xla)
@@ -1479,7 +1479,7 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_113() || jj_done;
- { jj_save(112, xla); }
+    finally { jj_save(112, xla); }
   }
 
  inline bool jj_2_114(int xla)
@@ -1487,38 +1487,38 @@ void parseInline();
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
     return !jj_3_114() || jj_done;
- { jj_save(113, xla); }
+    finally { jj_save(113, xla); }
   }
 
- inline bool jj_3R_258()
+ inline bool jj_3R_257()
  {
     if (jj_done) return true;
-    if (jj_3R_367()) return true;
+    if (jj_3R_366()) return true;
     return false;
   }
 
- inline bool jj_3R_257()
+ inline bool jj_3R_256()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_123()
+ inline bool jj_3R_122()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_257()) jj_scanpos = xsp;
+    if (jj_3R_256()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_258()) jj_scanpos = xsp;
+    if (jj_3R_257()) jj_scanpos = xsp;
     if (jj_scan_token(LOOP_T)) return true;
-    if (jj_3R_259()) return true;
+    if (jj_3R_258()) return true;
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(LOOP_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_625()) jj_scanpos = xsp;
+    if (jj_3R_628()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -1526,18 +1526,18 @@ void parseInline();
  inline bool jj_3_45()
  {
     if (jj_done) return true;
-    if (jj_3R_97()) return true;
+    if (jj_3R_96()) return true;
     return false;
   }
 
  inline bool jj_3_44()
  {
     if (jj_done) return true;
-    if (jj_3R_96()) return true;
+    if (jj_3R_95()) return true;
     return false;
   }
 
- inline bool jj_3R_233()
+ inline bool jj_3R_232()
  {
     if (jj_done) return true;
     if (jj_scan_token(NULL_T)) return true;
@@ -1547,21 +1547,14 @@ void parseInline();
  inline bool jj_3_43()
  {
     if (jj_done) return true;
-    if (jj_3R_95()) return true;
-    return false;
-  }
-
- inline bool jj_3R_232()
- {
-    if (jj_done) return true;
-    if (jj_3R_356()) return true;
+    if (jj_3R_94()) return true;
     return false;
   }
 
  inline bool jj_3R_231()
  {
     if (jj_done) return true;
-    if (jj_3R_97()) return true;
+    if (jj_3R_355()) return true;
     return false;
   }
 
@@ -1579,20 +1572,27 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_107()
+ inline bool jj_3R_228()
+ {
+    if (jj_done) return true;
+    if (jj_3R_94()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_106()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_228()) {
+    jj_scanpos = xsp;
     if (jj_3R_229()) {
     jj_scanpos = xsp;
     if (jj_3R_230()) {
     jj_scanpos = xsp;
     if (jj_3R_231()) {
     jj_scanpos = xsp;
-    if (jj_3R_232()) {
-    jj_scanpos = xsp;
-    if (jj_3R_233()) return true;
+    if (jj_3R_232()) return true;
     }
     }
     }
@@ -1603,69 +1603,69 @@ void parseInline();
  inline bool jj_3_42()
  {
     if (jj_done) return true;
-    if (jj_3R_94()) return true;
+    if (jj_3R_93()) return true;
     return false;
   }
 
- inline bool jj_3R_140()
+ inline bool jj_3R_139()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_199()
+ inline bool jj_3R_198()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_444()
+ inline bool jj_3R_442()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_408()) return true;
+    if (jj_3R_407()) return true;
     return false;
   }
 
- inline bool jj_3R_367()
+ inline bool jj_3R_366()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_443()) {
+    if (jj_3R_441()) {
     jj_scanpos = xsp;
-    if (jj_3R_444()) return true;
+    if (jj_3R_442()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_443()
+ inline bool jj_3R_441()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHILE_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
- inline bool jj_3R_198()
+ inline bool jj_3R_197()
  {
     if (jj_done) return true;
-    if (jj_3R_346()) return true;
+    if (jj_3R_345()) return true;
     return false;
   }
 
- inline bool jj_3R_400()
+ inline bool jj_3R_399()
  {
     if (jj_done) return true;
     if (jj_scan_token(SEMI_T)) return true;
-    if (jj_3R_399()) return true;
+    if (jj_3R_398()) return true;
     return false;
   }
 
- inline bool jj_3R_196()
+ inline bool jj_3R_195()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -1683,128 +1683,128 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_91()
+ inline bool jj_3R_90()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_196()) jj_scanpos = xsp;
-    if (jj_3R_197()) return true;
+    if (jj_3R_195()) jj_scanpos = xsp;
+    if (jj_3R_196()) return true;
     if (jj_scan_token(COLON_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_198()) jj_scanpos = xsp;
-    if (jj_3R_85()) return true;
+    if (jj_3R_197()) jj_scanpos = xsp;
+    if (jj_3R_84()) return true;
     xsp = jj_scanpos;
     if (jj_scan_token(27)) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_199()) jj_scanpos = xsp;
+    if (jj_3R_198()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_313()
+ inline bool jj_3R_312()
  {
     if (jj_done) return true;
-    if (jj_3R_399()) return true;
+    if (jj_3R_398()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_400()) { jj_scanpos = xsp; break; }
+      if (jj_3R_399()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_413()
+ inline bool jj_3R_411()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_92()
+ inline bool jj_3R_91()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
-    if (jj_3R_197()) return true;
+    if (jj_3R_196()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_399()
+ inline bool jj_3R_398()
  {
     if (jj_done) return true;
-    if (jj_3R_491()) return true;
+    if (jj_3R_489()) return true;
     return false;
   }
 
  inline bool jj_3_41()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_552()
+ inline bool jj_3R_557()
  {
     if (jj_done) return true;
-    if (jj_3R_613()) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_612()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_551()
+ inline bool jj_3R_556()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
  inline bool jj_3_40()
  {
     if (jj_done) return true;
-    if (jj_3R_92()) return true;
+    if (jj_3R_91()) return true;
     return false;
   }
 
  inline bool jj_3_39()
  {
     if (jj_done) return true;
-    if (jj_3R_91()) return true;
+    if (jj_3R_90()) return true;
     return false;
   }
 
- inline bool jj_3R_550()
+ inline bool jj_3R_555()
  {
     if (jj_done) return true;
-    if (jj_3R_108()) return true;
+    if (jj_3R_107()) return true;
     return false;
   }
 
  inline bool jj_3_38()
  {
     if (jj_done) return true;
-    if (jj_3R_90()) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
- inline bool jj_3R_491()
+ inline bool jj_3R_489()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_3_38()) {
     jj_scanpos = xsp;
-    if (jj_3R_550()) {
+    if (jj_3R_555()) {
     jj_scanpos = xsp;
     if (jj_3_39()) {
     jj_scanpos = xsp;
     if (jj_3_40()) {
     jj_scanpos = xsp;
-    if (jj_3R_551()) {
+    if (jj_3R_556()) {
     jj_scanpos = xsp;
-    if (jj_3R_552()) return true;
+    if (jj_3R_557()) return true;
     }
     }
     }
@@ -1813,93 +1813,93 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_181()
+ inline bool jj_3R_180()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_621()
+ inline bool jj_3R_624()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_416()
+ inline bool jj_3R_414()
  {
     if (jj_done) return true;
     if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_415()
+ inline bool jj_3R_413()
  {
     if (jj_done) return true;
     if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_331()
+ inline bool jj_3R_330()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_414()) {
+    if (jj_3R_412()) {
     jj_scanpos = xsp;
-    if (jj_3R_415()) {
+    if (jj_3R_413()) {
     jj_scanpos = xsp;
-    if (jj_3R_416()) return true;
+    if (jj_3R_414()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_414()
+ inline bool jj_3R_412()
  {
     if (jj_done) return true;
-    if (jj_3R_197()) return true;
+    if (jj_3R_196()) return true;
     return false;
   }
 
- inline bool jj_3R_698()
+ inline bool jj_3R_695()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_328()
+ inline bool jj_3R_327()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_327()
+ inline bool jj_3R_326()
  {
     if (jj_done) return true;
     if (jj_scan_token(ENTITY_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_413()) jj_scanpos = xsp;
+    if (jj_3R_411()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_174()
+ inline bool jj_3R_173()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_326()) {
+    if (jj_3R_325()) {
     jj_scanpos = xsp;
-    if (jj_3R_327()) {
+    if (jj_3R_326()) {
     jj_scanpos = xsp;
-    if (jj_3R_328()) return true;
+    if (jj_3R_327()) return true;
     }
     }
     return false;
@@ -1908,308 +1908,308 @@ void parseInline();
  inline bool jj_3_37()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_326()
+ inline bool jj_3R_325()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(28)) jj_scanpos = xsp;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_155()
+ inline bool jj_3R_154()
  {
     if (jj_done) return true;
-    if (jj_3R_158()) return true;
+    if (jj_3R_157()) return true;
     if (jj_scan_token(RANGE_T)) return true;
     if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
- inline bool jj_3R_427()
+ inline bool jj_3R_425()
  {
     if (jj_done) return true;
     if (jj_scan_token(IS_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_698()) {
+    if (jj_3R_695()) {
     jj_scanpos = xsp;
     if (jj_scan_token(145)) return true;
     }
     return false;
   }
 
- inline bool jj_3R_618()
+ inline bool jj_3R_621()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_617()
+ inline bool jj_3R_620()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_565()
+ inline bool jj_3R_564()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_617()) {
+    if (jj_3R_620()) {
     jj_scanpos = xsp;
-    if (jj_3R_618()) return true;
+    if (jj_3R_621()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_83()
+ inline bool jj_3R_82()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_181()) { jj_scanpos = xsp; break; }
+      if (jj_3R_180()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_526()
+ inline bool jj_3R_531()
  {
     if (jj_done) return true;
     if (jj_scan_token(TYPE_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_620()
+ inline bool jj_3R_623()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_259()) return true;
+    if (jj_3R_258()) return true;
     return false;
   }
 
- inline bool jj_3R_619()
+ inline bool jj_3R_622()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSIF_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     if (jj_scan_token(THEN_T)) return true;
-    if (jj_3R_259()) return true;
+    if (jj_3R_258()) return true;
     return false;
   }
 
- inline bool jj_3R_345()
+ inline bool jj_3R_344()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_514()
+ inline bool jj_3R_519()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_313()) return true;
+    if (jj_3R_312()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_255()
+ inline bool jj_3R_254()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_121()
+ inline bool jj_3R_120()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_255()) jj_scanpos = xsp;
+    if (jj_3R_254()) jj_scanpos = xsp;
     if (jj_scan_token(IF_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     if (jj_scan_token(THEN_T)) return true;
-    if (jj_3R_259()) return true;
+    if (jj_3R_258()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_619()) { jj_scanpos = xsp; break; }
+      if (jj_3R_622()) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_620()) jj_scanpos = xsp;
+    if (jj_3R_623()) 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_621()) jj_scanpos = xsp;
+    if (jj_3R_624()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_197()
+ inline bool jj_3R_196()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_345()) { jj_scanpos = xsp; break; }
+      if (jj_3R_344()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_165()
+ inline bool jj_3R_164()
  {
     if (jj_done) return true;
     if (jj_scan_token(BASIC_IDENTIFIER)) return true;
     return false;
   }
 
- inline bool jj_3R_164()
+ inline bool jj_3R_163()
  {
     if (jj_done) return true;
     if (jj_scan_token(EXTENDED_CHARACTER)) return true;
     return false;
   }
 
- inline bool jj_3R_70()
+ inline bool jj_3R_69()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_164()) {
+    if (jj_3R_163()) {
     jj_scanpos = xsp;
-    if (jj_3R_165()) return true;
+    if (jj_3R_164()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_539()
+ inline bool jj_3R_544()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_538()) return true;
+    if (jj_3R_543()) return true;
     return false;
   }
 
- inline bool jj_3R_425()
+ inline bool jj_3R_423()
  {
     if (jj_done) 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;
+    if (jj_3R_519()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3_114()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_66()
+ inline bool jj_3R_385()
+ {
+    if (jj_done) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_85()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(134)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(137)) return true;
+    }
+    return false;
+  }
+
+ inline bool jj_3R_65()
  {
     if (jj_done) return true;
     if (jj_scan_token(GROUP_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(IS_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_475()) return true;
+    if (jj_3R_473()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_386()
+ inline bool jj_3R_445()
  {
     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(134)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(137)) return true;
-    }
+    if (jj_3R_528()) return true;
     return false;
   }
 
- inline bool jj_3R_447()
+ inline bool jj_3R_529()
  {
     if (jj_done) return true;
-    if (jj_3R_523()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_447()) return true;
     return false;
   }
 
- inline bool jj_3R_383()
+ inline bool jj_3R_382()
  {
     if (jj_done) return true;
     if (jj_scan_token(GROUP_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_476()) return true;
+    if (jj_3R_474()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_524()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_449()) return true;
-    return false;
-  }
-
- inline bool jj_3R_540()
+ inline bool jj_3R_545()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_305()
+ inline bool jj_3R_304()
  {
     if (jj_done) return true;
-    if (jj_3R_384()) return true;
+    if (jj_3R_383()) return true;
     return false;
   }
 
- inline bool jj_3R_476()
+ inline bool jj_3R_474()
  {
     if (jj_done) return true;
-    if (jj_3R_538()) return true;
+    if (jj_3R_543()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_539()) { jj_scanpos = xsp; break; }
+      if (jj_3R_544()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_426()
+ inline bool jj_3R_424()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -2221,179 +2221,179 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_344()
+ inline bool jj_3R_343()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_426()) jj_scanpos = xsp;
+    if (jj_3R_424()) 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_3R_59()) return true;
+    if (jj_3R_423()) return true;
     if (jj_scan_token(RETURN_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_427()) jj_scanpos = xsp;
+    if (jj_3R_425()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_608()
+ inline bool jj_3R_607()
  {
     if (jj_done) return true;
-    if (jj_3R_352()) return true;
+    if (jj_3R_351()) return true;
     return false;
   }
 
- inline bool jj_3R_607()
+ inline bool jj_3R_606()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_538()
+ inline bool jj_3R_543()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_607()) {
+    if (jj_3R_606()) {
     jj_scanpos = xsp;
-    if (jj_3R_608()) return true;
+    if (jj_3R_607()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_71()
+ inline bool jj_3R_70()
  {
     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_166()) return true;
+    if (jj_3R_165()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_304()
- {
-    if (jj_done) return true;
-    if (jj_3R_59()) return true;
-    if (jj_3R_385()) return true;
-    return false;
-  }
-
- inline bool jj_3R_171()
+ inline bool jj_3R_303()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_58()) return true;
+    if (jj_3R_384()) return true;
     return false;
   }
 
- inline bool jj_3R_343()
+ inline bool jj_3R_342()
  {
     if (jj_done) return true;
     if (jj_scan_token(PROCEDURE_T)) return true;
-    if (jj_3R_70()) return true;
-    if (jj_3R_425()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_3R_423()) return true;
     return false;
   }
 
- inline bool jj_3R_195()
+ inline bool jj_3R_170()
  {
     if (jj_done) return true;
-    if (jj_3R_344()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_159()
+ inline bool jj_3R_194()
  {
     if (jj_done) return true;
-    if (jj_3R_313()) return true;
+    if (jj_3R_343()) return true;
     return false;
   }
 
- inline bool jj_3R_194()
+ inline bool jj_3R_193()
  {
     if (jj_done) return true;
-    if (jj_3R_343()) return true;
+    if (jj_3R_342()) return true;
     return false;
   }
 
- inline bool jj_3R_90()
+ inline bool jj_3R_89()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_194()) {
+    if (jj_3R_193()) {
     jj_scanpos = xsp;
-    if (jj_3R_195()) return true;
+    if (jj_3R_194()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_67()
+ inline bool jj_3R_158()
  {
     if (jj_done) 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;
+    if (jj_3R_312()) return true;
     return false;
   }
 
- inline bool jj_3R_477()
+ inline bool jj_3R_475()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_540()) jj_scanpos = xsp;
+    if (jj_3R_545()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_385()
+ inline bool jj_3R_66()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_158()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_384()
  {
     if (jj_done) return true;
     Token * xsp;
-    if (jj_3R_477()) return true;
+    if (jj_3R_475()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_477()) { jj_scanpos = xsp; break; }
+      if (jj_3R_475()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_322()
+ inline bool jj_3R_321()
  {
     if (jj_done) return true;
     if (jj_scan_token(IF_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
- inline bool jj_3R_169()
+ inline bool jj_3R_168()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_321()) {
+    if (jj_3R_320()) {
     jj_scanpos = xsp;
-    if (jj_3R_322()) return true;
+    if (jj_3R_321()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_321()
+ inline bool jj_3R_320()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_408()) return true;
+    if (jj_3R_407()) return true;
     return false;
   }
 
- inline bool jj_3R_384()
+ inline bool jj_3R_383()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -2405,58 +2405,58 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_448()
+ inline bool jj_3R_446()
  {
     if (jj_done) return true;
-    if (jj_3R_405()) return true;
+    if (jj_3R_404()) return true;
     return false;
   }
 
- inline bool jj_3R_449()
+ inline bool jj_3R_447()
  {
     if (jj_done) return true;
-    if (jj_3R_446()) return true;
+    if (jj_3R_444()) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_524()) { jj_scanpos = xsp; break; }
+      if (jj_3R_529()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_464()
+ inline bool jj_3R_462()
  {
     if (jj_done) return true;
-    if (jj_3R_528()) return true;
+    if (jj_3R_533()) return true;
     return false;
   }
 
- inline bool jj_3R_75()
+ inline bool jj_3R_74()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_169()) return true;
+    if (jj_3R_168()) return true;
     if (jj_scan_token(GENERATE_T)) return true;
-    if (jj_3R_170()) return true;
+    if (jj_3R_169()) return true;
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(GENERATE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_171()) jj_scanpos = xsp;
+    if (jj_3R_170()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_306()
+ inline bool jj_3R_305()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(134)) {
@@ -2465,125 +2465,125 @@ void parseInline();
     }
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_386()) { jj_scanpos = xsp; break; }
+      if (jj_3R_385()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_105()
+ inline bool jj_3R_302()
  {
     if (jj_done) 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;
+    if (jj_3R_383()) return true;
     return false;
   }
 
- inline bool jj_3R_303()
+ inline bool jj_3R_104()
  {
     if (jj_done) return true;
-    if (jj_3R_384()) return true;
+    if (jj_3R_59()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_225()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
  inline bool jj_3_110()
  {
     if (jj_done) return true;
-    if (jj_3R_143()) return true;
+    if (jj_3R_142()) return true;
     if (jj_scan_token(DOT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_145()
+ inline bool jj_3R_144()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(SELECT_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(155)) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     if (jj_scan_token(FORCE_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_305()) jj_scanpos = xsp;
-    if (jj_3R_306()) return true;
+    if (jj_3R_304()) jj_scanpos = xsp;
+    if (jj_3R_305()) return true;
     return false;
   }
 
- inline bool jj_3R_157()
+ inline bool jj_3_113()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_312()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3_113()
+ inline bool jj_3R_156()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_311()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_369()
+ inline bool jj_3R_368()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(SELECT_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(155)) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_448()) jj_scanpos = xsp;
-    if (jj_3R_449()) return true;
+    if (jj_3R_446()) jj_scanpos = xsp;
+    if (jj_3R_447()) return true;
     return false;
   }
 
- inline bool jj_3R_301()
+ inline bool jj_3R_300()
  {
     if (jj_done) return true;
-    if (jj_3R_143()) return true;
+    if (jj_3R_142()) return true;
     if (jj_scan_token(DOT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_689()
+ inline bool jj_3R_686()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_137()
+ inline bool jj_3R_136()
  {
     if (jj_done) return true;
     if (jj_scan_token(TYPE_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_577()) return true;
+    if (jj_3R_576()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_575()
+ inline bool jj_3R_574()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_688()
+ inline bool jj_3R_685()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
@@ -2592,258 +2592,265 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_688()) {
+    if (jj_3R_685()) {
     jj_scanpos = xsp;
-    if (jj_3R_689()) return true;
+    if (jj_3R_686()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_64()
+ inline bool jj_3R_63()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_157()) jj_scanpos = xsp;
+    if (jj_3R_156()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3_112()
  {
     if (jj_done) return true;
-    if (jj_3R_145()) return true;
-    return false;
-  }
-
- inline bool jj_3R_570()
- {
-    if (jj_done) return true;
-    if (jj_3R_313()) return true;
+    if (jj_3R_144()) return true;
     return false;
   }
 
- inline bool jj_3R_521()
+ inline bool jj_3R_526()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(SELECT_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
     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_306()) return true;
+    if (jj_3R_305()) return true;
     return false;
   }
 
- inline bool jj_3R_445()
+ inline bool jj_3R_443()
  {
     if (jj_done) return true;
-    if (jj_3R_405()) return true;
+    if (jj_3R_404()) return true;
     return false;
   }
 
- inline bool jj_3R_398()
+ inline bool jj_3R_569()
+ {
+    if (jj_done) return true;
+    if (jj_3R_312()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_397()
  {
     if (jj_done) return true;
     if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
- inline bool jj_3R_312()
+ inline bool jj_3R_311()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_397()) {
+    if (jj_3R_396()) {
     jj_scanpos = xsp;
-    if (jj_3R_398()) return true;
+    if (jj_3R_397()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_397()
+ inline bool jj_3R_396()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_271()
+ inline bool jj_3R_270()
  {
     if (jj_done) return true;
-    if (jj_3R_369()) return true;
+    if (jj_3R_368()) return true;
     return false;
   }
 
- inline bool jj_3R_128()
+ inline bool jj_3R_127()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_270()) {
+    if (jj_3R_269()) {
     jj_scanpos = xsp;
-    if (jj_3R_271()) return true;
+    if (jj_3R_270()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_270()
+ inline bool jj_3R_269()
  {
     if (jj_done) return true;
-    if (jj_3R_145()) return true;
+    if (jj_3R_144()) return true;
     return false;
   }
 
- inline bool jj_3R_144()
+ inline bool jj_3R_143()
  {
     if (jj_done) return true;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     if (jj_scan_token(FORCE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_303()) jj_scanpos = xsp;
-    if (jj_3R_59()) return true;
+    if (jj_3R_302()) jj_scanpos = xsp;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_304()) jj_scanpos = xsp;
+    if (jj_3R_303()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_654()
+ inline bool jj_3R_656()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
     if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_158()) return true;
+    if (jj_3R_157()) return true;
     return false;
   }
 
- inline bool jj_3R_523()
+ inline bool jj_3R_528()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_575()) jj_scanpos = xsp;
+    if (jj_3R_574()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3_111()
  {
     if (jj_done) return true;
-    if (jj_3R_144()) return true;
+    if (jj_3R_143()) return true;
     return false;
   }
 
- inline bool jj_3R_580()
+ inline bool jj_3R_323()
+ {
+    if (jj_done) return true;
+    if (jj_3R_409()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_579()
  {
     if (jj_done) return true;
     if (jj_scan_token(OPEN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_528()
+ inline bool jj_3R_533()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_580()) jj_scanpos = xsp;
+    if (jj_3R_579()) jj_scanpos = xsp;
     if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_581()) return true;
+    if (jj_3R_580()) return true;
     return false;
   }
 
- inline bool jj_3R_368()
+ inline bool jj_3R_367()
  {
     if (jj_done) return true;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_445()) jj_scanpos = xsp;
-    if (jj_3R_446()) return true;
+    if (jj_3R_443()) jj_scanpos = xsp;
+    if (jj_3R_444()) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_447()) jj_scanpos = xsp;
+    if (jj_3R_445()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_269()
+ inline bool jj_3R_268()
  {
     if (jj_done) return true;
-    if (jj_3R_368()) return true;
+    if (jj_3R_367()) return true;
     return false;
   }
 
- inline bool jj_3R_581()
+ inline bool jj_3R_580()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_127()
+ inline bool jj_3R_126()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_268()) {
+    if (jj_3R_267()) {
     jj_scanpos = xsp;
-    if (jj_3R_269()) return true;
+    if (jj_3R_268()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_268()
+ inline bool jj_3R_267()
  {
     if (jj_done) return true;
-    if (jj_3R_144()) return true;
+    if (jj_3R_143()) return true;
     return false;
   }
 
- inline bool jj_3R_450()
+ inline bool jj_3R_448()
  {
     if (jj_done) return true;
     if (jj_scan_token(DOUBLEMULT_T)) return true;
-    if (jj_3R_370()) return true;
+    if (jj_3R_369()) return true;
     return false;
   }
 
- inline bool jj_3R_142()
+ inline bool jj_3R_141()
  {
     if (jj_done) return true;
-    if (jj_3R_143()) return true;
+    if (jj_3R_142()) return true;
     if (jj_scan_token(DOT_T)) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_301()) { jj_scanpos = xsp; break; }
+      if (jj_3R_300()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_549()
+ inline bool jj_3R_554()
  {
     if (jj_done) return true;
     if (jj_scan_token(AT_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_302()
+ inline bool jj_3R_301()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -2851,134 +2858,127 @@ void parseInline();
  inline bool jj_3_109()
  {
     if (jj_done) return true;
-    if (jj_3R_142()) return true;
+    if (jj_3R_141()) return true;
     return false;
   }
 
- inline bool jj_3R_376()
+ inline bool jj_3R_375()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
-    if (jj_3R_197()) return true;
+    if (jj_3R_196()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_464()) jj_scanpos = xsp;
+    if (jj_3R_462()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_264()
+ inline bool jj_3R_263()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_284()
+ inline bool jj_3R_283()
  {
     if (jj_done) return true;
     if (jj_scan_token(NOT_T)) return true;
-    if (jj_3R_370()) return true;
+    if (jj_3R_369()) return true;
     return false;
   }
 
- inline bool jj_3R_283()
+ inline bool jj_3R_282()
  {
     if (jj_done) return true;
     if (jj_scan_token(ABS_T)) return true;
-    if (jj_3R_370()) return true;
+    if (jj_3R_369()) return true;
     return false;
   }
 
- inline bool jj_3R_136()
+ inline bool jj_3R_135()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_282()) {
+    if (jj_3R_281()) {
     jj_scanpos = xsp;
-    if (jj_3R_283()) {
+    if (jj_3R_282()) {
     jj_scanpos = xsp;
-    if (jj_3R_284()) return true;
+    if (jj_3R_283()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_282()
+ inline bool jj_3R_281()
  {
     if (jj_done) return true;
-    if (jj_3R_370()) return true;
+    if (jj_3R_369()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_450()) jj_scanpos = xsp;
+    if (jj_3R_448()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_612()
+ inline bool jj_3R_611()
  {
     if (jj_done) return true;
-    if (jj_3R_142()) return true;
+    if (jj_3R_141()) return true;
     return false;
   }
 
- inline bool jj_3R_699()
+ inline bool jj_3R_696()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_97()) return true;
-    return false;
-  }
-
- inline bool jj_3R_147()
- {
-    if (jj_done) return true;
-    if (jj_3R_309()) return true;
-    if (jj_3R_146()) return true;
+    if (jj_3R_96()) return true;
     return false;
   }
 
- inline bool jj_3R_143()
+ inline bool jj_3R_142()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_302()) jj_scanpos = xsp;
+    if (jj_3R_301()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_394()
+ inline bool jj_3R_146()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OR_T)) return true;
+    if (jj_3R_308()) return true;
+    if (jj_3R_145()) return true;
     return false;
   }
 
  inline bool jj_3R_393()
  {
     if (jj_done) return true;
-    if (jj_scan_token(XOR_T)) return true;
+    if (jj_scan_token(OR_T)) return true;
     return false;
   }
 
  inline bool jj_3R_392()
  {
     if (jj_done) return true;
-    if (jj_scan_token(XNOR_T)) return true;
+    if (jj_scan_token(XOR_T)) return true;
     return false;
   }
 
  inline bool jj_3R_391()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NOR_T)) return true;
+    if (jj_scan_token(XNOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_636()
+ inline bool jj_3R_639()
  {
     if (jj_done) return true;
     if (jj_scan_token(NEG_T)) return true;
@@ -2989,34 +2989,36 @@ void parseInline();
  inline bool jj_3R_390()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NAND_T)) return true;
+    if (jj_scan_token(NOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_611()
+ inline bool jj_3R_610()
  {
     if (jj_done) return true;
     Token * xsp;
-    if (jj_3R_636()) return true;
+    if (jj_3R_639()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_636()) { jj_scanpos = xsp; break; }
+      if (jj_3R_639()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_410()
+ inline bool jj_3R_389()
  {
     if (jj_done) return true;
-    if (jj_3R_498()) return true;
+    if (jj_scan_token(NAND_T)) return true;
     return false;
   }
 
- inline bool jj_3R_309()
+ inline bool jj_3R_308()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_388()) {
+    jj_scanpos = xsp;
     if (jj_3R_389()) {
     jj_scanpos = xsp;
     if (jj_3R_390()) {
@@ -3025,9 +3027,7 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3R_392()) {
     jj_scanpos = xsp;
-    if (jj_3R_393()) {
-    jj_scanpos = xsp;
-    if (jj_3R_394()) return true;
+    if (jj_3R_393()) return true;
     }
     }
     }
@@ -3036,7 +3036,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_389()
+ inline bool jj_3R_388()
  {
     if (jj_done) return true;
     if (jj_scan_token(AND_T)) return true;
@@ -3047,314 +3047,292 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_142()) return true;
+    if (jj_3R_141()) return true;
     return false;
   }
 
- inline bool jj_3R_548()
+ inline bool jj_3R_553()
  {
     if (jj_done) return true;
-    if (jj_3R_611()) return true;
+    if (jj_3R_610()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_612()) jj_scanpos = xsp;
-    if (jj_3R_70()) return true;
+    if (jj_3R_611()) jj_scanpos = xsp;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_610()
+ inline bool jj_3R_609()
  {
     if (jj_done) return true;
     if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_59()
+ inline bool jj_3R_58()
  {
     if (jj_done) return true;
-    if (jj_3R_146()) return true;
+    if (jj_3R_145()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_147()) { jj_scanpos = xsp; break; }
+      if (jj_3R_146()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_609()
+ inline bool jj_3R_608()
  {
     if (jj_done) return true;
     if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_142()) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_141()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_547()
+ inline bool jj_3R_552()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_609()) {
+    if (jj_3R_608()) {
     jj_scanpos = xsp;
-    if (jj_3R_610()) return true;
+    if (jj_3R_609()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_490()
+ inline bool jj_3R_488()
  {
     if (jj_done) return true;
-    if (jj_3R_549()) return true;
+    if (jj_3R_554()) return true;
     return false;
   }
 
- inline bool jj_3R_489()
+ inline bool jj_3R_487()
  {
     if (jj_done) return true;
-    if (jj_3R_548()) return true;
+    if (jj_3R_553()) return true;
     return false;
   }
 
- inline bool jj_3R_396()
+ inline bool jj_3R_395()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_488()) {
+    if (jj_3R_486()) {
     jj_scanpos = xsp;
-    if (jj_3R_489()) {
+    if (jj_3R_487()) {
     jj_scanpos = xsp;
-    if (jj_3R_490()) return true;
+    if (jj_3R_488()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_488()
+ inline bool jj_3R_486()
  {
     if (jj_done) return true;
-    if (jj_3R_547()) return true;
+    if (jj_3R_552()) return true;
     return false;
   }
 
  inline bool jj_3_105()
  {
     if (jj_done) return true;
-    if (jj_3R_139()) return true;
+    if (jj_3R_138()) return true;
     return false;
   }
 
- inline bool jj_3R_265()
+ inline bool jj_3R_264()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
- inline bool jj_3R_263()
+ inline bool jj_3R_262()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_487()
+ inline bool jj_3R_485()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_125()
+ inline bool jj_3R_484()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(SIGNAL_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_124()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_263()) jj_scanpos = xsp;
+    if (jj_3R_262()) jj_scanpos = xsp;
     if (jj_scan_token(EXIT_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_264()) jj_scanpos = xsp;
+    if (jj_3R_263()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_265()) jj_scanpos = xsp;
+    if (jj_3R_264()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_486()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(SIGNAL_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_395()
+ inline bool jj_3R_394()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_485()) {
+    if (jj_3R_483()) {
     jj_scanpos = xsp;
-    if (jj_3R_486()) {
+    if (jj_3R_484()) {
     jj_scanpos = xsp;
-    if (jj_3R_487()) return true;
+    if (jj_3R_485()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_485()
+ inline bool jj_3R_483()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_690()
+ inline bool jj_3R_687()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_97()) return true;
+    if (jj_3R_96()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_699()) { jj_scanpos = xsp; break; }
+      if (jj_3R_696()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_275()
+ inline bool jj_3_107()
  {
     if (jj_done) return true;
-    if (jj_3R_133()) return true;
+    if (jj_3R_140()) return true;
     return false;
   }
 
- inline bool jj_3R_209()
+ inline bool jj_3R_274()
  {
     if (jj_done) return true;
-    if (jj_3R_352()) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
- inline bool jj_3_107()
+ inline bool jj_3R_208()
  {
     if (jj_done) return true;
-    if (jj_3R_141()) return true;
-    if (jj_scan_token(BEGIN_T)) return true;
+    if (jj_3R_351()) return true;
     return false;
   }
 
- inline bool jj_3R_208()
+ inline bool jj_3R_207()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_97()
+ inline bool jj_3R_96()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_208()) {
+    if (jj_3R_207()) {
     jj_scanpos = xsp;
-    if (jj_3R_209()) return true;
+    if (jj_3R_208()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_311()
+ inline bool jj_3R_310()
  {
     if (jj_done) return true;
     if (jj_scan_token(SLSL_T)) return true;
+    if (jj_3R_394()) 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_3R_84()) return true;
     if (jj_scan_token(RSRS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_411()
+ inline bool jj_3R_694()
  {
     if (jj_done) return true;
-    if (jj_3R_498()) return true;
+    if (jj_3R_351()) return true;
     return false;
   }
 
- inline bool jj_3R_697()
+ inline bool jj_3R_408()
  {
     if (jj_done) return true;
-    if (jj_3R_352()) return true;
+    if (jj_3R_140()) return true;
     return false;
   }
 
- inline bool jj_3R_324()
+ inline bool jj_3R_322()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_411()) { jj_scanpos = xsp; break; }
+      if (jj_3R_408()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(BEGIN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_409()
- {
-    if (jj_done) return true;
-    if (jj_3R_141()) return true;
-    return false;
-  }
-
- inline bool jj_3R_696()
- {
-    if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    return false;
-  }
-
- inline bool jj_3R_683()
+ inline bool jj_3R_169()
  {
     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_3R_322()) jj_scanpos = xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_323()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_170()
+ inline bool jj_3R_693()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_323()) {
-    jj_scanpos = xsp;
-    if (jj_3R_324()) return true;
-    }
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_323()
+ inline bool jj_3R_683()
  {
     if (jj_done) 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; }
+    xsp = jj_scanpos;
+    if (jj_3R_693()) {
+    jj_scanpos = xsp;
+    if (jj_3R_694()) return true;
     }
     return false;
   }
@@ -3362,165 +3340,165 @@ void parseInline();
  inline bool jj_3_36()
  {
     if (jj_done) return true;
-    if (jj_3R_89()) return true;
+    if (jj_3R_88()) return true;
     return false;
   }
 
- inline bool jj_3R_285()
+ inline bool jj_3R_284()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_687()
+ inline bool jj_3R_661()
  {
     if (jj_done) return true;
     if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_687()) return true;
+    if (jj_3R_661()) return true;
     return false;
   }
 
  inline bool jj_3_35()
  {
     if (jj_done) return true;
-    if (jj_3R_88()) return true;
+    if (jj_3R_87()) return true;
     return false;
   }
 
- inline bool jj_3R_235()
+ inline bool jj_3R_234()
  {
     if (jj_done) return true;
-    if (jj_3R_133()) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
  inline bool jj_3_106()
  {
     if (jj_done) return true;
-    if (jj_3R_140()) return true;
+    if (jj_3R_139()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_139()
+ inline bool jj_3R_138()
  {
     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_3R_284()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_637()
+ inline bool jj_3R_640()
  {
     if (jj_done) return true;
-    if (jj_3R_133()) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
- inline bool jj_3R_661()
+ inline bool jj_3R_651()
  {
     if (jj_done) 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_3R_85()) return true;
     if (jj_scan_token(ARROW_T)) return true;
-    if (jj_3R_687()) return true;
+    if (jj_3R_661()) return true;
     return false;
   }
 
- inline bool jj_3R_649()
+ inline bool jj_3R_618()
  {
     if (jj_done) return true;
     Token * xsp;
-    if (jj_3R_661()) return true;
+    if (jj_3R_651()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_661()) { jj_scanpos = xsp; break; }
+      if (jj_3R_651()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_471()
+ inline bool jj_3R_469()
  {
     if (jj_done) return true;
-    if (jj_3R_533()) return true;
+    if (jj_3R_538()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_534()) return true;
+    if (jj_3R_539()) return true;
     return false;
   }
 
  inline bool jj_3R_684()
  {
     if (jj_done) return true;
-    if (jj_3R_234()) return true;
+    if (jj_3R_233()) return true;
     return false;
   }
 
- inline bool jj_3R_585()
+ inline bool jj_3R_584()
  {
     if (jj_done) return true;
     if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_584()
+ inline bool jj_3R_583()
  {
     if (jj_done) return true;
     if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_615()
+ inline bool jj_3R_560()
  {
     if (jj_done) return true;
     if (jj_scan_token(CASE_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(GENERATE_T)) return true;
-    if (jj_3R_649()) return true;
+    if (jj_3R_618()) return true;
     return false;
   }
 
- inline bool jj_3R_634()
+ inline bool jj_3R_637()
  {
     if (jj_done) return true;
-    if (jj_3R_656()) return true;
+    if (jj_3R_658()) return true;
     return false;
   }
 
- inline bool jj_3R_583()
+ inline bool jj_3R_582()
  {
     if (jj_done) return true;
     Token * xsp;
-    if (jj_3R_634()) return true;
+    if (jj_3R_637()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_634()) { jj_scanpos = xsp; break; }
+      if (jj_3R_637()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_533()
+ inline bool jj_3R_538()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_583()) {
+    if (jj_3R_582()) {
     jj_scanpos = xsp;
-    if (jj_3R_584()) {
+    if (jj_3R_583()) {
     jj_scanpos = xsp;
-    if (jj_3R_585()) return true;
+    if (jj_3R_584()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_656()
+ inline bool jj_3R_658()
  {
     if (jj_done) return true;
     if (jj_3R_683()) return true;
@@ -3530,23 +3508,23 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_132()
+ inline bool jj_3R_131()
  {
     if (jj_done) 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_3R_312()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_133()
+ inline bool jj_3R_132()
  {
     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_166()) return true;
+    if (jj_3R_165()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -3554,154 +3532,154 @@ void parseInline();
  inline bool jj_3_32()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
  inline bool jj_3_34()
  {
     if (jj_done) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_86()) return true;
     return false;
   }
 
  inline bool jj_3_33()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_537()
+ inline bool jj_3R_542()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_536()) return true;
+    if (jj_3R_541()) return true;
     return false;
   }
 
- inline bool jj_3R_131()
+ inline bool jj_3R_130()
  {
     if (jj_done) return true;
     if (jj_scan_token(FUNCTION_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) 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;
+    if (jj_3R_59()) return true;
+    if (jj_3R_233()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_275()) jj_scanpos = xsp;
+    if (jj_3R_274()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_108()
+ inline bool jj_3R_107()
  {
     if (jj_done) return true;
     if (jj_scan_token(PACKAGE_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) 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_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_637()) jj_scanpos = xsp;
+    if (jj_3R_640()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_87()
+ inline bool jj_3R_86()
  {
     if (jj_done) return true;
     if (jj_scan_token(PACKAGE_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) 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;
+    if (jj_3R_59()) return true;
+    if (jj_3R_233()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_235()) jj_scanpos = xsp;
+    if (jj_3R_234()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_606()
+ inline bool jj_3R_605()
  {
     if (jj_done) return true;
     if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
- inline bool jj_3R_349()
+ inline bool jj_3R_348()
  {
     if (jj_done) return true;
     if (jj_scan_token(ENTITY_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
  inline bool jj_3R_682()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_475()
+ inline bool jj_3R_473()
  {
     if (jj_done) return true;
-    if (jj_3R_536()) return true;
+    if (jj_3R_541()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_537()) { jj_scanpos = xsp; break; }
+      if (jj_3R_542()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_254()
+ inline bool jj_3R_253()
  {
     if (jj_done) return true;
-    if (jj_3R_366()) return true;
+    if (jj_3R_365()) return true;
     return false;
   }
 
- inline bool jj_3R_536()
+ inline bool jj_3R_541()
  {
     if (jj_done) return true;
-    if (jj_3R_534()) return true;
+    if (jj_3R_539()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_606()) jj_scanpos = xsp;
+    if (jj_3R_605()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_616()
+ inline bool jj_3R_619()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_602()
+ inline bool jj_3R_601()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_695()
+ inline bool jj_3R_692()
  {
     if (jj_done) return true;
-    if (jj_3R_705()) return true;
+    if (jj_3R_702()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_601()
+ inline bool jj_3R_600()
  {
     if (jj_done) return true;
     if (jj_scan_token(GROUP_T)) return true;
@@ -3714,139 +3692,139 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_695()) { jj_scanpos = xsp; break; }
+      if (jj_3R_692()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_600()
+ inline bool jj_3R_599()
  {
     if (jj_done) return true;
     if (jj_scan_token(UNITS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_599()
+ inline bool jj_3R_598()
  {
     if (jj_done) return true;
     if (jj_scan_token(LITERAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_598()
+ inline bool jj_3R_597()
  {
     if (jj_done) return true;
     if (jj_scan_token(LABEL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_722()
+ inline bool jj_3R_719()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3R_597()
+ inline bool jj_3R_596()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMPONENT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_721()
+ inline bool jj_3R_718()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
- inline bool jj_3R_596()
+ inline bool jj_3R_595()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_595()
+ inline bool jj_3R_594()
  {
     if (jj_done) return true;
     if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_594()
+ inline bool jj_3R_593()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_720()
+ inline bool jj_3R_717()
  {
     if (jj_done) return true;
-    if (jj_3R_347()) return true;
+    if (jj_3R_346()) return true;
     return false;
   }
 
- inline bool jj_3R_705()
+ inline bool jj_3R_702()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_720()) {
+    if (jj_3R_717()) {
     jj_scanpos = xsp;
-    if (jj_3R_721()) {
+    if (jj_3R_718()) {
     jj_scanpos = xsp;
-    if (jj_3R_722()) return true;
+    if (jj_3R_719()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_593()
+ inline bool jj_3R_592()
  {
     if (jj_done) return true;
     if (jj_scan_token(SUBTYPE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_592()
+ inline bool jj_3R_591()
  {
     if (jj_done) return true;
     if (jj_scan_token(TYPE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_591()
+ inline bool jj_3R_590()
  {
     if (jj_done) return true;
     if (jj_scan_token(PACKAGE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_590()
+ inline bool jj_3R_589()
  {
     if (jj_done) return true;
     if (jj_scan_token(FUNCTION_T)) return true;
     return false;
   }
 
- inline bool jj_3R_589()
+ inline bool jj_3R_588()
  {
     if (jj_done) return true;
     if (jj_scan_token(PROCEDURE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_588()
+ inline bool jj_3R_587()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONFIGURATION_T)) return true;
     return false;
   }
 
- inline bool jj_3R_587()
+ inline bool jj_3R_586()
  {
     if (jj_done) return true;
     if (jj_scan_token(ARCHITECTURE_T)) return true;
@@ -3856,22 +3834,24 @@ void parseInline();
  inline bool jj_3R_680()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_586()
+ inline bool jj_3R_585()
  {
     if (jj_done) return true;
     if (jj_scan_token(ENTITY_T)) return true;
     return false;
   }
 
- inline bool jj_3R_534()
+ inline bool jj_3R_539()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_585()) {
+    jj_scanpos = xsp;
     if (jj_3R_586()) {
     jj_scanpos = xsp;
     if (jj_3R_587()) {
@@ -3902,9 +3882,7 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3R_600()) {
     jj_scanpos = xsp;
-    if (jj_3R_601()) {
-    jj_scanpos = xsp;
-    if (jj_3R_602()) return true;
+    if (jj_3R_601()) return true;
     }
     }
     }
@@ -3924,14 +3902,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_253()
+ inline bool jj_3R_252()
  {
     if (jj_done) return true;
-    if (jj_3R_365()) return true;
+    if (jj_3R_364()) return true;
     return false;
   }
 
- inline bool jj_3R_655()
+ inline bool jj_3R_657()
  {
     if (jj_done) return true;
     if (jj_scan_token(PROTECTED_T)) return true;
@@ -3944,32 +3922,32 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_564()
+ inline bool jj_3R_563()
  {
     if (jj_done) return true;
     if (jj_scan_token(OPEN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_563()
+ inline bool jj_3R_562()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_694()
+ inline bool jj_3R_691()
  {
     if (jj_done) return true;
-    if (jj_3R_704()) return true;
+    if (jj_3R_701()) return true;
     return false;
   }
 
  inline bool jj_3_103()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
@@ -3979,58 +3957,58 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_694()) { jj_scanpos = xsp; break; }
+      if (jj_3R_691()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_562()
+ inline bool jj_3R_561()
  {
     if (jj_done) return true;
     if (jj_scan_token(ENTITY_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_616()) jj_scanpos = xsp;
+    if (jj_3R_619()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_500()
+ inline bool jj_3R_505()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_562()) {
+    if (jj_3R_561()) {
     jj_scanpos = xsp;
-    if (jj_3R_563()) {
+    if (jj_3R_562()) {
     jj_scanpos = xsp;
-    if (jj_3R_564()) return true;
+    if (jj_3R_563()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_719()
+ inline bool jj_3R_716()
  {
     if (jj_done) return true;
-    if (jj_3R_383()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
  inline bool jj_3_31()
  {
     if (jj_done) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_707()
+ inline bool jj_3R_704()
  {
     if (jj_done) return true;
-    if (jj_3R_197()) return true;
+    if (jj_3R_196()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -4038,131 +4016,137 @@ void parseInline();
  inline bool jj_3_104()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_718()
+ inline bool jj_3R_715()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3R_717()
+ inline bool jj_3R_714()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
- inline bool jj_3R_716()
+ inline bool jj_3R_713()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
  inline bool jj_3_30()
  {
     if (jj_done) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_715()
+ inline bool jj_3R_712()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
- inline bool jj_3R_714()
+ inline bool jj_3R_711()
  {
     if (jj_done) return true;
-    if (jj_3R_376()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
  inline bool jj_3_29()
  {
     if (jj_done) return true;
-    if (jj_3R_84()) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
- inline bool jj_3R_713()
+ inline bool jj_3R_710()
  {
     if (jj_done) return true;
-    if (jj_3R_375()) return true;
+    if (jj_3R_374()) return true;
     return false;
   }
 
- inline bool jj_3R_712()
+ inline bool jj_3R_709()
  {
     if (jj_done) return true;
-    if (jj_3R_373()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3R_359()
+ inline bool jj_3R_358()
  {
     if (jj_done) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_711()
+ inline bool jj_3R_708()
  {
     if (jj_done) return true;
-    if (jj_3R_372()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
- inline bool jj_3R_236()
+ inline bool jj_3R_235()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_359()) jj_scanpos = xsp;
-    if (jj_3R_59()) return true;
+    if (jj_3R_358()) jj_scanpos = xsp;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_710()
+ inline bool jj_3R_707()
  {
     if (jj_done) return true;
-    if (jj_3R_371()) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
- inline bool jj_3R_709()
+ inline bool jj_3R_706()
  {
     if (jj_done) return true;
-    if (jj_3R_519()) return true;
+    if (jj_3R_524()) return true;
     return false;
   }
 
- inline bool jj_3R_163()
+ inline bool jj_3R_162()
  {
     if (jj_done) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_708()
+ inline bool jj_3R_705()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_704()
+ inline bool jj_3R_701()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_705()) {
+    jj_scanpos = xsp;
+    if (jj_3R_706()) {
+    jj_scanpos = xsp;
+    if (jj_3R_707()) {
+    jj_scanpos = xsp;
     if (jj_3R_708()) {
     jj_scanpos = xsp;
     if (jj_3R_709()) {
@@ -4179,15 +4163,9 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3R_715()) {
     jj_scanpos = xsp;
-    if (jj_3R_716()) {
-    jj_scanpos = xsp;
-    if (jj_3R_717()) {
-    jj_scanpos = xsp;
-    if (jj_3R_718()) {
-    jj_scanpos = xsp;
     if (jj_3_104()) {
     jj_scanpos = xsp;
-    if (jj_3R_719()) return true;
+    if (jj_3R_716()) return true;
     }
     }
     }
@@ -4203,50 +4181,50 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_252()
+ inline bool jj_3R_251()
  {
     if (jj_done) return true;
-    if (jj_3R_364()) return true;
+    if (jj_3R_363()) return true;
     return false;
   }
 
- inline bool jj_3R_162()
+ inline bool jj_3R_161()
  {
     if (jj_done) return true;
-    if (jj_3R_84()) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
- inline bool jj_3R_69()
+ inline bool jj_3R_68()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_162()) {
+    if (jj_3R_161()) {
     jj_scanpos = xsp;
-    if (jj_3R_163()) return true;
+    if (jj_3R_162()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_522()
+ inline bool jj_3R_527()
  {
     if (jj_done) return true;
     if (jj_scan_token(AFTER_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_472()
+ inline bool jj_3R_470()
  {
     if (jj_done) return true;
-    if (jj_3R_535()) return true;
+    if (jj_3R_540()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_138()
+ inline bool jj_3R_137()
  {
     if (jj_done) return true;
     if (jj_scan_token(PROTECTED_T)) return true;
@@ -4261,182 +4239,182 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_497()
+ inline bool jj_3R_495()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_446()) return true;
+    if (jj_3R_444()) return true;
     return false;
   }
 
- inline bool jj_3R_381()
+ inline bool jj_3R_380()
  {
     if (jj_done) return true;
     if (jj_scan_token(DISCONNECT_T)) return true;
-    if (jj_3R_472()) return true;
+    if (jj_3R_470()) return true;
     if (jj_scan_token(AFTER_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_460()
+ inline bool jj_3R_458()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_239()
+ inline bool jj_3R_238()
  {
     if (jj_done) return true;
     if (jj_scan_token(DOWNTO_T)) return true;
     return false;
   }
 
- inline bool jj_3R_110()
+ inline bool jj_3R_109()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_238()) {
+    if (jj_3R_237()) {
     jj_scanpos = xsp;
-    if (jj_3R_239()) return true;
+    if (jj_3R_238()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_238()
+ inline bool jj_3R_237()
  {
     if (jj_done) return true;
     if (jj_scan_token(TO_T)) return true;
     return false;
   }
 
- inline bool jj_3R_569()
+ inline bool jj_3R_568()
  {
     if (jj_done) return true;
-    if (jj_3R_310()) return true;
+    if (jj_3R_309()) return true;
     return false;
   }
 
- inline bool jj_3R_446()
+ inline bool jj_3R_444()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_522()) jj_scanpos = xsp;
+    if (jj_3R_527()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_568()
+ inline bool jj_3R_567()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_515()
+ inline bool jj_3R_520()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_568()) {
+    if (jj_3R_567()) {
     jj_scanpos = xsp;
-    if (jj_3R_569()) return true;
+    if (jj_3R_568()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_407()
+ inline bool jj_3R_406()
  {
     if (jj_done) return true;
     if (jj_scan_token(UNAFFECTED_T)) return true;
     return false;
   }
 
- inline bool jj_3R_318()
+ inline bool jj_3R_317()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_406()) {
+    if (jj_3R_405()) {
     jj_scanpos = xsp;
-    if (jj_3R_407()) return true;
+    if (jj_3R_406()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_406()
+ inline bool jj_3R_405()
  {
     if (jj_done) return true;
-    if (jj_3R_446()) return true;
+    if (jj_3R_444()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_497()) { jj_scanpos = xsp; break; }
+      if (jj_3R_495()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_553()
+ inline bool jj_3R_558()
  {
     if (jj_done) return true;
     if (jj_scan_token(REJECT_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_251()
+ inline bool jj_3R_250()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_496()
+ inline bool jj_3R_494()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_553()) jj_scanpos = xsp;
+    if (jj_3R_558()) jj_scanpos = xsp;
     if (jj_scan_token(INERTIAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_118()
+ inline bool jj_3R_117()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_251()) jj_scanpos = xsp;
+    if (jj_3R_250()) jj_scanpos = xsp;
     if (jj_scan_token(WAIT_T)) return true;
     xsp = jj_scanpos;
+    if (jj_3R_251()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
     if (jj_3R_252()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3R_253()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_254()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_405()
+ inline bool jj_3R_404()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_495()) {
+    if (jj_3R_493()) {
     jj_scanpos = xsp;
-    if (jj_3R_496()) return true;
+    if (jj_3R_494()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_495()
+ inline bool jj_3R_493()
  {
     if (jj_done) return true;
     if (jj_scan_token(TRANSPORT_T)) return true;
@@ -4446,143 +4424,143 @@ void parseInline();
  inline bool jj_3_28()
  {
     if (jj_done) return true;
-    if (jj_3R_83()) return true;
+    if (jj_3R_82()) return true;
     return false;
   }
 
  inline bool jj_3_27()
  {
     if (jj_done) return true;
-    if (jj_3R_82()) return true;
+    if (jj_3R_81()) return true;
     return false;
   }
 
- inline bool jj_3R_156()
+ inline bool jj_3R_155()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_155()) return true;
+    if (jj_3R_154()) return true;
     return false;
   }
 
- inline bool jj_3R_277()
+ inline bool jj_3R_276()
  {
     if (jj_done) return true;
-    if (jj_3R_83()) return true;
+    if (jj_3R_82()) return true;
     return false;
   }
 
- inline bool jj_3R_134()
+ inline bool jj_3R_133()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_276()) {
+    if (jj_3R_275()) {
     jj_scanpos = xsp;
-    if (jj_3R_277()) return true;
+    if (jj_3R_276()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_276()
+ inline bool jj_3R_275()
  {
     if (jj_done) return true;
-    if (jj_3R_82()) return true;
+    if (jj_3R_81()) return true;
     return false;
   }
 
- inline bool jj_3R_463()
+ inline bool jj_3R_461()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_375()
+ inline bool jj_3R_374()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(101)) jj_scanpos = xsp;
     if (jj_scan_token(VARIABLE_T)) return true;
-    if (jj_3R_197()) return true;
+    if (jj_3R_196()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_463()) jj_scanpos = xsp;
+    if (jj_3R_461()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_474()
+ inline bool jj_3R_472()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_473()) return true;
+    if (jj_3R_471()) return true;
     return false;
   }
 
- inline bool jj_3R_706()
+ inline bool jj_3R_703()
  {
     if (jj_done) return true;
     if (jj_scan_token(ARRAY_T)) return true;
-    if (jj_3R_83()) return true;
+    if (jj_3R_82()) return true;
     if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_441()
+ inline bool jj_3R_439()
  {
     if (jj_done) return true;
-    if (jj_3R_521()) return true;
+    if (jj_3R_526()) return true;
     return false;
   }
 
  inline bool jj_3_102()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_362()
+ inline bool jj_3R_361()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_440()) {
+    if (jj_3R_438()) {
     jj_scanpos = xsp;
-    if (jj_3R_441()) return true;
+    if (jj_3R_439()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_440()
+ inline bool jj_3R_438()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_3_102()) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_373()
+ inline bool jj_3R_372()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONSTANT_T)) return true;
-    if (jj_3R_197()) return true;
+    if (jj_3R_196()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_460()) jj_scanpos = xsp;
+    if (jj_3R_458()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -4590,142 +4568,142 @@ void parseInline();
  inline bool jj_3_26()
  {
     if (jj_done) return true;
-    if (jj_3R_81()) return true;
+    if (jj_3R_80()) return true;
     return false;
   }
 
- inline bool jj_3R_380()
+ inline bool jj_3R_379()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_178()) return true;
-    if (jj_3R_332()) return true;
+    if (jj_3R_177()) return true;
+    if (jj_3R_331()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_567()
+ inline bool jj_3R_566()
  {
     if (jj_done) return true;
-    if (jj_3R_333()) return true;
+    if (jj_3R_332()) return true;
     return false;
   }
 
- inline bool jj_3R_382()
+ inline bool jj_3R_381()
  {
     if (jj_done) return true;
     if (jj_scan_token(USE_T)) return true;
-    if (jj_3R_473()) return true;
+    if (jj_3R_471()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_474()) { jj_scanpos = xsp; break; }
+      if (jj_3R_472()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_566()
+ inline bool jj_3R_565()
  {
     if (jj_done) return true;
-    if (jj_3R_81()) return true;
+    if (jj_3R_80()) return true;
     return false;
   }
 
- inline bool jj_3R_502()
+ inline bool jj_3R_507()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_566()) {
+    if (jj_3R_565()) {
     jj_scanpos = xsp;
-    if (jj_3R_567()) return true;
+    if (jj_3R_566()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_63()
+ inline bool jj_3R_62()
  {
     if (jj_done) return true;
     if (jj_scan_token(ARRAY_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_155()) return true;
+    if (jj_3R_154()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_156()) { jj_scanpos = xsp; break; }
+      if (jj_3R_155()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_158()
+ inline bool jj_3R_157()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_633()
+ inline bool jj_3R_636()
  {
     if (jj_done) return true;
-    if (jj_3R_655()) return true;
+    if (jj_3R_657()) return true;
     return false;
   }
 
  inline bool jj_3_101()
  {
     if (jj_done) return true;
-    if (jj_3R_138()) return true;
+    if (jj_3R_137()) return true;
     return false;
   }
 
- inline bool jj_3R_632()
+ inline bool jj_3R_635()
  {
     if (jj_done) return true;
-    if (jj_3R_654()) return true;
+    if (jj_3R_656()) return true;
     return false;
   }
 
- inline bool jj_3R_631()
+ inline bool jj_3R_634()
  {
     if (jj_done) return true;
-    if (jj_3R_653()) return true;
+    if (jj_3R_655()) return true;
     return false;
   }
 
- inline bool jj_3R_630()
+ inline bool jj_3R_633()
  {
     if (jj_done) return true;
-    if (jj_3R_652()) return true;
+    if (jj_3R_654()) return true;
     return false;
   }
 
- inline bool jj_3R_629()
+ inline bool jj_3R_632()
  {
     if (jj_done) return true;
-    if (jj_3R_651()) return true;
+    if (jj_3R_653()) return true;
     return false;
   }
 
- inline bool jj_3R_577()
+ inline bool jj_3R_576()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_629()) {
+    if (jj_3R_632()) {
     jj_scanpos = xsp;
-    if (jj_3R_630()) {
+    if (jj_3R_633()) {
     jj_scanpos = xsp;
-    if (jj_3R_631()) {
+    if (jj_3R_634()) {
     jj_scanpos = xsp;
-    if (jj_3R_632()) {
+    if (jj_3R_635()) {
     jj_scanpos = xsp;
     if (jj_3_101()) {
     jj_scanpos = xsp;
-    if (jj_3R_633()) return true;
+    if (jj_3R_636()) return true;
     }
     }
     }
@@ -4738,132 +4716,132 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     if (jj_scan_token(ELSE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_350()
+ inline bool jj_3R_349()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
  inline bool jj_3_97()
  {
     if (jj_done) return true;
-    if (jj_3R_134()) return true;
+    if (jj_3R_133()) return true;
     return false;
   }
 
- inline bool jj_3R_459()
+ inline bool jj_3R_457()
  {
     if (jj_done) return true;
-    if (jj_3R_526()) return true;
+    if (jj_3R_531()) return true;
     return false;
   }
 
  inline bool jj_3_100()
  {
     if (jj_done) return true;
-    if (jj_3R_137()) return true;
+    if (jj_3R_136()) return true;
     return false;
   }
 
- inline bool jj_3R_371()
+ inline bool jj_3R_370()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_3_100()) {
     jj_scanpos = xsp;
-    if (jj_3R_459()) return true;
+    if (jj_3R_457()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_320()
+ inline bool jj_3R_319()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
- inline bool jj_3R_106()
+ inline bool jj_3R_105()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
     if (jj_3R_59()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_319()
+ inline bool jj_3R_318()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_318()) return true;
+    if (jj_3R_317()) return true;
     return false;
   }
 
  inline bool jj_3_99()
  {
     if (jj_done) return true;
+    if (jj_3R_134()) return true;
     if (jj_3R_135()) return true;
-    if (jj_3R_136()) return true;
     return false;
   }
 
- inline bool jj_3R_185()
+ inline bool jj_3R_184()
  {
     if (jj_done) return true;
-    if (jj_3R_134()) return true;
+    if (jj_3R_133()) return true;
     return false;
   }
 
- inline bool jj_3R_168()
+ inline bool jj_3R_167()
  {
     if (jj_done) return true;
-    if (jj_3R_318()) return true;
+    if (jj_3R_317()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_319()) { jj_scanpos = xsp; break; }
+      if (jj_3R_318()) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_320()) jj_scanpos = xsp;
+    if (jj_3R_319()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_366()
+ inline bool jj_3R_365()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_72()
+ inline bool jj_3R_71()
  {
     if (jj_done) return true;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
+    if (jj_3R_166()) 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_130()
+ inline bool jj_3R_129()
  {
     if (jj_done) return true;
-    if (jj_3R_136()) return true;
+    if (jj_3R_135()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
@@ -4872,29 +4850,29 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_247()
+ inline bool jj_3R_246()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3R_365()
+ inline bool jj_3R_364()
  {
     if (jj_done) return true;
     if (jj_scan_token(UNTIL_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
- inline bool jj_3R_115()
+ inline bool jj_3R_114()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_246()) {
+    if (jj_3R_245()) {
     jj_scanpos = xsp;
-    if (jj_3R_247()) return true;
+    if (jj_3R_246()) return true;
     }
     return false;
   }
@@ -4902,78 +4880,78 @@ void parseInline();
  inline bool jj_3_98()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_246()
+ inline bool jj_3R_245()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
  inline bool jj_3_96()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_218()
+ inline bool jj_3R_217()
  {
     if (jj_done) return true;
     if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_80()
+ inline bool jj_3R_79()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_217()
+ inline bool jj_3R_216()
  {
     if (jj_done) return true;
-    if (jj_3R_310()) return true;
+    if (jj_3R_309()) return true;
     return false;
   }
 
- inline bool jj_3R_216()
+ inline bool jj_3R_215()
  {
     if (jj_done) return true;
-    if (jj_3R_352()) return true;
+    if (jj_3R_351()) return true;
     return false;
   }
 
  inline bool jj_3_24()
  {
     if (jj_done) return true;
-    if (jj_3R_79()) return true;
+    if (jj_3R_78()) return true;
     return false;
   }
 
- inline bool jj_3R_215()
+ inline bool jj_3R_214()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_100()
+ inline bool jj_3R_99()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_214()) {
+    jj_scanpos = xsp;
     if (jj_3R_215()) {
     jj_scanpos = xsp;
     if (jj_3R_216()) {
     jj_scanpos = xsp;
-    if (jj_3R_217()) {
-    jj_scanpos = xsp;
-    if (jj_3R_218()) return true;
+    if (jj_3R_217()) return true;
     }
     }
     }
@@ -4983,40 +4961,40 @@ void parseInline();
  inline bool jj_3_23()
  {
     if (jj_done) return true;
-    if (jj_3R_78()) return true;
+    if (jj_3R_77()) return true;
     return false;
   }
 
- inline bool jj_3R_184()
+ inline bool jj_3R_183()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
  inline bool jj_3_22()
  {
     if (jj_done) return true;
-    if (jj_3R_77()) return true;
+    if (jj_3R_76()) return true;
     return false;
   }
 
- inline bool jj_3R_85()
+ inline bool jj_3R_84()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_184()) jj_scanpos = xsp;
+    if (jj_3R_183()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_185()) jj_scanpos = xsp;
+    if (jj_3R_184()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_76()
+ inline bool jj_3R_75()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
@@ -5026,56 +5004,56 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_76()) jj_scanpos = xsp;
+    if (jj_3R_75()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(79)) jj_scanpos = xsp;
     if (jj_scan_token(ASSERT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_561()
+ inline bool jj_3R_503()
  {
     if (jj_done) return true;
-    if (jj_3R_79()) return true;
+    if (jj_3R_78()) return true;
     return false;
   }
 
- inline bool jj_3R_560()
+ inline bool jj_3R_502()
  {
     if (jj_done) return true;
-    if (jj_3R_78()) return true;
+    if (jj_3R_77()) return true;
     return false;
   }
 
  inline bool jj_3_20()
  {
     if (jj_done) return true;
-    if (jj_3R_75()) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
- inline bool jj_3R_559()
+ inline bool jj_3R_73()
  {
     if (jj_done) return true;
-    if (jj_3R_77()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_74()
+ inline bool jj_3R_501()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_76()) return true;
     return false;
   }
 
- inline bool jj_3R_372()
+ inline bool jj_3R_371()
  {
     if (jj_done) return true;
     if (jj_scan_token(SUBTYPE_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -5085,43 +5063,43 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_74()) jj_scanpos = xsp;
+    if (jj_3R_73()) 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()
+ inline bool jj_3R_630()
  {
     if (jj_done) return true;
-    if (jj_3R_113()) return true;
+    if (jj_3R_112()) return true;
     return false;
   }
 
- inline bool jj_3R_572()
+ inline bool jj_3R_571()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_627()) { jj_scanpos = xsp; break; }
+      if (jj_3R_630()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_558()
+ inline bool jj_3R_72()
  {
     if (jj_done) return true;
-    if (jj_3R_88()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_73()
+ inline bool jj_3R_500()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_87()) return true;
     return false;
   }
 
@@ -5130,61 +5108,63 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_73()) jj_scanpos = xsp;
+    if (jj_3R_72()) jj_scanpos = xsp;
     if (jj_scan_token(BLOCK_T)) return true;
     return false;
   }
 
- inline bool jj_3R_557()
+ inline bool jj_3R_499()
  {
     if (jj_done) return true;
-    if (jj_3R_615()) return true;
+    if (jj_3R_560()) return true;
     return false;
   }
 
- inline bool jj_3R_556()
+ inline bool jj_3R_498()
  {
     if (jj_done) return true;
-    if (jj_3R_75()) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
- inline bool jj_3R_555()
+ inline bool jj_3R_497()
  {
     if (jj_done) return true;
-    if (jj_3R_89()) return true;
+    if (jj_3R_88()) return true;
     return false;
   }
 
- inline bool jj_3R_554()
+ inline bool jj_3R_523()
  {
     if (jj_done) return true;
-    if (jj_3R_614()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_569()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_498()
+ inline bool jj_3R_409()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_554()) {
+    if (jj_3R_496()) {
     jj_scanpos = xsp;
-    if (jj_3R_555()) {
+    if (jj_3R_497()) {
     jj_scanpos = xsp;
-    if (jj_3R_556()) {
+    if (jj_3R_498()) {
     jj_scanpos = xsp;
-    if (jj_3R_557()) {
+    if (jj_3R_499()) {
     jj_scanpos = xsp;
-    if (jj_3R_558()) {
+    if (jj_3R_500()) {
     jj_scanpos = xsp;
-    if (jj_3R_559()) {
+    if (jj_3R_501()) {
     jj_scanpos = xsp;
-    if (jj_3R_560()) {
+    if (jj_3R_502()) {
     jj_scanpos = xsp;
-    if (jj_3R_561()) {
+    if (jj_3R_503()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(186)) return true;
+    if (jj_scan_token(187)) return true;
     }
     }
     }
@@ -5196,53 +5176,51 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_518()
+ inline bool jj_3R_496()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_570()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_559()) return true;
     return false;
   }
 
  inline bool jj_3_17()
  {
     if (jj_done) return true;
-    if (jj_3R_72()) return true;
+    if (jj_3R_71()) return true;
     return false;
   }
 
- inline bool jj_3_95()
+ inline bool jj_3R_521()
  {
     if (jj_done) return true;
-    if (jj_3R_133()) 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_516()
+ inline bool jj_3_95()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_313()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
  inline bool jj_3_94()
  {
     if (jj_done) return true;
-    if (jj_3R_132()) return true;
+    if (jj_3R_131()) return true;
     return false;
   }
 
- inline bool jj_3R_173()
+ inline bool jj_3R_172()
  {
     if (jj_done) return true;
-    if (jj_3R_325()) return true;
+    if (jj_3R_324()) return true;
     return false;
   }
 
- inline bool jj_3R_517()
+ inline bool jj_3R_522()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -5254,37 +5232,37 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_172()
+ inline bool jj_3R_171()
  {
     if (jj_done) return true;
-    if (jj_3R_72()) return true;
+    if (jj_3R_71()) return true;
     return false;
   }
 
  inline bool jj_3_16()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_434()
+ inline bool jj_3R_432()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_517()) jj_scanpos = xsp;
+    if (jj_3R_522()) jj_scanpos = xsp;
     if (jj_scan_token(FUNCTION_T)) return true;
-    if (jj_3R_515()) return true;
+    if (jj_3R_520()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_518()) jj_scanpos = xsp;
+    if (jj_3R_523()) jj_scanpos = xsp;
     if (jj_scan_token(RETURN_T)) return true;
-    if (jj_3R_158()) return true;
+    if (jj_3R_157()) return true;
     return false;
   }
 
- inline bool jj_3R_77()
+ inline bool jj_3R_76()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -5293,9 +5271,9 @@ void parseInline();
     xsp = jj_scanpos;
     if (jj_scan_token(79)) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_172()) {
+    if (jj_3R_171()) {
     jj_scanpos = xsp;
-    if (jj_3R_173()) return true;
+    if (jj_3R_172()) return true;
     }
     return false;
   }
@@ -5303,12 +5281,12 @@ void parseInline();
  inline bool jj_3_15()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_79()
+ inline bool jj_3R_78()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -5316,7 +5294,7 @@ void parseInline();
     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_3R_176()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -5324,7 +5302,7 @@ void parseInline();
  inline bool jj_3_14()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
@@ -5332,11 +5310,11 @@ void parseInline();
  inline bool jj_3_13()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_88()
+ inline bool jj_3R_87()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -5344,7 +5322,7 @@ void parseInline();
     if (jj_3_14()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(79)) jj_scanpos = xsp;
-    if (jj_3R_188()) return true;
+    if (jj_3R_187()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -5352,53 +5330,53 @@ void parseInline();
  inline bool jj_3R_678()
  {
     if (jj_done) return true;
-    if (jj_3R_693()) return true;
+    if (jj_3R_690()) return true;
     return false;
   }
 
- inline bool jj_3R_470()
+ inline bool jj_3R_468()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_347()
+ inline bool jj_3R_346()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_433()) {
+    if (jj_3R_431()) {
     jj_scanpos = xsp;
-    if (jj_3R_434()) return true;
+    if (jj_3R_432()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_433()
+ inline bool jj_3R_431()
  {
     if (jj_done) return true;
     if (jj_scan_token(PROCEDURE_T)) return true;
-    if (jj_3R_515()) return true;
+    if (jj_3R_520()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_516()) jj_scanpos = xsp;
+    if (jj_3R_521()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3_94()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3_95()) jj_scanpos = xsp;
-    if (jj_3R_425()) return true;
+    if (jj_3R_423()) return true;
     return false;
   }
 
  inline bool jj_3R_677()
  {
     if (jj_done) return true;
-    if (jj_3R_692()) return true;
+    if (jj_3R_689()) return true;
     return false;
   }
 
- inline bool jj_3R_652()
+ inline bool jj_3R_654()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -5410,21 +5388,21 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_176()
+ inline bool jj_3R_175()
  {
     if (jj_done) return true;
-    if (jj_3R_329()) return true;
+    if (jj_3R_328()) return true;
     return false;
   }
 
- inline bool jj_3R_175()
+ inline bool jj_3R_174()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_628()
+ inline bool jj_3R_631()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -5436,29 +5414,29 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_178()
+ inline bool jj_3R_177()
  {
     if (jj_done) return true;
-    if (jj_3R_331()) return true;
+    if (jj_3R_330()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_626()
+ inline bool jj_3R_629()
  {
     if (jj_done) return true;
-    if (jj_3R_650()) return true;
+    if (jj_3R_652()) return true;
     return false;
   }
 
- inline bool jj_3R_571()
+ inline bool jj_3R_570()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_626()) { jj_scanpos = xsp; break; }
+      if (jj_3R_629()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
@@ -5466,35 +5444,35 @@ void parseInline();
  inline bool jj_3_92()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
  inline bool jj_3R_674()
  {
     if (jj_done) return true;
-    if (jj_3R_383()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
  inline bool jj_3R_673()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3R_78()
+ inline bool jj_3R_77()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_174()) return true;
+    if (jj_3R_173()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_175()) jj_scanpos = xsp;
+    if (jj_3R_174()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_176()) jj_scanpos = xsp;
+    if (jj_3R_175()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -5502,98 +5480,98 @@ void parseInline();
  inline bool jj_3_93()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
  inline bool jj_3R_672()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
  inline bool jj_3R_671()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
  inline bool jj_3R_670()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
  inline bool jj_3R_669()
  {
     if (jj_done) return true;
-    if (jj_3R_376()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
  inline bool jj_3R_668()
  {
     if (jj_done) return true;
-    if (jj_3R_375()) return true;
+    if (jj_3R_374()) return true;
     return false;
   }
 
- inline bool jj_3R_574()
+ inline bool jj_3R_573()
  {
     if (jj_done) return true;
-    if (jj_3R_515()) return true;
+    if (jj_3R_520()) return true;
     return false;
   }
 
  inline bool jj_3R_667()
  {
     if (jj_done) return true;
-    if (jj_3R_373()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3R_469()
+ inline bool jj_3R_467()
  {
     if (jj_done) return true;
-    if (jj_3R_532()) return true;
+    if (jj_3R_537()) return true;
     return false;
   }
 
  inline bool jj_3R_666()
  {
     if (jj_done) return true;
-    if (jj_3R_372()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
  inline bool jj_3R_665()
  {
     if (jj_done) return true;
-    if (jj_3R_519()) return true;
+    if (jj_3R_524()) return true;
     return false;
   }
 
- inline bool jj_3R_468()
+ inline bool jj_3R_466()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3R_180()
+ inline bool jj_3R_179()
  {
     if (jj_done) return true;
-    if (jj_3R_333()) return true;
+    if (jj_3R_332()) return true;
     return false;
   }
 
- inline bool jj_3R_179()
+ inline bool jj_3R_178()
  {
     if (jj_done) return true;
-    if (jj_3R_332()) return true;
+    if (jj_3R_331()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -5601,26 +5579,26 @@ void parseInline();
  inline bool jj_3R_664()
  {
     if (jj_done) return true;
-    if (jj_3R_371()) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
- inline bool jj_3R_187()
+ inline bool jj_3R_186()
  {
     if (jj_done) return true;
     if (jj_scan_token(BAR_T)) return true;
-    if (jj_3R_186()) return true;
+    if (jj_3R_185()) return true;
     return false;
   }
 
  inline bool jj_3R_663()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_650()
+ inline bool jj_3R_652()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -5665,44 +5643,44 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_378()
+ inline bool jj_3R_377()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMPONENT_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) 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;
+    if (jj_3R_466()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_469()) jj_scanpos = xsp;
+    if (jj_3R_467()) 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_3R_468()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_462()
+ inline bool jj_3R_460()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_81()
+ inline bool jj_3R_80()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_178()) return true;
+    if (jj_3R_177()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_179()) jj_scanpos = xsp;
+    if (jj_3R_178()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_180()) jj_scanpos = xsp;
+    if (jj_3R_179()) 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;
@@ -5712,99 +5690,99 @@ void parseInline();
  inline bool jj_3_91()
  {
     if (jj_done) return true;
-    if (jj_3R_131()) return true;
+    if (jj_3R_130()) return true;
     return false;
   }
 
- inline bool jj_3R_348()
+ inline bool jj_3R_347()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_435()) {
+    if (jj_3R_433()) {
     jj_scanpos = xsp;
     if (jj_scan_token(137)) return true;
     }
     return false;
   }
 
- inline bool jj_3R_435()
+ inline bool jj_3R_433()
  {
     if (jj_done) return true;
-    if (jj_3R_519()) return true;
+    if (jj_3R_524()) return true;
     return false;
   }
 
  inline bool jj_3_12()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
  inline bool jj_3_11()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_86()
+ inline bool jj_3R_85()
  {
     if (jj_done) return true;
-    if (jj_3R_186()) return true;
+    if (jj_3R_185()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_187()) { jj_scanpos = xsp; break; }
+      if (jj_3R_186()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_201()
+ inline bool jj_3R_200()
  {
     if (jj_done) return true;
+    if (jj_3R_346()) return true;
     if (jj_3R_347()) return true;
-    if (jj_3R_348()) return true;
     return false;
   }
 
  inline bool jj_3_10()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_337()
+ inline bool jj_3R_336()
  {
     if (jj_done) return true;
     if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_573()
+ inline bool jj_3R_572()
  {
     if (jj_done) return true;
-    if (jj_3R_628()) return true;
+    if (jj_3R_631()) return true;
     return false;
   }
 
- inline bool jj_3R_200()
+ inline bool jj_3R_199()
  {
     if (jj_done) return true;
-    if (jj_3R_131()) return true;
+    if (jj_3R_130()) return true;
     return false;
   }
 
- inline bool jj_3R_93()
+ inline bool jj_3R_92()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_200()) {
+    if (jj_3R_199()) {
     jj_scanpos = xsp;
-    if (jj_3R_201()) return true;
+    if (jj_3R_200()) return true;
     }
     return false;
   }
@@ -5812,365 +5790,365 @@ void parseInline();
  inline bool jj_3_90()
  {
     if (jj_done) return true;
+    if (jj_3R_128()) return true;
     if (jj_3R_129()) return true;
-    if (jj_3R_130()) return true;
     return false;
   }
 
- inline bool jj_3R_336()
+ inline bool jj_3R_335()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_335()
+ inline bool jj_3R_334()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_186()
+ inline bool jj_3R_185()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_333()) {
+    jj_scanpos = xsp;
     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_3R_336()) return true;
     }
     }
     }
     return false;
   }
 
- inline bool jj_3R_334()
+ inline bool jj_3R_333()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_624()
+ inline bool jj_3R_627()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_461()
+ inline bool jj_3R_459()
  {
     if (jj_done) return true;
-    if (jj_3R_527()) return true;
+    if (jj_3R_532()) return true;
     return false;
   }
 
- inline bool jj_3R_161()
+ inline bool jj_3R_160()
  {
     if (jj_done) return true;
+    if (jj_3R_128()) return true;
     if (jj_3R_129()) return true;
-    if (jj_3R_130()) return true;
     return false;
   }
 
- inline bool jj_3R_352()
+ inline bool jj_3R_351()
  {
     if (jj_done) return true;
     if (jj_scan_token(CHARACTER_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_644()
+ inline bool jj_3R_613()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_519()
+ inline bool jj_3R_524()
  {
     if (jj_done) return true;
     if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_571()) return true;
+    if (jj_3R_570()) return true;
     if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_572()) return true;
+    if (jj_3R_571()) return true;
     if (jj_scan_token(END_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_573()) jj_scanpos = xsp;
+    if (jj_3R_572()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_574()) jj_scanpos = xsp;
+    if (jj_3R_573()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_622()
+ inline bool jj_3R_625()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     if (jj_scan_token(ARROW_T)) return true;
-    if (jj_3R_259()) return true;
+    if (jj_3R_258()) return true;
     return false;
   }
 
- inline bool jj_3R_648()
+ inline bool jj_3R_617()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_623()
+ inline bool jj_3R_626()
  {
     if (jj_done) return true;
-    if (jj_3R_622()) return true;
+    if (jj_3R_625()) return true;
     return false;
   }
 
- inline bool jj_3R_685()
+ inline bool jj_3R_659()
  {
     if (jj_done) 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_356()
+ inline bool jj_3R_355()
  {
     if (jj_done) return true;
     if (jj_scan_token(STRINGLITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_436()
+ inline bool jj_3R_434()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_160()
+ inline bool jj_3R_159()
  {
     if (jj_done) return true;
-    if (jj_3R_314()) return true;
+    if (jj_3R_313()) return true;
     return false;
   }
 
- inline bool jj_3R_256()
+ inline bool jj_3R_255()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_68()
+ inline bool jj_3R_67()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_160()) jj_scanpos = xsp;
-    if (jj_3R_130()) return true;
+    if (jj_3R_159()) jj_scanpos = xsp;
+    if (jj_3R_129()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_161()) { jj_scanpos = xsp; break; }
+      if (jj_3R_160()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_122()
+ inline bool jj_3R_121()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_256()) jj_scanpos = xsp;
+    if (jj_3R_255()) jj_scanpos = xsp;
     if (jj_scan_token(CASE_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_622()) return true;
+    if (jj_3R_625()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_623()) { jj_scanpos = xsp; break; }
+      if (jj_3R_626()) { 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_624()) jj_scanpos = xsp;
+    if (jj_3R_627()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_660()
+ inline bool jj_3R_650()
  {
     if (jj_done) return true;
-    if (jj_3R_498()) return true;
+    if (jj_3R_409()) return true;
     return false;
   }
 
- inline bool jj_3R_647()
+ inline bool jj_3R_616()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_660()) { jj_scanpos = xsp; break; }
+      if (jj_3R_650()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_358()
+ inline bool jj_3R_357()
  {
     if (jj_done) return true;
     if (jj_scan_token(RETURN_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_635()
+ inline bool jj_3R_638()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_357()
+ inline bool jj_3R_356()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_436()) { jj_scanpos = xsp; break; }
+      if (jj_3R_434()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_234()
+ inline bool jj_3R_233()
  {
     if (jj_done) return true;
     if (jj_scan_token(LBRACKET_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_357()) jj_scanpos = xsp;
+    if (jj_3R_356()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_358()) jj_scanpos = xsp;
+    if (jj_3R_357()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET_T)) return true;
     return false;
   }
 
- inline bool jj_3R_686()
+ inline bool jj_3R_660()
  {
     if (jj_done) return true;
-    if (jj_3R_329()) return true;
+    if (jj_3R_328()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_605()
+ inline bool jj_3R_604()
  {
     if (jj_done) return true;
     if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_604()
+ inline bool jj_3R_603()
  {
     if (jj_done) return true;
     if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_603()
+ inline bool jj_3R_602()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_635()) { jj_scanpos = xsp; break; }
+      if (jj_3R_638()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_535()
+ inline bool jj_3R_540()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_603()) {
+    if (jj_3R_602()) {
     jj_scanpos = xsp;
-    if (jj_3R_604()) {
+    if (jj_3R_603()) {
     jj_scanpos = xsp;
-    if (jj_3R_605()) return true;
+    if (jj_3R_604()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_501()
+ inline bool jj_3R_506()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_565()) return true;
+    if (jj_3R_564()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_579()
+ inline bool jj_3R_578()
  {
     if (jj_done) return true;
     if (jj_scan_token(BUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_614()
+ inline bool jj_3R_559()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) 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;
+    if (jj_3R_613()) 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_3R_614()) return true;
+    if (jj_3R_615()) return true;
     if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_647()) return true;
+    if (jj_3R_616()) 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_3R_617()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_578()
+ inline bool jj_3R_577()
  {
     if (jj_done) return true;
     if (jj_scan_token(REGISTER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_527()
+ inline bool jj_3R_532()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_578()) {
+    if (jj_3R_577()) {
     jj_scanpos = xsp;
-    if (jj_3R_579()) return true;
+    if (jj_3R_578()) return true;
     }
     return false;
   }
@@ -6178,247 +6156,240 @@ void parseInline();
  inline bool jj_3_9()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3R_420()
+ inline bool jj_3R_418()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_501()) jj_scanpos = xsp;
+    if (jj_3R_506()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_658()
+ inline bool jj_3R_648()
  {
     if (jj_done) return true;
-    if (jj_3R_532()) return true;
+    if (jj_3R_537()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_686()) jj_scanpos = xsp;
+    if (jj_3R_660()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_657()
+ inline bool jj_3R_647()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    if (jj_3R_66()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_685()) jj_scanpos = xsp;
+    if (jj_3R_659()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_645()
+ inline bool jj_3R_614()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_657()) jj_scanpos = xsp;
+    if (jj_3R_647()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_658()) jj_scanpos = xsp;
+    if (jj_3R_648()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_659()
+ inline bool jj_3R_649()
  {
     if (jj_done) return true;
-    if (jj_3R_141()) return true;
+    if (jj_3R_140()) return true;
     return false;
   }
 
- inline bool jj_3R_374()
+ inline bool jj_3R_373()
  {
     if (jj_done) return true;
     if (jj_scan_token(SIGNAL_T)) return true;
-    if (jj_3R_197()) return true;
+    if (jj_3R_196()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_461()) jj_scanpos = xsp;
+    if (jj_3R_459()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_462()) jj_scanpos = xsp;
+    if (jj_3R_460()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_646()
+ inline bool jj_3R_615()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_659()) { jj_scanpos = xsp; break; }
+      if (jj_3R_649()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_300()
+ inline bool jj_3R_299()
  {
     if (jj_done) return true;
-    if (jj_3R_383()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
  inline bool jj_3_89()
  {
     if (jj_done) return true;
-    if (jj_3R_128()) return true;
+    if (jj_3R_127()) return true;
     return false;
   }
 
  inline bool jj_3_7()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
  inline bool jj_3_88()
  {
     if (jj_done) return true;
-    if (jj_3R_127()) return true;
+    if (jj_3R_126()) return true;
     return false;
   }
 
  inline bool jj_3_8()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_299()
+ inline bool jj_3R_298()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3R_520()
+ inline bool jj_3R_525()
  {
     if (jj_done) return true;
-    if (jj_3R_405()) return true;
+    if (jj_3R_404()) return true;
     return false;
   }
 
- inline bool jj_3R_298()
+ inline bool jj_3R_297()
  {
     if (jj_done) return true;
-    if (jj_3R_381()) return true;
+    if (jj_3R_380()) return true;
     return false;
   }
 
- inline bool jj_3R_297()
+ inline bool jj_3R_296()
  {
     if (jj_done) return true;
-    if (jj_3R_380()) return true;
+    if (jj_3R_379()) return true;
     return false;
   }
 
  inline bool jj_3_87()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_296()
+ inline bool jj_3R_295()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
- inline bool jj_3R_439()
+ inline bool jj_3R_437()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_3_87()) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) 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_3R_525()) jj_scanpos = xsp;
+    if (jj_3R_317()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_438()
+ inline bool jj_3R_436()
  {
     if (jj_done) return true;
-    if (jj_3R_128()) return true;
+    if (jj_3R_127()) return true;
     return false;
   }
 
- inline bool jj_3R_294()
+ inline bool jj_3R_293()
  {
     if (jj_done) return true;
-    if (jj_3R_378()) return true;
+    if (jj_3R_377()) return true;
     return false;
   }
 
- inline bool jj_3R_295()
+ inline bool jj_3R_294()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_387()
+ inline bool jj_3R_386()
  {
     if (jj_done) return true;
-    if (jj_3R_478()) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_476()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_293()
+ inline bool jj_3R_292()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
- inline bool jj_3R_292()
+ inline bool jj_3R_291()
  {
     if (jj_done) return true;
-    if (jj_3R_376()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
- inline bool jj_3R_361()
+ inline bool jj_3R_360()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_437()) {
+    if (jj_3R_435()) {
     jj_scanpos = xsp;
-    if (jj_3R_438()) {
+    if (jj_3R_436()) {
     jj_scanpos = xsp;
-    if (jj_3R_439()) return true;
+    if (jj_3R_437()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_437()
- {
-    if (jj_done) return true;
-    if (jj_3R_127()) return true;
-    return false;
-  }
-
- inline bool jj_3R_291()
+ inline bool jj_3R_435()
  {
     if (jj_done) return true;
-    if (jj_3R_375()) return true;
+    if (jj_3R_126()) return true;
     return false;
   }
 
@@ -6450,32 +6421,41 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_422()
+ inline bool jj_3R_286()
  {
     if (jj_done) return true;
-    if (jj_3R_502()) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
- inline bool jj_3R_402()
+ inline bool jj_3R_420()
+ {
+    if (jj_done) return true;
+    if (jj_3R_507()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_401()
  {
     if (jj_done) return true;
     if (jj_scan_token(MINUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_421()
+ inline bool jj_3R_419()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3R_141()
+ inline bool jj_3R_140()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_285()) {
+    jj_scanpos = xsp;
     if (jj_3R_286()) {
     jj_scanpos = xsp;
     if (jj_3R_287()) {
@@ -6502,14 +6482,9 @@ void parseInline();
     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;
-    }
+    if (jj_3R_299()) return true;
     }
     }
     }
@@ -6528,73 +6503,73 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_286()
+ inline bool jj_3R_285()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_314()
+ inline bool jj_3R_313()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_401()) {
+    if (jj_3R_400()) {
     jj_scanpos = xsp;
-    if (jj_3R_402()) return true;
+    if (jj_3R_401()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_401()
+ inline bool jj_3R_400()
  {
     if (jj_done) return true;
     if (jj_scan_token(PLUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_546()
+ inline bool jj_3R_551()
  {
     if (jj_done) return true;
     if (jj_scan_token(ROR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_545()
+ inline bool jj_3R_550()
  {
     if (jj_done) return true;
     if (jj_scan_token(ROL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_544()
+ inline bool jj_3R_549()
  {
     if (jj_done) return true;
     if (jj_scan_token(SRA_T)) return true;
     return false;
   }
 
- inline bool jj_3R_543()
+ inline bool jj_3R_548()
  {
     if (jj_done) return true;
     if (jj_scan_token(SLA_T)) return true;
     return false;
   }
 
- inline bool jj_3R_333()
+ inline bool jj_3R_332()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_420()) return true;
+    if (jj_3R_418()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_421()) { jj_scanpos = xsp; break; }
+      if (jj_3R_419()) { jj_scanpos = xsp; break; }
     }
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_422()) { jj_scanpos = xsp; break; }
+      if (jj_3R_420()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(FOR_T)) return true;
@@ -6602,36 +6577,36 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_542()
+ inline bool jj_3R_547()
  {
     if (jj_done) return true;
     if (jj_scan_token(SRL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_541()
+ inline bool jj_3R_546()
  {
     if (jj_done) return true;
     if (jj_scan_token(SLL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_478()
+ inline bool jj_3R_476()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_541()) {
+    if (jj_3R_546()) {
     jj_scanpos = xsp;
-    if (jj_3R_542()) {
+    if (jj_3R_547()) {
     jj_scanpos = xsp;
-    if (jj_3R_543()) {
+    if (jj_3R_548()) {
     jj_scanpos = xsp;
-    if (jj_3R_544()) {
+    if (jj_3R_549()) {
     jj_scanpos = xsp;
-    if (jj_3R_545()) {
+    if (jj_3R_550()) {
     jj_scanpos = xsp;
-    if (jj_3R_546()) return true;
+    if (jj_3R_551()) return true;
     }
     }
     }
@@ -6640,35 +6615,35 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_307()
+ inline bool jj_3R_306()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_67()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_387()) jj_scanpos = xsp;
+    if (jj_3R_386()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_245()
+ inline bool jj_3R_244()
  {
     if (jj_done) return true;
-    if (jj_3R_363()) return true;
+    if (jj_3R_362()) return true;
     return false;
   }
 
- inline bool jj_3R_95()
+ inline bool jj_3R_94()
  {
     if (jj_done) return true;
     if (jj_scan_token(BIT_STRING_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_240()
+ inline bool jj_3R_239()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -6676,63 +6651,63 @@ void parseInline();
  inline bool jj_3_86()
  {
     if (jj_done) return true;
-    if (jj_3R_126()) return true;
+    if (jj_3R_125()) return true;
     return false;
   }
 
- inline bool jj_3R_419()
+ inline bool jj_3R_417()
  {
     if (jj_done) return true;
-    if (jj_3R_329()) return true;
+    if (jj_3R_328()) return true;
     return false;
   }
 
  inline bool jj_3_85()
  {
     if (jj_done) return true;
-    if (jj_3R_125()) return true;
+    if (jj_3R_124()) return true;
     return false;
   }
 
- inline bool jj_3R_418()
+ inline bool jj_3R_416()
  {
     if (jj_done) return true;
-    if (jj_3R_71()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
- inline bool jj_3R_417()
+ inline bool jj_3R_415()
  {
     if (jj_done) return true;
     if (jj_scan_token(USE_T)) return true;
-    if (jj_3R_500()) return true;
+    if (jj_3R_505()) return true;
     return false;
   }
 
  inline bool jj_3_84()
  {
     if (jj_done) return true;
-    if (jj_3R_124()) return true;
+    if (jj_3R_123()) return true;
     return false;
   }
 
- inline bool jj_3R_332()
+ inline bool jj_3R_331()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_417()) jj_scanpos = xsp;
+    if (jj_3R_415()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_418()) jj_scanpos = xsp;
+    if (jj_3R_416()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_419()) jj_scanpos = xsp;
+    if (jj_3R_417()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_119()
+ inline bool jj_3R_118()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
@@ -6742,8 +6717,8 @@ void parseInline();
     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_3R_118()) jj_scanpos = xsp;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
     return false;
   }
@@ -6751,43 +6726,43 @@ void parseInline();
  inline bool jj_3_83()
  {
     if (jj_done) return true;
-    if (jj_3R_123()) return true;
+    if (jj_3R_122()) return true;
     return false;
   }
 
  inline bool jj_3_82()
  {
     if (jj_done) return true;
-    if (jj_3R_122()) return true;
+    if (jj_3R_121()) return true;
     return false;
   }
 
  inline bool jj_3_81()
  {
     if (jj_done) return true;
-    if (jj_3R_121()) return true;
+    if (jj_3R_120()) return true;
     return false;
   }
 
  inline bool jj_3_80()
  {
     if (jj_done) return true;
-    if (jj_3R_120()) return true;
+    if (jj_3R_119()) return true;
     return false;
   }
 
- inline bool jj_3R_114()
+ inline bool jj_3R_113()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_244()
+ inline bool jj_3R_243()
  {
     if (jj_done) return true;
-    if (jj_3R_362()) return true;
+    if (jj_3R_361()) return true;
     return false;
   }
 
@@ -6796,8 +6771,8 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_114()) jj_scanpos = xsp;
-    if (jj_3R_115()) return true;
+    if (jj_3R_113()) jj_scanpos = xsp;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     return false;
   }
@@ -6805,40 +6780,40 @@ void parseInline();
  inline bool jj_3_78()
  {
     if (jj_done) return true;
-    if (jj_3R_118()) return true;
+    if (jj_3R_117()) return true;
     return false;
   }
 
  inline bool jj_3_77()
  {
     if (jj_done) return true;
-    if (jj_3R_117()) return true;
+    if (jj_3R_116()) return true;
     return false;
   }
 
  inline bool jj_3_76()
  {
     if (jj_done) return true;
-    if (jj_3R_116()) return true;
+    if (jj_3R_115()) return true;
     return false;
   }
 
- inline bool jj_3R_499()
+ inline bool jj_3R_504()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_318()) return true;
+    if (jj_3R_317()) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
- inline bool jj_3R_113()
+ inline bool jj_3R_112()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_243()) {
+    if (jj_3R_242()) {
     jj_scanpos = xsp;
     if (jj_3_76()) {
     jj_scanpos = xsp;
@@ -6846,7 +6821,7 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3_78()) {
     jj_scanpos = xsp;
-    if (jj_3R_244()) {
+    if (jj_3R_243()) {
     jj_scanpos = xsp;
     if (jj_3_80()) {
     jj_scanpos = xsp;
@@ -6862,7 +6837,7 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3_86()) {
     jj_scanpos = xsp;
-    if (jj_3R_245()) return true;
+    if (jj_3R_244()) return true;
     }
     }
     }
@@ -6878,37 +6853,37 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_243()
+ inline bool jj_3R_242()
  {
     if (jj_done) return true;
-    if (jj_3R_361()) return true;
+    if (jj_3R_360()) return true;
     return false;
   }
 
- inline bool jj_3R_503()
+ inline bool jj_3R_508()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_339()
+ inline bool jj_3R_338()
  {
     if (jj_done) return true;
     if (jj_scan_token(SEVERITY_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
  inline bool jj_3_74()
  {
     if (jj_done) return true;
-    if (jj_3R_113()) return true;
+    if (jj_3R_112()) return true;
     return false;
   }
 
- inline bool jj_3R_259()
+ inline bool jj_3R_258()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -6919,130 +6894,130 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_267()
+ inline bool jj_3R_266()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_423()
+ inline bool jj_3R_421()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_503()) { jj_scanpos = xsp; break; }
+      if (jj_3R_508()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_379()
+ inline bool jj_3R_378()
  {
     if (jj_done) return true;
     if (jj_scan_token(ATTRIBUTE_T)) return true;
-    if (jj_3R_220()) return true;
+    if (jj_3R_219()) return true;
     if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_471()) return true;
+    if (jj_3R_469()) return true;
     if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_316()
+ inline bool jj_3R_315()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_315()) return true;
+    if (jj_3R_314()) return true;
     return false;
   }
 
- inline bool jj_3R_111()
+ inline bool jj_3R_110()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(APOSTROPHE_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_240()) jj_scanpos = xsp;
+    if (jj_3R_239()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3_73()
  {
     if (jj_done) return true;
-    if (jj_3R_112()) return true;
+    if (jj_3R_111()) return true;
     return false;
   }
 
- inline bool jj_3R_364()
+ inline bool jj_3R_363()
  {
     if (jj_done) return true;
     if (jj_scan_token(ON_T)) return true;
-    if (jj_3R_423()) return true;
+    if (jj_3R_421()) return true;
     return false;
   }
 
- inline bool jj_3R_355()
+ inline bool jj_3R_354()
  {
     if (jj_done) return true;
     if (jj_scan_token(RANGE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_220()
+ inline bool jj_3R_219()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_354()) {
+    if (jj_3R_353()) {
     jj_scanpos = xsp;
-    if (jj_3R_355()) return true;
+    if (jj_3R_354()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_354()
+ inline bool jj_3R_353()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_412()
+ inline bool jj_3R_410()
  {
     if (jj_done) return true;
-    if (jj_3R_318()) return true;
+    if (jj_3R_317()) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_85()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_499()) { jj_scanpos = xsp; break; }
+      if (jj_3R_504()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_691()
+ inline bool jj_3R_688()
  {
     if (jj_done) return true;
-    if (jj_3R_112()) return true;
+    if (jj_3R_111()) return true;
     return false;
   }
 
- inline bool jj_3R_325()
+ inline bool jj_3R_324()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(SELECT_T)) return true;
-    if (jj_3R_115()) return true;
+    if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
-    if (jj_3R_167()) return true;
-    if (jj_3R_412()) return true;
+    if (jj_3R_166()) return true;
+    if (jj_3R_410()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -7050,83 +7025,83 @@ void parseInline();
  inline bool jj_3_6()
  {
     if (jj_done) return true;
-    if (jj_3R_64()) return true;
+    if (jj_3R_63()) return true;
     if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_65()
+ inline bool jj_3R_64()
  {
     if (jj_done) return true;
     if (jj_scan_token(ATTRIBUTE_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_158()) return true;
+    if (jj_3R_157()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_338()
+ inline bool jj_3R_337()
  {
     if (jj_done) return true;
     if (jj_scan_token(REPORT_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_473()
+ inline bool jj_3R_471()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_100()) return true;
+    if (jj_3R_99()) return true;
     return false;
   }
 
- inline bool jj_3R_166()
+ inline bool jj_3R_165()
  {
     if (jj_done) return true;
-    if (jj_3R_315()) return true;
+    if (jj_3R_314()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_316()) { jj_scanpos = xsp; break; }
+      if (jj_3R_315()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_360()
+ inline bool jj_3R_359()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(EQU_T)) return true;
-    if (jj_3R_103()) return true;
+    if (jj_3R_102()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_403()
+ inline bool jj_3R_402()
  {
     if (jj_done) return true;
-    if (jj_3R_64()) return true;
+    if (jj_3R_63()) return true;
     if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_315()
+ inline bool jj_3R_314()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_403()) jj_scanpos = xsp;
-    if (jj_3R_404()) return true;
+    if (jj_3R_402()) jj_scanpos = xsp;
+    if (jj_3R_403()) return true;
     return false;
   }
 
- inline bool jj_3R_248()
+ inline bool jj_3R_247()
  {
     if (jj_done) return true;
-    if (jj_3R_140()) return true;
+    if (jj_3R_139()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
@@ -7134,20 +7109,20 @@ void parseInline();
  inline bool jj_3R_676()
  {
     if (jj_done) return true;
-    if (jj_3R_82()) return true;
+    if (jj_3R_81()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_691()) jj_scanpos = xsp;
+    if (jj_3R_688()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_116()
+ inline bool jj_3R_115()
  {
     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_3R_247()) jj_scanpos = xsp;
+    if (jj_3R_187()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -7155,11 +7130,11 @@ void parseInline();
  inline bool jj_3R_675()
  {
     if (jj_done) return true;
-    if (jj_3R_690()) return true;
+    if (jj_3R_687()) return true;
     return false;
   }
 
- inline bool jj_3R_651()
+ inline bool jj_3R_653()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -7171,36 +7146,36 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_266()
+ inline bool jj_3R_265()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_188()
+ inline bool jj_3R_187()
  {
     if (jj_done) return true;
     if (jj_scan_token(ASSERT_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_338()) jj_scanpos = xsp;
+    if (jj_3R_337()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_339()) jj_scanpos = xsp;
+    if (jj_3R_338()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_126()
+ inline bool jj_3R_125()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_266()) jj_scanpos = xsp;
+    if (jj_3R_265()) jj_scanpos = xsp;
     if (jj_scan_token(RETURN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_267()) jj_scanpos = xsp;
+    if (jj_3R_266()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -7208,132 +7183,132 @@ void parseInline();
  inline bool jj_3_5()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    if (jj_3R_62()) return true;
     return false;
   }
 
- inline bool jj_3R_250()
+ inline bool jj_3R_249()
  {
     if (jj_done) return true;
     if (jj_scan_token(SEVERITY_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_701()
+ inline bool jj_3R_698()
  {
     if (jj_done) return true;
-    if (jj_3R_706()) return true;
+    if (jj_3R_703()) return true;
     return false;
   }
 
- inline bool jj_3R_308()
+ inline bool jj_3R_307()
  {
     if (jj_done) return true;
-    if (jj_3R_388()) return true;
-    if (jj_3R_307()) return true;
+    if (jj_3R_387()) return true;
+    if (jj_3R_306()) return true;
     return false;
   }
 
- inline bool jj_3R_700()
+ inline bool jj_3R_697()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    if (jj_3R_62()) return true;
     return false;
   }
 
- inline bool jj_3R_692()
+ inline bool jj_3R_689()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_700()) {
+    if (jj_3R_697()) {
     jj_scanpos = xsp;
-    if (jj_3R_701()) return true;
+    if (jj_3R_698()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_249()
+ inline bool jj_3R_248()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_117()
+ inline bool jj_3R_116()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_249()) jj_scanpos = xsp;
+    if (jj_3R_248()) jj_scanpos = xsp;
     if (jj_scan_token(REPORT_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_250()) jj_scanpos = xsp;
+    if (jj_3R_249()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_703()
+ inline bool jj_3R_700()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_484()
+ inline bool jj_3R_482()
  {
     if (jj_done) return true;
     if (jj_scan_token(NOTEQU_T)) return true;
     return false;
   }
 
- inline bool jj_3R_483()
+ inline bool jj_3R_481()
  {
     if (jj_done) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_482()
+ inline bool jj_3R_480()
  {
     if (jj_done) return true;
     if (jj_scan_token(GREATERTHAN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_481()
+ inline bool jj_3R_479()
  {
     if (jj_done) return true;
     if (jj_scan_token(EQU_T)) return true;
     return false;
   }
 
- inline bool jj_3R_480()
+ inline bool jj_3R_478()
  {
     if (jj_done) return true;
     if (jj_scan_token(GT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_388()
+ inline bool jj_3R_387()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_477()) {
+    jj_scanpos = xsp;
+    if (jj_3R_478()) {
+    jj_scanpos = xsp;
     if (jj_3R_479()) {
     jj_scanpos = xsp;
     if (jj_3R_480()) {
     jj_scanpos = xsp;
     if (jj_3R_481()) {
     jj_scanpos = xsp;
-    if (jj_3R_482()) {
-    jj_scanpos = xsp;
-    if (jj_3R_483()) {
-    jj_scanpos = xsp;
-    if (jj_3R_484()) return true;
+    if (jj_3R_482()) return true;
     }
     }
     }
@@ -7342,137 +7317,137 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_479()
+ inline bool jj_3R_477()
  {
     if (jj_done) return true;
     if (jj_scan_token(LT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_467()
+ inline bool jj_3R_465()
  {
     if (jj_done) return true;
-    if (jj_3R_234()) return true;
+    if (jj_3R_233()) return true;
     return false;
   }
 
- inline bool jj_3R_146()
+ inline bool jj_3R_145()
  {
     if (jj_done) return true;
-    if (jj_3R_307()) return true;
+    if (jj_3R_306()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_308()) jj_scanpos = xsp;
+    if (jj_3R_307()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_702()
+ inline bool jj_3R_699()
  {
     if (jj_done) return true;
-    if (jj_3R_707()) return true;
+    if (jj_3R_704()) return true;
     return false;
   }
 
- inline bool jj_3R_693()
+ inline bool jj_3R_690()
  {
     if (jj_done) return true;
     if (jj_scan_token(RECORD_T)) return true;
     Token * xsp;
-    if (jj_3R_702()) return true;
+    if (jj_3R_699()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_702()) { jj_scanpos = xsp; break; }
+      if (jj_3R_699()) { 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_703()) jj_scanpos = xsp;
+    if (jj_3R_700()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_237()
+ inline bool jj_3R_236()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_236()) return true;
+    if (jj_3R_235()) return true;
     return false;
   }
 
  inline bool jj_3_71()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
-    if (jj_3R_110()) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_67()) return true;
+    if (jj_3R_109()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
  inline bool jj_3_72()
  {
     if (jj_done) return true;
-    if (jj_3R_111()) return true;
+    if (jj_3R_110()) return true;
     return false;
   }
 
- inline bool jj_3R_82()
+ inline bool jj_3R_81()
  {
     if (jj_done) return true;
     if (jj_scan_token(RANGE_T)) return true;
-    if (jj_3R_84()) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
- inline bool jj_3R_576()
+ inline bool jj_3R_575()
  {
     if (jj_done) return true;
     if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
  inline bool jj_3_70()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3R_183()
+ inline bool jj_3R_182()
  {
     if (jj_done) return true;
-    if (jj_3R_111()) return true;
+    if (jj_3R_110()) return true;
     return false;
   }
 
- inline bool jj_3R_182()
+ inline bool jj_3R_181()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
-    if (jj_3R_110()) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_67()) return true;
+    if (jj_3R_109()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_84()
+ inline bool jj_3R_83()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_182()) {
+    if (jj_3R_181()) {
     jj_scanpos = xsp;
-    if (jj_3R_183()) return true;
+    if (jj_3R_182()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_525()
+ inline bool jj_3R_530()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_3_4()) {
     jj_scanpos = xsp;
-    if (jj_3R_576()) return true;
+    if (jj_3R_575()) return true;
     }
     return false;
   }
@@ -7481,176 +7456,176 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_62()) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3R_531()
+ inline bool jj_3R_536()
  {
     if (jj_done) return true;
-    if (jj_3R_310()) return true;
+    if (jj_3R_309()) return true;
     return false;
   }
 
- inline bool jj_3R_228()
+ inline bool jj_3R_227()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_530()
+ inline bool jj_3R_535()
  {
     if (jj_done) return true;
     if (jj_scan_token(CHARACTER_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_529()
+ inline bool jj_3R_534()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_465()
+ inline bool jj_3R_463()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_529()) {
+    if (jj_3R_534()) {
     jj_scanpos = xsp;
-    if (jj_3R_530()) {
+    if (jj_3R_535()) {
     jj_scanpos = xsp;
-    if (jj_3R_531()) return true;
+    if (jj_3R_536()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_227()
+ inline bool jj_3R_226()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3R_62()
+ inline bool jj_3R_61()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(APOSTROPHE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_227()) {
+    if (jj_3R_226()) {
     jj_scanpos = xsp;
-    if (jj_3R_228()) return true;
+    if (jj_3R_227()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_342()
+ inline bool jj_3R_341()
  {
     if (jj_done) return true;
-    if (jj_3R_113()) return true;
+    if (jj_3R_112()) return true;
     return false;
   }
 
- inline bool jj_3R_192()
+ inline bool jj_3R_191()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_342()) { jj_scanpos = xsp; break; }
+      if (jj_3R_341()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_466()
+ inline bool jj_3R_464()
  {
     if (jj_done) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_193()
+ inline bool jj_3R_192()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_377()
+ inline bool jj_3R_376()
  {
     if (jj_done) return true;
     if (jj_scan_token(ALIAS_T)) return true;
-    if (jj_3R_465()) return true;
+    if (jj_3R_463()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_466()) jj_scanpos = xsp;
+    if (jj_3R_464()) jj_scanpos = xsp;
     if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_467()) jj_scanpos = xsp;
+    if (jj_3R_465()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_340()
+ inline bool jj_3R_339()
  {
     if (jj_done) return true;
-    if (jj_3R_423()) return true;
+    if (jj_3R_421()) return true;
     return false;
   }
 
- inline bool jj_3R_109()
+ inline bool jj_3R_108()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_236()) return true;
+    if (jj_3R_235()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_237()) { jj_scanpos = xsp; break; }
+      if (jj_3R_236()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_273()
+ inline bool jj_3R_272()
  {
     if (jj_done) return true;
     if (jj_scan_token(MINUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_274()
+ inline bool jj_3R_273()
  {
     if (jj_done) return true;
     if (jj_scan_token(AMPERSAND_T)) return true;
     return false;
   }
 
- inline bool jj_3R_129()
+ inline bool jj_3R_128()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_272()) {
+    if (jj_3R_271()) {
     jj_scanpos = xsp;
-    if (jj_3R_273()) {
+    if (jj_3R_272()) {
     jj_scanpos = xsp;
-    if (jj_3R_274()) return true;
+    if (jj_3R_273()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_272()
+ inline bool jj_3R_271()
  {
     if (jj_done) return true;
     if (jj_scan_token(PLUS_T)) return true;
@@ -7660,64 +7635,64 @@ void parseInline();
  inline bool jj_3_3()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
- inline bool jj_3R_493()
+ inline bool jj_3R_491()
  {
     if (jj_done) return true;
     if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
- inline bool jj_3R_494()
+ inline bool jj_3R_492()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_61()) return true;
+    if (jj_3R_60()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_404()
+ inline bool jj_3R_403()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_492()) {
+    if (jj_3R_490()) {
     jj_scanpos = xsp;
-    if (jj_3R_493()) {
+    if (jj_3R_491()) {
     jj_scanpos = xsp;
-    if (jj_3R_494()) return true;
+    if (jj_3R_492()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_492()
+ inline bool jj_3R_490()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
  inline bool jj_3_2()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_226()
+ inline bool jj_3R_225()
  {
     if (jj_done) return true;
-    if (jj_3R_166()) return true;
+    if (jj_3R_165()) return true;
     return false;
   }
 
- inline bool jj_3R_190()
+ inline bool jj_3R_189()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -7725,7 +7700,7 @@ void parseInline();
     xsp = jj_scanpos;
     if (jj_scan_token(15)) {
     jj_scanpos = xsp;
-    if (jj_3R_340()) return true;
+    if (jj_3R_339()) return true;
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
@@ -7734,114 +7709,114 @@ void parseInline();
  inline bool jj_3_1()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_154()
+ inline bool jj_3R_153()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_189()
+ inline bool jj_3R_188()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_89()
+ inline bool jj_3R_88()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_189()) jj_scanpos = xsp;
+    if (jj_3R_188()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     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;
+    if (jj_3R_189()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(56)) jj_scanpos = xsp;
-    if (jj_3R_191()) return true;
+    if (jj_3R_190()) return true;
     if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_192()) return true;
+    if (jj_3R_191()) return true;
     if (jj_scan_token(END_T)) return true;
     xsp = jj_scanpos;
     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;
+    if (jj_3R_192()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_153()
+ inline bool jj_3R_152()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_341()
+ inline bool jj_3R_340()
  {
     if (jj_done) return true;
-    if (jj_3R_424()) return true;
+    if (jj_3R_422()) return true;
     return false;
   }
 
- inline bool jj_3R_152()
+ inline bool jj_3R_151()
  {
     if (jj_done) return true;
     if (jj_scan_token(OPEN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_61()
+ inline bool jj_3R_60()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_152()) {
+    if (jj_3R_151()) {
     jj_scanpos = xsp;
-    if (jj_3R_153()) {
+    if (jj_3R_152()) {
     jj_scanpos = xsp;
-    if (jj_3R_154()) return true;
+    if (jj_3R_153()) return true;
     }
     }
     return false;
   }
 
- inline bool jj_3R_191()
+ inline bool jj_3R_190()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_341()) { jj_scanpos = xsp; break; }
+      if (jj_3R_340()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_653()
+ inline bool jj_3R_655()
  {
     if (jj_done) return true;
     if (jj_scan_token(ACCESS_T)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_513()
+ inline bool jj_3R_518()
  {
     if (jj_done) return true;
-    if (jj_3R_383()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3R_225()
+ inline bool jj_3R_224()
  {
     if (jj_done) return true;
     if (jj_scan_token(BASED_LITERAL)) return true;
@@ -7851,48 +7826,48 @@ void parseInline();
  inline bool jj_3_69()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_512()
+ inline bool jj_3R_517()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_3R_381()) return true;
     return false;
   }
 
- inline bool jj_3R_224()
+ inline bool jj_3R_223()
  {
     if (jj_done) return true;
     if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
- inline bool jj_3R_511()
+ inline bool jj_3R_516()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
- inline bool jj_3R_223()
+ inline bool jj_3R_222()
  {
     if (jj_done) return true;
     if (jj_scan_token(DECIMAL_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_104()
+ inline bool jj_3R_103()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_223()) {
+    if (jj_3R_222()) {
     jj_scanpos = xsp;
-    if (jj_3R_224()) {
+    if (jj_3R_223()) {
     jj_scanpos = xsp;
-    if (jj_3R_225()) return true;
+    if (jj_3R_224()) return true;
     }
     }
     return false;
@@ -7901,80 +7876,80 @@ void parseInline();
  inline bool jj_3_68()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_510()
+ inline bool jj_3R_515()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
- inline bool jj_3R_509()
+ inline bool jj_3R_514()
  {
     if (jj_done) return true;
-    if (jj_3R_376()) return true;
+    if (jj_3R_375()) return true;
     return false;
   }
 
- inline bool jj_3R_508()
+ inline bool jj_3R_513()
  {
     if (jj_done) return true;
-    if (jj_3R_375()) return true;
+    if (jj_3R_374()) return true;
     return false;
   }
 
- inline bool jj_3R_507()
+ inline bool jj_3R_512()
  {
     if (jj_done) return true;
-    if (jj_3R_373()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3R_506()
+ inline bool jj_3R_511()
  {
     if (jj_done) return true;
-    if (jj_3R_372()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
- inline bool jj_3R_505()
+ inline bool jj_3R_510()
  {
     if (jj_done) return true;
-    if (jj_3R_371()) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
- inline bool jj_3R_424()
+ inline bool jj_3R_422()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_504()) {
+    if (jj_3R_509()) {
     jj_scanpos = xsp;
-    if (jj_3R_505()) {
+    if (jj_3R_510()) {
     jj_scanpos = xsp;
-    if (jj_3R_506()) {
+    if (jj_3R_511()) {
     jj_scanpos = xsp;
-    if (jj_3R_507()) {
+    if (jj_3R_512()) {
     jj_scanpos = xsp;
-    if (jj_3R_508()) {
+    if (jj_3R_513()) {
     jj_scanpos = xsp;
-    if (jj_3R_509()) {
+    if (jj_3R_514()) {
     jj_scanpos = xsp;
-    if (jj_3R_510()) {
+    if (jj_3R_515()) {
     jj_scanpos = xsp;
     if (jj_3_68()) {
     jj_scanpos = xsp;
-    if (jj_3R_511()) {
+    if (jj_3R_516()) {
     jj_scanpos = xsp;
-    if (jj_3R_512()) {
+    if (jj_3R_517()) {
     jj_scanpos = xsp;
     if (jj_3_69()) {
     jj_scanpos = xsp;
-    if (jj_3R_513()) return true;
+    if (jj_3R_518()) return true;
     }
     }
     }
@@ -7989,18 +7964,18 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_504()
+ inline bool jj_3R_509()
  {
     if (jj_done) return true;
-    if (jj_3R_93()) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_330()
+ inline bool jj_3R_329()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_226()) return true;
+    if (jj_3R_225()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -8008,88 +7983,88 @@ void parseInline();
  inline bool jj_3_67()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_120()
+ inline bool jj_3R_119()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_3_67()) jj_scanpos = xsp;
-    if (jj_3R_177()) return true;
+    if (jj_3R_176()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_177()
+ inline bool jj_3R_176()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_330()) jj_scanpos = xsp;
+    if (jj_3R_329()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3_65()
  {
     if (jj_done) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_86()) return true;
     return false;
   }
 
- inline bool jj_3R_205()
+ inline bool jj_3R_204()
  {
     if (jj_done) return true;
-    if (jj_3R_351()) return true;
+    if (jj_3R_350()) return true;
     return false;
   }
 
  inline bool jj_3_66()
  {
     if (jj_done) return true;
-    if (jj_3R_108()) return true;
+    if (jj_3R_107()) return true;
     return false;
   }
 
- inline bool jj_3R_204()
+ inline bool jj_3R_203()
  {
     if (jj_done) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_86()) return true;
     return false;
   }
 
- inline bool jj_3R_203()
+ inline bool jj_3R_202()
  {
     if (jj_done) return true;
-    if (jj_3R_350()) return true;
+    if (jj_3R_349()) return true;
     return false;
   }
 
- inline bool jj_3R_202()
+ inline bool jj_3R_201()
  {
     if (jj_done) return true;
-    if (jj_3R_349()) return true;
+    if (jj_3R_348()) return true;
     return false;
   }
 
- inline bool jj_3R_94()
+ inline bool jj_3R_93()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_201()) {
+    jj_scanpos = xsp;
     if (jj_3R_202()) {
     jj_scanpos = xsp;
     if (jj_3R_203()) {
     jj_scanpos = xsp;
-    if (jj_3R_204()) {
-    jj_scanpos = xsp;
     if (jj_3_66()) {
     jj_scanpos = xsp;
-    if (jj_3R_205()) return true;
+    if (jj_3R_204()) return true;
     }
     }
     }
@@ -8100,49 +8075,49 @@ void parseInline();
  inline bool jj_3_64()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
  inline bool jj_3_63()
  {
     if (jj_done) return true;
-    if (jj_3R_107()) return true;
+    if (jj_3R_106()) return true;
     return false;
   }
 
- inline bool jj_3R_458()
+ inline bool jj_3R_456()
  {
     if (jj_done) return true;
-    if (jj_3R_109()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
  inline bool jj_3_62()
  {
     if (jj_done) return true;
-    if (jj_3R_106()) return true;
+    if (jj_3R_105()) return true;
     return false;
   }
 
- inline bool jj_3R_457()
+ inline bool jj_3R_455()
  {
     if (jj_done) return true;
-    if (jj_3R_525()) return true;
+    if (jj_3R_530()) return true;
     return false;
   }
 
  inline bool jj_3_61()
  {
     if (jj_done) return true;
-    if (jj_3R_62()) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3R_456()
+ inline bool jj_3R_454()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
@@ -8150,60 +8125,64 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_455()
+ inline bool jj_3R_453()
  {
     if (jj_done) return true;
-    if (jj_3R_107()) return true;
+    if (jj_3R_106()) return true;
     return false;
   }
 
  inline bool jj_3_59()
  {
     if (jj_done) return true;
-    if (jj_3R_105()) return true;
+    if (jj_3R_104()) return true;
     return false;
   }
 
- inline bool jj_3R_454()
+ inline bool jj_3R_452()
  {
     if (jj_done) return true;
-    if (jj_3R_106()) return true;
+    if (jj_3R_105()) return true;
     return false;
   }
 
- inline bool jj_3R_242()
+ inline bool jj_3R_241()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_453()
+ inline bool jj_3R_451()
  {
     if (jj_done) return true;
-    if (jj_3R_62()) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3R_452()
+ inline bool jj_3R_450()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_370()
+ inline bool jj_3R_369()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_449()) {
+    jj_scanpos = xsp;
+    if (jj_3R_450()) {
+    jj_scanpos = xsp;
     if (jj_3R_451()) {
     jj_scanpos = xsp;
     if (jj_3R_452()) {
@@ -8214,11 +8193,7 @@ void parseInline();
     jj_scanpos = xsp;
     if (jj_3R_455()) {
     jj_scanpos = xsp;
-    if (jj_3R_456()) {
-    jj_scanpos = xsp;
-    if (jj_3R_457()) {
-    jj_scanpos = xsp;
-    if (jj_3R_458()) return true;
+    if (jj_3R_456()) return true;
     }
     }
     }
@@ -8229,183 +8204,183 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_451()
+ inline bool jj_3R_449()
  {
     if (jj_done) return true;
-    if (jj_3R_105()) return true;
+    if (jj_3R_104()) return true;
     return false;
   }
 
- inline bool jj_3R_329()
+ inline bool jj_3R_328()
  {
     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_166()) return true;
+    if (jj_3R_165()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_582()
+ inline bool jj_3R_581()
  {
     if (jj_done) return true;
-    if (jj_3R_313()) return true;
+    if (jj_3R_312()) return true;
     return false;
   }
 
- inline bool jj_3R_532()
+ inline bool jj_3R_537()
  {
     if (jj_done) return true;
     if (jj_scan_token(PORT_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_582()) return true;
+    if (jj_3R_581()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_241()
+ inline bool jj_3R_240()
  {
     if (jj_done) return true;
-    if (jj_3R_360()) return true;
+    if (jj_3R_359()) return true;
     return false;
   }
 
- inline bool jj_3R_112()
+ inline bool jj_3R_111()
  {
     if (jj_done) return true;
     if (jj_scan_token(UNITS_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_241()) { jj_scanpos = xsp; break; }
+      if (jj_3R_240()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(UNITS_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_242()) jj_scanpos = xsp;
+    if (jj_3R_241()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3_58()
  {
     if (jj_done) return true;
-    if (jj_3R_104()) return true;
+    if (jj_3R_103()) return true;
     return false;
   }
 
- inline bool jj_3R_222()
+ inline bool jj_3R_221()
  {
     if (jj_done) return true;
-    if (jj_3R_104()) return true;
+    if (jj_3R_103()) return true;
     return false;
   }
 
- inline bool jj_3R_103()
+ inline bool jj_3R_102()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_222()) jj_scanpos = xsp;
-    if (jj_3R_60()) return true;
+    if (jj_3R_221()) jj_scanpos = xsp;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_408()
+ inline bool jj_3R_407()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_scan_token(IN_T)) return true;
     if (jj_3R_69()) return true;
+    if (jj_scan_token(IN_T)) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
  inline bool jj_3_57()
  {
     if (jj_done) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_86()) return true;
     return false;
   }
 
  inline bool jj_3_55()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
  inline bool jj_3_56()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_351()
+ inline bool jj_3R_350()
  {
     if (jj_done) return true;
     if (jj_scan_token(PACKAGE_T)) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
  inline bool jj_3_54()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_317()
+ inline bool jj_3R_316()
  {
     if (jj_done) return true;
-    if (jj_3R_405()) return true;
+    if (jj_3R_404()) return true;
     return false;
   }
 
- inline bool jj_3R_261()
+ inline bool jj_3R_260()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_167()
+ inline bool jj_3R_166()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(50)) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_317()) jj_scanpos = xsp;
+    if (jj_3R_316()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_310()
+ inline bool jj_3R_309()
  {
     if (jj_done) return true;
     if (jj_scan_token(STRINGLITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_643()
+ inline bool jj_3R_646()
  {
     if (jj_done) return true;
     if (jj_scan_token(TYPE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_642()
+ inline bool jj_3R_645()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_641()
+ inline bool jj_3R_644()
  {
     if (jj_done) return true;
     if (jj_scan_token(SHARED_T)) return true;
@@ -8416,47 +8391,47 @@ void parseInline();
  inline bool jj_3_53()
  {
     if (jj_done) return true;
-    if (jj_3R_103()) return true;
+    if (jj_3R_102()) return true;
     return false;
   }
 
- inline bool jj_3R_640()
+ inline bool jj_3R_643()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_639()
+ inline bool jj_3R_642()
  {
     if (jj_done) return true;
     if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_638()
+ inline bool jj_3R_641()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_613()
+ inline bool jj_3R_612()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_638()) {
+    if (jj_3R_641()) {
     jj_scanpos = xsp;
-    if (jj_3R_639()) {
+    if (jj_3R_642()) {
     jj_scanpos = xsp;
-    if (jj_3R_640()) {
+    if (jj_3R_643()) {
     jj_scanpos = xsp;
-    if (jj_3R_641()) {
+    if (jj_3R_644()) {
     jj_scanpos = xsp;
-    if (jj_3R_642()) {
+    if (jj_3R_645()) {
     jj_scanpos = xsp;
-    if (jj_3R_643()) return true;
+    if (jj_3R_646()) return true;
     }
     }
     }
@@ -8465,72 +8440,72 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_353()
+ inline bool jj_3R_352()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_207()
+ inline bool jj_3R_206()
  {
     if (jj_done) return true;
-    if (jj_3R_104()) return true;
+    if (jj_3R_103()) return true;
     return false;
   }
 
- inline bool jj_3R_206()
+ inline bool jj_3R_205()
  {
     if (jj_done) return true;
-    if (jj_3R_103()) return true;
+    if (jj_3R_102()) return true;
     return false;
   }
 
- inline bool jj_3R_96()
+ inline bool jj_3R_95()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_206()) {
+    if (jj_3R_205()) {
     jj_scanpos = xsp;
-    if (jj_3R_207()) return true;
+    if (jj_3R_206()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_442()
+ inline bool jj_3R_440()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_363()
+ inline bool jj_3R_362()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_442()) jj_scanpos = xsp;
+    if (jj_3R_440()) jj_scanpos = xsp;
     if (jj_scan_token(NULL_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_102()
+ inline bool jj_3R_101()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_262()
+ inline bool jj_3R_261()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
@@ -8541,42 +8516,42 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_260()
+ inline bool jj_3R_259()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_124()
+ inline bool jj_3R_123()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_260()) jj_scanpos = xsp;
+    if (jj_3R_259()) jj_scanpos = xsp;
     if (jj_scan_token(NEXT_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_261()) jj_scanpos = xsp;
+    if (jj_3R_260()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_262()) jj_scanpos = xsp;
+    if (jj_3R_261()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_221()
+ inline bool jj_3R_220()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_219()
+ inline bool jj_3R_218()
  {
     if (jj_done) return true;
-    if (jj_3R_234()) return true;
+    if (jj_3R_233()) return true;
     return false;
   }
 
@@ -8584,33 +8559,33 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_102()) { jj_scanpos = xsp; break; }
+      if (jj_3R_101()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_101()
+ inline bool jj_3R_100()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_219()) jj_scanpos = xsp;
+    if (jj_3R_218()) jj_scanpos = xsp;
     if (jj_scan_token(APOSTROPHE_T)) return true;
-    if (jj_3R_220()) return true;
+    if (jj_3R_219()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_221()) jj_scanpos = xsp;
+    if (jj_3R_220()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3_47()
  {
     if (jj_done) return true;
-    if (jj_3R_99()) return true;
+    if (jj_3R_98()) return true;
     return false;
   }
 
@@ -8618,7 +8593,7 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -8626,19 +8601,19 @@ void parseInline();
  inline bool jj_3_49()
  {
     if (jj_done) return true;
-    if (jj_3R_101()) return true;
+    if (jj_3R_100()) return true;
     return false;
   }
 
- inline bool jj_3R_214()
+ inline bool jj_3R_213()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_58()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_353()) { jj_scanpos = xsp; break; }
+      if (jj_3R_352()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
@@ -8648,60 +8623,60 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_100()) return true;
+    if (jj_3R_99()) return true;
     return false;
   }
 
- inline bool jj_3R_210()
+ inline bool jj_3R_209()
  {
     if (jj_done) return true;
-    if (jj_3R_99()) return true;
+    if (jj_3R_98()) return true;
     return false;
   }
 
- inline bool jj_3R_213()
+ inline bool jj_3R_212()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_68()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_150()
+ inline bool jj_3R_149()
  {
     if (jj_done) return true;
-    if (jj_3R_311()) return true;
+    if (jj_3R_310()) return true;
     return false;
   }
 
- inline bool jj_3R_212()
+ inline bool jj_3R_211()
  {
     if (jj_done) return true;
-    if (jj_3R_101()) return true;
+    if (jj_3R_100()) return true;
     return false;
   }
 
- inline bool jj_3R_211()
+ inline bool jj_3R_210()
  {
     if (jj_done) return true;
     if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_100()) return true;
+    if (jj_3R_99()) return true;
     return false;
   }
 
- inline bool jj_3R_99()
+ inline bool jj_3R_98()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_210()) {
+    jj_scanpos = xsp;
     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;
+    if (jj_3R_213()) return true;
     }
     }
     }
@@ -8711,155 +8686,155 @@ void parseInline();
  inline bool jj_3_46()
  {
     if (jj_done) return true;
-    if (jj_3R_98()) return true;
+    if (jj_3R_97()) return true;
     return false;
   }
 
- inline bool jj_3R_98()
+ inline bool jj_3R_97()
  {
     if (jj_done) return true;
-    if (jj_3R_99()) return true;
+    if (jj_3R_98()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_210()) { jj_scanpos = xsp; break; }
+      if (jj_3R_209()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_149()
+ inline bool jj_3R_148()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_151()
+ inline bool jj_3R_150()
  {
     if (jj_done) return true;
-    if (jj_3R_98()) return true;
+    if (jj_3R_97()) return true;
     return false;
   }
 
- inline bool jj_3R_148()
+ inline bool jj_3R_147()
  {
     if (jj_done) return true;
-    if (jj_3R_310()) return true;
+    if (jj_3R_309()) return true;
     return false;
   }
 
- inline bool jj_3R_60()
+ inline bool jj_3R_59()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_148()) {
+    if (jj_3R_147()) {
     jj_scanpos = xsp;
-    if (jj_3R_149()) {
+    if (jj_3R_148()) {
     jj_scanpos = xsp;
-    if (jj_3R_150()) return true;
+    if (jj_3R_149()) return true;
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_151()) jj_scanpos = xsp;
+    if (jj_3R_150()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_281()
+ inline bool jj_3R_280()
  {
     if (jj_done) return true;
     if (jj_scan_token(REM_T)) return true;
     return false;
   }
 
- inline bool jj_3R_280()
+ inline bool jj_3R_279()
  {
     if (jj_done) return true;
     if (jj_scan_token(MOD_T)) return true;
     return false;
   }
 
- inline bool jj_3R_279()
+ inline bool jj_3R_278()
  {
     if (jj_done) return true;
     if (jj_scan_token(SLASH_T)) return true;
     return false;
   }
 
- inline bool jj_3R_135()
+ inline bool jj_3R_134()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
+    if (jj_3R_277()) {
+    jj_scanpos = xsp;
     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;
+    if (jj_3R_280()) return true;
     }
     }
     }
     return false;
   }
 
- inline bool jj_3R_278()
+ inline bool jj_3R_277()
  {
     if (jj_done) return true;
     if (jj_scan_token(MULT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_625()
+ inline bool jj_3R_628()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_432()
+ inline bool jj_3R_430()
  {
     if (jj_done) return true;
     if (jj_scan_token(LINKAGE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_431()
+ inline bool jj_3R_429()
  {
     if (jj_done) return true;
     if (jj_scan_token(BUFFER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_430()
+ inline bool jj_3R_428()
  {
     if (jj_done) return true;
     if (jj_scan_token(INOUT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_429()
+ inline bool jj_3R_427()
  {
     if (jj_done) return true;
     if (jj_scan_token(OUT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_346()
+ inline bool jj_3R_345()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_428()) {
+    if (jj_3R_426()) {
     jj_scanpos = xsp;
-    if (jj_3R_429()) {
+    if (jj_3R_427()) {
     jj_scanpos = xsp;
-    if (jj_3R_430()) {
+    if (jj_3R_428()) {
     jj_scanpos = xsp;
-    if (jj_3R_431()) {
+    if (jj_3R_429()) {
     jj_scanpos = xsp;
-    if (jj_3R_432()) return true;
+    if (jj_3R_430()) return true;
     }
     }
     }
@@ -8867,53 +8842,46 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_428()
+ inline bool jj_3R_426()
  {
     if (jj_done) return true;
     if (jj_scan_token(IN_T)) return true;
     return false;
   }
 
-
-public: 
-  TokenManager *token_source;
-  CharStream   *jj_input_stream;
+  public: TokenManager *token_source;
+  public: CharStream *jj_input_stream;
   /** Current token. */
-  Token        *token;
+  public: Token *token;
   /** Next token. */
-  Token        *jj_nt;
-private: 
-  int           jj_ntk;
-  JJCalls       jj_2_rtns[115];
-  bool          jj_rescan;
-  int           jj_gc;
-  Token        *jj_scanpos, *jj_lastpos;
-  int           jj_la;
+  public: Token *jj_nt;
+  private: int jj_ntk;
+  private: JJCalls jj_2_rtns[115];
+  private: bool jj_rescan;
+  private: int jj_gc;
+  private: Token *jj_scanpos, *jj_lastpos;
+  private: int jj_la;
   /** Whether we are looking ahead. */
-  bool          jj_lookingAhead;
-  bool          jj_semLA;
-  int           jj_gen;
-  int           jj_la1[295];
-  ErrorHandler *errorHandler;
-  bool          errorHandlerCreated;
-protected: 
-  bool          hasError;
-public: 
-  void setErrorHandler(ErrorHandler *eh) {
+  private: bool jj_lookingAhead;
+  private: bool jj_semLA;
+  private: int jj_gen;
+  private: int jj_la1[294];
+  private: ErrorHandler *errorHandler;
+  private: bool errorHandlerCreated;
+  protected: bool hasError;
+  public: void setErrorHandler(ErrorHandler *eh) {
     if (errorHandlerCreated) delete errorHandler;
     errorHandler = eh;
     errorHandlerCreated = false;
   }
-  Token *head; 
-public: 
+ Token *head; 
+ public: 
 
  VhdlParser(TokenManager *tm);
-  virtual ~VhdlParser();
+   public: virtual ~VhdlParser();
 
 void ReInit(TokenManager *tm);
 
-void clear();
-
 Token * jj_consume_token(int kind);
 
 bool  jj_scan_token(int kind);
@@ -8923,29 +8891,24 @@ Token * getNextToken();
 Token * getToken(int index);
 
 int jj_ntk_f();
-private:
-  int jj_kind;
+ private: int jj_kind;
   int **jj_expentries;
   int *jj_expentry;
 
-  void jj_add_error_token(int kind, int pos);
-protected:
-  /** Generate ParseException. */
-
-  virtual void  parseError();
-private:
-  int  trace_indent;
-  bool trace_enabled;
+void jj_add_error_token(int kind, int pos);
 
-public:
+protected: virtual void  parseError();
+  private: int trace_indent;
+  private: bool trace_enabled;
+  /** Enable tracing. */
 
-  void enable_tracing();
+public: void enable_tracing();
 
-  void disable_tracing();
+public: void disable_tracing();
 
-  void jj_rescan_token();
+void jj_rescan_token();
 
-  void jj_save(int index, int xla);
+void jj_save(int index, int xla);
 typedef unsigned long long uint64;
 
 static Entry* current_root;
@@ -8989,10 +8952,8 @@ static  void mapLibPackage( Entry* root);
 static void createFlow();
 static void error_skipto(int kind);
 static void oneLineComment(QCString qcs);
-static void setMultCommentLine();
+static void setMultCommentLine();private: bool jj_done;
 
-private:
-  bool jj_done;
 };
 }
 }
diff --git a/vhdlparser/VhdlParserConstants.h b/vhdlparser/VhdlParserConstants.h
index 0c2c0e5..2f66b40 100644
--- a/vhdlparser/VhdlParserConstants.h
+++ b/vhdlparser/VhdlParserConstants.h
@@ -6,7 +6,6 @@
  */
 #ifndef VHDLPARSERCONSTANTS_H
 #define VHDLPARSERCONSTANTS_H
-#include "JavaCC.h"
 
 namespace vhdl {
 namespace parser {
@@ -375,7 +374,9 @@ const  int SPACE_CHARACTER = 184;
   /** RegularExpression Id. */
 const  int LOWER_CASE_LETTER = 185;
   /** RegularExpression Id. */
-const  int VHDL2008TOOLDIR = 186;
+const  int QUOTE = 186;
+  /** RegularExpression Id. */
+const  int VHDL2008TOOLDIR = 187;
 
   /** Lexical state. */
 const  int DEFAULT = 0;
@@ -754,6 +755,8 @@ const  int DEFAULT = 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, 0x51, 0x55, 0x4f, 0x54, 0x45, 0x3e, 0x22, 0};
+  static JAVACC_CHAR_TYPE tokenImage_arr_187[] = 
 {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, 
@@ -943,6 +946,7 @@ tokenImage_arr_183,
 tokenImage_arr_184, 
 tokenImage_arr_185, 
 tokenImage_arr_186, 
+tokenImage_arr_187, 
   };
 
 }
diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc
index 9733acd..1ddc623 100644
--- a/vhdlparser/VhdlParserTokenManager.cc
+++ b/vhdlparser/VhdlParserTokenManager.cc
@@ -1,6 +1,5 @@
 /* VhdlParserTokenManager.cc */
-#include "VhdlParserTokenManager.h"
-#include "TokenMgrError.h"
+#include "./VhdlParserTokenManager.h"
 namespace vhdl {
 namespace parser {
 static const unsigned long long jjbitVec0[] = {
@@ -235,6 +234,7 @@ 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 JAVACC_CHAR_TYPE jjstrLiteralChars_187[] = {0};
 static const JAVACC_STRING_TYPE jjstrLiteralImages[] = {
 jjstrLiteralChars_0, 
 jjstrLiteralChars_1, 
@@ -423,6 +423,7 @@ jjstrLiteralChars_183,
 jjstrLiteralChars_184, 
 jjstrLiteralChars_185, 
 jjstrLiteralChars_186, 
+jjstrLiteralChars_187, 
 };
 
 /** Lexer state names. */
@@ -432,7 +433,7 @@ static const JAVACC_STRING_TYPE lexStateNames[] = {
 lexStateNames_arr_0, 
 };
 static const unsigned long long jjtoToken[] = {
-   0xfffffffffffff801ULL, 0xffffffffffffffffULL, 0x4081fffffffffffULL, 
+   0xfffffffffffff801ULL, 0xffffffffffffffffULL, 0x8081fffffffffffULL, 
 };
 static const unsigned long long jjtoSkip[] = {
    0x7deULL, 0x0ULL, 0x0ULL, 
@@ -2692,7 +2693,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
       if (curChar < 64)
       {
          unsigned long long l = 1ULL << curChar;
-         (void)l;
+         if (l == 1);
          do
          {
             switch(jjstateSet[--i])
@@ -2796,7 +2797,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                      jjstateSet[jjnewStateCnt++] = 18;
                   break;
                case 18:
-                  if ((0xfffffffb00000200ULL & l) != 0L)
+                  if ((0xffffffff00000200ULL & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 19;
                   break;
                case 19:
@@ -2833,15 +2834,15 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                case 28:
                   if (curChar != 34)
                      break;
-                  if (kind > 186)
-                     kind = 186;
+                  if (kind > 187)
+                     kind = 187;
                   { jjCheckNAddTwoStates(26, 29); }
                   break;
                case 29:
                   if ((0xfffffffb00000200ULL & l) == 0L)
                      break;
-                  if (kind > 186)
-                     kind = 186;
+                  if (kind > 187)
+                     kind = 187;
                   { jjCheckNAddTwoStates(26, 29); }
                   break;
                case 30:
@@ -3030,7 +3031,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
       else if (curChar < 128)
       {
          unsigned long long l = 1ULL << (curChar & 077);
-         (void)l;
+         if (l == 1);
          do
          {
             switch(jjstateSet[--i])
@@ -3117,8 +3118,8 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                case 29:
                   if ((0x7fffffffffffffffULL & l) == 0L)
                      break;
-                  if (kind > 186)
-                     kind = 186;
+                  if (kind > 187)
+                     kind = 187;
                   { jjCheckNAddTwoStates(26, 29); }
                   break;
                case 32:
@@ -3218,8 +3219,8 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                case 29:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 186)
-                     kind = 186;
+                  if (kind > 187)
+                     kind = 187;
                   { jjAddStates(52, 53); }
                   break;
                case 32:
@@ -3244,7 +3245,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   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;
+               default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;
             }
          } while(i != startsAt);
       }
@@ -3308,10 +3309,10 @@ bool VhdlParserTokenManager::jjCanMove_1(int hiByte, int i1, int i2, unsigned lo
 Token * VhdlParserTokenManager::jjFillToken(){
    Token *t;
    JAVACC_STRING_TYPE curTokenImage;
-   int beginLine   = -1;
-   int endLine     = -1;
-   int beginColumn = -1;
-   int endColumn   = -1;
+   int beginLine;
+   int endLine;
+   int beginColumn;
+   int endColumn;
    JAVACC_STRING_TYPE im = jjstrLiteralImages[jjmatchedKind];
    curTokenImage = (im.length() == 0) ? input_stream->GetImage() : im;
    if (input_stream->getTrackLineColumn()) {
@@ -3320,9 +3321,7 @@ Token * VhdlParserTokenManager::jjFillToken(){
      endLine = input_stream->getEndLine();
      endColumn = input_stream->getEndColumn();
    }
-   t = Token::newToken(jjmatchedKind);
-   t->kind = jjmatchedKind;
-   t->image = curTokenImage;
+   t = Token::newToken(jjmatchedKind, curTokenImage);
    t->specialToken = NULL;
    t->next = NULL;
 
@@ -3393,7 +3392,7 @@ Token * VhdlParserTokenManager::getNextToken(){
    if (!EOFSeen) {
       error_after = curPos <= 1 ? EMPTY : input_stream->GetImage();
    }
-   errorHandler->lexicalError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, this);
+   lexicalError();
   }
 }
 
@@ -3401,13 +3400,13 @@ 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;
-       }
-      case 6 : {
+      case 6 :
          image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+    {
     QCString doc(image.data());
     int count=doc.contains("--!");
     ::vhdl::parser::VhdlParser::setMultCommentLine();
@@ -3416,31 +3415,29 @@ void  VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){
       ::vhdl::parser::VhdlParser::oneLineComment(doc);
     else
       ::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),FALSE); ;
+    }
          break;
-       }
-      case 7 : {
+      case 7 :
          image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                                                                                ::vhdl::parser::VhdlParser::handleFlowComment(image.data());
          break;
-       }
-      case 8 : {
+      case 8 :
          image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
     ::vhdl::parser::VhdlParser::lineCount(image.data());
          break;
-       }
-      case 9 : {
+      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();
+   {
+     QCString q(image.data());
+     q.stripPrefix("/*!");
+     q.resize(q.length()-2);
+     ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear();
+   }
          break;
-       }
-      case 10 : {
+      case 10 :
          image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                                                     ::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();
          break;
-       }
       default :
          break;
    }
@@ -3449,128 +3446,105 @@ void  VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){
 void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
    switch(jjmatchedKind)
    {
-      case 17 : {
+      case 17 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                                     ::vhdl::parser::VhdlParser::setLineParsed(ARCHITECTURE_T);
          break;
-       }
-      case 18 : {
+      case 18 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                       VhdlParser::setLineParsed(ARRAY_T);
          break;
-       }
-      case 22 : {
+      case 22 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                               ::vhdl::parser::VhdlParser::setLineParsed(ATTRIBUTE_T);
          break;
-       }
-      case 25 : {
+      case 25 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                     ::vhdl::parser::VhdlParser::setLineParsed(BODY_T);
          break;
-       }
-      case 28 : {
+      case 28 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                               VhdlParser::setLineParsed(COMPONENT_T);
          break;
-       }
-      case 30 : {
+      case 30 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                                       VhdlParser::setLineParsed(CONFIGURATION_T);
          break;
-       }
-      case 31 : {
+      case 31 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                              VhdlParser::setLineParsed(CONSTANT_T);
          break;
-       }
-      case 32 : {
+      case 32 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                           VhdlParser::setLineParsed(CONTEXT_T);
          break;
-       }
-      case 39 : {
+      case 39 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                   VhdlParser::setLineParsed(END_T);
          break;
-       }
-      case 40 : {
+      case 40 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                         VhdlParser::setLineParsed(ENTITY_T);
          break;
-       }
-      case 43 : {
+      case 43 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                     VhdlParser::setLineParsed(FILE_T);
          break;
-       }
-      case 46 : {
+      case 46 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                              VhdlParser::setLineParsed(FUNCTION_T);
          break;
-       }
-      case 49 : {
+      case 49 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                       VhdlParser::setLineParsed(GROUP_T);
          break;
-       }
-      case 58 : {
+      case 58 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                           VhdlParser::setLineParsed(LIBRARY_T);
          break;
-       }
-      case 76 : {
+      case 76 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                           ::vhdl::parser::VhdlParser::setLineParsed(PACKAGE_T);
          break;
-       }
-      case 78 : {
+      case 78 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                     ::vhdl::parser::VhdlParser::setLineParsed(PORT_T);
          break;
-       }
-      case 80 : {
+      case 80 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                               ::vhdl::parser::VhdlParser::setLineParsed(PROCEDURE_T);
          break;
-       }
-      case 81 : {
+      case 81 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                           ::vhdl::parser::VhdlParser::setLineParsed(PROCESS_T);
          break;
-       }
-      case 86 : {
+      case 86 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                         ::vhdl::parser::VhdlParser::setLineParsed(RECORD_T);
          break;
-       }
-      case 100 : {
+      case 100 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                         ::vhdl::parser::VhdlParser::setLineParsed(SIGNAL_T);
          break;
-       }
-      case 107 : {
+      case 107 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                           ::vhdl::parser::VhdlParser::setLineParsed(SUBTYPE_T);
          break;
-       }
-      case 111 : {
+      case 111 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                     ::vhdl::parser::VhdlParser::setLineParsed(TYPE_T);
          break;
-       }
-      case 113 : {
+      case 113 :
         image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
                       ::vhdl::parser::VhdlParser::setLineParsed(UNITS_T);
          break;
-       }
       default :
          break;
    }
 }
   /** Reinitialise parser. */
   void VhdlParserTokenManager::ReInit(JAVACC_CHARSTREAM *stream, int lexState, VhdlParser *parserArg) {
-    clear();
+    if (input_stream) delete input_stream;
     jjmatchedPos = jjnewStateCnt = 0;
     curLexState = lexState;
     input_stream = stream;
@@ -3578,8 +3552,6 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
     debugStream = stdout; // init
     SwitchTo(lexState);
     parser = parserArg;
-    errorHandler = new TokenManagerErrorHandler();
-    errorHandlerCreated = true;
   }
 
   void VhdlParserTokenManager::ReInitRounds() {
@@ -3591,17 +3563,10 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
 
   /** Switch to specified lex state. */
   void VhdlParserTokenManager::SwitchTo(int lexState) {
-    if (lexState >= 1 || lexState < 0) {
-      JAVACC_STRING_TYPE message;
-#ifdef WIDE_CHAR
-      message += L"Error: Ignoring invalid lexical state : ";
-      message += lexState; message += L". State unchanged.";
-#else
-      message += "Error: Ignoring invalid lexical state : ";
-      message += lexState; message += ". State unchanged.";
-#endif
-      throw new TokenMgrError(message, INVALID_LEXICAL_STATE);
-    } else
+    if (lexState >= 1 || lexState < 0)
+      assert(false);
+      //throw 1;//new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+    else
       curLexState = lexState;
   }
 
@@ -3609,23 +3574,12 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
   VhdlParserTokenManager::VhdlParserTokenManager (JAVACC_CHARSTREAM *stream, int lexState, VhdlParser *parserArg)
   {
     input_stream = NULL;
-    errorHandlerCreated = false;
     ReInit(stream, lexState, parserArg);
   }
 
   // Destructor
   VhdlParserTokenManager::~VhdlParserTokenManager () {
-    clear();
+    if (input_stream) delete input_stream;
   }
-
-  // clear
-  void VhdlParserTokenManager::clear() {
-    //Since input_stream was generated outside of TokenManager
-    //TokenManager should not take care of deleting it
-    //if (input_stream) delete input_stream;
-    if (errorHandlerCreated) delete errorHandler;    
-  }
-
-
 }
 }
diff --git a/vhdlparser/VhdlParserTokenManager.h b/vhdlparser/VhdlParserTokenManager.h
index f24c8e3..304cff3 100644
--- a/vhdlparser/VhdlParserTokenManager.h
+++ b/vhdlparser/VhdlParserTokenManager.h
@@ -1,10 +1,8 @@
 #ifndef VHDLPARSERTOKENMANAGER_H
 #define VHDLPARSERTOKENMANAGER_H
-#include "stdio.h"
 #include "JavaCC.h"
 #include "CharStream.h"
 #include "Token.h"
-#include "ErrorHandler.h"
 #include "TokenManager.h"
 #include "VhdlParserConstants.h"
 #include "VhdlParser.h"
@@ -117,27 +115,16 @@ void  TokenLexicalActions(Token *matchedToken);
   public: virtual ~VhdlParserTokenManager();
   void ReInit(JAVACC_CHARSTREAM *stream, int lexState = 0, VhdlParser *parserArg = NULL);
   void SwitchTo(int lexState);
-  void clear();
   const JAVACC_SIMPLE_STRING jjKindsForBitVector(int i, unsigned long long vec);
   const JAVACC_SIMPLE_STRING jjKindsForStateVector(int lexState, int vec[], int start, int end);
-  JAVACC_CHARSTREAM*        input_stream;
-  int                       jjrounds[75];
-  int                       jjstateSet[2 * 75];
-  JAVACC_STRING_TYPE        jjimage;
-  JAVACC_STRING_TYPE        image;
-  int                       jjimageLen;
-  int                       lengthOfMatch;
-  JAVACC_CHAR_TYPE          curChar;
-  TokenManagerErrorHandler* errorHandler;
-  bool                      errorHandlerCreated;
-
-public: 
-  void setErrorHandler(TokenManagerErrorHandler *eh) {
-      if (errorHandlerCreated && errorHandler != NULL) delete errorHandler;
-      errorHandler = eh;
-      errorHandlerCreated = false;
-    }
-    
+    JAVACC_CHARSTREAM  *input_stream;
+    int jjrounds[75];
+    int jjstateSet[2 * 75];
+    JAVACC_STRING_TYPE jjimage;
+    JAVACC_STRING_TYPE image;
+    int jjimageLen;
+    int lengthOfMatch;
+    JAVACC_CHAR_TYPE curChar;
 };
 }
 }
diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj
index aa42127..befc4e0 100644
--- a/vhdlparser/vhdlparser.jj
+++ b/vhdlparser/vhdlparser.jj
@@ -86,6 +86,7 @@ SKIP:
   <#DOXYGEN_VHDL_COMMENT: (" "|"\t")*"--!"(~["\n", "\r"])* ("\n" | "\r" | "\r\n")?>
   | <MULT_DOXYGEN_COMMENT: (<DOXYGEN_VHDL_COMMENT>)+ >
   {
+    {
     QCString doc(image.data());
     int count=doc.contains("--!");
     ::vhdl::parser::VhdlParser::setMultCommentLine();
@@ -94,6 +95,7 @@ SKIP:
       ::vhdl::parser::VhdlParser::oneLineComment(doc);
     else
       ::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),FALSE); ;
+    }
 
   }
   |<VHDL_FLOWCHART_COMMENT: "--#" (~["\n", "\r"])* ("\n" | "\r" | "\r\n")?>  { ::vhdl::parser::VhdlParser::handleFlowComment(image.data());}
@@ -108,10 +110,12 @@ SKIP :
 {
   <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();
+   {
+     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();}
 }
@@ -289,7 +293,7 @@ TOKEN:
  | <STRINGLITERAL: (( ["\""](<GRAPHIC_CHARACTER>)*) "\"")+ >
  | <BASIC_IDENTIFIER:  (<LETTER> ( (["_"])* <LETTER_OR_DIGIT> )*) >
  | <EXTENDED_CHARACTER: ( ["\\"](<GRAPHIC_CHARACTER>)*["\\"] ) >
- | <CHARACTER_LITERAL: (["'"]<GRAPHIC_CHARACTER>["'"]) >
+ | <CHARACTER_LITERAL: (["'"](<GRAPHIC_CHARACTER>|<QUOTE>)["'"]) >
  | <DECIMAL_LITERAL: (<INTEGER> (["."]<INTEGER>)? (<EXPONENT>)? ) >
  | <BASED_INTEGER: <LETTER_OR_DIGIT>( <LETTER_OR_DIGIT>)* >
  | <BASED_LITERAL: <INTEGER>["#"]<BASED_INTEGER>(["."] <BASED_INTEGER>)? ["#"] (<EXPONENT>)? >
@@ -306,6 +310,7 @@ TOKEN:
  | < #OTHER_SPECIAL_CHARACTER: ["%","!","$","@","?","[","\\","]","^","`","{","}","~","\u00A0"-"\u00FF"]>
  | < #SPACE_CHARACTER: [" ","\t"] >
  | < #LOWER_CASE_LETTER: ["a"-"z"] >
+ | < #QUOTE: ["\""] >
  | <VHDL2008TOOLDIR  : ["`"](<GRAPHIC_CHARACTER>|<STRINGLITERAL>)+ >
 
 }
@@ -577,7 +582,7 @@ attribute_declaration()
 LOOKAHEAD(3)
 group_template_declaration()
 | group_declaration()
-| <VHDL2008TOOLDIR>
+//| <VHDL2008TOOLDIR>
 }
 
 void block_declarative_part() : {}
@@ -2612,9 +2617,10 @@ void generate_statement_body() : {}
 
 void generate_statement_body1() : {}
 {
-   LOOKAHEAD(block_declarative_item()<BEGIN_T> )
-   (block_declarative_item() )*  <BEGIN_T> (concurrent_statement())*
-   | (concurrent_statement())*
+  //   [LOOKAHEAD(block_declarative_item()<BEGIN_T> )(block_declarative_item() )*  <BEGIN_T>] (concurrent_statement())*
+
+   [(LOOKAHEAD(block_declarative_item())block_declarative_item() )*  <BEGIN_T>] (concurrent_statement())*
+  // | (concurrent_statement())*
 }
 
 QCString external_name(): {QCString s,s1,s2;}
diff --git a/vhdlparser/vhdlstring.h b/vhdlparser/vhdlstring.h
index f15ef6c..9403713 100644
--- a/vhdlparser/vhdlstring.h
+++ b/vhdlparser/vhdlstring.h
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+
 /** @brief Minimal string class with std::string like behaviour that fulfills the JavaCC
  *  string requirements.
  */
@@ -99,4 +100,8 @@ class VhdlString
     int   m_len;
 };
 
+extern VhdlString addUnicodeEscapes(VhdlString str);
+
+#define finally
+
 #endif
author	Dimitri van Heesch <dimitri@stack.nl>	2015-01-02 16:28:03 (GMT)
committer	Dimitri van Heesch <dimitri@stack.nl>	2015-01-02 16:28:03 (GMT)
commit	34b00c442308efe169cc89fad62588fdce1d84e8 (patch)
tree	19ceab12fa37beece4a9a94a0dff26ed14a28779 /vhdlparser
parent	981515820134a2171d2b6a912275e919f56532b4 (diff)
download	Doxygen-34b00c442308efe169cc89fad62588fdce1d84e8.zip Doxygen-34b00c442308efe169cc89fad62588fdce1d84e8.tar.gz Doxygen-34b00c442308efe169cc89fad62588fdce1d84e8.tar.bz2