diff options
Diffstat (limited to 'vhdlparser')
| -rw-r--r-- | vhdlparser/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | vhdlparser/CharStream.cc | 4 | ||||
| -rw-r--r-- | vhdlparser/CharStream.h | 206 | ||||
| -rw-r--r-- | vhdlparser/ErrorHandler.h | 5 | ||||
| -rw-r--r-- | vhdlparser/JavaCC.h | 47 | ||||
| -rw-r--r-- | vhdlparser/ParseException.cc | 6 | ||||
| -rw-r--r-- | vhdlparser/ParseException.h | 4 | ||||
| -rw-r--r-- | vhdlparser/Token.cc | 4 | ||||
| -rw-r--r-- | vhdlparser/Token.h | 7 | ||||
| -rw-r--r-- | vhdlparser/TokenManager.h | 14 | ||||
| -rw-r--r-- | vhdlparser/TokenMgrError.cc | 9 | ||||
| -rw-r--r-- | vhdlparser/TokenMgrError.h | 23 | ||||
| -rw-r--r-- | vhdlparser/VhdlParser.cc | 783 | ||||
| -rw-r--r-- | vhdlparser/VhdlParser.h | 3974 | ||||
| -rw-r--r-- | vhdlparser/VhdlParserConstants.h | 2 | ||||
| -rw-r--r-- | vhdlparser/VhdlParserIF.cpp | 2 | ||||
| -rw-r--r-- | vhdlparser/VhdlParserTokenManager.cc | 259 | ||||
| -rw-r--r-- | vhdlparser/VhdlParserTokenManager.h | 27 | ||||
| -rw-r--r-- | vhdlparser/vhdlparser.jj | 42 |
19 files changed, 2792 insertions, 2636 deletions
diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt index f89008c..43dc74d 100644 --- a/vhdlparser/CMakeLists.txt +++ b/vhdlparser/CMakeLists.txt @@ -1,3 +1,13 @@ +find_package(Javacc) +if (JAVACC_FOUND) + add_custom_command( + COMMAND ${JAVACC_EXECUTABLE} ${JAVACC_FLAGS} -OUTPUT_DIRECTORY=${CMAKE_SOURCE_DIR}/vhdlparser ${CMAKE_SOURCE_DIR}/vhdlparser/vhdlparser.jj + DEPENDS ${CMAKE_SOURCE_DIR}/vhdlparser/vhdlparser.jj + OUTPUT ${CMAKE_SOURCE_DIR}/vhdlparser/CharStream.cc ${CMAKE_SOURCE_DIR}/vhdlparser/CharStream.h ${CMAKE_SOURCE_DIR}/vhdlparser/ErrorHandler.h ${CMAKE_SOURCE_DIR}/vhdlparser/JavaCC.h ${CMAKE_SOURCE_DIR}/vhdlparser/ParseException.cc ${CMAKE_SOURCE_DIR}/vhdlparser/ParseException.h ${CMAKE_SOURCE_DIR}/vhdlparser/Token.cc ${CMAKE_SOURCE_DIR}/vhdlparser/Token.h ${CMAKE_SOURCE_DIR}/vhdlparser/TokenManager.h ${CMAKE_SOURCE_DIR}/vhdlparser/TokenMgrError.cc ${CMAKE_SOURCE_DIR}/vhdlparser/TokenMgrError.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParser.cc ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParser.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserConstants.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserTokenManager.cc ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserTokenManager.h + ) + +endif() + include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC}) add_library(vhdlparser STATIC CharStream.cc diff --git a/vhdlparser/CharStream.cc b/vhdlparser/CharStream.cc index 8cc17c3..65179f5 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.0 */ +/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 6.2 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ #include "CharStream.h" @@ -209,4 +209,4 @@ void CharStream::UpdateLineColumn(JAVACC_CHAR_TYPE c) { } } -/* JavaCC - OriginalChecksum=e709b9ee1adf0fcb6b1c5e1641f10348 (do not edit this line) */ +/* JavaCC - OriginalChecksum=ade3c1b57a731a003629de593814ffa6 (do not edit this line) */ diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h index 784b584..69b8ab5 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.0 */ +/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 6.2 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ #ifndef CHARSTREAM_H #define CHARSTREAM_H @@ -28,44 +28,60 @@ namespace parser { class CharStream { +public: + void setTabSize(int i) { tabSize = i; } + int getTabSize(int i) { return tabSize; } + private: + int getBufcolumn(int pos) { + if (trackLineColumn && pos>=0) { + return bufcolumn[pos]; + } else { + return -1; + } + } + int getBufline(int pos) { + if (trackLineColumn && pos>=0) { + return bufline[pos]; + } else { + return -1; + } + } public: - void setTabSize(int i) { tabSize = i; } - int getTabSize(int i) { 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 int getColumn() { return getBufcolumn(bufpos); } + virtual int getLine() { return getBufline(bufpos); } + virtual int getEndColumn() { return getBufcolumn(bufpos); } + virtual int getEndLine() { return getBufline(bufpos); } + virtual int getBeginColumn() { return getBufcolumn(tokenBegin); } + virtual int getBeginLine() { return getBufline(tokenBegin); } + + virtual bool getTrackLineColumn() { return trackLineColumn; } virtual void setTrackLineColumn(bool val) { trackLineColumn = val; } /** * Backs up the input stream by amount steps. Lexer calls this method if it * had already read some characters, but could not use them to match a * (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. + * token and it is the implementation'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,31 +89,30 @@ virtual inline JAVACC_CHAR_TYPE BeginToken() { * 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; + virtual inline JAVACC_CHAR_TYPE readChar() { + if (inBuf > 0) { + --inBuf; + ++bufpos; + if (bufpos == bufsize) { + bufpos = 0; + } + return buffer[bufpos]; } - return buffer[bufpos]; - } + ++bufpos; + if (bufpos >= maxNextCharInd) { + FillBuff(); + } - ++bufpos; - if (bufpos >= maxNextCharInd) { - FillBuff(); - } + JAVACC_CHAR_TYPE c = buffer[bufpos]; - JAVACC_CHAR_TYPE c = buffer[bufpos]; + if (trackLineColumn) { + UpdateLineColumn(c); + } - if (trackLineColumn) { - UpdateLineColumn(c); + return c; } - return c; -} - virtual void ExpandBuff(bool wrapAround); virtual void FillBuff(); @@ -112,8 +127,7 @@ virtual inline JAVACC_CHAR_TYPE readChar() { 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); } /** @@ -126,8 +140,7 @@ virtual inline JAVACC_CHAR_TYPE readChar() { 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); } /** @@ -144,74 +157,71 @@ virtual inline JAVACC_CHAR_TYPE readChar() { } 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), 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) { + 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(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, buffersize); } CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline, int startcolumn) : - 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) { + 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(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), 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) { + 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(str, startline, startcolumn, buffersize); } CharStream(const JAVACC_STRING_TYPE& str, int startline, int startcolumn) : - 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){ + 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(str, startline, startcolumn, INITIAL_BUFFER_SIZE); } CharStream(ReaderStream *input_stream, int startline, int startcolumn, int buffersize) : - 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) { + 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, INITIAL_BUFFER_SIZE); } CharStream(ReaderStream *input_stream, int startline, int startcolumn) : - 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) { + 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, INITIAL_BUFFER_SIZE); } CharStream(ReaderStream *input_stream) : - 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) { + 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, 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); } @@ -232,26 +242,26 @@ virtual inline JAVACC_CHAR_TYPE readChar() { protected: virtual void UpdateLineColumn(JAVACC_CHAR_TYPE c); - 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; + 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; }; } } #endif -/* JavaCC - OriginalChecksum=5eaf75ef6a2c7859369c80cf6fd037e0 (do not edit this line) */ +/* JavaCC - OriginalChecksum=3f0e693d1617236429891c8c95713d73 (do not edit this line) */ diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h index 7500a5f..224500e 100644 --- a/vhdlparser/ErrorHandler.h +++ b/vhdlparser/ErrorHandler.h @@ -1,7 +1,8 @@ -/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.0 */ +/* 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 */ #ifndef ERRORHANDLER_H #define ERRORHANDLER_H +#include <stdio.h> #include <string> #include "JavaCC.h" #include "Token.h" @@ -75,4 +76,4 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str); } #endif -/* JavaCC - OriginalChecksum=685d19cb4cd943b60089f599e45f23ad (do not edit this line) */ +/* JavaCC - OriginalChecksum=c18f1105ba178be8e21cc9f279f94496 (do not edit this line) */ diff --git a/vhdlparser/JavaCC.h b/vhdlparser/JavaCC.h index 224b2b5..2d34634 100644 --- a/vhdlparser/JavaCC.h +++ b/vhdlparser/JavaCC.h @@ -1,31 +1,33 @@ -/* Generated By:JavaCC: Do not edit this line. JavaCC.h Version 6.2 */ +/* Generated By:JavaCC: Do not edit this line. JavaCC.h Version 7.0 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ -#ifndef JAVACC_H_ -#define JAVACC_H_ -#include <stdio.h> +#ifndef JAVACC_JAVACC_H_ +#define JAVACC_JAVACC_H_ + #include <string> -#include <memory.h> -#include <assert.h> -#include "vhdlstring.h" +#include <memory> +#include <cassert> +#include <functional> #ifndef JAVACC_CHAR_TYPE #define JAVACC_CHAR_TYPE char #endif #ifndef JAVACC_STRING_TYPE -#define JAVACC_STRING_TYPE VhdlString +#define JAVACC_STRING_TYPE std::basic_string<JAVACC_CHAR_TYPE> #endif -#define JAVACC_SIMPLE_STRING VhdlString +#define JAVACC_SIMPLE_STRING std::basic_string<char> -typedef JAVACC_STRING_TYPE StringBuffer; -typedef JAVACC_STRING_TYPE String; +typedef JAVACC_CHAR_TYPE JJChar; +typedef JAVACC_STRING_TYPE JJString; +typedef JAVACC_STRING_TYPE JJStringBuffer; +typedef JAVACC_SIMPLE_STRING JJSimpleString; // Abstraction on stream classes to read a block of data into a buffer. class ReaderStream { public: // Read block of data into a buffer and return the actual number read. - virtual size_t read(JAVACC_CHAR_TYPE * /*bufptr*/, int /*offset*/, size_t /*len*/) { return 0; } + virtual size_t read(JAVACC_CHAR_TYPE *buffer, int offset, size_t len) { return 0; } virtual bool endOfInput() { return true; } virtual ~ReaderStream() {} }; @@ -33,11 +35,26 @@ public: const JAVACC_CHAR_TYPE EMPTY[] = { 0 }; #ifndef MAX -#define MAX(a,b) ((a)>(b)?(a):(b)) +#define MAX(a,b) (a>=b?a:b) #endif #ifndef MIN -#define MIN(a,b) ((a)<(b)?(a):(b)) +#define MIN(a,b) (a<=b?a:b) #endif +template<typename T> +struct JJEnter +{ + JJEnter(T f_) : f{f_} {f();} + ~JJEnter(){} + T f; +}; +template<typename T> +struct JJExit +{ + JJExit(T f_) : f{f_} {} + ~JJExit(){f();} + T f; +}; + #endif -/* JavaCC - OriginalChecksum=eb066370c81bb58bb68713327da9719f (do not edit this line) */ +/* JavaCC - OriginalChecksum=b719dd5e5f87efc5315d14df0b701850 (do not edit this line) */ diff --git a/vhdlparser/ParseException.cc b/vhdlparser/ParseException.cc index 99649af..375ff6c 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.0 */ +/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 6.2 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ #include "ParseException.h" @@ -141,8 +141,6 @@ namespace parser { for (int i = 0; i < str.length(); i++) { switch (str.charAt(i)) { - case 0 : - continue; case '\b': retval.append("\\b"); continue; @@ -183,4 +181,4 @@ namespace parser { } } -/* JavaCC - OriginalChecksum=99d488e13335cf377284c90700f070ed (do not edit this line) */ +/* JavaCC - OriginalChecksum=9f6af8fd72f5fe3e4210cf02acbd8387 (do not edit this line) */ diff --git a/vhdlparser/ParseException.h b/vhdlparser/ParseException.h index b025912..4a22772 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.0 */ +/* Generated By:JavaCC: Do not edit this line. ParseException.h Version 6.2 */ /* 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=8c47c56fc2030f05b43e20cae6ca5d66 (do not edit this line) */ +/* JavaCC - OriginalChecksum=bd87c2fc11a4306bd2c2482fd1025b7c (do not edit this line) */ diff --git a/vhdlparser/Token.cc b/vhdlparser/Token.cc index 62a8169..735091d 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.0 */ +/* Generated By:JavaCC: Do not edit this line. Token.cc Version 6.2 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */ #include "Token.h" @@ -89,4 +89,4 @@ namespace parser { } } -/* JavaCC - OriginalChecksum=9db9ca693072c4c37bb7cc933c0c5e35 (do not edit this line) */ +/* JavaCC - OriginalChecksum=dcb0f64486aa6455ae5af05d6bb539ec (do not edit this line) */ diff --git a/vhdlparser/Token.h b/vhdlparser/Token.h index 5fce69f..040899e 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.0 */ +/* Generated By:JavaCC: Do not edit this line. Token.h Version 6.2 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */ #ifndef TOKEN_H #define TOKEN_H @@ -86,12 +86,13 @@ 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 @@ -113,4 +114,4 @@ class Token } } #endif -/* JavaCC - OriginalChecksum=2f5eb1c937adc983dfa2008c4fe383a7 (do not edit this line) */ +/* JavaCC - OriginalChecksum=4748c3d6443aa3445d3c95ab54f14c2a (do not edit this line) */ diff --git a/vhdlparser/TokenManager.h b/vhdlparser/TokenManager.h index df371d9..0c2caa6 100644 --- a/vhdlparser/TokenManager.h +++ b/vhdlparser/TokenManager.h @@ -1,10 +1,12 @@ -/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 6.0 */ +/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 6.2 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ #ifndef TOKENMANAGER_H #define TOKENMANAGER_H +#include <iostream> #include "JavaCC.h" #include "Token.h" +using namespace std; namespace vhdl { namespace parser { @@ -19,10 +21,10 @@ public: /** This gets the next token from the input stream. * A token of kind 0 (<EOF>) should be returned on EOF. */ - public: virtual Token *getNextToken() = 0; - public: virtual ~TokenManager() { } - public: virtual void lexicalError() { - fprintf(stderr, "Lexical error encountered.\n"); + virtual ~TokenManager() { } + virtual Token *getNextToken() = 0; + virtual void lexicalError() { + cerr << "Lexical error encountered." << endl; } }; @@ -30,4 +32,4 @@ public: } } #endif -/* JavaCC - OriginalChecksum=9e6cfa00cefe7e342b80eb59f1a114ff (do not edit this line) */ +/* JavaCC - OriginalChecksum=918e2eba53e028d6c4142283ce3f498f (do not edit this line) */ diff --git a/vhdlparser/TokenMgrError.cc b/vhdlparser/TokenMgrError.cc index 9093e6e..74908f0 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.0 */ +/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 6.2 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ #include "TokenMgrError.h" @@ -64,7 +64,7 @@ namespace parser { // i < 16 - guaranteed char hexChar(int i) { if (i < 10) { - return i - '0'; + return i + '0'; } return 'a' + (i - 10); } @@ -79,9 +79,6 @@ 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; @@ -118,4 +115,4 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) { } } -/* JavaCC - OriginalChecksum=2bf63f131c8e60fd30c70d0b4f660016 (do not edit this line) */ +/* JavaCC - OriginalChecksum=72f292bc267bd0602e63291bf864f942 (do not edit this line) */ diff --git a/vhdlparser/TokenMgrError.h b/vhdlparser/TokenMgrError.h index 2702b29..abb305d 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.0 */ +/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 6.2 */ /* 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,11 +28,10 @@ namespace parser { * 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. */ @@ -57,7 +56,8 @@ class TokenMgrError */ 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,6 +68,7 @@ class TokenMgrError * * from this method for such cases in the release version of your parser. */ +public: JAVACC_STRING_TYPE getMessage() ; /* @@ -75,16 +76,16 @@ class TokenMgrError */ /** No arg constructor. */ - public: TokenMgrError() ; + TokenMgrError() ; /** Constructor with message and reason. */ - public: TokenMgrError(JAVACC_STRING_TYPE message, int reason) ; + TokenMgrError(JAVACC_STRING_TYPE message, int reason) ; /** Full Constructor. */ - public: TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) ; + TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) ; }; } } #endif -/* JavaCC - OriginalChecksum=c7d825cb4d037b031ae43569d383f738 (do not edit this line) */ +/* JavaCC - OriginalChecksum=c22a1b25630ec91deb47dcba22b6b39d (do not edit this line) */ diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc index 4cf8ec0..b360217 100644 --- a/vhdlparser/VhdlParser.cc +++ b/vhdlparser/VhdlParser.cc @@ -1,5 +1,6 @@ /* VhdlParser.cc */ -#include "./VhdlParser.h" +#include "VhdlParser.h" +#include "TokenMgrError.h" namespace vhdl { namespace parser { unsigned int jj_la1_0[] = { @@ -61,7 +62,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;if (!hasError) { @@ -75,7 +76,7 @@ QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;if str=tok->image.c_str(); return str+str1; assert(false); - } +} QCString VhdlParser::actual_designator() {QCString str;Token *t=0; @@ -117,7 +118,7 @@ return str; } } assert(false); - } +} QCString VhdlParser::actual_parameter_part() {QCString s;if (!hasError) { @@ -127,7 +128,7 @@ QCString VhdlParser::actual_parameter_part() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::actual_part() {QCString s,s1; @@ -186,7 +187,7 @@ s+="(";s+=s1+")";return s; } } assert(false); - } +} QCString VhdlParser::adding_operator() { @@ -230,7 +231,7 @@ return "&"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::aggregate() {QCString s,s1,s2;if (!hasError) { @@ -275,7 +276,7 @@ s+=","+s1; return "("+s+")"; assert(false); - } +} QCString VhdlParser::alias_declaration() {QCString s,s1,s2;if (!hasError) { @@ -357,7 +358,7 @@ addVhdlType(s2.data(),getLine(ALIAS_T),Entry::VARIABLE_SEC,VhdlDocGen::ALIAS,0,s return s2+" "+s+";"; assert(false); - } +} QCString VhdlParser::alias_designator() {Token *tok=0;QCString s; @@ -402,7 +403,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::allocator() { @@ -434,7 +435,7 @@ void VhdlParser::allocator() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::architecture_body() {QCString s,s1;if (!hasError) { @@ -462,7 +463,7 @@ void VhdlParser::architecture_body() {QCString s,s1;if (!hasError) { QCString t=s1+"::"+s; genLabels.resize(0); pushLabel(genLabels,s1); - lastCompound=current; + lastCompound=current.get(); addVhdlType(t,getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlDocGen::ARCHITECTURE,0,0,Private); } if (!hasError) { @@ -527,7 +528,7 @@ error_skipto(BEGIN_T); } lastEntity=0;lastCompound=0; genLabels.resize(0); - } +} void VhdlParser::architecture_declarative_part() {if (!hasError) { @@ -567,7 +568,7 @@ void VhdlParser::architecture_declarative_part() {if (!hasError) { end_label_2: ; } - } +} void VhdlParser::architecture_statement_part() {if (!hasError) { @@ -600,7 +601,7 @@ void VhdlParser::architecture_statement_part() {if (!hasError) { end_label_3: ; } - } +} QCString VhdlParser::array_type_definition() {QCString s; @@ -633,7 +634,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) { @@ -688,7 +689,7 @@ s.prepend("assert "); if(t1) s2.prepend(" report "); return s+s1+s2; assert(false); - } +} QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;if (!hasError) { @@ -723,7 +724,7 @@ QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;if (!has if(t) s+=":"; return s+s1+";"; assert(false); - } +} QCString VhdlParser::association_element() {QCString s,s1;if (!hasError) { @@ -748,7 +749,7 @@ QCString VhdlParser::association_element() {QCString s,s1;if (!hasError) { return s+" => "+s1; assert(false); - } +} QCString VhdlParser::association_list() {QCString s,s1;if (!hasError) { @@ -785,7 +786,7 @@ s+=","+s1; return s; assert(false); - } +} QCString VhdlParser::attribute_declaration() {QCString s,s1;if (!hasError) { @@ -812,7 +813,7 @@ QCString VhdlParser::attribute_declaration() {QCString s,s1;if (!hasError) { addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,s1.data(),Public); return " attribute "+s+":"+s1+";"; assert(false); - } +} QCString VhdlParser::attribute_designator() {QCString s;Token *tok=0; @@ -846,7 +847,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::attribute_name() {QCString s,s1;if (!hasError) { @@ -895,7 +896,7 @@ s+"("+s1+")"; return s; assert(false); - } +} QCString VhdlParser::attribute_specification() {QCString s,s1,s2;if (!hasError) { @@ -931,7 +932,7 @@ QCString t= s1+" is "+s2; addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,t.data(),Public); return " attribute "+s+" of "+s1+ " is "+s2+";"; assert(false); - } +} QCString VhdlParser::base() {Token *tok=0;if (!hasError) { @@ -941,7 +942,7 @@ QCString VhdlParser::base() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::base_specifier() {Token *tok=0;if (!hasError) { @@ -951,7 +952,7 @@ QCString VhdlParser::base_specifier() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::base_unit_declaration() {QCString s;if (!hasError) { @@ -961,7 +962,7 @@ QCString VhdlParser::base_unit_declaration() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::based_integer() {Token *tok=0;if (!hasError) { @@ -971,7 +972,7 @@ QCString VhdlParser::based_integer() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::based_literal() {Token *tok=0;if (!hasError) { @@ -981,7 +982,7 @@ QCString VhdlParser::based_literal() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::basic_identifier() {Token *tok=0;if (!hasError) { @@ -991,7 +992,7 @@ QCString VhdlParser::basic_identifier() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} void VhdlParser::binding_indication() {if (!hasError) { @@ -1044,7 +1045,7 @@ void VhdlParser::binding_indication() {if (!hasError) { } } - } +} QCString VhdlParser::bit_string_literal() {Token *tok=0;if (!hasError) { @@ -1054,7 +1055,7 @@ QCString VhdlParser::bit_string_literal() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::bit_value() {Token *tok=0;if (!hasError) { @@ -1064,7 +1065,7 @@ QCString VhdlParser::bit_value() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} void VhdlParser::block_configuration() {if (!hasError) { @@ -1126,7 +1127,7 @@ void VhdlParser::block_configuration() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::block_declarative_item() { @@ -1260,7 +1261,7 @@ void VhdlParser::block_declarative_item() { } } } - } +} void VhdlParser::block_declarative_part() {if (!hasError) { @@ -1300,7 +1301,7 @@ void VhdlParser::block_declarative_part() {if (!hasError) { end_label_7: ; } - } +} void VhdlParser::block_header() {if (!hasError) { @@ -1368,7 +1369,7 @@ void VhdlParser::block_header() {if (!hasError) { } } - } +} void VhdlParser::block_specification() {if (!hasError) { @@ -1399,7 +1400,7 @@ void VhdlParser::block_specification() {if (!hasError) { } } - } +} void VhdlParser::block_statement() {QCString s;if (!hasError) { @@ -1502,7 +1503,7 @@ pushLabel(genLabels,s); } genLabels=popLabel(genLabels); - } +} void VhdlParser::block_statement_part() {if (!hasError) { @@ -1535,7 +1536,7 @@ void VhdlParser::block_statement_part() {if (!hasError) { end_label_8: ; } - } +} void VhdlParser::case_statement() {QCString s;if (!hasError) { @@ -1629,7 +1630,7 @@ QCString ca="case "+s; FlowChart::moveToPrevLevel(); FlowChart::addFlowChart(FlowChart::END_CASE,"end case",0); - } +} void VhdlParser::case_statement_alternative() {QCString s;if (!hasError) { @@ -1656,7 +1657,7 @@ QCString t="when "; } FlowChart::moveToPrevLevel(); - } +} QCString VhdlParser::character_literal() {Token *tok=0;if (!hasError) { @@ -1666,7 +1667,7 @@ QCString VhdlParser::character_literal() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::choice() {QCString s; @@ -1717,7 +1718,7 @@ return " others "; } } assert(false); - } +} QCString VhdlParser::choices() {QCString s,s1;if (!hasError) { @@ -1754,7 +1755,7 @@ s+="|";s+=s1; return s; assert(false); - } +} void VhdlParser::component_configuration() {if (!hasError) { @@ -1815,7 +1816,7 @@ void VhdlParser::component_configuration() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::component_declaration() {QCString s;if (!hasError) { @@ -1909,7 +1910,7 @@ addVhdlType(s.data(),getLine(COMPONENT_T),Entry::VARIABLE_SEC,VhdlDocGen::COMPON jj_consume_token(SEMI_T); } - } +} void VhdlParser::component_instantiation_statement() {QCString s,s1;if (!hasError) { @@ -1965,7 +1966,7 @@ QCString s3; jj_consume_token(SEMI_T); } - } +} void VhdlParser::component_specification() {if (!hasError) { @@ -1981,7 +1982,7 @@ void VhdlParser::component_specification() {if (!hasError) { name(); } - } +} QCString VhdlParser::composite_type_definition() {QCString s,s1; @@ -2014,7 +2015,7 @@ return s+"#"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::concurrent_assertion_statement() {if (!hasError) { @@ -2056,7 +2057,7 @@ void VhdlParser::concurrent_assertion_statement() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) { @@ -2098,7 +2099,7 @@ void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) { @@ -2155,7 +2156,7 @@ void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) { } } - } +} void VhdlParser::concurrent_statement() { @@ -2222,7 +2223,7 @@ void VhdlParser::concurrent_statement() { } } } - } +} QCString VhdlParser::condition() {QCString s;if (!hasError) { @@ -2232,7 +2233,7 @@ QCString VhdlParser::condition() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::condition_clause() {QCString s;if (!hasError) { @@ -2246,7 +2247,7 @@ QCString VhdlParser::condition_clause() {QCString s;if (!hasError) { return " until "+s; assert(false); - } +} void VhdlParser::conditional_signal_assignment() {if (!hasError) { @@ -2270,7 +2271,7 @@ void VhdlParser::conditional_signal_assignment() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::conditional_waveforms() {if (!hasError) { @@ -2324,7 +2325,7 @@ void VhdlParser::conditional_waveforms() {if (!hasError) { } } - } +} void VhdlParser::configuration_declaration() {QCString s,s1;if (!hasError) { @@ -2403,7 +2404,7 @@ confName=s+"::"+s1; } genLabels.resize(0); confName=""; - } +} void VhdlParser::configuration_declarative_item() { @@ -2434,7 +2435,7 @@ void VhdlParser::configuration_declarative_item() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::configuration_declarative_part() {if (!hasError) { @@ -2459,7 +2460,7 @@ void VhdlParser::configuration_declarative_part() {if (!hasError) { end_label_12: ; } - } +} void VhdlParser::configuration_item() { @@ -2483,7 +2484,7 @@ void VhdlParser::configuration_item() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::configuration_specification() {if (!hasError) { @@ -2503,7 +2504,7 @@ void VhdlParser::configuration_specification() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0;if (!hasError) { @@ -2553,7 +2554,7 @@ if(t) it.prepend("constant "); return it; assert(false); - } +} QCString VhdlParser::constraint_array_definition() {QCString s,s1;if (!hasError) { @@ -2575,7 +2576,7 @@ QCString VhdlParser::constraint_array_definition() {QCString s,s1;if (!hasError) return s+" "+s1; assert(false); - } +} void VhdlParser::context_clause() {if (!hasError) { @@ -2599,7 +2600,7 @@ void VhdlParser::context_clause() {if (!hasError) { end_label_13: ; } - } +} QCString VhdlParser::constraint() {QCString s; @@ -2626,7 +2627,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::context_item() { @@ -2650,7 +2651,7 @@ void VhdlParser::context_item() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} QCString VhdlParser::decimal_literal() {Token *tok=0;if (!hasError) { @@ -2660,7 +2661,7 @@ QCString VhdlParser::decimal_literal() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::delay_mechanism() {QCString s; @@ -2717,7 +2718,7 @@ return s+" inertial "; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::design_file() { @@ -2772,7 +2773,7 @@ void VhdlParser::design_file() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::design_unit() {if (!hasError) { @@ -2784,7 +2785,7 @@ void VhdlParser::design_unit() {if (!hasError) { library_unit(); } - } +} QCString VhdlParser::designator() {QCString s; @@ -2818,7 +2819,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::direction() {Token *tok=0; @@ -2851,7 +2852,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::disconnection_specification() {if (!hasError) { @@ -2875,7 +2876,7 @@ void VhdlParser::disconnection_specification() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::guarded_signal_specificatio() {if (!hasError) { @@ -2891,7 +2892,7 @@ void VhdlParser::guarded_signal_specificatio() {if (!hasError) { name(); } - } +} QCString VhdlParser::discrete_range() {QCString s; @@ -2918,7 +2919,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::element_association() {QCString s,s1;if (!hasError) { @@ -2945,7 +2946,7 @@ if(!s.isEmpty()) return s+"=>"+s1; return s1; assert(false); - } +} QCString VhdlParser::element_declaration() {QCString s,s1;if (!hasError) { @@ -2969,7 +2970,7 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data( //addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public); return s+":"+s1; assert(false); - } +} QCString VhdlParser::entity_aspect() {Token *tok=0;QCString s,s1; @@ -3048,7 +3049,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::entity_class() { @@ -3246,7 +3247,7 @@ return "file"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::entity_class_entry() {QCString s;if (!hasError) { @@ -3275,7 +3276,7 @@ s+="<>"; return s; assert(false); - } +} QCString VhdlParser::entity_class_entry_list() {QCString s,s1,s2;if (!hasError) { @@ -3319,7 +3320,7 @@ s2+=",";s2+=s; return s1+s2; assert(false); - } +} void VhdlParser::entity_declaration() {QCString s;if (!hasError) { @@ -3336,7 +3337,7 @@ void VhdlParser::entity_declaration() {QCString s;if (!hasError) { } if (!hasError) { -lastEntity=current; +lastEntity=current.get(); lastCompound=0; addVhdlType(s.data(),getLine(ENTITY_T),Entry::CLASS_SEC,VhdlDocGen::ENTITY,0,0,Public); } @@ -3410,7 +3411,7 @@ lastEntity=current; } lastEntity=0;lastCompound=0; genLabels.resize(0); - } +} void VhdlParser::entity_declarative_item() { @@ -3555,7 +3556,7 @@ void VhdlParser::entity_declarative_item() { } } } - } +} void VhdlParser::entity_declarative_part() {if (!hasError) { @@ -3595,7 +3596,7 @@ void VhdlParser::entity_declarative_part() {if (!hasError) { end_label_16: ; } - } +} QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) { @@ -3620,7 +3621,7 @@ QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) { return s+s1; assert(false); - } +} void VhdlParser::entity_header() {if (!hasError) { @@ -3662,7 +3663,7 @@ currP=VhdlDocGen::PORT; } } - } +} QCString VhdlParser::entity_name_list() {QCString s,s1; @@ -3733,7 +3734,7 @@ return "all"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::entity_specification() {QCString s,s1;if (!hasError) { @@ -3751,7 +3752,7 @@ QCString VhdlParser::entity_specification() {QCString s,s1;if (!hasError) { return s+":"+s1; assert(false); - } +} void VhdlParser::entity_statement() { @@ -3784,7 +3785,7 @@ void VhdlParser::entity_statement() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::entity_statement_part() {if (!hasError) { @@ -3813,7 +3814,7 @@ void VhdlParser::entity_statement_part() {if (!hasError) { end_label_18: ; } - } +} QCString VhdlParser::entity_tag() {QCString s; @@ -3849,7 +3850,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::enumeration_literal() {QCString s; @@ -3883,7 +3884,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::enumeration_type_definition() {QCString s,s1;if (!hasError) { @@ -3928,7 +3929,7 @@ s+=",";s+=s1; return "("+s+")"; assert(false); - } +} QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) { @@ -4002,7 +4003,7 @@ lab.resize(0); return s+s1+s2+";"; assert(false); - } +} QCString VhdlParser::expression() {QCString s,s1,s2;if (!hasError) { @@ -4044,7 +4045,7 @@ s+=s1;s+=s2; return s; assert(false); - } +} QCString VhdlParser::logop() { @@ -4121,7 +4122,7 @@ return "or" ; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::extended_identifier() {Token *t;if (!hasError) { @@ -4131,7 +4132,7 @@ QCString VhdlParser::extended_identifier() {Token *t;if (!hasError) { return t->image.c_str(); assert(false); - } +} QCString VhdlParser::factor() {QCString s,s1; @@ -4217,7 +4218,7 @@ s1="not ";return s1+s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3;if (!hasError) { @@ -4261,7 +4262,7 @@ QCString t1=s2+" "+s3; addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,t1.data(),Public); return " file "+s+":"+s2+" "+s3+";"; assert(false); - } +} QCString VhdlParser::file_logical_name() {QCString s;if (!hasError) { @@ -4271,7 +4272,7 @@ QCString VhdlParser::file_logical_name() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) { @@ -4304,7 +4305,7 @@ QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) { s2="open "+s+" is "+s1; return s2; assert(false); - } +} QCString VhdlParser::file_type_definition() {QCString s,s1;if (!hasError) { @@ -4322,7 +4323,7 @@ QCString VhdlParser::file_type_definition() {QCString s,s1;if (!hasError) { s1=" file of "+s; return s1; assert(false); - } +} QCString VhdlParser::floating_type_definition() {QCString s;if (!hasError) { @@ -4332,7 +4333,7 @@ QCString VhdlParser::floating_type_definition() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::formal_designator() {QCString s;Token *tok=0; @@ -4368,7 +4369,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::formal_parameter_list() {QCString s;if (!hasError) { @@ -4378,7 +4379,7 @@ QCString VhdlParser::formal_parameter_list() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::formal_part() {QCString s,s1;if (!hasError) { @@ -4415,7 +4416,7 @@ s+"("+s1+")"; return s; assert(false); - } +} QCString VhdlParser::full_type_declaration() {Entry *tmpEntry;QCString s,s1,s2;if (!hasError) { @@ -4432,7 +4433,7 @@ QCString VhdlParser::full_type_declaration() {Entry *tmpEntry;QCString s,s1,s2;i } if (!hasError) { -tmpEntry=current; +tmpEntry=current.get(); addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,0,Public); } if (!hasError) { @@ -4471,7 +4472,7 @@ if (s2.contains("#")) { tmpEntry=0; return "type "+s+" is "+s2+";"; assert(false); - } +} QCString VhdlParser::function_call() {QCString s,s1;if (!hasError) { @@ -4493,7 +4494,7 @@ QCString VhdlParser::function_call() {QCString s,s1;if (!hasError) { return s+"("+s1+")"; assert(false); - } +} void VhdlParser::generate_statement() {QCString s;if (!hasError) { @@ -4557,7 +4558,7 @@ error_skipto(GENERATE_T); } genLabels=popLabel(genLabels); - } +} void VhdlParser::generate_scheme() { @@ -4589,7 +4590,7 @@ void VhdlParser::generate_scheme() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::generic_clause() {QCString s;if (!hasError) { @@ -4618,7 +4619,7 @@ parse_sec=GEN_SEC; } parse_sec=0; - } +} QCString VhdlParser::generic_list() {QCString s;if (!hasError) { @@ -4628,7 +4629,7 @@ QCString VhdlParser::generic_list() {QCString s;if (!hasError) { return s; assert(false); - } +} void VhdlParser::generic_map_aspect() {if (!hasError) { @@ -4652,7 +4653,7 @@ void VhdlParser::generic_map_aspect() {if (!hasError) { jj_consume_token(RPAREN_T); } - } +} QCString VhdlParser::group_constituent() {QCString s; @@ -4688,7 +4689,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::group_constituent_list() {QCString s,s1,s2;if (!hasError) { @@ -4728,7 +4729,7 @@ s2+=",";s2+=s1; return s+s2; assert(false); - } +} QCString VhdlParser::group_declaration() {QCString s,s1,s2;if (!hasError) { @@ -4766,7 +4767,7 @@ QCString VhdlParser::group_declaration() {QCString s,s1,s2;if (!hasError) { return "group "+s+":"+s1+"("+s2+");"; assert(false); - } +} QCString VhdlParser::group_template_declaration() {QCString s,s1;if (!hasError) { @@ -4800,7 +4801,7 @@ QCString VhdlParser::group_template_declaration() {QCString s,s1;if (!hasError) return "group "+s+ "is ("+s1+");"; assert(false); - } +} void VhdlParser::guarded_signal_specification() {if (!hasError) { @@ -4816,7 +4817,7 @@ void VhdlParser::guarded_signal_specification() {if (!hasError) { type_mark(); } - } +} QCString VhdlParser::identifier() {Token *tok=0; @@ -4849,7 +4850,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::identifier_list() {QCString str,str1;if (!hasError) { @@ -4886,7 +4887,7 @@ str+=",";str+=str1; return str; assert(false); - } +} void VhdlParser::if_statement() {QCString s,s1;if (!hasError) { @@ -5020,7 +5021,7 @@ FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0); FlowChart::moveToPrevLevel(); FlowChart::addFlowChart(FlowChart::ENDIF_NO,0,0); - } +} QCString VhdlParser::incomplete_type_declaration() {QCString s;if (!hasError) { @@ -5038,7 +5039,7 @@ QCString VhdlParser::incomplete_type_declaration() {QCString s;if (!hasError) { return "type "+s+";"; assert(false); - } +} QCString VhdlParser::index_constraint() {QCString s="("; QCString s1,s2;if (!hasError) { @@ -5087,7 +5088,7 @@ s+=",";s+=s1; return s+")"; assert(false); - } +} QCString VhdlParser::index_specification() {QCString s; @@ -5135,7 +5136,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::index_subtype_definition() {QCString s;if (!hasError) { @@ -5153,7 +5154,7 @@ QCString VhdlParser::index_subtype_definition() {QCString s;if (!hasError) { return s+" range <> "; assert(false); - } +} QCString VhdlParser::instantiation_unit() {QCString s,s1,s2;Token *tok; @@ -5268,7 +5269,7 @@ s1="configuration ";return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::instantiation_list() {QCString s;Token *tok=0; @@ -5313,7 +5314,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::integer() {Token *t;if (!hasError) { @@ -5323,7 +5324,7 @@ QCString VhdlParser::integer() {Token *t;if (!hasError) { return t->image.c_str(); assert(false); - } +} QCString VhdlParser::integer_type_definition() {QCString s;if (!hasError) { @@ -5333,7 +5334,7 @@ QCString VhdlParser::integer_type_definition() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::interface_declaration() {QCString s,s1; @@ -5422,7 +5423,7 @@ if (parse_sec==GEN_SEC) } } assert(false); - } +} QCString VhdlParser::interface_element() {QCString s;if (!hasError) { @@ -5432,7 +5433,7 @@ QCString VhdlParser::interface_element() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::interface_file_declaration() {QCString s,s1;if (!hasError) { @@ -5455,7 +5456,7 @@ QCString VhdlParser::interface_file_declaration() {QCString s,s1;if (!hasError) addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public); return " file "+s+":"+s1; assert(false); - } +} QCString VhdlParser::interface_list() {QCString s,s1,s2;if (!hasError) { @@ -5492,7 +5493,7 @@ s2+=";";s2+=s1; return s+s2; assert(false); - } +} QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=0;Token *tok2=0;QCString s,s1,s2,s3,s4,s5;if (!hasError) { @@ -5640,7 +5641,7 @@ if(tok) } // if component return it; assert(false); - } +} QCString VhdlParser::iteration_scheme() {QCString s; @@ -5687,7 +5688,7 @@ QCString q=lab+" for "+s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::label() {QCString s;if (!hasError) { @@ -5697,7 +5698,7 @@ QCString VhdlParser::label() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::library_clause() {QCString s;if (!hasError) { @@ -5723,7 +5724,7 @@ if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) ) QCString s1="library "+s; return s1; assert(false); - } +} QCString VhdlParser::library_unit() {QCString s; @@ -5764,7 +5765,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::literal() {QCString s; @@ -5826,7 +5827,7 @@ return "null"; } } assert(false); - } +} QCString VhdlParser::logical_operator() {QCString s;if (!hasError) { @@ -5836,7 +5837,7 @@ QCString VhdlParser::logical_operator() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::loop_statement() {QCString s,s1,s2,s3;if (!hasError) { @@ -5927,7 +5928,7 @@ QCString q = s+" loop "+s2+" end loop" +s3; FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop.data(),0); return q; assert(false); - } +} QCString VhdlParser::miscellaneous_operator() {Token *t=0; @@ -5971,7 +5972,7 @@ return "not"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::mode() {Token *tok=0; @@ -6037,7 +6038,7 @@ return "linkage"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::multiplying_operation() {Token *tok=0; @@ -6092,7 +6093,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::name() {QCString s,s1;if (!hasError) { @@ -6144,7 +6145,7 @@ s+=s1; return s; assert(false); - } +} QCString VhdlParser::name_ext1() {QCString s,s1,s2;if (!hasError) { @@ -6173,13 +6174,26 @@ s+=s1; return s; assert(false); - } +} QCString VhdlParser::name_ext() {QCString s,s1,s2;if (!hasError) { if (jj_2_49(2147483647)) {if (!hasError) { + jj_consume_token(APOSTROPHE_T); + } + if (!hasError) { + + jj_consume_token(SUBTYPE_T); + } + if (!hasError) { + +s+="'subtype"; + } + + } else if (jj_2_50(2147483647)) {if (!hasError) { + jj_consume_token(DOT_T); } if (!hasError) { @@ -6191,7 +6205,7 @@ QCString VhdlParser::name_ext() {QCString s,s1,s2;if (!hasError) { s+=".";s+=s1; } - } else if (jj_2_50(2147483647)) {if (!hasError) { + } else if (jj_2_51(2147483647)) {if (!hasError) { s1 = test_att_name(); } @@ -6200,7 +6214,7 @@ s+=".";s+=s1; s+=s1; } - } else if (jj_2_51(2147483647)) {if (!hasError) { + } else if (jj_2_52(2147483647)) {if (!hasError) { jj_consume_token(LPAREN_T); } @@ -6217,7 +6231,7 @@ s+=s1; s+="(";s+=s1;s+=")"; } - } else if (jj_2_52(2147483647)) {if (!hasError) { + } else if (jj_2_53(2147483647)) {if (!hasError) { jj_consume_token(LPAREN_T); } @@ -6273,12 +6287,12 @@ s+=")"; return s; assert(false); - } +} QCString VhdlParser::test_att_name() {QCString s,s1;if (!hasError) { - if (jj_2_53(2147483647)) {if (!hasError) { + if (jj_2_54(2147483647)) {if (!hasError) { s1 = signature(); } @@ -6333,7 +6347,7 @@ s+="(";s+=s1;s+=")"; return s; assert(false); - } +} QCString VhdlParser::indexed_name() {QCString s,s1,s2;if (!hasError) { @@ -6386,7 +6400,7 @@ s+=",";s+=s1; return s+")"; assert(false); - } +} QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) { @@ -6459,7 +6473,7 @@ if(t) s+=":"; if(t1) s2.prepend("when "); return s+s1+s2+";"; assert(false); - } +} QCString VhdlParser::null_statement() {QCString s;if (!hasError) { @@ -6497,11 +6511,11 @@ s+=":"; return s+="null"; assert(false); - } +} QCString VhdlParser::numeric_literal() {QCString s; - if (jj_2_54(2147483647)) {if (!hasError) { + if (jj_2_55(2147483647)) {if (!hasError) { s = physical_literal(); } @@ -6532,7 +6546,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::object_class() { @@ -6613,7 +6627,7 @@ return "type"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::operator_symbol() {Token *tok=0;if (!hasError) { @@ -6623,7 +6637,7 @@ QCString VhdlParser::operator_symbol() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} void VhdlParser::options() {if (!hasError) { @@ -6659,7 +6673,7 @@ void VhdlParser::options() {if (!hasError) { } } - } +} void VhdlParser::package_body() {QCString s;if (!hasError) { @@ -6680,7 +6694,7 @@ void VhdlParser::package_body() {QCString s;if (!hasError) { } if (!hasError) { -lastCompound=current; +lastCompound=current.get(); s.prepend("_"); addVhdlType(s,getLine(),Entry::CLASS_SEC,VhdlDocGen::PACKAGE_BODY,0,0,Protected); } @@ -6735,7 +6749,7 @@ lastCompound=current; } lastCompound=0; genLabels.resize(0); - } +} void VhdlParser::package_body_declarative_item() { @@ -6802,7 +6816,7 @@ void VhdlParser::package_body_declarative_item() { } default: jj_la1[152] = jj_gen; - if (jj_2_55(3)) {if (!hasError) { + if (jj_2_56(3)) {if (!hasError) { group_template_declaration(); } @@ -6823,7 +6837,7 @@ void VhdlParser::package_body_declarative_item() { } } } - } +} void VhdlParser::package_body_declarative_part() {if (!hasError) { @@ -6858,7 +6872,7 @@ void VhdlParser::package_body_declarative_part() {if (!hasError) { end_label_29: ; } - } +} void VhdlParser::package_declaration() {QCString s;if (!hasError) { @@ -6875,15 +6889,15 @@ void VhdlParser::package_declaration() {QCString s;if (!hasError) { } if (!hasError) { -lastCompound=current; - Entry *clone=new Entry(*current); +lastCompound=current.get(); + std::shared_ptr<Entry> clone=std::make_shared<Entry>(*current); clone->section=Entry::NAMESPACE_SEC; clone->spec=VhdlDocGen::PACKAGE; clone->name=s; clone->startLine=getLine(PACKAGE_T); clone->bodyLine=getLine(PACKAGE_T); clone->protection=Package; - current_root->addSubEntry(clone); + current_root->moveToSubEntryAndKeep(clone); addVhdlType(s,getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlDocGen::PACKAGE,0,0,Package); } if (!hasError) { @@ -6933,7 +6947,7 @@ lastCompound=current; } lastEntity=0;lastCompound=0; genLabels.resize(0); - } +} void VhdlParser::geninter() {if (!hasError) { @@ -6975,7 +6989,7 @@ void VhdlParser::geninter() {if (!hasError) { } } - } +} void VhdlParser::package_declarative_item() { @@ -7049,7 +7063,7 @@ void VhdlParser::package_declarative_item() { } default: jj_la1[159] = jj_gen; - if (jj_2_56(2147483647)) {if (!hasError) { + if (jj_2_57(2147483647)) {if (!hasError) { attribute_declaration(); } @@ -7079,7 +7093,7 @@ void VhdlParser::package_declarative_item() { } default: jj_la1[160] = jj_gen; - if (jj_2_57(3)) {if (!hasError) { + if (jj_2_58(3)) {if (!hasError) { group_template_declaration(); } @@ -7095,7 +7109,7 @@ void VhdlParser::package_declarative_item() { } default: jj_la1[161] = jj_gen; - if (jj_2_58(5)) {if (!hasError) { + if (jj_2_59(5)) {if (!hasError) { package_instantiation_declaration(); } @@ -7120,7 +7134,7 @@ void VhdlParser::package_declarative_item() { } } } - } +} void VhdlParser::package_declarative_part() {if (!hasError) { @@ -7160,7 +7174,7 @@ void VhdlParser::package_declarative_part() {if (!hasError) { end_label_30: ; } - } +} QCString VhdlParser::parameter_specification() {QCString s,s1;if (!hasError) { @@ -7178,12 +7192,12 @@ QCString VhdlParser::parameter_specification() {QCString s,s1;if (!hasError) { return s+" in "+s1; assert(false); - } +} QCString VhdlParser::physical_literal() {QCString s,s1;if (!hasError) { - if (jj_2_59(2147483647)) {if (!hasError) { + if (jj_2_60(2147483647)) {if (!hasError) { s = abstract_literal(); } @@ -7199,7 +7213,7 @@ QCString VhdlParser::physical_literal() {QCString s,s1;if (!hasError) { s+=" ";s+=s1;s.prepend(" "); return s; assert(false); - } +} QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;if (!hasError) { @@ -7267,7 +7281,7 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public) return s+"%"; assert(false); - } +} void VhdlParser::port_clause() {if (!hasError) { @@ -7292,7 +7306,7 @@ void VhdlParser::port_clause() {if (!hasError) { } currP=0; - } +} QCString VhdlParser::port_list() {QCString s;if (!hasError) { @@ -7302,7 +7316,7 @@ QCString VhdlParser::port_list() {QCString s;if (!hasError) { return s; assert(false); - } +} void VhdlParser::port_map_aspect() {if (!hasError) { @@ -7326,11 +7340,11 @@ void VhdlParser::port_map_aspect() {if (!hasError) { jj_consume_token(RPAREN_T); } - } +} QCString VhdlParser::primary() {QCString s,s1; - if (jj_2_60(2147483647)) {if (!hasError) { + if (jj_2_61(2147483647)) {if (!hasError) { s = function_call(); } @@ -7339,7 +7353,7 @@ QCString VhdlParser::primary() {QCString s,s1; return s; } - } else if (jj_2_61(2147483647)) {if (!hasError) { + } else if (jj_2_62(2147483647)) {if (!hasError) { jj_consume_token(LPAREN_T); } @@ -7356,7 +7370,7 @@ return s; s="("+s1+")"; return s; } - } else if (jj_2_62(2147483647)) {if (!hasError) { + } else if (jj_2_63(2147483647)) {if (!hasError) { s = qualified_expression(); } @@ -7365,7 +7379,7 @@ s="("+s1+")"; return s; return s; } - } else if (jj_2_63(2147483647)) {if (!hasError) { + } else if (jj_2_64(2147483647)) {if (!hasError) { s = type_conversion(); } @@ -7374,7 +7388,7 @@ return s; return s; } - } else if (jj_2_64(2147483647)) {if (!hasError) { + } else if (jj_2_65(2147483647)) {if (!hasError) { s = literal(); } @@ -7383,7 +7397,7 @@ return s; s.prepend(" ");return s; } - } else if (jj_2_65(2147483647)) {if (!hasError) { + } else if (jj_2_66(2147483647)) {if (!hasError) { s = name(); } @@ -7423,7 +7437,7 @@ return s; } } assert(false); - } +} void VhdlParser::primary_unit() { @@ -7444,12 +7458,12 @@ void VhdlParser::primary_unit() { } default: jj_la1[167] = jj_gen; - if (jj_2_66(2147483647)) {if (!hasError) { + if (jj_2_67(2147483647)) {if (!hasError) { package_instantiation_declaration(); } - } else if (jj_2_67(4)) {if (!hasError) { + } else if (jj_2_68(4)) {if (!hasError) { interface_package_declaration(); } @@ -7470,7 +7484,7 @@ void VhdlParser::primary_unit() { } } } - } +} QCString VhdlParser::procedure_call() {QCString s,s1;if (!hasError) { @@ -7507,12 +7521,12 @@ s1.prepend("("); s1.append(")"); return s+s1; assert(false); - } +} QCString VhdlParser::procedure_call_statement() {QCString s,s1;if (!hasError) { - if (jj_2_68(2)) {if (!hasError) { + if (jj_2_69(2)) {if (!hasError) { s = identifier(); } @@ -7540,7 +7554,7 @@ s+=":"; return s+s1+";"; assert(false); - } +} QCString VhdlParser::process_declarative_item() {QCString s; @@ -7628,7 +7642,7 @@ return s; } default: jj_la1[170] = jj_gen; - if (jj_2_69(3)) {if (!hasError) { + if (jj_2_70(3)) {if (!hasError) { s = attribute_declaration(); } @@ -7663,7 +7677,7 @@ return s; } default: jj_la1[171] = jj_gen; - if (jj_2_70(3)) {if (!hasError) { + if (jj_2_71(3)) {if (!hasError) { s = group_template_declaration(); } @@ -7695,7 +7709,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::process_declarative_part() {QCString s,s1;if (!hasError) { @@ -7737,7 +7751,7 @@ s+=s1; return s; assert(false); - } +} void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;if (!hasError) { @@ -7913,7 +7927,7 @@ if(s.isEmpty()) currName=s; current->name=currName; - tempEntry=current; + tempEntry=current.get(); current->endBodyLine=getLine(); currP=0; if(tok) @@ -7922,7 +7936,7 @@ if(s.isEmpty()) createFlow(); currName=""; newEntry(); - } +} void VhdlParser::process_statement_part() {if (!hasError) { @@ -7962,7 +7976,7 @@ void VhdlParser::process_statement_part() {if (!hasError) { end_label_33: ; } - } +} QCString VhdlParser::qualified_expression() {QCString s,s1;if (!hasError) { @@ -7979,7 +7993,7 @@ s=s1+"'"; } if (!hasError) { - if (jj_2_71(2147483647)) {if (!hasError) { + if (jj_2_72(2147483647)) {if (!hasError) { s1 = aggregate(); } @@ -8019,11 +8033,11 @@ s+="(";s+=s1;s+=")"; return s; assert(false); - } +} QCString VhdlParser::range() {QCString s,s1,s2; - if (jj_2_72(2147483647)) {if (!hasError) { + if (jj_2_73(2147483647)) {if (!hasError) { s = simple_expression(); } @@ -8040,7 +8054,7 @@ QCString VhdlParser::range() {QCString s,s1,s2; return s+" "+s1+" "+s2; } - } else if (jj_2_73(2147483647)) {if (!hasError) { + } else if (jj_2_74(2147483647)) {if (!hasError) { s = attribute_name(); } @@ -8054,7 +8068,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::range_constraint() {QCString s,s1;if (!hasError) { @@ -8068,7 +8082,7 @@ QCString VhdlParser::range_constraint() {QCString s,s1;if (!hasError) { return " range "+s; assert(false); - } +} void VhdlParser::record_type_definition() {if (!hasError) { @@ -8122,7 +8136,7 @@ void VhdlParser::record_type_definition() {if (!hasError) { } } - } +} QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) { @@ -8156,7 +8170,7 @@ QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) { return s+s1+s2; assert(false); - } +} QCString VhdlParser::relation_operator() { @@ -8233,7 +8247,7 @@ return "/="; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2;if (!hasError) { @@ -8293,7 +8307,7 @@ if(t) s.append(":"); if(t1) s2.prepend(" severity "); return s+s1+s2+";"; assert(false); - } +} QCString VhdlParser::return_statement() {QCString s,s1;if (!hasError) { @@ -8361,7 +8375,7 @@ s+=":"; return s+" return "+s1+";"; assert(false); - } +} QCString VhdlParser::scalar_type_definition() {QCString s,s1; @@ -8383,7 +8397,7 @@ return s; } if (!hasError) { - if (jj_2_74(2147483647)) {if (!hasError) { + if (jj_2_75(2147483647)) {if (!hasError) { s1 = physical_type_definition(); } @@ -8405,7 +8419,7 @@ return s+" "+s1+"%"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::secondary_unit() { @@ -8429,7 +8443,7 @@ void VhdlParser::secondary_unit() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;if (!hasError) { @@ -8454,7 +8468,7 @@ QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;if (!hasError) return s+"="+s1; assert(false); - } +} QCString VhdlParser::selected_name() {QCString s,s1;if (!hasError) { @@ -8472,7 +8486,7 @@ QCString VhdlParser::selected_name() {QCString s,s1;if (!hasError) { return s+"."+s1; assert(false); - } +} void VhdlParser::selected_signal_assignment() {if (!hasError) { @@ -8508,7 +8522,7 @@ void VhdlParser::selected_signal_assignment() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::selected_waveforms() {if (!hasError) { @@ -8555,7 +8569,7 @@ void VhdlParser::selected_waveforms() {if (!hasError) { end_label_35: ; } - } +} QCString VhdlParser::sensitivity_clause() {QCString s;if (!hasError) { @@ -8570,7 +8584,7 @@ QCString VhdlParser::sensitivity_clause() {QCString s;if (!hasError) { s.prepend(" on "); return s; assert(false); - } +} QCString VhdlParser::sensitivity_list() {QCString s,s1;if (!hasError) { @@ -8607,13 +8621,13 @@ s+=",";s+=s1; return s; assert(false); - } +} QCString VhdlParser::sequence_of_statement() {QCString s,s1;if (!hasError) { while (!hasError) { - if (jj_2_75(3)) { + if (jj_2_76(3)) { ; } else { goto end_label_37; @@ -8632,11 +8646,11 @@ s+=s1; return s; assert(false); - } +} QCString VhdlParser::sequential_statement() {QCString s; - if (jj_2_76(2147483647)) {if (!hasError) { + if (jj_2_77(2147483647)) {if (!hasError) { s = signal_assignment_statement(); } @@ -8645,7 +8659,7 @@ QCString VhdlParser::sequential_statement() {QCString s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_77(3)) {if (!hasError) { + } else if (jj_2_78(3)) {if (!hasError) { s = assertion_statement(); } @@ -8654,7 +8668,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_78(3)) {if (!hasError) { + } else if (jj_2_79(3)) {if (!hasError) { s = report_statement(); } @@ -8663,7 +8677,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_79(3)) {if (!hasError) { + } else if (jj_2_80(3)) {if (!hasError) { s = wait_statement(); } @@ -8672,7 +8686,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_80(2147483647)) {if (!hasError) { + } else if (jj_2_81(2147483647)) {if (!hasError) { s = variable_assignment_statement(); } @@ -8681,7 +8695,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_81(3)) {if (!hasError) { + } else if (jj_2_82(3)) {if (!hasError) { s = procedure_call_statement(); } @@ -8690,7 +8704,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_82(3)) {if (!hasError) { + } else if (jj_2_83(3)) {if (!hasError) { if_statement(); } @@ -8699,7 +8713,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; return s; } - } else if (jj_2_83(3)) {if (!hasError) { + } else if (jj_2_84(3)) {if (!hasError) { case_statement(); } @@ -8708,7 +8722,7 @@ return s; return s; } - } else if (jj_2_84(3)) {if (!hasError) { + } else if (jj_2_85(3)) {if (!hasError) { loop_statement(); } @@ -8717,7 +8731,7 @@ return s; return s; } - } else if (jj_2_85(3)) {if (!hasError) { + } else if (jj_2_86(3)) {if (!hasError) { s = next_statement(); } @@ -8726,7 +8740,7 @@ return s; return s; } - } else if (jj_2_86(3)) {if (!hasError) { + } else if (jj_2_87(3)) {if (!hasError) { s = exit_statement(); } @@ -8735,7 +8749,7 @@ return s; return s; } - } else if (jj_2_87(3)) {if (!hasError) { + } else if (jj_2_88(3)) {if (!hasError) { s = return_statement(); } @@ -8766,7 +8780,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } } assert(false); - } +} QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) { @@ -8800,7 +8814,7 @@ QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) { return s+s1+s2; assert(false); - } +} QCString VhdlParser::shift_operator() { @@ -8877,7 +8891,7 @@ return "ror"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::sign() { @@ -8910,11 +8924,11 @@ return "-"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3; - if (jj_2_89(2147483647)) {if (!hasError) { + if (jj_2_90(2147483647)) {if (!hasError) { conditional_signal_assignment_wave(); } @@ -8923,7 +8937,7 @@ QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3; return ""; } - } else if (jj_2_90(2147483647)) {if (!hasError) { + } else if (jj_2_91(2147483647)) {if (!hasError) { selected_signal_assignment_wave(); } @@ -8940,7 +8954,7 @@ return ""; case BASIC_IDENTIFIER: case EXTENDED_CHARACTER:{if (!hasError) { - if (jj_2_88(2)) {if (!hasError) { + if (jj_2_89(2)) {if (!hasError) { s = identifier(); } @@ -9004,7 +9018,7 @@ return s+s1+"<="+s2+s3+";"; } } assert(false); - } +} void VhdlParser::semi() {if (!hasError) { @@ -9012,7 +9026,7 @@ void VhdlParser::semi() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;if (!hasError) { @@ -9075,7 +9089,7 @@ if(tok) s3.prepend(":="); s4=s1+s2+s3; addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SIGNAL,0,s4.data(),Public); - } +} QCString VhdlParser::signal_kind() { @@ -9108,7 +9122,7 @@ return "bus"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::signal_list() {QCString s,s1; @@ -9178,7 +9192,7 @@ return "all"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::signature() {QCString s,s1,s2;if (!hasError) { @@ -9260,7 +9274,7 @@ s+="return ";s+=s1; s1="["+s+"]";return s1; assert(false); - } +} QCString VhdlParser::simple_expression() {QCString s,s1,s2;if (!hasError) { @@ -9290,7 +9304,7 @@ s+=s1; if (!hasError) { while (!hasError) { - if (jj_2_91(2147483647)) { + if (jj_2_92(2147483647)) { ; } else { goto end_label_40; @@ -9313,7 +9327,7 @@ s+=s1;s+=s2; return s; assert(false); - } +} void VhdlParser::simple_name() {if (!hasError) { @@ -9321,7 +9335,7 @@ void VhdlParser::simple_name() {if (!hasError) { name(); } - } +} QCString VhdlParser::slice_name() {QCString s,s1;if (!hasError) { @@ -9343,7 +9357,7 @@ QCString VhdlParser::slice_name() {QCString s,s1;if (!hasError) { return s+"("+s1+")"; assert(false); - } +} QCString VhdlParser::string_literal() {Token *tok=0;if (!hasError) { @@ -9353,7 +9367,7 @@ QCString VhdlParser::string_literal() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} void VhdlParser::subprogram_body() {QCString s;if (!hasError) { @@ -9426,11 +9440,11 @@ if (s.data()) tempEntry->endBodyLine=getLine(END_T); createFlow(); currP=0; - } +} void VhdlParser::subprogram_declaration() { - if (jj_2_92(2147483647)) {if (!hasError) { + if (jj_2_93(2147483647)) {if (!hasError) { subprogram_instantiation_declaration(); } @@ -9461,7 +9475,7 @@ currP=0; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::subprogram_1() { @@ -9485,7 +9499,7 @@ void VhdlParser::subprogram_1() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} QCString VhdlParser::subprogram_declarative_item() {QCString s; @@ -9584,7 +9598,7 @@ return s; } default: jj_la1[214] = jj_gen; - if (jj_2_93(2147483647)) {if (!hasError) { + if (jj_2_94(2147483647)) {if (!hasError) { s = attribute_declaration(); } @@ -9619,7 +9633,7 @@ return s; } default: jj_la1[215] = jj_gen; - if (jj_2_94(3)) {if (!hasError) { + if (jj_2_95(3)) {if (!hasError) { s = group_template_declaration(); } @@ -9651,7 +9665,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;if (!hasError) { @@ -9694,7 +9708,7 @@ s+=s1; return s; assert(false); - } +} void VhdlParser::subprogram_kind() { @@ -9718,7 +9732,7 @@ void VhdlParser::subprogram_kind() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::subprogram_specification() {QCString s;Token *tok=0;Token *t; @@ -9735,7 +9749,7 @@ void VhdlParser::subprogram_specification() {QCString s;Token *tok=0;Token *t; currP=VhdlDocGen::PROCEDURE; createFunction(s.data(),currP,0); - tempEntry=current; + tempEntry=current.get(); current->startLine=getLine(PROCEDURE_T); current->bodyLine=getLine(PROCEDURE_T); } @@ -9772,7 +9786,7 @@ param_sec=0; } if (!hasError) { - if (jj_2_95(2)) {if (!hasError) { + if (jj_2_96(2)) {if (!hasError) { gen_interface_list(); } @@ -9783,7 +9797,7 @@ param_sec=0; } if (!hasError) { - if (jj_2_96(2)) {if (!hasError) { + if (jj_2_97(2)) {if (!hasError) { gen_assoc_list(); } @@ -9855,7 +9869,7 @@ currP=VhdlDocGen::FUNCTION; createFunction(tok->image.c_str(),currP,s.data()); else createFunction(0,currP,s.data()); - tempEntry=current; + tempEntry=current.get(); current->startLine=getLine(FUNCTION_T); current->bodyLine=getLine(FUNCTION_T); } @@ -9900,7 +9914,7 @@ param_sec=0; } if (!hasError) { -tempEntry=current; +tempEntry=current.get(); current->type=s; newEntry(); } @@ -9912,7 +9926,7 @@ tempEntry=current; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::subprogram_statement_part() {if (!hasError) { @@ -9952,7 +9966,7 @@ void VhdlParser::subprogram_statement_part() {if (!hasError) { end_label_42: ; } - } +} QCString VhdlParser::subtype_declaration() {QCString s,s1;if (!hasError) { @@ -9979,7 +9993,7 @@ QCString VhdlParser::subtype_declaration() {QCString s,s1;if (!hasError) { addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SUBTYPE,0,s1.data(),Public); return " subtype "+s+" is "+s1+";"; assert(false); - } +} QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) { @@ -9988,7 +10002,7 @@ QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) { } if (!hasError) { - if (jj_2_97(2147483647)) {if (!hasError) { + if (jj_2_98(2147483647)) {if (!hasError) { s1 = name(); } @@ -9999,7 +10013,7 @@ QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) { } if (!hasError) { - if (jj_2_98(2147483647)) {if (!hasError) { + if (jj_2_99(2147483647)) {if (!hasError) { s2 = constraint(); } @@ -10011,11 +10025,11 @@ QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) { return s+" "+s1+" "+s2; assert(false); - } +} QCString VhdlParser::suffix() {QCString s; - if (jj_2_99(2147483647)) {if (!hasError) { + if (jj_2_100(2147483647)) {if (!hasError) { s = name(); } @@ -10066,7 +10080,7 @@ return " all "; } } assert(false); - } +} QCString VhdlParser::target() {QCString s; @@ -10102,7 +10116,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::term() {QCString s,s1,s2;if (!hasError) { @@ -10112,7 +10126,7 @@ QCString VhdlParser::term() {QCString s,s1,s2;if (!hasError) { if (!hasError) { while (!hasError) { - if (jj_2_100(2)) { + if (jj_2_101(2)) { ; } else { goto end_label_43; @@ -10135,7 +10149,7 @@ s+=s1;s+=s2; return s; assert(false); - } +} QCString VhdlParser::timeout_clause() {QCString s;if (!hasError) { @@ -10149,7 +10163,7 @@ QCString VhdlParser::timeout_clause() {QCString s;if (!hasError) { return " for "+s; assert(false); - } +} QCString VhdlParser::type_conversion() {QCString s,s1;if (!hasError) { @@ -10171,11 +10185,11 @@ QCString VhdlParser::type_conversion() {QCString s,s1;if (!hasError) { return s+"("+s1+")"; assert(false); - } +} QCString VhdlParser::type_declaration() {QCString s; - if (jj_2_101(3)) {if (!hasError) { + if (jj_2_102(3)) {if (!hasError) { s = full_type_declaration(); } @@ -10204,7 +10218,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::type_definition() {QCString s; @@ -10258,7 +10272,7 @@ return s; } default: jj_la1[228] = jj_gen; - if (jj_2_102(2)) {if (!hasError) { + if (jj_2_103(2)) {if (!hasError) { protected_type_body(); } @@ -10288,7 +10302,7 @@ return ""; } } assert(false); - } +} QCString VhdlParser::type_mark() {QCString s;if (!hasError) { @@ -10298,7 +10312,7 @@ QCString VhdlParser::type_mark() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;if (!hasError) { @@ -10355,7 +10369,7 @@ s3+=",";s3+=s1; return "array("+s+s3+") of "+s2; assert(false); - } +} QCString VhdlParser::use_clause() {QCString s,s1;if (!hasError) { @@ -10411,7 +10425,7 @@ QCStringList ql1=QCStringList::split(",",s); s1="use "+s; return s1; assert(false); - } +} QCString VhdlParser::variable_assignment_statement() {QCString s,s1,s2; @@ -10422,7 +10436,7 @@ QCString VhdlParser::variable_assignment_statement() {QCString s,s1,s2; case BASIC_IDENTIFIER: case EXTENDED_CHARACTER:{if (!hasError) { - if (jj_2_103(2)) {if (!hasError) { + if (jj_2_104(2)) {if (!hasError) { s = identifier(); } @@ -10479,7 +10493,7 @@ return ""; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s,s1,s2;if (!hasError) { @@ -10558,7 +10572,7 @@ int spec; addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,spec,0,it.data(),Public); return val; assert(false); - } +} QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasError) { @@ -10638,7 +10652,7 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr if(t) s.append(":"); return s+" wait "+s1+s2+s3+";"; assert(false); - } +} QCString VhdlParser::waveform() {QCString s,s1; @@ -10713,7 +10727,7 @@ return " unaffected "; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::waveform_element() {QCString s,s1;if (!hasError) { @@ -10746,7 +10760,7 @@ s1.prepend(" after "); return s+s1; assert(false); - } +} QCString VhdlParser::protected_type_body() {if (!hasError) { @@ -10792,7 +10806,7 @@ QCString VhdlParser::protected_type_body() {if (!hasError) { return ""; assert(false); - } +} void VhdlParser::protected_type_body_declarative_item() { @@ -10859,7 +10873,7 @@ void VhdlParser::protected_type_body_declarative_item() { } default: jj_la1[243] = jj_gen; - if (jj_2_104(2147483647)) {if (!hasError) { + if (jj_2_105(2147483647)) {if (!hasError) { attribute_declaration(); } @@ -10882,7 +10896,7 @@ void VhdlParser::protected_type_body_declarative_item() { } default: jj_la1[244] = jj_gen; - if (jj_2_105(3)) {if (!hasError) { + if (jj_2_106(3)) {if (!hasError) { group_template_declaration(); } @@ -10905,7 +10919,7 @@ void VhdlParser::protected_type_body_declarative_item() { } } } - } +} void VhdlParser::protected_type_body_declarative_part() {if (!hasError) { @@ -10942,7 +10956,7 @@ void VhdlParser::protected_type_body_declarative_part() {if (!hasError) { end_label_47: ; } - } +} QCString VhdlParser::protected_type_declaration() {if (!hasError) { @@ -10987,7 +11001,7 @@ error_skipto(END_T); return ""; assert(false); - } +} void VhdlParser::protected_type_declarative_item() { @@ -11021,7 +11035,7 @@ void VhdlParser::protected_type_declarative_item() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::protected_type_declarative_part() {if (!hasError) { @@ -11053,7 +11067,7 @@ void VhdlParser::protected_type_declarative_part() {if (!hasError) { end_label_48: ; } - } +} QCString VhdlParser::context_ref() {QCString s;if (!hasError) { @@ -11071,7 +11085,7 @@ QCString VhdlParser::context_ref() {QCString s;if (!hasError) { return "context "+s ; assert(false); - } +} void VhdlParser::context_declaration() {QCString s,s1;if (!hasError) { @@ -11153,7 +11167,7 @@ parse_sec=CONTEXT_SEC; parse_sec=0; addVhdlType(s.data(),getLine(LIBRARY_T),Entry::VARIABLE_SEC,VhdlDocGen::LIBRARY,"context",s1.data(),Public); - } +} QCString VhdlParser::libustcont_stats() {QCString s; @@ -11197,7 +11211,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasError) { @@ -11246,7 +11260,7 @@ void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasE QCString q=" is new "+s1+s2; addVhdlType(s.data(),getLine(PACKAGE_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"package",q.data(),Public); - } +} QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasError) { @@ -11288,7 +11302,7 @@ QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasErro current->name=s; return "package "+s+" is new "+s1; assert(false); - } +} QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;if (!hasError) { @@ -11339,7 +11353,7 @@ QCString q= " is new "+s1+s2; addVhdlType(s.data(),getLine(FUNCTION_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"function ",q.data(),Public); return q; assert(false); - } +} void VhdlParser::gen_assoc_list() {if (!hasError) { @@ -11363,7 +11377,7 @@ void VhdlParser::gen_assoc_list() {if (!hasError) { jj_consume_token(RPAREN_T); } - } +} void VhdlParser::gen_interface_list() {if (!hasError) { @@ -11393,7 +11407,7 @@ void VhdlParser::gen_interface_list() {if (!hasError) { jj_consume_token(RPAREN_T); } - } +} void VhdlParser::case_scheme() {if (!hasError) { @@ -11414,7 +11428,7 @@ void VhdlParser::case_scheme() {if (!hasError) { } if (!hasError) { - if (jj_2_106(3)) {if (!hasError) { + if (jj_2_107(3)) {if (!hasError) { ttend(); } @@ -11440,7 +11454,7 @@ void VhdlParser::case_scheme() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::when_stats() {if (!hasError) { @@ -11451,7 +11465,7 @@ void VhdlParser::when_stats() {if (!hasError) { } if (!hasError) { - if (jj_2_107(2)) {if (!hasError) { + if (jj_2_108(2)) {if (!hasError) { label(); } @@ -11490,7 +11504,7 @@ void VhdlParser::when_stats() {if (!hasError) { end_label_50: ; } - } +} void VhdlParser::ttend() {if (!hasError) { @@ -11518,7 +11532,7 @@ void VhdlParser::ttend() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::generate_statement_body() {if (!hasError) { @@ -11530,7 +11544,7 @@ void VhdlParser::generate_statement_body() {if (!hasError) { generate_statement_body(); } - } +} void VhdlParser::generate_statement_body1() {if (!hasError) { @@ -11557,7 +11571,7 @@ void VhdlParser::generate_statement_body1() {if (!hasError) { case VARIABLE_T:{if (!hasError) { while (!hasError) { - if (jj_2_108(2147483647)) { + if (jj_2_109(2147483647)) { ; } else { goto end_label_51; @@ -11611,7 +11625,7 @@ void VhdlParser::generate_statement_body1() {if (!hasError) { end_label_52: ; } - } +} QCString VhdlParser::external_name() {QCString s,s1,s2;if (!hasError) { @@ -11643,7 +11657,7 @@ QCString t="<<"+s; QCString t1=s1+":"+s2+">>"; return s+s1; assert(false); - } +} QCString VhdlParser::sig_stat() {Token *t; @@ -11687,7 +11701,7 @@ return t->image.data(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::external_pathname() {QCString s; @@ -11731,11 +11745,11 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::absolute_pathname() {QCString s,s1; - if (jj_2_109(2147483647)) {if (!hasError) { + if (jj_2_110(2147483647)) {if (!hasError) { jj_consume_token(DOT_T); } @@ -11776,7 +11790,7 @@ return "."+s; } } assert(false); - } +} QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) { @@ -11785,7 +11799,7 @@ QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) { } if (!hasError) { - if (jj_2_110(2147483647)) {if (!hasError) { + if (jj_2_111(2147483647)) {if (!hasError) { s1 = pathname_element_list(); } @@ -11801,7 +11815,7 @@ QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) { return s+s1+s2; assert(false); - } +} QCString VhdlParser::neg_list() {QCString s;if (!hasError) { @@ -11834,7 +11848,7 @@ s+="^."; return s; assert(false); - } +} QCString VhdlParser::pathname_element() {QCString s,s1;if (!hasError) { @@ -11870,7 +11884,7 @@ if(!s1.isEmpty()) return s; assert(false); - } +} QCString VhdlParser::pathname_element_list() {QCString s,s1,s2;if (!hasError) { @@ -11891,7 +11905,7 @@ s+="."; if (!hasError) { while (!hasError) { - if (jj_2_111(2147483647)) { + if (jj_2_112(2147483647)) { ; } else { goto end_label_54; @@ -11914,7 +11928,7 @@ s2+=s1;s2+="."; return s+s2; assert(false); - } +} QCString VhdlParser::package_path_name() {QCString s;if (!hasError) { @@ -11928,11 +11942,11 @@ QCString VhdlParser::package_path_name() {QCString s;if (!hasError) { return "@"+s; assert(false); - } +} void VhdlParser::conditional_signal_assignment_wave() { - if (jj_2_112(2147483647)) {if (!hasError) { + if (jj_2_113(2147483647)) {if (!hasError) { conditional_force_assignment(); } @@ -11956,7 +11970,7 @@ void VhdlParser::conditional_signal_assignment_wave() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::conditional_waveform_assignment() {if (!hasError) { @@ -12016,7 +12030,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::else_wave_list() {if (!hasError) { @@ -12047,7 +12061,7 @@ void VhdlParser::else_wave_list() {if (!hasError) { } } - } +} void VhdlParser::conditional_force_assignment() {if (!hasError) { @@ -12125,11 +12139,11 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::selected_signal_assignment_wave() { - if (jj_2_113(2147483647)) {if (!hasError) { + if (jj_2_114(2147483647)) {if (!hasError) { selected_force_assignment(); } @@ -12149,7 +12163,7 @@ void VhdlParser::selected_signal_assignment_wave() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::selected_variable_assignment() {if (!hasError) { @@ -12192,11 +12206,11 @@ void VhdlParser::selected_variable_assignment() {if (!hasError) { sel_var_list(); } - } +} void VhdlParser::select_name() { - if (jj_2_114(2147483647)) {if (!hasError) { + if (jj_2_115(2147483647)) {if (!hasError) { aggregate(); } @@ -12219,7 +12233,7 @@ void VhdlParser::select_name() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::selected_waveform_assignment() {if (!hasError) { @@ -12279,7 +12293,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) { sel_wave_list(); } - } +} void VhdlParser::selected_force_assignment() {if (!hasError) { @@ -12342,7 +12356,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) { sel_var_list(); } - } +} void VhdlParser::sel_var_list() {if (!hasError) { @@ -12386,7 +12400,7 @@ void VhdlParser::sel_var_list() {if (!hasError) { if (!hasError) { while (!hasError) { - if (jj_2_115(2147483647)) { + if (jj_2_116(2147483647)) { ; } else { goto end_label_55; @@ -12430,7 +12444,7 @@ void VhdlParser::sel_var_list() {if (!hasError) { end_label_55: ; } - } +} void VhdlParser::sel_wave_list() {if (!hasError) { @@ -12473,7 +12487,7 @@ void VhdlParser::sel_wave_list() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::inout_stat() { @@ -12497,7 +12511,7 @@ void VhdlParser::inout_stat() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::else_stat() {if (!hasError) { @@ -12543,7 +12557,7 @@ void VhdlParser::else_stat() {if (!hasError) { end_label_57: ; } - } +} QCString VhdlParser::interface_subprogram_declaration() {QCString s; @@ -12578,7 +12592,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::iproc() {QCString s,s1;if (!hasError) { @@ -12597,7 +12611,7 @@ QCString VhdlParser::iproc() {QCString s,s1;if (!hasError) { current->name=s; return "procedure "+s+s1; assert(false); - } +} QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *t2=0;if (!hasError) { @@ -12711,7 +12725,7 @@ QCString q; } currP=0;return ""; assert(false); - } +} QCString VhdlParser::param() {QCString s,s1;Token *tok=0;if (!hasError) { @@ -12765,7 +12779,7 @@ if(tok) param_sec=0; return s+"("+s1+")"; assert(false); - } +} void VhdlParser::parseInline() { @@ -12795,31 +12809,21 @@ void VhdlParser::parseInline() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} VhdlParser::VhdlParser(TokenManager *tm){ head = NULL; + errorHandlerCreated = false; ReInit(tm); } - VhdlParser::~VhdlParser() +VhdlParser::~VhdlParser() { - 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; - } + clear(); } void VhdlParser::ReInit(TokenManager *tm){ - if (head) delete head; + clear(); errorHandler = new ErrorHandler(); errorHandlerCreated = true; hasError = false; @@ -12841,6 +12845,24 @@ void VhdlParser::ReInit(TokenManager *tm){ } +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; + } + } + if (errorHandlerCreated) { + delete errorHandler; + } +} + + Token * VhdlParser::jj_consume_token(int kind) { Token *oldToken; if ((oldToken = token)->next != NULL) token = token->next; @@ -12850,7 +12872,7 @@ Token * VhdlParser::jj_consume_token(int kind) { jj_gen++; if (++jj_gc > 100) { jj_gc = 0; - for (int i = 0; i < 115; i++) { + for (int i = 0; i < 116; i++) { JJCalls *c = &jj_2_rtns[i]; while (c != NULL) { if (c->gen < jj_gen) c->first = NULL; @@ -12863,7 +12885,8 @@ Token * VhdlParser::jj_consume_token(int kind) { token = oldToken; jj_kind = kind; JAVACC_STRING_TYPE image = kind >= 0 ? tokenImage[kind] : tokenImage[0]; - errorHandler->handleUnexpectedToken(kind, image.substr(1, image.size() - 2), getToken(1), this), hasError = true; + errorHandler->handleUnexpectedToken(kind, image.substr(1, image.size() - 2), getToken(1), this); + hasError = true; return token; } @@ -12920,28 +12943,25 @@ 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() { } - /** Disable tracing. */ - - void VhdlParser::disable_tracing() { + void VhdlParser::disable_tracing() { } -void VhdlParser::jj_rescan_token(){ + void VhdlParser::jj_rescan_token(){ jj_rescan = true; - for (int i = 0; i < 115; i++) { + for (int i = 0; i < 116; i++) { JJCalls *p = &jj_2_rtns[i]; do { if (p->gen > jj_gen) { @@ -13062,6 +13082,7 @@ void VhdlParser::jj_rescan_token(){ case 112: jj_3_113(); break; case 113: jj_3_114(); break; case 114: jj_3_115(); break; + case 115: jj_3_116(); break; } } p = p->next; @@ -13071,7 +13092,7 @@ void VhdlParser::jj_rescan_token(){ } -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 3e32daa..efdfe33 100644 --- a/vhdlparser/VhdlParser.h +++ b/vhdlparser/VhdlParser.h @@ -12,12 +12,12 @@ namespace vhdl { namespace parser { struct JJCalls { - int gen; - Token *first; - int arg; - JJCalls *next; + int gen; + int arg; + JJCalls* next; + Token* first; ~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 { @@ -582,7 +582,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_1() || jj_done; + return (!jj_3_1() || jj_done); { jj_save(0, xla); } } @@ -590,7 +590,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_2() || jj_done; + return (!jj_3_2() || jj_done); { jj_save(1, xla); } } @@ -598,7 +598,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_3() || jj_done; + return (!jj_3_3() || jj_done); { jj_save(2, xla); } } @@ -606,7 +606,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_4() || jj_done; + return (!jj_3_4() || jj_done); { jj_save(3, xla); } } @@ -614,7 +614,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_5() || jj_done; + return (!jj_3_5() || jj_done); { jj_save(4, xla); } } @@ -622,7 +622,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_6() || jj_done; + return (!jj_3_6() || jj_done); { jj_save(5, xla); } } @@ -630,7 +630,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_7() || jj_done; + return (!jj_3_7() || jj_done); { jj_save(6, xla); } } @@ -638,7 +638,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_8() || jj_done; + return (!jj_3_8() || jj_done); { jj_save(7, xla); } } @@ -646,7 +646,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_9() || jj_done; + return (!jj_3_9() || jj_done); { jj_save(8, xla); } } @@ -654,7 +654,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_10() || jj_done; + return (!jj_3_10() || jj_done); { jj_save(9, xla); } } @@ -662,7 +662,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_11() || jj_done; + return (!jj_3_11() || jj_done); { jj_save(10, xla); } } @@ -670,7 +670,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_12() || jj_done; + return (!jj_3_12() || jj_done); { jj_save(11, xla); } } @@ -678,7 +678,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_13() || jj_done; + return (!jj_3_13() || jj_done); { jj_save(12, xla); } } @@ -686,7 +686,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_14() || jj_done; + return (!jj_3_14() || jj_done); { jj_save(13, xla); } } @@ -694,7 +694,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_15() || jj_done; + return (!jj_3_15() || jj_done); { jj_save(14, xla); } } @@ -702,7 +702,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_16() || jj_done; + return (!jj_3_16() || jj_done); { jj_save(15, xla); } } @@ -710,7 +710,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_17() || jj_done; + return (!jj_3_17() || jj_done); { jj_save(16, xla); } } @@ -718,7 +718,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_18() || jj_done; + return (!jj_3_18() || jj_done); { jj_save(17, xla); } } @@ -726,7 +726,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_19() || jj_done; + return (!jj_3_19() || jj_done); { jj_save(18, xla); } } @@ -734,7 +734,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_20() || jj_done; + return (!jj_3_20() || jj_done); { jj_save(19, xla); } } @@ -742,7 +742,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_21() || jj_done; + return (!jj_3_21() || jj_done); { jj_save(20, xla); } } @@ -750,7 +750,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_22() || jj_done; + return (!jj_3_22() || jj_done); { jj_save(21, xla); } } @@ -758,7 +758,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_23() || jj_done; + return (!jj_3_23() || jj_done); { jj_save(22, xla); } } @@ -766,7 +766,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_24() || jj_done; + return (!jj_3_24() || jj_done); { jj_save(23, xla); } } @@ -774,7 +774,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_25() || jj_done; + return (!jj_3_25() || jj_done); { jj_save(24, xla); } } @@ -782,7 +782,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_26() || jj_done; + return (!jj_3_26() || jj_done); { jj_save(25, xla); } } @@ -790,7 +790,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_27() || jj_done; + return (!jj_3_27() || jj_done); { jj_save(26, xla); } } @@ -798,7 +798,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_28() || jj_done; + return (!jj_3_28() || jj_done); { jj_save(27, xla); } } @@ -806,7 +806,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_29() || jj_done; + return (!jj_3_29() || jj_done); { jj_save(28, xla); } } @@ -814,7 +814,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_30() || jj_done; + return (!jj_3_30() || jj_done); { jj_save(29, xla); } } @@ -822,7 +822,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_31() || jj_done; + return (!jj_3_31() || jj_done); { jj_save(30, xla); } } @@ -830,7 +830,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_32() || jj_done; + return (!jj_3_32() || jj_done); { jj_save(31, xla); } } @@ -838,7 +838,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_33() || jj_done; + return (!jj_3_33() || jj_done); { jj_save(32, xla); } } @@ -846,7 +846,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_34() || jj_done; + return (!jj_3_34() || jj_done); { jj_save(33, xla); } } @@ -854,7 +854,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_35() || jj_done; + return (!jj_3_35() || jj_done); { jj_save(34, xla); } } @@ -862,7 +862,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_36() || jj_done; + return (!jj_3_36() || jj_done); { jj_save(35, xla); } } @@ -870,7 +870,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_37() || jj_done; + return (!jj_3_37() || jj_done); { jj_save(36, xla); } } @@ -878,7 +878,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_38() || jj_done; + return (!jj_3_38() || jj_done); { jj_save(37, xla); } } @@ -886,7 +886,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_39() || jj_done; + return (!jj_3_39() || jj_done); { jj_save(38, xla); } } @@ -894,7 +894,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_40() || jj_done; + return (!jj_3_40() || jj_done); { jj_save(39, xla); } } @@ -902,7 +902,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_41() || jj_done; + return (!jj_3_41() || jj_done); { jj_save(40, xla); } } @@ -910,7 +910,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_42() || jj_done; + return (!jj_3_42() || jj_done); { jj_save(41, xla); } } @@ -918,7 +918,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_43() || jj_done; + return (!jj_3_43() || jj_done); { jj_save(42, xla); } } @@ -926,7 +926,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_44() || jj_done; + return (!jj_3_44() || jj_done); { jj_save(43, xla); } } @@ -934,7 +934,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_45() || jj_done; + return (!jj_3_45() || jj_done); { jj_save(44, xla); } } @@ -942,7 +942,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_46() || jj_done; + return (!jj_3_46() || jj_done); { jj_save(45, xla); } } @@ -950,7 +950,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_47() || jj_done; + return (!jj_3_47() || jj_done); { jj_save(46, xla); } } @@ -958,7 +958,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_48() || jj_done; + return (!jj_3_48() || jj_done); { jj_save(47, xla); } } @@ -966,7 +966,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_49() || jj_done; + return (!jj_3_49() || jj_done); { jj_save(48, xla); } } @@ -974,7 +974,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_50() || jj_done; + return (!jj_3_50() || jj_done); { jj_save(49, xla); } } @@ -982,7 +982,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_51() || jj_done; + return (!jj_3_51() || jj_done); { jj_save(50, xla); } } @@ -990,7 +990,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_52() || jj_done; + return (!jj_3_52() || jj_done); { jj_save(51, xla); } } @@ -998,7 +998,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_53() || jj_done; + return (!jj_3_53() || jj_done); { jj_save(52, xla); } } @@ -1006,7 +1006,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_54() || jj_done; + return (!jj_3_54() || jj_done); { jj_save(53, xla); } } @@ -1014,7 +1014,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_55() || jj_done; + return (!jj_3_55() || jj_done); { jj_save(54, xla); } } @@ -1022,7 +1022,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_56() || jj_done; + return (!jj_3_56() || jj_done); { jj_save(55, xla); } } @@ -1030,7 +1030,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_57() || jj_done; + return (!jj_3_57() || jj_done); { jj_save(56, xla); } } @@ -1038,7 +1038,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_58() || jj_done; + return (!jj_3_58() || jj_done); { jj_save(57, xla); } } @@ -1046,7 +1046,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_59() || jj_done; + return (!jj_3_59() || jj_done); { jj_save(58, xla); } } @@ -1054,7 +1054,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_60() || jj_done; + return (!jj_3_60() || jj_done); { jj_save(59, xla); } } @@ -1062,7 +1062,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_61() || jj_done; + return (!jj_3_61() || jj_done); { jj_save(60, xla); } } @@ -1070,7 +1070,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_62() || jj_done; + return (!jj_3_62() || jj_done); { jj_save(61, xla); } } @@ -1078,7 +1078,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_63() || jj_done; + return (!jj_3_63() || jj_done); { jj_save(62, xla); } } @@ -1086,7 +1086,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_64() || jj_done; + return (!jj_3_64() || jj_done); { jj_save(63, xla); } } @@ -1094,7 +1094,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_65() || jj_done; + return (!jj_3_65() || jj_done); { jj_save(64, xla); } } @@ -1102,7 +1102,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_66() || jj_done; + return (!jj_3_66() || jj_done); { jj_save(65, xla); } } @@ -1110,7 +1110,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_67() || jj_done; + return (!jj_3_67() || jj_done); { jj_save(66, xla); } } @@ -1118,7 +1118,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_68() || jj_done; + return (!jj_3_68() || jj_done); { jj_save(67, xla); } } @@ -1126,7 +1126,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_69() || jj_done; + return (!jj_3_69() || jj_done); { jj_save(68, xla); } } @@ -1134,7 +1134,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_70() || jj_done; + return (!jj_3_70() || jj_done); { jj_save(69, xla); } } @@ -1142,7 +1142,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_71() || jj_done; + return (!jj_3_71() || jj_done); { jj_save(70, xla); } } @@ -1150,7 +1150,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_72() || jj_done; + return (!jj_3_72() || jj_done); { jj_save(71, xla); } } @@ -1158,7 +1158,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_73() || jj_done; + return (!jj_3_73() || jj_done); { jj_save(72, xla); } } @@ -1166,7 +1166,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_74() || jj_done; + return (!jj_3_74() || jj_done); { jj_save(73, xla); } } @@ -1174,7 +1174,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_75() || jj_done; + return (!jj_3_75() || jj_done); { jj_save(74, xla); } } @@ -1182,7 +1182,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_76() || jj_done; + return (!jj_3_76() || jj_done); { jj_save(75, xla); } } @@ -1190,7 +1190,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_77() || jj_done; + return (!jj_3_77() || jj_done); { jj_save(76, xla); } } @@ -1198,7 +1198,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_78() || jj_done; + return (!jj_3_78() || jj_done); { jj_save(77, xla); } } @@ -1206,7 +1206,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_79() || jj_done; + return (!jj_3_79() || jj_done); { jj_save(78, xla); } } @@ -1214,7 +1214,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_80() || jj_done; + return (!jj_3_80() || jj_done); { jj_save(79, xla); } } @@ -1222,7 +1222,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_81() || jj_done; + return (!jj_3_81() || jj_done); { jj_save(80, xla); } } @@ -1230,7 +1230,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_82() || jj_done; + return (!jj_3_82() || jj_done); { jj_save(81, xla); } } @@ -1238,7 +1238,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_83() || jj_done; + return (!jj_3_83() || jj_done); { jj_save(82, xla); } } @@ -1246,7 +1246,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_84() || jj_done; + return (!jj_3_84() || jj_done); { jj_save(83, xla); } } @@ -1254,7 +1254,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_85() || jj_done; + return (!jj_3_85() || jj_done); { jj_save(84, xla); } } @@ -1262,7 +1262,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_86() || jj_done; + return (!jj_3_86() || jj_done); { jj_save(85, xla); } } @@ -1270,7 +1270,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_87() || jj_done; + return (!jj_3_87() || jj_done); { jj_save(86, xla); } } @@ -1278,7 +1278,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_88() || jj_done; + return (!jj_3_88() || jj_done); { jj_save(87, xla); } } @@ -1286,7 +1286,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_89() || jj_done; + return (!jj_3_89() || jj_done); { jj_save(88, xla); } } @@ -1294,7 +1294,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_90() || jj_done; + return (!jj_3_90() || jj_done); { jj_save(89, xla); } } @@ -1302,7 +1302,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_91() || jj_done; + return (!jj_3_91() || jj_done); { jj_save(90, xla); } } @@ -1310,7 +1310,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_92() || jj_done; + return (!jj_3_92() || jj_done); { jj_save(91, xla); } } @@ -1318,7 +1318,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_93() || jj_done; + return (!jj_3_93() || jj_done); { jj_save(92, xla); } } @@ -1326,7 +1326,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_94() || jj_done; + return (!jj_3_94() || jj_done); { jj_save(93, xla); } } @@ -1334,7 +1334,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_95() || jj_done; + return (!jj_3_95() || jj_done); { jj_save(94, xla); } } @@ -1342,7 +1342,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_96() || jj_done; + return (!jj_3_96() || jj_done); { jj_save(95, xla); } } @@ -1350,7 +1350,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_97() || jj_done; + return (!jj_3_97() || jj_done); { jj_save(96, xla); } } @@ -1358,7 +1358,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_98() || jj_done; + return (!jj_3_98() || jj_done); { jj_save(97, xla); } } @@ -1366,7 +1366,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_99() || jj_done; + return (!jj_3_99() || jj_done); { jj_save(98, xla); } } @@ -1374,7 +1374,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_100() || jj_done; + return (!jj_3_100() || jj_done); { jj_save(99, xla); } } @@ -1382,7 +1382,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_101() || jj_done; + return (!jj_3_101() || jj_done); { jj_save(100, xla); } } @@ -1390,7 +1390,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_102() || jj_done; + return (!jj_3_102() || jj_done); { jj_save(101, xla); } } @@ -1398,7 +1398,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_103() || jj_done; + return (!jj_3_103() || jj_done); { jj_save(102, xla); } } @@ -1406,7 +1406,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_104() || jj_done; + return (!jj_3_104() || jj_done); { jj_save(103, xla); } } @@ -1414,7 +1414,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_105() || jj_done; + return (!jj_3_105() || jj_done); { jj_save(104, xla); } } @@ -1422,7 +1422,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_106() || jj_done; + return (!jj_3_106() || jj_done); { jj_save(105, xla); } } @@ -1430,7 +1430,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_107() || jj_done; + return (!jj_3_107() || jj_done); { jj_save(106, xla); } } @@ -1438,7 +1438,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_108() || jj_done; + return (!jj_3_108() || jj_done); { jj_save(107, xla); } } @@ -1446,7 +1446,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_109() || jj_done; + return (!jj_3_109() || jj_done); { jj_save(108, xla); } } @@ -1454,7 +1454,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_110() || jj_done; + return (!jj_3_110() || jj_done); { jj_save(109, xla); } } @@ -1462,7 +1462,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_111() || jj_done; + return (!jj_3_111() || jj_done); { jj_save(110, xla); } } @@ -1470,7 +1470,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_112() || jj_done; + return (!jj_3_112() || jj_done); { jj_save(111, xla); } } @@ -1478,7 +1478,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_113() || jj_done; + return (!jj_3_113() || jj_done); { jj_save(112, xla); } } @@ -1486,7 +1486,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_114() || jj_done; + return (!jj_3_114() || jj_done); { jj_save(113, xla); } } @@ -1494,10 +1494,18 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_115() || jj_done; + return (!jj_3_115() || jj_done); { jj_save(114, xla); } } + inline bool jj_2_116(int xla) + { + jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_done = false; + return (!jj_3_116() || jj_done); + { jj_save(115, xla); } + } + inline bool jj_3_43() { if (jj_done) return true; @@ -1520,27 +1528,27 @@ void parseInline(); return false; } - inline bool jj_3R_442() + inline bool jj_3R_443() { if (jj_done) return true; if (jj_scan_token(FOR_T)) return true; - if (jj_3R_407()) return true; + if (jj_3R_408()) return true; return false; } - inline bool jj_3R_366() + inline bool jj_3R_367() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_441()) { + if (jj_3R_442()) { jj_scanpos = xsp; - if (jj_3R_442()) return true; + if (jj_3R_443()) return true; } return false; } - inline bool jj_3R_441() + inline bool jj_3R_442() { if (jj_done) return true; if (jj_scan_token(WHILE_T)) return true; @@ -1551,19 +1559,19 @@ void parseInline(); inline bool jj_3R_197() { if (jj_done) return true; - if (jj_3R_345()) return true; + if (jj_3R_346()) return true; return false; } - inline bool jj_3R_399() + inline bool jj_3R_400() { if (jj_done) return true; if (jj_scan_token(SEMI_T)) return true; - if (jj_3R_398()) return true; + if (jj_3R_399()) return true; return false; } - inline bool jj_3R_411() + inline bool jj_3R_412() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -1608,14 +1616,14 @@ void parseInline(); return false; } - inline bool jj_3R_312() + inline bool jj_3R_313() { if (jj_done) return true; - if (jj_3R_398()) return true; + if (jj_3R_399()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_399()) { jj_scanpos = xsp; break; } + if (jj_3R_400()) { jj_scanpos = xsp; break; } } return false; } @@ -1630,10 +1638,10 @@ void parseInline(); return false; } - inline bool jj_3R_398() + inline bool jj_3R_399() { if (jj_done) return true; - if (jj_3R_489()) return true; + if (jj_3R_490()) return true; return false; } @@ -1644,15 +1652,15 @@ void parseInline(); return false; } - inline bool jj_3R_557() + inline bool jj_3R_558() { if (jj_done) return true; - if (jj_3R_612()) return true; + if (jj_3R_613()) return true; if (jj_3R_69()) return true; return false; } - inline bool jj_3R_556() + inline bool jj_3R_557() { if (jj_done) return true; if (jj_3R_92()) return true; @@ -1673,7 +1681,7 @@ void parseInline(); return false; } - inline bool jj_3R_555() + inline bool jj_3R_556() { if (jj_done) return true; if (jj_3R_107()) return true; @@ -1687,22 +1695,22 @@ void parseInline(); return false; } - inline bool jj_3R_489() + inline bool jj_3R_490() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_39()) { jj_scanpos = xsp; - if (jj_3R_555()) { + if (jj_3R_556()) { jj_scanpos = xsp; if (jj_3_40()) { jj_scanpos = xsp; if (jj_3_41()) { jj_scanpos = xsp; - if (jj_3R_556()) { + if (jj_3R_557()) { jj_scanpos = xsp; - if (jj_3R_557()) return true; + if (jj_3R_558()) return true; } } } @@ -1727,57 +1735,57 @@ void parseInline(); return false; } - inline bool jj_3R_624() + inline bool jj_3R_625() { if (jj_done) return true; if (jj_3R_69()) return true; return false; } - inline bool jj_3R_414() + inline bool jj_3R_696() { if (jj_done) return true; - if (jj_scan_token(ALL_T)) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_413() + inline bool jj_3R_415() { if (jj_done) return true; - if (jj_scan_token(OTHER_T)) return true; + if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_695() + inline bool jj_3R_414() { if (jj_done) return true; - if (jj_3R_69()) return true; + if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_330() + inline bool jj_3R_331() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_412()) { - jj_scanpos = xsp; if (jj_3R_413()) { jj_scanpos = xsp; - if (jj_3R_414()) return true; + if (jj_3R_414()) { + jj_scanpos = xsp; + if (jj_3R_415()) return true; } } return false; } - inline bool jj_3R_412() + inline bool jj_3R_413() { if (jj_done) return true; if (jj_3R_196()) return true; return false; } - inline bool jj_3R_327() + inline bool jj_3R_328() { if (jj_done) return true; if (jj_scan_token(CONFIGURATION_T)) return true; @@ -1785,7 +1793,7 @@ void parseInline(); return false; } - inline bool jj_3R_326() + inline bool jj_3R_327() { if (jj_done) return true; if (jj_scan_token(ENTITY_T)) return true; @@ -1794,20 +1802,33 @@ void parseInline(); if (jj_3_38()) jj_scanpos = xsp; if (jj_3R_59()) return true; xsp = jj_scanpos; - if (jj_3R_411()) jj_scanpos = xsp; + if (jj_3R_412()) jj_scanpos = xsp; return false; } - inline bool jj_3R_173() + inline bool jj_3R_426() { if (jj_done) return true; + if (jj_scan_token(IS_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_325()) { + if (jj_3R_696()) { jj_scanpos = xsp; + if (jj_scan_token(145)) return true; + } + return false; + } + + inline bool jj_3R_173() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; if (jj_3R_326()) { jj_scanpos = xsp; - if (jj_3R_327()) return true; + if (jj_3R_327()) { + jj_scanpos = xsp; + if (jj_3R_328()) return true; } } return false; @@ -1820,7 +1841,7 @@ void parseInline(); return false; } - inline bool jj_3R_325() + inline bool jj_3R_326() { if (jj_done) return true; Token * xsp; @@ -1830,19 +1851,6 @@ void parseInline(); return false; } - 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_695()) { - jj_scanpos = xsp; - if (jj_scan_token(145)) return true; - } - return false; - } - inline bool jj_3R_154() { if (jj_done) return true; @@ -1852,28 +1860,28 @@ void parseInline(); return false; } - inline bool jj_3R_621() + inline bool jj_3R_622() { if (jj_done) return true; if (jj_3R_58()) return true; return false; } - inline bool jj_3R_620() + inline bool jj_3R_621() { if (jj_done) return true; if (jj_3R_67()) return true; return false; } - inline bool jj_3R_564() + inline bool jj_3R_565() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_620()) { + if (jj_3R_621()) { jj_scanpos = xsp; - if (jj_3R_621()) return true; + if (jj_3R_622()) return true; } return false; } @@ -1892,7 +1900,7 @@ void parseInline(); return false; } - inline bool jj_3R_531() + inline bool jj_3R_532() { if (jj_done) return true; if (jj_scan_token(TYPE_T)) return true; @@ -1901,42 +1909,42 @@ void parseInline(); return false; } - inline bool jj_3R_623() + inline bool jj_3R_624() { if (jj_done) return true; if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_258()) return true; + if (jj_3R_259()) return true; return false; } - inline bool jj_3R_622() + inline bool jj_3R_623() { if (jj_done) return true; if (jj_scan_token(ELSIF_T)) return true; if (jj_3R_79()) return true; if (jj_scan_token(THEN_T)) return true; - if (jj_3R_258()) return true; + if (jj_3R_259()) return true; return false; } - inline bool jj_3R_344() + inline bool jj_3R_520() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_69()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_313()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_519() + inline bool jj_3R_345() { 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_scan_token(COMMA_T)) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_254() + inline bool jj_3R_255() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -1949,21 +1957,21 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_254()) jj_scanpos = xsp; + if (jj_3R_255()) jj_scanpos = xsp; if (jj_scan_token(IF_T)) return true; if (jj_3R_79()) return true; if (jj_scan_token(THEN_T)) return true; - if (jj_3R_258()) return true; + if (jj_3R_259()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_622()) { jj_scanpos = xsp; break; } + if (jj_3R_623()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_623()) jj_scanpos = xsp; + if (jj_3R_624()) 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_624()) jj_scanpos = xsp; + if (jj_3R_625()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -1975,34 +1983,34 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_344()) { jj_scanpos = xsp; break; } + if (jj_3R_345()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_423() + inline bool jj_3R_424() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(77)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_519()) jj_scanpos = xsp; + if (jj_3R_520()) jj_scanpos = xsp; return false; } - inline bool jj_3R_164() + inline bool jj_3_116() { if (jj_done) return true; - if (jj_scan_token(BASIC_IDENTIFIER)) return true; + if (jj_3R_58()) return true; + if (jj_scan_token(WHEN_T)) return true; return false; } - inline bool jj_3_115() + inline bool jj_3R_164() { if (jj_done) return true; - if (jj_3R_58()) return true; - if (jj_scan_token(WHEN_T)) return true; + if (jj_scan_token(BASIC_IDENTIFIER)) return true; return false; } @@ -2025,15 +2033,15 @@ void parseInline(); return false; } - inline bool jj_3R_544() + inline bool jj_3R_545() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_543()) return true; + if (jj_3R_544()) return true; return false; } - inline bool jj_3R_385() + inline bool jj_3R_386() { if (jj_done) return true; if (jj_3R_58()) return true; @@ -2048,35 +2056,35 @@ void parseInline(); return false; } - inline bool jj_3R_65() + inline bool jj_3R_446() { if (jj_done) return true; - if (jj_scan_token(GROUP_T)) 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_473()) return true; - if (jj_scan_token(RPAREN_T)) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_529()) return true; return false; } - inline bool jj_3R_445() + inline bool jj_3R_530() { if (jj_done) return true; - if (jj_3R_528()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_448()) return true; return false; } - inline bool jj_3R_529() + inline bool jj_3R_65() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_447()) return true; + if (jj_scan_token(GROUP_T)) 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_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_545() + inline bool jj_3R_546() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; @@ -2084,28 +2092,14 @@ void parseInline(); return false; } - inline bool jj_3R_304() - { - if (jj_done) return true; - if (jj_3R_383()) return true; - return false; - } - - inline bool jj_3R_382() + inline bool jj_3R_305() { if (jj_done) return true; - if (jj_scan_token(GROUP_T)) return true; - if (jj_3R_69()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_69()) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_474()) return true; - if (jj_scan_token(RPAREN_T)) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_384()) return true; return false; } - inline bool jj_3R_424() + inline bool jj_3R_425() { if (jj_done) return true; Token * xsp; @@ -2117,106 +2111,113 @@ void parseInline(); return false; } - inline bool jj_3R_343() + inline bool jj_3R_344() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_424()) jj_scanpos = xsp; + if (jj_3R_425()) jj_scanpos = xsp; if (jj_scan_token(FUNCTION_T)) return true; if (jj_3R_59()) return true; - if (jj_3R_423()) return true; + if (jj_3R_424()) return true; if (jj_scan_token(RETURN_T)) return true; if (jj_3R_59()) return true; xsp = jj_scanpos; - if (jj_3R_425()) jj_scanpos = xsp; + if (jj_3R_426()) jj_scanpos = xsp; return false; } - inline bool jj_3R_474() + inline bool jj_3R_383() { if (jj_done) return true; - if (jj_3R_543()) return true; + if (jj_scan_token(GROUP_T)) return true; + if (jj_3R_69()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_69()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_475()) return true; + if (jj_scan_token(RPAREN_T)) return true; + if (jj_scan_token(SEMI_T)) return true; + return false; + } + + inline bool jj_3R_475() + { + if (jj_done) return true; + if (jj_3R_544()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_544()) { jj_scanpos = xsp; break; } + if (jj_3R_545()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_607() + inline bool jj_3R_304() { if (jj_done) return true; - if (jj_3R_351()) return true; + if (jj_3R_58()) return true; + if (jj_3R_385()) return true; return false; } - inline bool jj_3R_303() + inline bool jj_3R_343() { if (jj_done) return true; - if (jj_3R_58()) return true; - if (jj_3R_384()) return true; + if (jj_scan_token(PROCEDURE_T)) return true; + if (jj_3R_69()) return true; + if (jj_3R_424()) return true; return false; } - inline bool jj_3R_342() + inline bool jj_3R_608() { if (jj_done) return true; - if (jj_scan_token(PROCEDURE_T)) return true; - if (jj_3R_69()) return true; - if (jj_3R_423()) return true; + if (jj_3R_352()) return true; return false; } - inline bool jj_3R_606() + inline bool jj_3R_607() { if (jj_done) return true; if (jj_3R_59()) return true; return false; } - inline bool jj_3R_543() + inline bool jj_3R_544() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_606()) { + if (jj_3R_607()) { jj_scanpos = xsp; - if (jj_3R_607()) return true; + if (jj_3R_608()) return true; } return false; } - 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_165()) return true; - if (jj_scan_token(RPAREN_T)) return true; - return false; - } - inline bool jj_3R_194() { if (jj_done) return true; - if (jj_3R_343()) return true; + if (jj_3R_344()) return true; return false; } - inline bool jj_3R_170() + inline bool jj_3R_70() { if (jj_done) return true; - if (jj_3R_69()) 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_165()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } inline bool jj_3R_193() { if (jj_done) return true; - if (jj_3R_342()) return true; + if (jj_3R_343()) return true; return false; } @@ -2232,36 +2233,43 @@ void parseInline(); return false; } - inline bool jj_3R_158() + inline bool jj_3R_170() { if (jj_done) return true; - if (jj_3R_312()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_475() + inline bool jj_3R_476() { if (jj_done) return true; if (jj_scan_token(ELSE_T)) return true; if (jj_3R_58()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_545()) jj_scanpos = xsp; + if (jj_3R_546()) jj_scanpos = xsp; return false; } - inline bool jj_3R_384() + inline bool jj_3R_385() { if (jj_done) return true; Token * xsp; - if (jj_3R_475()) return true; + if (jj_3R_476()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_475()) { jj_scanpos = xsp; break; } + if (jj_3R_476()) { jj_scanpos = xsp; break; } } return false; } + inline bool jj_3R_158() + { + if (jj_done) return true; + if (jj_3R_313()) return true; + return false; + } + inline bool jj_3R_66() { if (jj_done) return true; @@ -2273,7 +2281,7 @@ void parseInline(); return false; } - inline bool jj_3R_383() + inline bool jj_3R_384() { if (jj_done) return true; Token * xsp; @@ -2285,14 +2293,14 @@ void parseInline(); return false; } - inline bool jj_3R_446() + inline bool jj_3R_447() { if (jj_done) return true; - if (jj_3R_404()) return true; + if (jj_3R_405()) return true; return false; } - inline bool jj_3R_321() + inline bool jj_3R_322() { if (jj_done) return true; if (jj_scan_token(IF_T)) return true; @@ -2300,42 +2308,42 @@ void parseInline(); return false; } - inline bool jj_3R_168() + inline bool jj_3R_448() { if (jj_done) return true; + if (jj_3R_445()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_85()) return true; Token * xsp; - xsp = jj_scanpos; - if (jj_3R_320()) { - jj_scanpos = xsp; - if (jj_3R_321()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_530()) { jj_scanpos = xsp; break; } } + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_320() + inline bool jj_3R_168() { if (jj_done) return true; - if (jj_scan_token(FOR_T)) return true; - if (jj_3R_407()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_321()) { + jj_scanpos = xsp; + if (jj_3R_322()) return true; + } return false; } - inline bool jj_3R_447() + inline bool jj_3R_321() { if (jj_done) return true; - if (jj_3R_444()) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_85()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_529()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(SEMI_T)) return true; + if (jj_scan_token(FOR_T)) return true; + if (jj_3R_408()) return true; return false; } - inline bool jj_3R_305() + inline bool jj_3R_306() { if (jj_done) return true; if (jj_3R_58()) return true; @@ -2349,36 +2357,19 @@ void parseInline(); } while (true) { xsp = jj_scanpos; - if (jj_3R_385()) { jj_scanpos = xsp; break; } + if (jj_3R_386()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_74() - { - if (jj_done) return true; - if (jj_3R_69()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_168()) return true; - if (jj_scan_token(GENERATE_T)) 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_170()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; - return false; - } - - inline bool jj_3R_302() + inline bool jj_3R_303() { if (jj_done) return true; - if (jj_3R_383()) return true; + if (jj_3R_384()) return true; return false; } - inline bool jj_3_111() + inline bool jj_3_112() { if (jj_done) return true; if (jj_3R_142()) return true; @@ -2386,13 +2377,20 @@ void parseInline(); return false; } - inline bool jj_3R_104() + inline bool jj_3R_74() { if (jj_done) 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; + if (jj_3R_69()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_168()) return true; + if (jj_scan_token(GENERATE_T)) 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_170()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } @@ -2409,19 +2407,29 @@ void parseInline(); if (jj_scan_token(LESSTHAN_T)) return true; if (jj_scan_token(FORCE_T)) return true; xsp = jj_scanpos; - if (jj_3R_304()) jj_scanpos = xsp; - if (jj_3R_305()) return true; + if (jj_3R_305()) jj_scanpos = xsp; + if (jj_3R_306()) return true; return false; } - inline bool jj_3_114() + inline bool jj_3R_104() + { + if (jj_done) return true; + if (jj_3R_59()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_226()) return true; + if (jj_scan_token(RPAREN_T)) return true; + return false; + } + + inline bool jj_3_115() { if (jj_done) return true; if (jj_3R_108()) return true; return false; } - inline bool jj_3R_368() + inline bool jj_3R_369() { if (jj_done) return true; if (jj_scan_token(WITH_T)) return true; @@ -2433,12 +2441,12 @@ void parseInline(); if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; xsp = jj_scanpos; - if (jj_3R_446()) jj_scanpos = xsp; - if (jj_3R_447()) return true; + if (jj_3R_447()) jj_scanpos = xsp; + if (jj_3R_448()) return true; return false; } - inline bool jj_3R_300() + inline bool jj_3R_301() { if (jj_done) return true; if (jj_3R_142()) return true; @@ -2446,14 +2454,14 @@ void parseInline(); return false; } - inline bool jj_3R_686() + inline bool jj_3R_687() { if (jj_done) return true; if (jj_3R_59()) return true; return false; } - inline bool jj_3R_574() + inline bool jj_3R_575() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; @@ -2461,40 +2469,33 @@ void parseInline(); return false; } - inline bool jj_3R_685() + inline bool jj_3R_686() { if (jj_done) return true; if (jj_3R_108()) return true; return false; } - inline bool jj_3R_662() + inline bool jj_3R_663() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_685()) { + if (jj_3R_686()) { jj_scanpos = xsp; - if (jj_3R_686()) return true; + if (jj_3R_687()) return true; } return false; } - inline bool jj_3R_462() - { - if (jj_done) return true; - if (jj_3R_533()) return true; - return false; - } - - inline bool jj_3_113() + inline bool jj_3_114() { if (jj_done) return true; if (jj_3R_144()) return true; return false; } - inline bool jj_3R_526() + inline bool jj_3R_527() { if (jj_done) return true; if (jj_scan_token(WITH_T)) return true; @@ -2503,23 +2504,30 @@ void parseInline(); Token * xsp; xsp = jj_scanpos; if (jj_scan_token(155)) jj_scanpos = xsp; - if (jj_3R_662()) return true; + if (jj_3R_663()) return true; if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_305()) return true; + if (jj_3R_306()) return true; return false; } - inline bool jj_3R_443() + inline bool jj_3R_444() { if (jj_done) return true; - if (jj_3R_404()) return true; + if (jj_3R_405()) return true; return false; } - inline bool jj_3R_270() + inline bool jj_3R_463() { if (jj_done) return true; - if (jj_3R_368()) return true; + if (jj_3R_534()) return true; + return false; + } + + inline bool jj_3R_271() + { + if (jj_done) return true; + if (jj_3R_369()) return true; return false; } @@ -2528,29 +2536,20 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_269()) { + if (jj_3R_270()) { jj_scanpos = xsp; - if (jj_3R_270()) return true; + if (jj_3R_271()) return true; } return false; } - inline bool jj_3R_269() + inline bool jj_3R_270() { if (jj_done) return true; if (jj_3R_144()) return true; return false; } - inline bool jj_3R_156() - { - if (jj_done) 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_143() { if (jj_done) return true; @@ -2559,96 +2558,98 @@ void parseInline(); if (jj_scan_token(FORCE_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_302()) jj_scanpos = xsp; + if (jj_3R_303()) jj_scanpos = xsp; if (jj_3R_58()) return true; if (jj_scan_token(WHEN_T)) return true; xsp = jj_scanpos; - if (jj_3R_303()) jj_scanpos = xsp; + if (jj_3R_304()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_136() + inline bool jj_3R_156() { if (jj_done) return true; - if (jj_scan_token(TYPE_T)) return true; - if (jj_3R_69()) return true; - if (jj_scan_token(IS_T)) return true; - if (jj_3R_576()) return true; - if (jj_scan_token(SEMI_T)) 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_528() + inline bool jj_3R_529() { if (jj_done) return true; if (jj_scan_token(ELSE_T)) return true; if (jj_3R_58()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_574()) jj_scanpos = xsp; + if (jj_3R_575()) jj_scanpos = xsp; return false; } - inline bool jj_3_112() + inline bool jj_3_113() { if (jj_done) return true; if (jj_3R_143()) return true; return false; } - inline bool jj_3R_323() + inline bool jj_3R_136() { if (jj_done) return true; - if (jj_3R_409()) return true; + if (jj_scan_token(TYPE_T)) return true; + if (jj_3R_69()) return true; + if (jj_scan_token(IS_T)) return true; + if (jj_3R_577()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_63() + inline bool jj_3R_324() { if (jj_done) return true; - if (jj_3R_59()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_156()) jj_scanpos = xsp; + if (jj_3R_410()) return true; return false; } - inline bool jj_3R_367() + inline bool jj_3R_368() { if (jj_done) return true; if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_443()) jj_scanpos = xsp; - if (jj_3R_444()) return true; + if (jj_3R_444()) jj_scanpos = xsp; + if (jj_3R_445()) return true; if (jj_scan_token(WHEN_T)) return true; if (jj_3R_58()) return true; xsp = jj_scanpos; - if (jj_3R_445()) jj_scanpos = xsp; + if (jj_3R_446()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_569() + inline bool jj_3R_63() { if (jj_done) return true; - if (jj_3R_312()) return true; + if (jj_3R_59()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_156()) jj_scanpos = xsp; return false; } - inline bool jj_3R_268() + inline bool jj_3R_269() { if (jj_done) return true; - if (jj_3R_367()) return true; + if (jj_3R_368()) return true; return false; } - inline bool jj_3R_397() + inline bool jj_3R_570() { if (jj_done) return true; - if (jj_scan_token(INTEGER)) return true; + if (jj_3R_313()) return true; return false; } @@ -2657,33 +2658,40 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_267()) { + if (jj_3R_268()) { jj_scanpos = xsp; - if (jj_3R_268()) return true; + if (jj_3R_269()) return true; } return false; } - inline bool jj_3R_267() + inline bool jj_3R_268() { if (jj_done) return true; if (jj_3R_143()) return true; return false; } - inline bool jj_3R_311() + inline bool jj_3R_398() + { + if (jj_done) return true; + if (jj_scan_token(INTEGER)) return true; + return false; + } + + inline bool jj_3R_312() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_396()) { + if (jj_3R_397()) { jj_scanpos = xsp; - if (jj_3R_397()) return true; + if (jj_3R_398()) return true; } return false; } - inline bool jj_3R_396() + inline bool jj_3R_397() { if (jj_done) return true; if (jj_3R_59()) return true; @@ -2698,12 +2706,12 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_300()) { jj_scanpos = xsp; break; } + if (jj_3R_301()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_554() + inline bool jj_3R_555() { if (jj_done) return true; if (jj_scan_token(AT_T)) return true; @@ -2711,7 +2719,7 @@ void parseInline(); return false; } - inline bool jj_3R_301() + inline bool jj_3R_302() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -2720,14 +2728,14 @@ void parseInline(); return false; } - inline bool jj_3_110() + inline bool jj_3_111() { if (jj_done) return true; if (jj_3R_141()) return true; return false; } - inline bool jj_3R_656() + inline bool jj_3R_657() { if (jj_done) return true; if (jj_scan_token(FILE_T)) return true; @@ -2736,29 +2744,29 @@ void parseInline(); return false; } - inline bool jj_3R_579() + inline bool jj_3R_612() { if (jj_done) return true; - if (jj_scan_token(OPEN_T)) return true; - if (jj_3R_58()) return true; + if (jj_3R_141()) return true; return false; } - inline bool jj_3R_611() + inline bool jj_3R_580() { if (jj_done) return true; - if (jj_3R_141()) return true; + if (jj_scan_token(OPEN_T)) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_533() + inline bool jj_3R_534() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_579()) jj_scanpos = xsp; + if (jj_3R_580()) jj_scanpos = xsp; if (jj_scan_token(IS_T)) return true; - if (jj_3R_580()) return true; + if (jj_3R_581()) return true; return false; } @@ -2768,65 +2776,73 @@ void parseInline(); if (jj_3R_69()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_301()) jj_scanpos = xsp; + if (jj_3R_302()) jj_scanpos = xsp; return false; } - inline bool jj_3R_580() + inline bool jj_3R_640() { if (jj_done) return true; - if (jj_3R_58()) return true; + if (jj_scan_token(NEG_T)) return true; + if (jj_scan_token(DOT_T)) return true; return false; } - inline bool jj_3R_639() + inline bool jj_3R_581() { if (jj_done) return true; - if (jj_scan_token(NEG_T)) return true; - if (jj_scan_token(DOT_T)) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_610() + inline bool jj_3R_611() { if (jj_done) return true; Token * xsp; - if (jj_3R_639()) return true; + if (jj_3R_640()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_639()) { jj_scanpos = xsp; break; } + if (jj_3R_640()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_448() + inline bool jj_3_110() { if (jj_done) return true; - if (jj_scan_token(DOUBLEMULT_T)) return true; - if (jj_3R_369()) return true; + if (jj_scan_token(DOT_T)) return true; + if (jj_3R_141()) return true; return false; } - inline bool jj_3_109() + inline bool jj_3R_554() { if (jj_done) return true; - if (jj_scan_token(DOT_T)) return true; - if (jj_3R_141()) return true; + if (jj_3R_611()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_612()) jj_scanpos = xsp; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_553() + inline bool jj_3R_449() { if (jj_done) return true; - if (jj_3R_610()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_611()) jj_scanpos = xsp; + if (jj_scan_token(DOUBLEMULT_T)) return true; + if (jj_3R_370()) return true; + return false; + } + + inline bool jj_3R_610() + { + if (jj_done) return true; + if (jj_scan_token(DOT_T)) return true; if (jj_3R_69()) return true; return false; } - inline bool jj_3R_375() + inline bool jj_3R_376() { if (jj_done) return true; if (jj_scan_token(FILE_T)) return true; @@ -2835,12 +2851,12 @@ void parseInline(); if (jj_3R_84()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_462()) jj_scanpos = xsp; + if (jj_3R_463()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_263() + inline bool jj_3R_264() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -2851,44 +2867,50 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; + if (jj_3R_141()) return true; if (jj_3R_69()) return true; return false; } - inline bool jj_3R_283() + inline bool jj_3R_553() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_609()) { + jj_scanpos = xsp; + if (jj_3R_610()) return true; + } + return false; + } + + inline bool jj_3R_284() { if (jj_done) return true; if (jj_scan_token(NOT_T)) return true; - if (jj_3R_369()) return true; + if (jj_3R_370()) return true; return false; } - inline bool jj_3R_282() + inline bool jj_3R_283() { if (jj_done) return true; if (jj_scan_token(ABS_T)) return true; - if (jj_3R_369()) return true; + if (jj_3R_370()) return true; return false; } - inline bool jj_3R_608() + inline bool jj_3R_489() { if (jj_done) return true; - if (jj_scan_token(DOT_T)) return true; - if (jj_3R_141()) return true; - if (jj_3R_69()) return true; + if (jj_3R_555()) return true; return false; } - inline bool jj_3R_552() + inline bool jj_3R_488() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_608()) { - jj_scanpos = xsp; - if (jj_3R_609()) return true; - } + if (jj_3R_554()) return true; return false; } @@ -2897,30 +2919,38 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_281()) { - jj_scanpos = xsp; if (jj_3R_282()) { jj_scanpos = xsp; - if (jj_3R_283()) return true; + if (jj_3R_283()) { + jj_scanpos = xsp; + if (jj_3R_284()) return true; } } return false; } - inline bool jj_3R_281() + inline bool jj_3R_282() { if (jj_done) return true; - if (jj_3R_369()) return true; + if (jj_3R_370()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_448()) jj_scanpos = xsp; + if (jj_3R_449()) jj_scanpos = xsp; return false; } - inline bool jj_3R_488() + inline bool jj_3R_396() { if (jj_done) return true; - if (jj_3R_554()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_487()) { + jj_scanpos = xsp; + if (jj_3R_488()) { + jj_scanpos = xsp; + if (jj_3R_489()) return true; + } + } return false; } @@ -2931,129 +2961,119 @@ void parseInline(); return false; } - inline bool jj_3R_395() + inline bool jj_3_107() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_486()) { - jj_scanpos = xsp; - if (jj_3R_487()) { - jj_scanpos = xsp; - if (jj_3R_488()) return true; - } - } + if (jj_3R_138()) return true; return false; } - inline bool jj_3R_486() + inline bool jj_3R_697() { if (jj_done) return true; - if (jj_3R_552()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_96()) return true; return false; } - inline bool jj_3R_696() + inline bool jj_3R_486() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_96()) return true; + if (jj_scan_token(VARIABLE_T)) return true; return false; } inline bool jj_3R_146() { if (jj_done) return true; - if (jj_3R_308()) return true; + if (jj_3R_309()) return true; if (jj_3R_145()) return true; return false; } - inline bool jj_3_106() + inline bool jj_3R_485() { if (jj_done) return true; - if (jj_3R_138()) return true; + if (jj_scan_token(SIGNAL_T)) return true; return false; } - inline bool jj_3R_393() + inline bool jj_3R_394() { if (jj_done) return true; if (jj_scan_token(OR_T)) return true; return false; } - inline bool jj_3R_392() + inline bool jj_3R_393() { if (jj_done) return true; if (jj_scan_token(XOR_T)) return true; return false; } - inline bool jj_3R_485() + inline bool jj_3R_392() { if (jj_done) return true; - if (jj_scan_token(VARIABLE_T)) return true; + if (jj_scan_token(XNOR_T)) return true; return false; } - inline bool jj_3R_391() + inline bool jj_3R_395() { if (jj_done) return true; - if (jj_scan_token(XNOR_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_484()) { + jj_scanpos = xsp; + if (jj_3R_485()) { + jj_scanpos = xsp; + if (jj_3R_486()) return true; + } + } return false; } inline bool jj_3R_484() { if (jj_done) return true; - if (jj_scan_token(SIGNAL_T)) return true; + if (jj_scan_token(CONSTANT_T)) return true; return false; } - inline bool jj_3R_390() + inline bool jj_3R_391() { if (jj_done) return true; if (jj_scan_token(NOR_T)) return true; return false; } - inline bool jj_3R_389() + inline bool jj_3R_390() { if (jj_done) return true; if (jj_scan_token(NAND_T)) return true; return false; } - inline bool jj_3R_394() + inline bool jj_3_109() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_483()) { - jj_scanpos = xsp; - if (jj_3R_484()) { - jj_scanpos = xsp; - if (jj_3R_485()) return true; - } - } + if (jj_3R_140()) return true; return false; } - inline bool jj_3R_483() + inline bool jj_3R_275() { if (jj_done) return true; - if (jj_scan_token(CONSTANT_T)) return true; + if (jj_3R_132()) return true; return false; } - inline bool jj_3R_308() + inline bool jj_3R_309() { 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()) { @@ -3062,7 +3082,9 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_392()) { jj_scanpos = xsp; - if (jj_3R_393()) return true; + if (jj_3R_393()) { + jj_scanpos = xsp; + if (jj_3R_394()) return true; } } } @@ -3071,24 +3093,22 @@ void parseInline(); return false; } - inline bool jj_3R_388() + inline bool jj_3R_389() { if (jj_done) return true; if (jj_scan_token(AND_T)) return true; return false; } - inline bool jj_3_108() - { - if (jj_done) return true; - if (jj_3R_140()) return true; - return false; - } - - inline bool jj_3R_274() + inline bool jj_3R_311() { if (jj_done) return true; - if (jj_3R_132()) return true; + if (jj_scan_token(SLSL_T)) 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_84()) return true; + if (jj_scan_token(RSRS_T)) return true; return false; } @@ -3104,32 +3124,20 @@ void parseInline(); return false; } - 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_scan_token(COLON_T)) return true; - if (jj_3R_84()) return true; - if (jj_scan_token(RSRS_T)) return true; - return false; - } - - inline bool jj_3R_408() + inline bool jj_3R_409() { if (jj_done) return true; if (jj_3R_140()) return true; return false; } - inline bool jj_3R_322() + inline bool jj_3R_323() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_408()) { jj_scanpos = xsp; break; } + if (jj_3R_409()) { jj_scanpos = xsp; break; } } if (jj_scan_token(BEGIN_T)) return true; return false; @@ -3140,15 +3148,30 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_322()) jj_scanpos = xsp; + if (jj_3R_323()) jj_scanpos = xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_323()) { jj_scanpos = xsp; break; } + if (jj_3R_324()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_264() + inline bool jj_3R_285() + { + if (jj_done) return true; + if (jj_3R_69()) return true; + return false; + } + + inline bool jj_3R_662() + { + if (jj_done) return true; + if (jj_scan_token(BEGIN_T)) return true; + if (jj_3R_662()) return true; + return false; + } + + inline bool jj_3R_265() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; @@ -3156,14 +3179,14 @@ void parseInline(); return false; } - inline bool jj_3R_284() + inline bool jj_3R_235() { if (jj_done) return true; - if (jj_3R_69()) return true; + if (jj_3R_132()) return true; return false; } - inline bool jj_3R_262() + inline bool jj_3R_263() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -3171,11 +3194,11 @@ void parseInline(); return false; } - inline bool jj_3R_661() + inline bool jj_3_108() { if (jj_done) return true; - if (jj_scan_token(BEGIN_T)) return true; - if (jj_3R_661()) return true; + if (jj_3R_139()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } @@ -3184,32 +3207,28 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_262()) jj_scanpos = xsp; - if (jj_scan_token(EXIT_T)) return true; - xsp = jj_scanpos; if (jj_3R_263()) jj_scanpos = xsp; + if (jj_scan_token(EXIT_T)) return true; xsp = jj_scanpos; if (jj_3R_264()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_265()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_234() - { - if (jj_done) return true; - if (jj_3R_132()) return true; - return false; - } - - inline bool jj_3_107() + inline bool jj_3R_138() { if (jj_done) return true; - if (jj_3R_139()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_scan_token(END_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_285()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_687() + inline bool jj_3R_688() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -3217,47 +3236,48 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_696()) { jj_scanpos = xsp; break; } + if (jj_3R_697()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_138() + inline bool jj_3R_641() { if (jj_done) return true; - if (jj_scan_token(END_T)) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_284()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_132()) return true; return false; } - inline bool jj_3R_640() + inline bool jj_3R_652() { if (jj_done) return true; - if (jj_3R_132()) return true; + if (jj_scan_token(WHEN_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3_108()) jj_scanpos = xsp; + if (jj_3R_85()) return true; + if (jj_scan_token(ARROW_T)) return true; + if (jj_3R_662()) return true; return false; } inline bool jj_3R_208() { if (jj_done) return true; - if (jj_3R_351()) return true; + if (jj_3R_352()) return true; return false; } - inline bool jj_3R_651() + inline bool jj_3R_619() { if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; Token * xsp; - xsp = jj_scanpos; - if (jj_3_107()) jj_scanpos = xsp; - if (jj_3R_85()) return true; - if (jj_scan_token(ARROW_T)) return true; - if (jj_3R_661()) return true; + if (jj_3R_652()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_652()) { jj_scanpos = xsp; break; } + } return false; } @@ -3280,54 +3300,42 @@ void parseInline(); return false; } - inline bool jj_3R_618() + inline bool jj_3R_695() { if (jj_done) return true; - Token * xsp; - if (jj_3R_651()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3R_651()) { jj_scanpos = xsp; break; } - } + if (jj_3R_352()) return true; return false; } - inline bool jj_3R_694() + inline bool jj_3R_561() { if (jj_done) return true; - if (jj_3R_351()) return true; + if (jj_scan_token(CASE_T)) return true; + if (jj_3R_58()) return true; + if (jj_scan_token(GENERATE_T)) return true; + if (jj_3R_619()) return true; return false; } - inline bool jj_3R_693() + inline bool jj_3R_694() { if (jj_done) return true; if (jj_3R_59()) return true; return false; } - inline bool jj_3R_683() + inline bool jj_3R_684() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_693()) { + if (jj_3R_694()) { jj_scanpos = xsp; - if (jj_3R_694()) return true; + if (jj_3R_695()) return true; } return false; } - inline bool jj_3R_560() - { - if (jj_done) return true; - if (jj_scan_token(CASE_T)) return true; - if (jj_3R_58()) return true; - if (jj_scan_token(GENERATE_T)) return true; - if (jj_3R_618()) return true; - return false; - } - inline bool jj_3_36() { if (jj_done) return true; @@ -3347,7 +3355,7 @@ void parseInline(); if (jj_done) return true; if (jj_scan_token(GENERIC_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_312()) return true; + if (jj_3R_313()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } @@ -3363,65 +3371,65 @@ void parseInline(); return false; } - inline bool jj_3R_469() + inline bool jj_3R_470() { if (jj_done) return true; - if (jj_3R_538()) return true; - if (jj_scan_token(COLON_T)) return true; if (jj_3R_539()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_540()) return true; return false; } - inline bool jj_3R_684() + inline bool jj_3R_685() { if (jj_done) return true; - if (jj_3R_233()) return true; + if (jj_3R_234()) return true; return false; } - inline bool jj_3R_584() + inline bool jj_3R_585() { if (jj_done) return true; if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_583() + inline bool jj_3R_584() { if (jj_done) return true; if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_637() + inline bool jj_3R_638() { if (jj_done) return true; - if (jj_3R_658()) return true; + if (jj_3R_659()) return true; return false; } - inline bool jj_3R_582() + inline bool jj_3R_583() { if (jj_done) return true; Token * xsp; - if (jj_3R_637()) return true; + if (jj_3R_638()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_637()) { jj_scanpos = xsp; break; } + if (jj_3R_638()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_538() + inline bool jj_3R_539() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_582()) { - jj_scanpos = xsp; if (jj_3R_583()) { jj_scanpos = xsp; - if (jj_3R_584()) return true; + if (jj_3R_584()) { + jj_scanpos = xsp; + if (jj_3R_585()) return true; } } return false; @@ -3435,35 +3443,35 @@ void parseInline(); if (jj_scan_token(IS_T)) return true; if (jj_scan_token(NEW_T)) return true; if (jj_3R_59()) return true; - if (jj_3R_233()) return true; + if (jj_3R_234()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_274()) jj_scanpos = xsp; + if (jj_3R_275()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_658() + inline bool jj_3R_107() { if (jj_done) return true; - if (jj_3R_683()) return true; + if (jj_scan_token(PACKAGE_T)) 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_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_684()) jj_scanpos = xsp; + if (jj_3R_641()) jj_scanpos = xsp; return false; } - inline bool jj_3R_107() + inline bool jj_3R_659() { if (jj_done) return true; - if (jj_scan_token(PACKAGE_T)) 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_59()) return true; + if (jj_3R_684()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_640()) jj_scanpos = xsp; + if (jj_3R_685()) jj_scanpos = xsp; return false; } @@ -3475,10 +3483,10 @@ void parseInline(); if (jj_scan_token(IS_T)) return true; if (jj_scan_token(NEW_T)) return true; if (jj_3R_59()) return true; - if (jj_3R_233()) return true; + if (jj_3R_234()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_234()) jj_scanpos = xsp; + if (jj_3R_235()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -3504,297 +3512,290 @@ void parseInline(); return false; } - inline bool jj_3R_542() + inline bool jj_3R_543() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_541()) return true; + if (jj_3R_542()) return true; return false; } - inline bool jj_3R_682() + inline bool jj_3R_683() { if (jj_done) return true; if (jj_3R_69()) return true; return false; } - inline bool jj_3R_253() + inline bool jj_3R_254() { if (jj_done) return true; - if (jj_3R_365()) return true; + if (jj_3R_366()) return true; return false; } - inline bool jj_3R_692() + inline bool jj_3R_693() { if (jj_done) return true; - if (jj_3R_702()) return true; + if (jj_3R_703()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_681() + inline bool jj_3R_682() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_692()) { jj_scanpos = xsp; break; } + if (jj_3R_693()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_605() - { - if (jj_done) return true; - if (jj_scan_token(BOX_T)) return true; - return false; - } - - inline bool jj_3R_719() + inline bool jj_3R_720() { if (jj_done) return true; - if (jj_3R_381()) return true; + if (jj_3R_382()) return true; return false; } - inline bool jj_3R_718() + inline bool jj_3R_606() { if (jj_done) return true; - if (jj_3R_378()) return true; + if (jj_scan_token(BOX_T)) return true; return false; } - inline bool jj_3R_348() + inline bool jj_3R_719() { if (jj_done) return true; - if (jj_scan_token(ENTITY_T)) return true; - if (jj_3R_69()) return true; + if (jj_3R_379()) return true; return false; } - inline bool jj_3R_717() + inline bool jj_3R_718() { if (jj_done) return true; - if (jj_3R_346()) return true; + if (jj_3R_347()) return true; return false; } - inline bool jj_3R_702() + inline bool jj_3R_703() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_717()) { - jj_scanpos = xsp; if (jj_3R_718()) { jj_scanpos = xsp; - if (jj_3R_719()) return true; + if (jj_3R_719()) { + jj_scanpos = xsp; + if (jj_3R_720()) return true; } } return false; } - inline bool jj_3R_473() + inline bool jj_3R_349() { if (jj_done) return true; - if (jj_3R_541()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_542()) { jj_scanpos = xsp; break; } - } + if (jj_scan_token(ENTITY_T)) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_680() + inline bool jj_3R_681() { if (jj_done) return true; if (jj_3R_69()) return true; return false; } - inline bool jj_3R_252() + inline bool jj_3R_253() { if (jj_done) return true; - if (jj_3R_364()) return true; + if (jj_3R_365()) return true; return false; } - inline bool jj_3R_657() + inline bool jj_3R_474() { if (jj_done) return true; - if (jj_scan_token(PROTECTED_T)) return true; - if (jj_3R_681()) return true; - if (jj_scan_token(END_T)) return true; - if (jj_scan_token(PROTECTED_T)) return true; + if (jj_3R_542()) return true; Token * xsp; - xsp = jj_scanpos; - if (jj_3R_682()) jj_scanpos = xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_543()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_541() + inline bool jj_3R_658() { if (jj_done) return true; - if (jj_3R_539()) return true; + if (jj_scan_token(PROTECTED_T)) return true; + if (jj_3R_682()) return true; + if (jj_scan_token(END_T)) return true; + if (jj_scan_token(PROTECTED_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_605()) jj_scanpos = xsp; + if (jj_3R_683()) jj_scanpos = xsp; return false; } - inline bool jj_3R_691() + inline bool jj_3R_692() { if (jj_done) return true; - if (jj_3R_701()) return true; + if (jj_3R_702()) return true; return false; } - inline bool jj_3R_619() + inline bool jj_3R_542() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_69()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_540()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_606()) jj_scanpos = xsp; return false; } - inline bool jj_3_104() + inline bool jj_3_105() { if (jj_done) return true; if (jj_3R_64()) return true; return false; } - inline bool jj_3R_679() + inline bool jj_3R_680() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_691()) { jj_scanpos = xsp; break; } + if (jj_3R_692()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_601() + inline bool jj_3R_620() { if (jj_done) return true; - if (jj_scan_token(FILE_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_69()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_600() + inline bool jj_3R_602() { if (jj_done) return true; - if (jj_scan_token(GROUP_T)) return true; + if (jj_scan_token(FILE_T)) return true; return false; } - inline bool jj_3R_599() + inline bool jj_3R_717() { if (jj_done) return true; - if (jj_scan_token(UNITS_T)) return true; + if (jj_3R_383()) return true; return false; } - inline bool jj_3R_598() + inline bool jj_3R_601() { if (jj_done) return true; - if (jj_scan_token(LITERAL_T)) return true; + if (jj_scan_token(GROUP_T)) return true; return false; } - inline bool jj_3R_716() + inline bool jj_3R_600() { if (jj_done) return true; - if (jj_3R_382()) return true; + if (jj_scan_token(UNITS_T)) return true; return false; } - inline bool jj_3R_597() + inline bool jj_3R_599() { if (jj_done) return true; - if (jj_scan_token(LABEL_T)) return true; + if (jj_scan_token(LITERAL_T)) return true; return false; } - inline bool jj_3R_596() + inline bool jj_3_106() { if (jj_done) return true; - if (jj_scan_token(COMPONENT_T)) return true; + if (jj_3R_65()) return true; return false; } - inline bool jj_3R_595() + inline bool jj_3R_716() { if (jj_done) return true; - if (jj_scan_token(VARIABLE_T)) return true; + if (jj_3R_382()) return true; return false; } - inline bool jj_3_105() + inline bool jj_3R_598() { if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_scan_token(LABEL_T)) return true; return false; } inline bool jj_3R_715() { if (jj_done) return true; - if (jj_3R_381()) return true; + if (jj_3R_379()) return true; return false; } - inline bool jj_3R_594() + inline bool jj_3R_597() { if (jj_done) return true; - if (jj_scan_token(SIGNAL_T)) return true; + if (jj_scan_token(COMPONENT_T)) return true; return false; } - inline bool jj_3R_714() + inline bool jj_3R_596() { if (jj_done) return true; - if (jj_3R_378()) return true; + if (jj_scan_token(VARIABLE_T)) return true; return false; } - inline bool jj_3R_593() + inline bool jj_3R_714() { if (jj_done) return true; - if (jj_scan_token(CONSTANT_T)) return true; + if (jj_3R_64()) return true; return false; } - inline bool jj_3R_592() + inline bool jj_3R_595() { if (jj_done) return true; - if (jj_scan_token(SUBTYPE_T)) return true; + if (jj_scan_token(SIGNAL_T)) return true; return false; } - inline bool jj_3R_713() + inline bool jj_3R_594() { if (jj_done) return true; - if (jj_3R_64()) return true; + if (jj_scan_token(CONSTANT_T)) return true; return false; } - inline bool jj_3R_591() + inline bool jj_3R_713() { if (jj_done) return true; - if (jj_scan_token(TYPE_T)) return true; + if (jj_3R_377()) return true; return false; } - inline bool jj_3R_590() + inline bool jj_3R_593() { if (jj_done) return true; - if (jj_scan_token(PACKAGE_T)) return true; + if (jj_scan_token(SUBTYPE_T)) return true; return false; } @@ -3805,10 +3806,10 @@ void parseInline(); return false; } - inline bool jj_3R_589() + inline bool jj_3R_592() { if (jj_done) return true; - if (jj_scan_token(FUNCTION_T)) return true; + if (jj_scan_token(TYPE_T)) return true; return false; } @@ -3819,24 +3820,24 @@ void parseInline(); return false; } - inline bool jj_3R_588() + inline bool jj_3R_591() { if (jj_done) return true; - if (jj_scan_token(PROCEDURE_T)) return true; + if (jj_scan_token(PACKAGE_T)) return true; return false; } inline bool jj_3R_710() { if (jj_done) return true; - if (jj_3R_374()) return true; + if (jj_3R_373()) return true; return false; } - inline bool jj_3R_587() + inline bool jj_3R_590() { if (jj_done) return true; - if (jj_scan_token(CONFIGURATION_T)) return true; + if (jj_scan_token(FUNCTION_T)) return true; return false; } @@ -3847,10 +3848,10 @@ void parseInline(); return false; } - inline bool jj_3R_586() + inline bool jj_3R_589() { if (jj_done) return true; - if (jj_scan_token(ARCHITECTURE_T)) return true; + if (jj_scan_token(PROCEDURE_T)) return true; return false; } @@ -3861,69 +3862,64 @@ void parseInline(); return false; } + inline bool jj_3R_588() + { + if (jj_done) return true; + if (jj_scan_token(CONFIGURATION_T)) return true; + return false; + } + inline bool jj_3R_707() { if (jj_done) return true; - if (jj_3R_370()) return true; + if (jj_3R_525()) return true; return false; } - inline bool jj_3R_706() + inline bool jj_3R_587() { if (jj_done) return true; - if (jj_3R_524()) return true; + if (jj_scan_token(ARCHITECTURE_T)) return true; return false; } - inline bool jj_3R_585() + inline bool jj_3R_706() { if (jj_done) return true; - if (jj_scan_token(ENTITY_T)) return true; + if (jj_3R_92()) return true; return false; } - inline bool jj_3R_539() + inline bool jj_3R_702() { 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()) { - jj_scanpos = xsp; - if (jj_3R_588()) { - jj_scanpos = xsp; - if (jj_3R_589()) { + if (jj_3R_706()) { jj_scanpos = xsp; - if (jj_3R_590()) { + if (jj_3R_707()) { jj_scanpos = xsp; - if (jj_3R_591()) { + if (jj_3R_708()) { jj_scanpos = xsp; - if (jj_3R_592()) { + if (jj_3R_709()) { jj_scanpos = xsp; - if (jj_3R_593()) { + if (jj_3R_710()) { jj_scanpos = xsp; - if (jj_3R_594()) { + if (jj_3R_711()) { jj_scanpos = xsp; - if (jj_3R_595()) { + if (jj_3R_712()) { jj_scanpos = xsp; - if (jj_3R_596()) { + if (jj_3R_713()) { jj_scanpos = xsp; - if (jj_3R_597()) { + if (jj_3R_714()) { jj_scanpos = xsp; - if (jj_3R_598()) { + if (jj_3R_715()) { jj_scanpos = xsp; - if (jj_3R_599()) { + if (jj_3R_716()) { jj_scanpos = xsp; - if (jj_3R_600()) { + if (jj_3_106()) { jj_scanpos = xsp; - if (jj_3R_601()) return true; - } - } - } - } + if (jj_3R_717()) return true; } } } @@ -3939,43 +3935,55 @@ void parseInline(); return false; } - inline bool jj_3R_705() + inline bool jj_3R_586() { if (jj_done) return true; - if (jj_3R_92()) return true; + if (jj_scan_token(ENTITY_T)) return true; return false; } - inline bool jj_3R_701() + inline bool jj_3R_540() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_705()) { + if (jj_3R_586()) { jj_scanpos = xsp; - if (jj_3R_706()) { + if (jj_3R_587()) { jj_scanpos = xsp; - if (jj_3R_707()) { + if (jj_3R_588()) { jj_scanpos = xsp; - if (jj_3R_708()) { + if (jj_3R_589()) { jj_scanpos = xsp; - if (jj_3R_709()) { + if (jj_3R_590()) { jj_scanpos = xsp; - if (jj_3R_710()) { + if (jj_3R_591()) { jj_scanpos = xsp; - if (jj_3R_711()) { + if (jj_3R_592()) { jj_scanpos = xsp; - if (jj_3R_712()) { + if (jj_3R_593()) { jj_scanpos = xsp; - if (jj_3R_713()) { + if (jj_3R_594()) { jj_scanpos = xsp; - if (jj_3R_714()) { + if (jj_3R_595()) { jj_scanpos = xsp; - if (jj_3R_715()) { + if (jj_3R_596()) { + jj_scanpos = xsp; + if (jj_3R_597()) { + jj_scanpos = xsp; + if (jj_3R_598()) { jj_scanpos = xsp; - if (jj_3_105()) { + if (jj_3R_599()) { + jj_scanpos = xsp; + if (jj_3R_600()) { jj_scanpos = xsp; - if (jj_3R_716()) return true; + if (jj_3R_601()) { + jj_scanpos = xsp; + if (jj_3R_602()) return true; + } + } + } + } } } } @@ -3991,21 +3999,21 @@ void parseInline(); return false; } - inline bool jj_3R_563() + inline bool jj_3R_252() { if (jj_done) return true; - if (jj_scan_token(OPEN_T)) return true; + if (jj_3R_364()) return true; return false; } - inline bool jj_3R_251() + inline bool jj_3R_564() { if (jj_done) return true; - if (jj_3R_363()) return true; + if (jj_scan_token(OPEN_T)) return true; return false; } - inline bool jj_3R_562() + inline bool jj_3R_563() { if (jj_done) return true; if (jj_scan_token(CONFIGURATION_T)) return true; @@ -4013,60 +4021,60 @@ void parseInline(); return false; } - inline bool jj_3R_561() + inline bool jj_3R_562() { if (jj_done) return true; if (jj_scan_token(ENTITY_T)) return true; if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_619()) jj_scanpos = xsp; + if (jj_3R_620()) jj_scanpos = xsp; return false; } - inline bool jj_3R_505() + inline bool jj_3R_528() + { + if (jj_done) return true; + if (jj_scan_token(AFTER_T)) return true; + if (jj_3R_58()) return true; + return false; + } + + inline bool jj_3R_506() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_561()) { - jj_scanpos = xsp; if (jj_3R_562()) { jj_scanpos = xsp; - if (jj_3R_563()) return true; + if (jj_3R_563()) { + jj_scanpos = xsp; + if (jj_3R_564()) return true; } } return false; } - inline bool jj_3R_527() - { - if (jj_done) return true; - if (jj_scan_token(AFTER_T)) return true; - if (jj_3R_58()) return true; - return false; - } - inline bool jj_3R_137() { if (jj_done) return true; if (jj_scan_token(PROTECTED_T)) return true; if (jj_scan_token(BODY_T)) return true; - if (jj_3R_679()) return true; + if (jj_3R_680()) return true; if (jj_scan_token(END_T)) return true; if (jj_scan_token(PROTECTED_T)) return true; if (jj_scan_token(BODY_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_680()) jj_scanpos = xsp; + if (jj_3R_681()) jj_scanpos = xsp; return false; } - inline bool jj_3R_495() + inline bool jj_3R_496() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_444()) return true; + if (jj_3R_445()) return true; return false; } @@ -4078,7 +4086,7 @@ void parseInline(); return false; } - inline bool jj_3R_704() + inline bool jj_3R_705() { if (jj_done) return true; if (jj_3R_196()) return true; @@ -4095,24 +4103,24 @@ void parseInline(); return false; } - inline bool jj_3_29() + inline bool jj_3R_445() { if (jj_done) return true; - if (jj_3R_83()) return true; + if (jj_3R_58()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_528()) jj_scanpos = xsp; return false; } - inline bool jj_3R_444() + inline bool jj_3_29() { if (jj_done) return true; - if (jj_3R_58()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_527()) jj_scanpos = xsp; + if (jj_3R_83()) return true; return false; } - inline bool jj_3R_358() + inline bool jj_3R_359() { if (jj_done) return true; if (jj_3R_85()) return true; @@ -4120,87 +4128,87 @@ void parseInline(); return false; } - inline bool jj_3R_235() + inline bool jj_3R_236() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_358()) jj_scanpos = xsp; + if (jj_3R_359()) jj_scanpos = xsp; if (jj_3R_58()) return true; return false; } - inline bool jj_3R_160() - { - if (jj_done) return true; - if (jj_3R_84()) return true; - return false; - } - - inline bool jj_3R_406() + inline bool jj_3R_407() { if (jj_done) return true; if (jj_scan_token(UNAFFECTED_T)) return true; return false; } - inline bool jj_3R_159() + inline bool jj_3R_160() { if (jj_done) return true; - if (jj_3R_83()) return true; + if (jj_3R_84()) return true; return false; } - inline bool jj_3R_67() + inline bool jj_3R_318() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_159()) { + if (jj_3R_406()) { jj_scanpos = xsp; - if (jj_3R_160()) return true; + if (jj_3R_407()) return true; } return false; } - inline bool jj_3R_317() + inline bool jj_3R_406() { if (jj_done) return true; + if (jj_3R_445()) return true; Token * xsp; - xsp = jj_scanpos; - if (jj_3R_405()) { - jj_scanpos = xsp; - if (jj_3R_406()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_496()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_405() + inline bool jj_3R_159() + { + if (jj_done) return true; + if (jj_3R_83()) return true; + return false; + } + + inline bool jj_3R_67() { if (jj_done) return true; - if (jj_3R_444()) return true; Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_495()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_159()) { + jj_scanpos = xsp; + if (jj_3R_160()) return true; } return false; } - inline bool jj_3R_470() + inline bool jj_3R_251() { if (jj_done) return true; - if (jj_3R_540()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_59()) return true; return false; } - inline bool jj_3R_250() + inline bool jj_3R_471() { if (jj_done) return true; - if (jj_3R_69()) return true; + if (jj_3R_541()) return true; if (jj_scan_token(COLON_T)) return true; + if (jj_3R_59()) return true; return false; } @@ -4209,30 +4217,30 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - 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; + if (jj_scan_token(WAIT_T)) return true; 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_380() + inline bool jj_3R_381() { if (jj_done) return true; if (jj_scan_token(DISCONNECT_T)) return true; - if (jj_3R_470()) return true; + if (jj_3R_471()) return true; if (jj_scan_token(AFTER_T)) return true; if (jj_3R_58()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_458() + inline bool jj_3R_459() { if (jj_done) return true; if (jj_scan_token(VARASSIGN_T)) return true; @@ -4240,7 +4248,7 @@ void parseInline(); return false; } - inline bool jj_3R_238() + inline bool jj_3R_239() { if (jj_done) return true; if (jj_scan_token(DOWNTO_T)) return true; @@ -4252,55 +4260,55 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_237()) { + if (jj_3R_238()) { jj_scanpos = xsp; - if (jj_3R_238()) return true; + if (jj_3R_239()) return true; } return false; } - inline bool jj_3R_237() + inline bool jj_3R_238() { if (jj_done) return true; if (jj_scan_token(TO_T)) return true; return false; } - inline bool jj_3R_568() + inline bool jj_3R_155() { if (jj_done) return true; - if (jj_3R_309()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_154()) return true; return false; } - inline bool jj_3R_155() + inline bool jj_3R_569() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_154()) return true; + if (jj_3R_310()) return true; return false; } - inline bool jj_3R_567() + inline bool jj_3R_568() { if (jj_done) return true; if (jj_3R_69()) return true; return false; } - inline bool jj_3R_520() + inline bool jj_3R_521() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_567()) { + if (jj_3R_568()) { jj_scanpos = xsp; - if (jj_3R_568()) return true; + if (jj_3R_569()) return true; } return false; } - inline bool jj_3R_461() + inline bool jj_3R_462() { if (jj_done) return true; if (jj_scan_token(VARASSIGN_T)) return true; @@ -4308,25 +4316,7 @@ void parseInline(); return false; } - inline bool jj_3R_558() - { - if (jj_done) return true; - if (jj_scan_token(REJECT_T)) return true; - if (jj_3R_58()) return true; - return false; - } - - inline bool jj_3R_494() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_558()) jj_scanpos = xsp; - if (jj_scan_token(INERTIAL_T)) return true; - return false; - } - - inline bool jj_3R_374() + inline bool jj_3R_375() { if (jj_done) return true; Token * xsp; @@ -4337,53 +4327,64 @@ void parseInline(); if (jj_scan_token(COLON_T)) return true; if (jj_3R_84()) return true; xsp = jj_scanpos; - if (jj_3R_461()) jj_scanpos = xsp; + if (jj_3R_462()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_472() + inline bool jj_3R_559() + { + if (jj_done) return true; + if (jj_scan_token(REJECT_T)) return true; + if (jj_3R_58()) return true; + return false; + } + + inline bool jj_3R_473() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_471()) return true; + if (jj_3R_472()) return true; return false; } - inline bool jj_3R_404() + inline bool jj_3R_495() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_493()) { - jj_scanpos = xsp; - if (jj_3R_494()) return true; - } + if (jj_3R_559()) jj_scanpos = xsp; + if (jj_scan_token(INERTIAL_T)) return true; return false; } - inline bool jj_3R_493() + inline bool jj_3R_440() { if (jj_done) return true; - if (jj_scan_token(TRANSPORT_T)) return true; + if (jj_3R_527()) return true; return false; } - inline bool jj_3R_439() + inline bool jj_3R_405() { if (jj_done) return true; - if (jj_3R_526()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_494()) { + jj_scanpos = xsp; + if (jj_3R_495()) return true; + } return false; } - inline bool jj_3_28() + inline bool jj_3R_494() { if (jj_done) return true; - if (jj_3R_82()) return true; + if (jj_scan_token(TRANSPORT_T)) return true; return false; } - inline bool jj_3_103() + inline bool jj_3_104() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -4391,24 +4392,24 @@ void parseInline(); return false; } - inline bool jj_3R_361() + inline bool jj_3R_362() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_438()) { + if (jj_3R_439()) { jj_scanpos = xsp; - if (jj_3R_439()) return true; + if (jj_3R_440()) return true; } return false; } - inline bool jj_3R_438() + inline bool jj_3R_439() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_103()) jj_scanpos = xsp; + if (jj_3_104()) jj_scanpos = xsp; if (jj_3R_114()) return true; if (jj_scan_token(VARASSIGN_T)) return true; if (jj_3R_58()) return true; @@ -4416,6 +4417,13 @@ void parseInline(); return false; } + inline bool jj_3_28() + { + if (jj_done) return true; + if (jj_3R_82()) return true; + return false; + } + inline bool jj_3_27() { if (jj_done) return true; @@ -4423,7 +4431,7 @@ void parseInline(); return false; } - inline bool jj_3R_276() + inline bool jj_3R_277() { if (jj_done) return true; if (jj_3R_82()) return true; @@ -4435,44 +4443,34 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_275()) { + if (jj_3R_276()) { jj_scanpos = xsp; - if (jj_3R_276()) return true; + if (jj_3R_277()) return true; } return false; } - inline bool jj_3R_275() + inline bool jj_3R_276() { if (jj_done) return true; if (jj_3R_81()) return true; return false; } - inline bool jj_3R_381() + inline bool jj_3R_382() { if (jj_done) return true; if (jj_scan_token(USE_T)) return true; - if (jj_3R_471()) return true; + if (jj_3R_472()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_472()) { jj_scanpos = xsp; break; } + if (jj_3R_473()) { jj_scanpos = xsp; break; } } if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_703() - { - if (jj_done) return true; - if (jj_scan_token(ARRAY_T)) return true; - if (jj_3R_82()) return true; - if (jj_scan_token(OF_T)) return true; - if (jj_3R_84()) return true; - return false; - } - inline bool jj_3R_62() { if (jj_done) return true; @@ -4490,6 +4488,16 @@ void parseInline(); return false; } + inline bool jj_3R_704() + { + if (jj_done) return true; + if (jj_scan_token(ARRAY_T)) return true; + if (jj_3R_82()) return true; + if (jj_scan_token(OF_T)) return true; + if (jj_3R_84()) return true; + return false; + } + inline bool jj_3R_157() { if (jj_done) return true; @@ -4497,6 +4505,20 @@ void parseInline(); return false; } + inline bool jj_3R_637() + { + if (jj_done) return true; + if (jj_3R_658()) return true; + return false; + } + + inline bool jj_3_103() + { + if (jj_done) return true; + if (jj_3R_137()) return true; + return false; + } + inline bool jj_3R_636() { if (jj_done) return true; @@ -4504,7 +4526,7 @@ void parseInline(); return false; } - inline bool jj_3R_372() + inline bool jj_3R_373() { if (jj_done) return true; if (jj_scan_token(CONSTANT_T)) return true; @@ -4513,18 +4535,11 @@ void parseInline(); if (jj_3R_84()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_458()) jj_scanpos = xsp; + if (jj_3R_459()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3_102() - { - if (jj_done) return true; - if (jj_3R_137()) return true; - return false; - } - inline bool jj_3R_635() { if (jj_done) return true; @@ -4546,36 +4561,22 @@ void parseInline(); return false; } - inline bool jj_3_26() - { - if (jj_done) return true; - if (jj_3R_80()) return true; - return false; - } - - inline bool jj_3R_632() - { - if (jj_done) return true; - if (jj_3R_653()) return true; - return false; - } - - inline bool jj_3R_576() + inline bool jj_3R_577() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_632()) { - jj_scanpos = xsp; if (jj_3R_633()) { jj_scanpos = xsp; if (jj_3R_634()) { jj_scanpos = xsp; if (jj_3R_635()) { jj_scanpos = xsp; - if (jj_3_102()) { + if (jj_3R_636()) { jj_scanpos = xsp; - if (jj_3R_636()) return true; + if (jj_3_103()) { + jj_scanpos = xsp; + if (jj_3R_637()) return true; } } } @@ -4584,71 +4585,78 @@ void parseInline(); return false; } - inline bool jj_3R_379() + inline bool jj_3_26() + { + if (jj_done) return true; + if (jj_3R_80()) return true; + return false; + } + + inline bool jj_3R_380() { if (jj_done) return true; if (jj_scan_token(FOR_T)) return true; if (jj_3R_177()) return true; - if (jj_3R_331()) return true; + if (jj_3R_332()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_566() + inline bool jj_3_99() { if (jj_done) return true; - if (jj_3R_332()) return true; + if (jj_3R_133()) return true; return false; } - inline bool jj_3_98() + inline bool jj_3R_458() { if (jj_done) return true; - if (jj_3R_133()) return true; + if (jj_3R_532()) return true; return false; } - inline bool jj_3R_457() + inline bool jj_3R_567() { if (jj_done) return true; - if (jj_3R_531()) return true; + if (jj_3R_333()) return true; return false; } - inline bool jj_3R_565() + inline bool jj_3_102() { if (jj_done) return true; - if (jj_3R_80()) return true; + if (jj_3R_136()) return true; return false; } - inline bool jj_3R_507() + inline bool jj_3R_371() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_565()) { + if (jj_3_102()) { jj_scanpos = xsp; - if (jj_3R_566()) return true; + if (jj_3R_458()) return true; } return false; } - inline bool jj_3_101() + inline bool jj_3R_566() { if (jj_done) return true; - if (jj_3R_136()) return true; + if (jj_3R_80()) return true; return false; } - inline bool jj_3R_370() + inline bool jj_3R_508() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_101()) { + if (jj_3R_566()) { jj_scanpos = xsp; - if (jj_3R_457()) return true; + if (jj_3R_567()) return true; } return false; } @@ -4663,7 +4671,7 @@ void parseInline(); return false; } - inline bool jj_3_100() + inline bool jj_3_101() { if (jj_done) return true; if (jj_3R_134()) return true; @@ -4678,7 +4686,7 @@ void parseInline(); return false; } - inline bool jj_3R_365() + inline bool jj_3R_366() { if (jj_done) return true; if (jj_scan_token(FOR_T)) return true; @@ -4693,12 +4701,12 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3_100()) { jj_scanpos = xsp; break; } + if (jj_3_101()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_246() + inline bool jj_3R_247() { if (jj_done) return true; if (jj_3R_108()) return true; @@ -4710,81 +4718,73 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_245()) { + if (jj_3R_246()) { jj_scanpos = xsp; - if (jj_3R_246()) return true; + if (jj_3R_247()) return true; } return false; } - inline bool jj_3_99() + inline bool jj_3_100() { if (jj_done) return true; if (jj_3R_59()) return true; return false; } - inline bool jj_3R_245() + inline bool jj_3R_246() { if (jj_done) return true; if (jj_3R_59()) return true; return false; } - inline bool jj_3_25() - { - if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_79()) return true; - if (jj_scan_token(ELSE_T)) return true; - return false; - } - - inline bool jj_3R_349() + inline bool jj_3_98() { if (jj_done) return true; - if (jj_scan_token(CONFIGURATION_T)) return true; - if (jj_3R_69()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3_97() + inline bool jj_3R_218() { if (jj_done) return true; - if (jj_3R_59()) return true; + if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_217() + inline bool jj_3_25() { if (jj_done) return true; - if (jj_scan_token(ALL_T)) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_79()) return true; + if (jj_scan_token(ELSE_T)) return true; return false; } - inline bool jj_3R_216() + inline bool jj_3R_350() { if (jj_done) return true; - if (jj_3R_309()) return true; + if (jj_scan_token(CONFIGURATION_T)) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_215() + inline bool jj_3R_217() { if (jj_done) return true; - if (jj_3R_351()) return true; + if (jj_3R_310()) return true; return false; } - inline bool jj_3R_319() + inline bool jj_3R_216() { if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_79()) return true; + if (jj_3R_352()) return true; return false; } - inline bool jj_3R_214() + inline bool jj_3R_215() { if (jj_done) return true; if (jj_3R_59()) return true; @@ -4796,26 +4796,24 @@ void parseInline(); 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()) return true; + if (jj_3R_217()) { + jj_scanpos = xsp; + if (jj_3R_218()) return true; } } } return false; } - inline bool jj_3R_318() + inline bool jj_3R_320() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; if (jj_3R_79()) return true; - if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_317()) return true; return false; } @@ -4826,6 +4824,16 @@ void parseInline(); return false; } + inline bool jj_3R_319() + { + if (jj_done) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_79()) return true; + if (jj_scan_token(ELSE_T)) return true; + if (jj_3R_318()) return true; + return false; + } + inline bool jj_3R_84() { if (jj_done) return true; @@ -4841,14 +4849,14 @@ void parseInline(); inline bool jj_3R_167() { if (jj_done) return true; - if (jj_3R_317()) return true; + if (jj_3R_318()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_318()) { jj_scanpos = xsp; break; } + if (jj_3R_319()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_319()) jj_scanpos = xsp; + if (jj_3R_320()) jj_scanpos = xsp; return false; } @@ -4863,7 +4871,7 @@ void parseInline(); return false; } - inline bool jj_3R_371() + inline bool jj_3R_372() { if (jj_done) return true; if (jj_scan_token(SUBTYPE_T)) return true; @@ -4874,25 +4882,25 @@ void parseInline(); return false; } - inline bool jj_3R_630() + inline bool jj_3R_631() { if (jj_done) return true; if (jj_3R_112()) return true; return false; } - inline bool jj_3R_571() + inline bool jj_3R_572() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_630()) { jj_scanpos = xsp; break; } + if (jj_3R_631()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_364() + inline bool jj_3R_365() { if (jj_done) return true; if (jj_scan_token(UNTIL_T)) return true; @@ -4907,35 +4915,42 @@ void parseInline(); return false; } - inline bool jj_3R_523() + inline bool jj_3R_524() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_569()) return true; + if (jj_3R_570()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3_24() + inline bool jj_3R_522() { if (jj_done) return true; - if (jj_3R_78()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_313()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_521() + inline bool jj_3_97() { 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_132()) return true; + return false; + } + + inline bool jj_3_24() + { + if (jj_done) return true; + if (jj_3R_78()) return true; return false; } inline bool jj_3_96() { if (jj_done) return true; - if (jj_3R_132()) return true; + if (jj_3R_131()) return true; return false; } @@ -4946,10 +4961,15 @@ void parseInline(); return false; } - inline bool jj_3_95() + inline bool jj_3R_523() { if (jj_done) return true; - if (jj_3R_131()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_scan_token(84)) { + jj_scanpos = xsp; + if (jj_scan_token(52)) return true; + } return false; } @@ -4968,15 +4988,18 @@ void parseInline(); return false; } - inline bool jj_3R_522() + inline bool jj_3R_433() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_scan_token(84)) { - jj_scanpos = xsp; - if (jj_scan_token(52)) return true; - } + if (jj_3R_523()) jj_scanpos = xsp; + if (jj_scan_token(FUNCTION_T)) return true; + if (jj_3R_521()) return true; + xsp = jj_scanpos; + if (jj_3R_524()) jj_scanpos = xsp; + if (jj_scan_token(RETURN_T)) return true; + if (jj_3R_157()) return true; return false; } @@ -4992,29 +5015,14 @@ void parseInline(); return false; } - inline bool jj_3R_503() + inline bool jj_3R_504() { if (jj_done) return true; if (jj_3R_78()) return true; return false; } - inline bool jj_3R_432() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_522()) jj_scanpos = xsp; - if (jj_scan_token(FUNCTION_T)) return true; - if (jj_3R_520()) return true; - xsp = jj_scanpos; - if (jj_3R_523()) jj_scanpos = xsp; - if (jj_scan_token(RETURN_T)) return true; - if (jj_3R_157()) return true; - return false; - } - - inline bool jj_3R_502() + inline bool jj_3R_503() { if (jj_done) return true; if (jj_3R_77()) return true; @@ -5036,7 +5044,7 @@ void parseInline(); return false; } - inline bool jj_3R_501() + inline bool jj_3R_502() { if (jj_done) return true; if (jj_3R_76()) return true; @@ -5063,7 +5071,7 @@ void parseInline(); return false; } - inline bool jj_3R_500() + inline bool jj_3R_501() { if (jj_done) return true; if (jj_3R_87()) return true; @@ -5080,62 +5088,72 @@ void parseInline(); return false; } - inline bool jj_3R_499() - { - if (jj_done) return true; - if (jj_3R_560()) return true; - return false; - } - - inline bool jj_3R_498() + inline bool jj_3R_500() { if (jj_done) return true; - if (jj_3R_74()) return true; + if (jj_3R_561()) return true; return false; } - inline bool jj_3R_346() + inline bool jj_3R_347() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_431()) { + if (jj_3R_432()) { jj_scanpos = xsp; - if (jj_3R_432()) return true; + if (jj_3R_433()) return true; } return false; } - inline bool jj_3R_431() + inline bool jj_3R_432() { if (jj_done) return true; if (jj_scan_token(PROCEDURE_T)) return true; - if (jj_3R_520()) return true; + if (jj_3R_521()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_521()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3_95()) jj_scanpos = xsp; + if (jj_3R_522()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_3_96()) jj_scanpos = xsp; - if (jj_3R_423()) return true; + xsp = jj_scanpos; + if (jj_3_97()) jj_scanpos = xsp; + if (jj_3R_424()) return true; return false; } - inline bool jj_3R_497() + inline bool jj_3R_499() + { + if (jj_done) return true; + if (jj_3R_74()) return true; + return false; + } + + inline bool jj_3R_498() { if (jj_done) return true; if (jj_3R_88()) return true; return false; } - inline bool jj_3R_409() + inline bool jj_3R_632() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_496()) { + if (jj_scan_token(46)) { jj_scanpos = xsp; + if (jj_scan_token(80)) return true; + } + return false; + } + + inline bool jj_3R_410() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; if (jj_3R_497()) { jj_scanpos = xsp; if (jj_3R_498()) { @@ -5150,6 +5168,8 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_503()) { jj_scanpos = xsp; + if (jj_3R_504()) { + jj_scanpos = xsp; if (jj_scan_token(189)) return true; } } @@ -5162,22 +5182,17 @@ void parseInline(); return false; } - inline bool jj_3R_496() + inline bool jj_3R_497() { if (jj_done) return true; - if (jj_3R_559()) return true; + if (jj_3R_560()) return true; return false; } - inline bool jj_3R_631() + inline bool jj_3R_630() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_scan_token(46)) { - jj_scanpos = xsp; - if (jj_scan_token(80)) return true; - } + if (jj_3R_653()) return true; return false; } @@ -5188,35 +5203,35 @@ void parseInline(); return false; } - inline bool jj_3R_629() + inline bool jj_3R_571() { if (jj_done) return true; - if (jj_3R_652()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_630()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_570() + inline bool jj_3_94() { if (jj_done) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_629()) { jj_scanpos = xsp; break; } - } + if (jj_3R_64()) return true; return false; } - inline bool jj_3R_172() + inline bool jj_3R_675() { if (jj_done) return true; - if (jj_3R_324()) return true; + if (jj_3R_383()) return true; return false; } - inline bool jj_3_93() + inline bool jj_3R_172() { if (jj_done) return true; - if (jj_3R_64()) return true; + if (jj_3R_325()) return true; return false; } @@ -5242,40 +5257,33 @@ void parseInline(); return false; } - inline bool jj_3R_76() + inline bool jj_3_95() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3_16()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_scan_token(79)) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_171()) { - jj_scanpos = xsp; - if (jj_3R_172()) return true; - } + if (jj_3R_65()) return true; return false; } inline bool jj_3R_673() { if (jj_done) return true; - if (jj_3R_381()) return true; - return false; - } - - inline bool jj_3_94() - { - if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_3R_379()) return true; return false; } - inline bool jj_3R_672() + inline bool jj_3R_76() { if (jj_done) return true; - if (jj_3R_378()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3_16()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_scan_token(79)) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_171()) { + jj_scanpos = xsp; + if (jj_3R_172()) return true; + } return false; } @@ -5287,23 +5295,17 @@ void parseInline(); return false; } - inline bool jj_3R_78() + inline bool jj_3R_672() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3_15()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_scan_token(79)) jj_scanpos = xsp; - if (jj_3R_176()) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_64()) return true; return false; } inline bool jj_3R_671() { if (jj_done) return true; - if (jj_3R_64()) return true; + if (jj_3R_377()) return true; return false; } @@ -5321,53 +5323,66 @@ void parseInline(); return false; } - inline bool jj_3_14() + inline bool jj_3R_574() { if (jj_done) return true; - if (jj_3R_69()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_521()) return true; return false; } - inline bool jj_3_13() + inline bool jj_3R_78() { if (jj_done) return true; - if (jj_3R_70()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3_15()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_scan_token(79)) jj_scanpos = xsp; + if (jj_3R_176()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } inline bool jj_3R_668() { if (jj_done) return true; - if (jj_3R_374()) return true; + if (jj_3R_373()) return true; return false; } - inline bool jj_3R_573() + inline bool jj_3R_667() { if (jj_done) return true; - if (jj_3R_520()) return true; + if (jj_3R_372()) return true; return false; } - inline bool jj_3R_667() + inline bool jj_3R_666() { if (jj_done) return true; - if (jj_3R_372()) return true; + if (jj_3R_525()) return true; return false; } - inline bool jj_3R_666() + inline bool jj_3_14() { if (jj_done) return true; - if (jj_3R_371()) return true; + if (jj_3R_69()) return true; + if (jj_scan_token(COLON_T)) return true; + return false; + } + + inline bool jj_3_13() + { + if (jj_done) return true; + if (jj_3R_70()) return true; return false; } inline bool jj_3R_665() { if (jj_done) return true; - if (jj_3R_524()) return true; + if (jj_3R_371()) return true; return false; } @@ -5384,53 +5399,18 @@ void parseInline(); return false; } - inline bool jj_3R_678() - { - if (jj_done) return true; - if (jj_3R_690()) return true; - return false; - } - inline bool jj_3R_664() { if (jj_done) return true; - if (jj_3R_370()) return true; - return false; - } - - inline bool jj_3R_677() - { - if (jj_done) return true; - if (jj_3R_689()) return true; - return false; - } - - inline bool jj_3R_663() - { - if (jj_done) return true; if (jj_3R_92()) return true; return false; } - inline bool jj_3R_654() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_677()) { - jj_scanpos = xsp; - if (jj_3R_678()) return true; - } - return false; - } - - inline bool jj_3R_652() + inline bool jj_3R_653() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_663()) { - jj_scanpos = xsp; if (jj_3R_664()) { jj_scanpos = xsp; if (jj_3R_665()) { @@ -5451,9 +5431,11 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_673()) { jj_scanpos = xsp; - if (jj_3_94()) { + if (jj_3R_674()) { + jj_scanpos = xsp; + if (jj_3_95()) { jj_scanpos = xsp; - if (jj_3R_674()) return true; + if (jj_3R_675()) return true; } } } @@ -5469,21 +5451,33 @@ void parseInline(); return false; } - inline bool jj_3R_175() + inline bool jj_3R_679() { if (jj_done) return true; - if (jj_3R_328()) return true; + if (jj_3R_691()) return true; return false; } - inline bool jj_3R_174() + inline bool jj_3R_678() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_690()) return true; return false; } - inline bool jj_3R_460() + inline bool jj_3R_655() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_678()) { + jj_scanpos = xsp; + if (jj_3R_679()) return true; + } + return false; + } + + inline bool jj_3R_461() { if (jj_done) return true; if (jj_scan_token(VARASSIGN_T)) return true; @@ -5491,43 +5485,57 @@ void parseInline(); return false; } - inline bool jj_3R_468() + inline bool jj_3R_175() { if (jj_done) return true; - if (jj_3R_69()) return true; + if (jj_3R_329()) return true; return false; } - inline bool jj_3_92() + inline bool jj_3R_174() + { + if (jj_done) return true; + if (jj_3R_70()) return true; + return false; + } + + inline bool jj_3_93() { if (jj_done) return true; if (jj_3R_130()) return true; return false; } - inline bool jj_3R_347() + inline bool jj_3R_348() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_433()) { + if (jj_3R_434()) { jj_scanpos = xsp; if (jj_scan_token(137)) return true; } return false; } - inline bool jj_3R_433() + inline bool jj_3R_434() + { + if (jj_done) return true; + if (jj_3R_525()) return true; + return false; + } + + inline bool jj_3R_469() { if (jj_done) return true; - if (jj_3R_524()) return true; + if (jj_3R_69()) return true; return false; } inline bool jj_3R_177() { if (jj_done) return true; - if (jj_3R_330()) return true; + if (jj_3R_331()) return true; if (jj_scan_token(COLON_T)) return true; if (jj_3R_59()) return true; return false; @@ -5536,15 +5544,15 @@ void parseInline(); 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_3R_572() + inline bool jj_3R_573() { if (jj_done) return true; - if (jj_3R_631()) return true; + if (jj_3R_632()) return true; return false; } @@ -5567,7 +5575,22 @@ void parseInline(); return false; } - inline bool jj_3_91() + inline bool jj_3_92() + { + if (jj_done) return true; + if (jj_3R_128()) return true; + if (jj_3R_129()) return true; + return false; + } + + inline bool jj_3R_460() + { + if (jj_done) return true; + if (jj_3R_533()) return true; + return false; + } + + inline bool jj_3R_162() { if (jj_done) return true; if (jj_3R_128()) return true; @@ -5590,46 +5613,48 @@ void parseInline(); return false; } - inline bool jj_3R_459() - { - if (jj_done) return true; - if (jj_3R_532()) return true; - return false; - } - - inline bool jj_3R_162() + inline bool jj_3R_468() { if (jj_done) return true; - if (jj_3R_128()) return true; - if (jj_3R_129()) return true; + if (jj_3R_538()) return true; return false; } inline bool jj_3R_467() { if (jj_done) return true; - if (jj_3R_537()) return true; + if (jj_3R_66()) return true; return false; } - inline bool jj_3R_466() + inline bool jj_3R_179() { if (jj_done) return true; - if (jj_3R_66()) return true; + if (jj_3R_333()) 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_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_178() + inline bool jj_3R_525() { if (jj_done) return true; - if (jj_3R_331()) return true; + if (jj_scan_token(IS_T)) return true; + if (jj_3R_571()) return true; + if (jj_scan_token(BEGIN_T)) return true; + if (jj_3R_572()) return true; + if (jj_scan_token(END_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_573()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_574()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -5642,7 +5667,7 @@ void parseInline(); return false; } - inline bool jj_3R_377() + inline bool jj_3R_378() { if (jj_done) return true; if (jj_scan_token(COMPONENT_T)) return true; @@ -5651,30 +5676,13 @@ void parseInline(); xsp = jj_scanpos; if (jj_scan_token(56)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_466()) jj_scanpos = xsp; - xsp = jj_scanpos; 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_468()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; - return false; - } - - inline bool jj_3R_524() - { - if (jj_done) return true; - if (jj_scan_token(IS_T)) return true; - if (jj_3R_570()) return true; - if (jj_scan_token(BEGIN_T)) return true; - if (jj_3R_571()) return true; if (jj_scan_token(END_T)) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_572()) jj_scanpos = xsp; + if (jj_scan_token(COMPONENT_T)) return true; xsp = jj_scanpos; - if (jj_3R_573()) jj_scanpos = xsp; + if (jj_3R_469()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -5695,7 +5703,7 @@ void parseInline(); return false; } - inline bool jj_3R_355() + inline bool jj_3R_356() { if (jj_done) return true; if (jj_scan_token(STRINGLITERAL)) return true; @@ -5728,6 +5736,14 @@ void parseInline(); return false; } + inline bool jj_3R_435() + { + if (jj_done) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_59()) return true; + return false; + } + inline bool jj_3_10() { if (jj_done) return true; @@ -5735,57 +5751,65 @@ void parseInline(); return false; } - inline bool jj_3R_336() + inline bool jj_3R_337() { if (jj_done) return true; if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_434() + inline bool jj_3R_161() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_314()) return true; return false; } - inline bool jj_3R_335() + inline bool jj_3R_336() { if (jj_done) return true; if (jj_3R_69()) return true; return false; } - inline bool jj_3R_334() + inline bool jj_3R_68() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_161()) jj_scanpos = xsp; + if (jj_3R_129()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_162()) { jj_scanpos = xsp; break; } + } + return false; + } + + inline bool jj_3R_335() { if (jj_done) return true; if (jj_3R_68()) return true; return false; } - inline bool jj_3R_161() + inline bool jj_3R_358() { if (jj_done) return true; - if (jj_3R_313()) return true; + if (jj_scan_token(RETURN_T)) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_68() + inline bool jj_3R_639() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_161()) jj_scanpos = xsp; - if (jj_3R_129()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3R_162()) { jj_scanpos = xsp; break; } - } + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_627() + inline bool jj_3R_628() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -5797,20 +5821,20 @@ void parseInline(); 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()) return true; + if (jj_3R_336()) { + jj_scanpos = xsp; + if (jj_3R_337()) return true; } } } return false; } - inline bool jj_3R_333() + inline bool jj_3R_334() { if (jj_done) return true; if (jj_3R_67()) return true; @@ -5820,39 +5844,36 @@ void parseInline(); inline bool jj_3R_357() { if (jj_done) return true; - if (jj_scan_token(RETURN_T)) return true; - if (jj_3R_59()) return true; - return false; - } - - inline bool jj_3R_638() - { - if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; if (jj_3R_59()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_435()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_356() + inline bool jj_3R_234() { if (jj_done) return true; - if (jj_3R_59()) return true; + if (jj_scan_token(LBRACKET_T)) return true; Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_434()) { jj_scanpos = xsp; break; } - } + xsp = jj_scanpos; + if (jj_3R_357()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_358()) jj_scanpos = xsp; + if (jj_scan_token(RBRACKET_T)) return true; return false; } - inline bool jj_3R_351() + inline bool jj_3R_352() { if (jj_done) return true; if (jj_scan_token(CHARACTER_LITERAL)) return true; return false; } - inline bool jj_3R_613() + inline bool jj_3R_614() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -5861,111 +5882,98 @@ void parseInline(); return false; } - 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_356()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_357()) jj_scanpos = xsp; - if (jj_scan_token(RBRACKET_T)) return true; - return false; - } - - inline bool jj_3R_604() + inline bool jj_3R_605() { if (jj_done) return true; if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_603() + inline bool jj_3R_604() { if (jj_done) return true; if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_602() + inline bool jj_3R_603() { if (jj_done) return true; if (jj_3R_59()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_638()) { jj_scanpos = xsp; break; } + if (jj_3R_639()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_540() + inline bool jj_3R_541() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_602()) { - jj_scanpos = xsp; if (jj_3R_603()) { jj_scanpos = xsp; - if (jj_3R_604()) return true; + if (jj_3R_604()) { + jj_scanpos = xsp; + if (jj_3R_605()) return true; } } return false; } - inline bool jj_3R_578() + inline bool jj_3R_579() { if (jj_done) return true; if (jj_scan_token(BUS_T)) return true; return false; } - inline bool jj_3R_625() + inline bool jj_3R_578() { if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_85()) return true; - if (jj_scan_token(ARROW_T)) return true; - if (jj_3R_258()) return true; + if (jj_scan_token(REGISTER_T)) return true; return false; } - inline bool jj_3R_617() + inline bool jj_3R_533() { if (jj_done) return true; - if (jj_3R_69()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_578()) { + jj_scanpos = xsp; + if (jj_3R_579()) return true; + } return false; } inline bool jj_3R_626() { if (jj_done) return true; - if (jj_3R_625()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_85()) return true; + if (jj_scan_token(ARROW_T)) return true; + if (jj_3R_259()) return true; return false; } - inline bool jj_3R_577() + inline bool jj_3R_618() { if (jj_done) return true; - if (jj_scan_token(REGISTER_T)) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_532() + inline bool jj_3R_627() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_577()) { - jj_scanpos = xsp; - if (jj_3R_578()) return true; - } + if (jj_3R_626()) return true; return false; } - inline bool jj_3R_659() + inline bool jj_3R_660() { if (jj_done) return true; if (jj_3R_70()) return true; @@ -5973,7 +5981,7 @@ void parseInline(); return false; } - inline bool jj_3R_373() + inline bool jj_3R_374() { if (jj_done) return true; if (jj_scan_token(SIGNAL_T)) return true; @@ -5982,14 +5990,14 @@ void parseInline(); if (jj_3R_84()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_459()) jj_scanpos = xsp; - xsp = jj_scanpos; if (jj_3R_460()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_461()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_255() + inline bool jj_3R_256() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -5997,68 +6005,68 @@ void parseInline(); return false; } + inline bool jj_3_91() + { + if (jj_done) return true; + if (jj_3R_127()) return true; + return false; + } + inline bool jj_3R_121() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_255()) jj_scanpos = xsp; + if (jj_3R_256()) jj_scanpos = xsp; if (jj_scan_token(CASE_T)) return true; if (jj_3R_58()) return true; if (jj_scan_token(IS_T)) return true; - if (jj_3R_625()) return true; + if (jj_3R_626()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_626()) { jj_scanpos = xsp; break; } + if (jj_3R_627()) { 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_627()) jj_scanpos = xsp; + if (jj_3R_628()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_650() + inline bool jj_3R_651() { if (jj_done) return true; - if (jj_3R_409()) return true; + if (jj_3R_410()) return true; return false; } inline bool jj_3_90() { if (jj_done) return true; - if (jj_3R_127()) return true; + if (jj_3R_126()) return true; return false; } - inline bool jj_3R_616() + inline bool jj_3R_617() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_650()) { jj_scanpos = xsp; break; } + if (jj_3R_651()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3_89() - { - if (jj_done) return true; - if (jj_3R_126()) return true; - return false; - } - - inline bool jj_3R_525() + inline bool jj_3R_526() { if (jj_done) return true; - if (jj_3R_404()) return true; + if (jj_3R_405()) return true; return false; } - inline bool jj_3_88() + inline bool jj_3_89() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -6066,76 +6074,76 @@ void parseInline(); return false; } - inline bool jj_3R_437() + inline bool jj_3R_438() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_88()) jj_scanpos = xsp; + if (jj_3_89()) jj_scanpos = xsp; if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; xsp = jj_scanpos; - if (jj_3R_525()) jj_scanpos = xsp; - if (jj_3R_317()) return true; + if (jj_3R_526()) jj_scanpos = xsp; + if (jj_3R_318()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_660() - { - if (jj_done) return true; - if (jj_3R_328()) return true; - if (jj_scan_token(SEMI_T)) return true; - return false; - } - - inline bool jj_3R_436() + inline bool jj_3R_437() { if (jj_done) return true; if (jj_3R_127()) return true; return false; } - inline bool jj_3R_386() + inline bool jj_3R_387() { if (jj_done) return true; - if (jj_3R_476()) return true; + if (jj_3R_477()) return true; if (jj_3R_68()) return true; return false; } - inline bool jj_3R_506() + inline bool jj_3R_661() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_564()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_329()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_360() + inline bool jj_3R_361() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_435()) { - jj_scanpos = xsp; if (jj_3R_436()) { jj_scanpos = xsp; - if (jj_3R_437()) return true; + if (jj_3R_437()) { + jj_scanpos = xsp; + if (jj_3R_438()) return true; } } return false; } - inline bool jj_3R_435() + inline bool jj_3R_436() { if (jj_done) return true; if (jj_3R_126()) return true; return false; } - inline bool jj_3R_559() + inline bool jj_3R_507() + { + if (jj_done) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_565()) return true; + if (jj_scan_token(RPAREN_T)) return true; + return false; + } + + inline bool jj_3R_560() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -6143,162 +6151,131 @@ void parseInline(); if (jj_scan_token(BLOCK_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_613()) jj_scanpos = xsp; + if (jj_3R_614()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(56)) jj_scanpos = xsp; - if (jj_3R_614()) return true; if (jj_3R_615()) return true; - if (jj_scan_token(BEGIN_T)) return true; if (jj_3R_616()) return true; + if (jj_scan_token(BEGIN_T)) return true; + if (jj_3R_617()) return true; if (jj_scan_token(END_T)) return true; if (jj_scan_token(BLOCK_T)) return true; xsp = jj_scanpos; - if (jj_3R_617()) jj_scanpos = xsp; + if (jj_3R_618()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3_9() - { - if (jj_done) return true; - if (jj_3R_66()) return true; - return false; - } - - inline bool jj_3R_401() + inline bool jj_3R_402() { if (jj_done) return true; if (jj_scan_token(MINUS_T)) return true; return false; } - inline bool jj_3R_418() + inline bool jj_3_9() { if (jj_done) return true; - if (jj_3R_59()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_506()) jj_scanpos = xsp; + if (jj_3R_66()) return true; return false; } - inline bool jj_3R_313() + inline bool jj_3R_314() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_400()) { + if (jj_3R_401()) { jj_scanpos = xsp; - if (jj_3R_401()) return true; + if (jj_3R_402()) return true; } return false; } - inline bool jj_3R_400() + inline bool jj_3R_401() { if (jj_done) return true; if (jj_scan_token(PLUS_T)) return true; return false; } - inline bool jj_3R_551() + inline bool jj_3R_552() { if (jj_done) return true; if (jj_scan_token(ROR_T)) return true; return false; } - inline bool jj_3R_550() - { - if (jj_done) return true; - if (jj_scan_token(ROL_T)) return true; - return false; - } - - inline bool jj_3R_648() + inline bool jj_3R_419() { if (jj_done) return true; - if (jj_3R_537()) return true; + if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_660()) jj_scanpos = xsp; + if (jj_3R_507()) jj_scanpos = xsp; return false; } - inline bool jj_3R_549() + inline bool jj_3R_551() { if (jj_done) return true; - if (jj_scan_token(SRA_T)) return true; + if (jj_scan_token(ROL_T)) return true; return false; } - inline bool jj_3R_548() + inline bool jj_3R_550() { if (jj_done) return true; - if (jj_scan_token(SLA_T)) return true; + if (jj_scan_token(SRA_T)) return true; return false; } - inline bool jj_3R_647() + inline bool jj_3R_549() { if (jj_done) return true; - if (jj_3R_66()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_659()) jj_scanpos = xsp; + if (jj_scan_token(SLA_T)) return true; return false; } - inline bool jj_3R_547() + inline bool jj_3R_548() { if (jj_done) return true; if (jj_scan_token(SRL_T)) return true; return false; } - inline bool jj_3R_614() + inline bool jj_3R_649() { if (jj_done) return true; + if (jj_3R_538()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_647()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_648()) jj_scanpos = xsp; - return false; - } - - inline bool jj_3R_649() - { - if (jj_done) return true; - if (jj_3R_140()) return true; + if (jj_3R_661()) jj_scanpos = xsp; return false; } - inline bool jj_3R_615() + inline bool jj_3R_648() { if (jj_done) return true; + if (jj_3R_66()) return true; Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_649()) { jj_scanpos = xsp; break; } - } + xsp = jj_scanpos; + if (jj_3R_660()) jj_scanpos = xsp; return false; } - inline bool jj_3R_546() + inline bool jj_3R_547() { if (jj_done) return true; if (jj_scan_token(SLL_T)) return true; return false; } - inline bool jj_3R_476() + inline bool jj_3R_477() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_546()) { - jj_scanpos = xsp; if (jj_3R_547()) { jj_scanpos = xsp; if (jj_3R_548()) { @@ -6307,7 +6284,9 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_550()) { jj_scanpos = xsp; - if (jj_3R_551()) return true; + if (jj_3R_551()) { + jj_scanpos = xsp; + if (jj_3R_552()) return true; } } } @@ -6316,27 +6295,63 @@ void parseInline(); return false; } - inline bool jj_3R_306() + inline bool jj_3R_615() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_648()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_649()) jj_scanpos = xsp; + return false; + } + + inline bool jj_3R_650() + { + if (jj_done) return true; + if (jj_3R_140()) return true; + return false; + } + + inline bool jj_3R_616() + { + if (jj_done) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_650()) { jj_scanpos = xsp; break; } + } + return false; + } + + inline bool jj_3R_307() { if (jj_done) return true; if (jj_3R_68()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_386()) jj_scanpos = xsp; + if (jj_3R_387()) jj_scanpos = xsp; return false; } - inline bool jj_3R_299() + inline bool jj_3R_245() { if (jj_done) return true; - if (jj_3R_382()) return true; + if (jj_3R_363()) return true; return false; } - inline bool jj_3R_244() + inline bool jj_3R_300() { if (jj_done) return true; - if (jj_3R_362()) return true; + if (jj_3R_383()) return true; + return false; + } + + inline bool jj_3_88() + { + if (jj_done) return true; + if (jj_3R_125()) return true; return false; } @@ -6350,7 +6365,7 @@ void parseInline(); inline bool jj_3_87() { if (jj_done) return true; - if (jj_3R_125()) return true; + if (jj_3R_124()) return true; return false; } @@ -6361,6 +6376,13 @@ void parseInline(); return false; } + inline bool jj_3R_299() + { + if (jj_done) return true; + if (jj_3R_382()) return true; + return false; + } + inline bool jj_3R_298() { if (jj_done) return true; @@ -6375,78 +6397,78 @@ void parseInline(); return false; } - inline bool jj_3R_296() + inline bool jj_3_86() { if (jj_done) return true; - if (jj_3R_379()) return true; + if (jj_3R_123()) return true; return false; } - inline bool jj_3_86() + inline bool jj_3R_296() { if (jj_done) return true; - if (jj_3R_124()) return true; + if (jj_3R_379()) return true; return false; } - inline bool jj_3R_295() + inline bool jj_3R_118() { if (jj_done) return true; - if (jj_3R_378()) return true; + if (jj_3R_69()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3_85() + inline bool jj_3_81() { if (jj_done) return true; - if (jj_3R_123()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_118()) jj_scanpos = xsp; + if (jj_3R_114()) return true; + if (jj_scan_token(VARASSIGN_T)) return true; return false; } - inline bool jj_3R_118() + inline bool jj_3_85() { if (jj_done) return true; - if (jj_3R_69()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_122()) return true; return false; } - inline bool jj_3R_293() + inline bool jj_3R_294() { if (jj_done) return true; - if (jj_3R_377()) return true; + if (jj_3R_378()) return true; return false; } - inline bool jj_3R_294() + inline bool jj_3R_295() { if (jj_done) return true; if (jj_3R_64()) return true; return false; } - inline bool jj_3R_292() + inline bool jj_3_84() { if (jj_done) return true; - if (jj_3R_376()) return true; + if (jj_3R_121()) return true; return false; } - inline bool jj_3_80() + inline bool jj_3R_293() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_118()) jj_scanpos = xsp; - if (jj_3R_114()) return true; - if (jj_scan_token(VARASSIGN_T)) return true; + if (jj_3R_377()) return true; return false; } - inline bool jj_3_84() + inline bool jj_3R_292() { if (jj_done) return true; - if (jj_3R_122()) return true; + if (jj_3R_376()) return true; return false; } @@ -6457,17 +6479,17 @@ void parseInline(); return false; } - inline bool jj_3R_290() + inline bool jj_3_83() { if (jj_done) return true; - if (jj_3R_374()) return true; + if (jj_3R_120()) return true; return false; } - inline bool jj_3_83() + inline bool jj_3R_290() { if (jj_done) return true; - if (jj_3R_121()) return true; + if (jj_3R_374()) return true; return false; } @@ -6492,31 +6514,24 @@ void parseInline(); return false; } - inline bool jj_3_82() + inline bool jj_3R_421() { if (jj_done) return true; - if (jj_3R_120()) return true; + if (jj_3R_508()) return true; return false; } - inline bool jj_3R_286() + inline bool jj_3_82() { if (jj_done) return true; - if (jj_3R_370()) return true; + if (jj_3R_119()) return true; return false; } inline bool jj_3R_420() { if (jj_done) return true; - if (jj_3R_507()) return true; - return false; - } - - inline bool jj_3R_419() - { - if (jj_done) return true; - if (jj_3R_381()) return true; + if (jj_3R_382()) return true; return false; } @@ -6525,8 +6540,6 @@ void parseInline(); 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()) { @@ -6553,9 +6566,11 @@ 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_299()) return true; + if (jj_3R_300()) return true; } } } @@ -6574,20 +6589,13 @@ void parseInline(); return false; } - inline bool jj_3R_285() + inline bool jj_3R_286() { if (jj_done) return true; if (jj_3R_92()) return true; return false; } - inline bool jj_3_81() - { - if (jj_done) return true; - if (jj_3R_119()) return true; - return false; - } - inline bool jj_3R_113() { if (jj_done) return true; @@ -6596,14 +6604,14 @@ void parseInline(); return false; } - inline bool jj_3R_243() + inline bool jj_3R_244() { if (jj_done) return true; - if (jj_3R_361()) return true; + if (jj_3R_362()) return true; return false; } - inline bool jj_3_76() + inline bool jj_3_77() { if (jj_done) return true; Token * xsp; @@ -6614,19 +6622,26 @@ void parseInline(); return false; } - inline bool jj_3R_332() + inline bool jj_3_80() + { + if (jj_done) return true; + if (jj_3R_117()) return true; + return false; + } + + inline bool jj_3R_333() { if (jj_done) return true; if (jj_scan_token(FOR_T)) return true; - if (jj_3R_418()) return true; + if (jj_3R_419()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_419()) { jj_scanpos = xsp; break; } + if (jj_3R_420()) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; - if (jj_3R_420()) { jj_scanpos = xsp; break; } + if (jj_3R_421()) { jj_scanpos = xsp; break; } } if (jj_scan_token(END_T)) return true; if (jj_scan_token(FOR_T)) return true; @@ -6637,29 +6652,22 @@ void parseInline(); inline bool jj_3_79() { if (jj_done) return true; - if (jj_3R_117()) return true; - return false; - } - - inline bool jj_3_78() - { - if (jj_done) return true; if (jj_3R_116()) return true; return false; } - inline bool jj_3_77() + inline bool jj_3_78() { if (jj_done) return true; if (jj_3R_115()) return true; return false; } - inline bool jj_3R_504() + inline bool jj_3R_505() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_317()) return true; + if (jj_3R_318()) return true; if (jj_scan_token(WHEN_T)) return true; if (jj_3R_85()) return true; return false; @@ -6670,17 +6678,15 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_242()) { - jj_scanpos = xsp; - if (jj_3_77()) { + if (jj_3R_243()) { jj_scanpos = xsp; if (jj_3_78()) { jj_scanpos = xsp; if (jj_3_79()) { jj_scanpos = xsp; - if (jj_3R_243()) { + if (jj_3_80()) { jj_scanpos = xsp; - if (jj_3_81()) { + if (jj_3R_244()) { jj_scanpos = xsp; if (jj_3_82()) { jj_scanpos = xsp; @@ -6694,7 +6700,9 @@ void parseInline(); jj_scanpos = xsp; if (jj_3_87()) { jj_scanpos = xsp; - if (jj_3R_244()) return true; + if (jj_3_88()) { + jj_scanpos = xsp; + if (jj_3R_245()) return true; } } } @@ -6710,10 +6718,18 @@ void parseInline(); return false; } - inline bool jj_3R_242() + inline bool jj_3R_243() { if (jj_done) return true; - if (jj_3R_360()) return true; + if (jj_3R_361()) return true; + return false; + } + + inline bool jj_3R_509() + { + if (jj_done) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_59()) return true; return false; } @@ -6724,7 +6740,7 @@ void parseInline(); return false; } - inline bool jj_3R_239() + inline bool jj_3R_240() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -6733,116 +6749,108 @@ void parseInline(); return false; } - inline bool jj_3R_508() + inline bool jj_3_76() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_112()) return true; return false; } - inline bool jj_3_75() + inline bool jj_3R_259() { if (jj_done) return true; - if (jj_3R_112()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_76()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_417() + inline bool jj_3R_418() { if (jj_done) return true; - if (jj_3R_328()) return true; + if (jj_3R_329()) return true; return false; } - inline bool jj_3R_416() + inline bool jj_3R_417() { if (jj_done) return true; if (jj_3R_70()) return true; return false; } - inline bool jj_3R_258() + inline bool jj_3R_416() { if (jj_done) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_75()) { jj_scanpos = xsp; break; } - } + if (jj_scan_token(USE_T)) return true; + if (jj_3R_506()) return true; return false; } - inline bool jj_3R_415() + inline bool jj_3R_422() { if (jj_done) return true; - if (jj_scan_token(USE_T)) return true; - if (jj_3R_505()) return true; + if (jj_3R_59()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_509()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_331() + inline bool jj_3R_332() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_415()) jj_scanpos = xsp; - xsp = jj_scanpos; if (jj_3R_416()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_3R_417()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_418()) jj_scanpos = xsp; return false; } - inline bool jj_3R_421() - { - if (jj_done) return true; - if (jj_3R_59()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_508()) { jj_scanpos = xsp; break; } - } - return false; - } - - inline bool jj_3R_266() + inline bool jj_3R_267() { if (jj_done) return true; if (jj_3R_58()) return true; return false; } - inline bool jj_3R_363() + inline bool jj_3R_364() { if (jj_done) return true; if (jj_scan_token(ON_T)) return true; - if (jj_3R_421()) return true; + if (jj_3R_422()) return true; return false; } - inline bool jj_3_74() + inline bool jj_3_75() { if (jj_done) return true; if (jj_3R_111()) return true; return false; } - inline bool jj_3R_410() + inline bool jj_3R_411() { if (jj_done) return true; - if (jj_3R_317()) return true; + if (jj_3R_318()) return true; if (jj_scan_token(WHEN_T)) return true; if (jj_3R_85()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_504()) { jj_scanpos = xsp; break; } + if (jj_3R_505()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_324() + inline bool jj_3R_325() { if (jj_done) return true; if (jj_scan_token(WITH_T)) return true; @@ -6851,19 +6859,19 @@ void parseInline(); if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; if (jj_3R_166()) return true; - if (jj_3R_410()) return true; + if (jj_3R_411()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_688() + inline bool jj_3R_689() { if (jj_done) return true; if (jj_3R_111()) return true; return false; } - inline bool jj_3R_471() + inline bool jj_3R_472() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -6872,7 +6880,7 @@ void parseInline(); return false; } - inline bool jj_3R_338() + inline bool jj_3R_339() { if (jj_done) return true; if (jj_scan_token(SEVERITY_T)) return true; @@ -6880,7 +6888,7 @@ void parseInline(); return false; } - inline bool jj_3R_359() + inline bool jj_3R_360() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -6890,95 +6898,95 @@ void parseInline(); return false; } - inline bool jj_3R_378() + inline bool jj_3R_379() { if (jj_done) return true; if (jj_scan_token(ATTRIBUTE_T)) return true; - if (jj_3R_219()) return true; + if (jj_3R_220()) return true; if (jj_scan_token(OF_T)) return true; - if (jj_3R_469()) return true; + if (jj_3R_470()) return true; if (jj_scan_token(IS_T)) return true; if (jj_3R_58()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_315() + inline bool jj_3R_316() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_314()) return true; + if (jj_3R_315()) return true; return false; } - inline bool jj_3R_110() + inline bool jj_3R_677() { if (jj_done) return true; - if (jj_3R_69()) return true; - if (jj_scan_token(APOSTROPHE_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_81()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_239()) jj_scanpos = xsp; + if (jj_3R_689()) jj_scanpos = xsp; return false; } - inline bool jj_3R_676() + inline bool jj_3R_110() { if (jj_done) return true; - if (jj_3R_81()) return true; + if (jj_3R_69()) return true; + if (jj_scan_token(APOSTROPHE_T)) return true; + if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_688()) jj_scanpos = xsp; + if (jj_3R_240()) jj_scanpos = xsp; return false; } - inline bool jj_3R_354() + inline bool jj_3R_676() { if (jj_done) return true; - if (jj_scan_token(RANGE_T)) return true; + if (jj_3R_688()) return true; return false; } - inline bool jj_3R_675() + inline bool jj_3R_654() { if (jj_done) return true; - if (jj_3R_687()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_676()) { + jj_scanpos = xsp; + if (jj_3R_677()) return true; + } return false; } - inline bool jj_3R_653() + inline bool jj_3R_355() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_675()) { - jj_scanpos = xsp; - if (jj_3R_676()) return true; - } + if (jj_scan_token(RANGE_T)) return true; return false; } - inline bool jj_3R_219() + inline bool jj_3R_220() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_353()) { + if (jj_3R_354()) { jj_scanpos = xsp; - if (jj_3R_354()) return true; + if (jj_3R_355()) return true; } return false; } - inline bool jj_3R_353() + inline bool jj_3R_354() { if (jj_done) return true; if (jj_3R_69()) return true; return false; } - inline bool jj_3R_265() + inline bool jj_3R_266() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -6991,15 +6999,15 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_265()) jj_scanpos = xsp; + if (jj_3R_266()) jj_scanpos = xsp; if (jj_scan_token(RETURN_T)) return true; xsp = jj_scanpos; - if (jj_3R_266()) jj_scanpos = xsp; + if (jj_3R_267()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_249() + inline bool jj_3R_250() { if (jj_done) return true; if (jj_scan_token(SEVERITY_T)) return true; @@ -7007,6 +7015,14 @@ void parseInline(); return false; } + inline bool jj_3R_308() + { + if (jj_done) return true; + if (jj_3R_388()) return true; + if (jj_3R_307()) return true; + return false; + } + inline bool jj_3_6() { if (jj_done) return true; @@ -7026,7 +7042,7 @@ void parseInline(); return false; } - inline bool jj_3R_337() + inline bool jj_3R_338() { if (jj_done) return true; if (jj_scan_token(REPORT_T)) return true; @@ -7034,56 +7050,48 @@ void parseInline(); return false; } - inline bool jj_3R_307() + inline bool jj_3R_249() { if (jj_done) return true; - if (jj_3R_387()) return true; - if (jj_3R_306()) return true; + if (jj_3R_69()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } inline bool jj_3R_165() { if (jj_done) return true; - if (jj_3R_314()) return true; + if (jj_3R_315()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_315()) { jj_scanpos = xsp; break; } + if (jj_3R_316()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_248() - { - if (jj_done) return true; - if (jj_3R_69()) return true; - if (jj_scan_token(COLON_T)) return true; - return false; - } - inline bool jj_3R_116() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_248()) jj_scanpos = xsp; + if (jj_3R_249()) jj_scanpos = xsp; if (jj_scan_token(REPORT_T)) return true; if (jj_3R_58()) return true; xsp = jj_scanpos; - if (jj_3R_249()) jj_scanpos = xsp; + if (jj_3R_250()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_700() + inline bool jj_3R_701() { if (jj_done) return true; if (jj_3R_59()) return true; return false; } - inline bool jj_3R_402() + inline bool jj_3R_403() { if (jj_done) return true; if (jj_3R_63()) return true; @@ -7091,77 +7099,64 @@ void parseInline(); return false; } - inline bool jj_3R_314() + inline bool jj_3R_483() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_402()) jj_scanpos = xsp; - if (jj_3R_403()) return true; + if (jj_scan_token(NOTEQU_T)) return true; return false; } - inline bool jj_3R_482() + inline bool jj_3R_315() { if (jj_done) return true; - if (jj_scan_token(NOTEQU_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_403()) jj_scanpos = xsp; + if (jj_3R_404()) return true; return false; } - inline bool jj_3R_481() + inline bool jj_3R_482() { if (jj_done) return true; if (jj_scan_token(LESSTHAN_T)) return true; return false; } - inline bool jj_3R_480() + inline bool jj_3R_481() { if (jj_done) return true; if (jj_scan_token(GREATERTHAN_T)) return true; return false; } - inline bool jj_3R_247() - { - if (jj_done) return true; - if (jj_3R_139()) return true; - if (jj_scan_token(COLON_T)) return true; - return false; - } - - inline bool jj_3R_479() + inline bool jj_3R_480() { if (jj_done) return true; if (jj_scan_token(EQU_T)) return true; return false; } - inline bool jj_3R_478() + inline bool jj_3R_479() { if (jj_done) return true; if (jj_scan_token(GT_T)) return true; return false; } - inline bool jj_3R_115() + inline bool jj_3R_248() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_247()) jj_scanpos = xsp; - if (jj_3R_187()) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_139()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_387() + inline bool jj_3R_388() { 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()) { @@ -7170,7 +7165,9 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_481()) { jj_scanpos = xsp; - if (jj_3R_482()) return true; + if (jj_3R_482()) { + jj_scanpos = xsp; + if (jj_3R_483()) return true; } } } @@ -7179,106 +7176,98 @@ void parseInline(); return false; } - inline bool jj_3R_477() + inline bool jj_3R_478() { if (jj_done) return true; if (jj_scan_token(LT_T)) return true; return false; } - inline bool jj_3R_145() + inline bool jj_3R_115() { if (jj_done) return true; - if (jj_3R_306()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_307()) jj_scanpos = xsp; - return false; - } - - inline bool jj_3R_699() - { - if (jj_done) return true; - if (jj_3R_704()) return true; + if (jj_3R_248()) jj_scanpos = xsp; + if (jj_3R_187()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_187() + inline bool jj_3R_145() { if (jj_done) return true; - if (jj_scan_token(ASSERT_T)) return true; - if (jj_3R_79()) return true; + if (jj_3R_307()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_337()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_338()) jj_scanpos = xsp; + if (jj_3R_308()) jj_scanpos = xsp; return false; } - inline bool jj_3_5() + inline bool jj_3R_700() { if (jj_done) return true; - if (jj_3R_62()) return true; + if (jj_3R_705()) return true; return false; } - inline bool jj_3R_690() + inline bool jj_3R_691() { if (jj_done) return true; if (jj_scan_token(RECORD_T)) return true; Token * xsp; - if (jj_3R_699()) return true; + if (jj_3R_700()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_699()) { jj_scanpos = xsp; break; } + if (jj_3R_700()) { 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_700()) jj_scanpos = xsp; + if (jj_3R_701()) jj_scanpos = xsp; return false; } - inline bool jj_3R_698() + inline bool jj_3R_187() { if (jj_done) return true; - if (jj_3R_703()) return true; + if (jj_scan_token(ASSERT_T)) return true; + if (jj_3R_79()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_338()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_339()) jj_scanpos = xsp; return false; } - inline bool jj_3_72() + inline bool jj_3_5() { if (jj_done) return true; - if (jj_3R_68()) return true; - if (jj_3R_109()) return true; - if (jj_3R_68()) return true; + if (jj_3R_62()) return true; return false; } inline bool jj_3_73() { if (jj_done) return true; - if (jj_3R_110()) return true; + if (jj_3R_68()) return true; + if (jj_3R_109()) return true; + if (jj_3R_68()) return true; return false; } - inline bool jj_3R_697() + inline bool jj_3_74() { if (jj_done) return true; - if (jj_3R_62()) return true; + if (jj_3R_110()) return true; return false; } - inline bool jj_3R_689() + inline bool jj_3R_699() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_697()) { - jj_scanpos = xsp; - if (jj_3R_698()) return true; - } + if (jj_3R_704()) return true; return false; } @@ -7290,7 +7279,26 @@ void parseInline(); return false; } - inline bool jj_3_71() + inline bool jj_3R_698() + { + if (jj_done) return true; + if (jj_3R_62()) return true; + return false; + } + + inline bool jj_3R_690() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_698()) { + jj_scanpos = xsp; + if (jj_3R_699()) return true; + } + return false; + } + + inline bool jj_3_72() { if (jj_done) return true; if (jj_3R_108()) return true; @@ -7325,7 +7333,7 @@ void parseInline(); return false; } - inline bool jj_3R_227() + inline bool jj_3R_228() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -7334,17 +7342,17 @@ void parseInline(); return false; } - inline bool jj_3R_226() + inline bool jj_3R_227() { if (jj_done) return true; if (jj_3R_108()) return true; return false; } - inline bool jj_3R_465() + inline bool jj_3R_466() { if (jj_done) return true; - if (jj_3R_233()) return true; + if (jj_3R_234()) return true; return false; } @@ -7355,14 +7363,14 @@ void parseInline(); if (jj_scan_token(APOSTROPHE_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_226()) { + if (jj_3R_227()) { jj_scanpos = xsp; - if (jj_3R_227()) return true; + if (jj_3R_228()) return true; } return false; } - inline bool jj_3R_341() + inline bool jj_3R_342() { if (jj_done) return true; if (jj_3R_112()) return true; @@ -7375,7 +7383,7 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_341()) { jj_scanpos = xsp; break; } + if (jj_3R_342()) { jj_scanpos = xsp; break; } } return false; } @@ -7387,22 +7395,22 @@ void parseInline(); return false; } - inline bool jj_3R_236() + inline bool jj_3R_340() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_235()) return true; + if (jj_3R_422()) return true; return false; } - inline bool jj_3R_339() + inline bool jj_3R_237() { if (jj_done) return true; - if (jj_3R_421()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_236()) return true; return false; } - inline bool jj_3R_575() + inline bool jj_3R_576() { if (jj_done) return true; if (jj_scan_token(NEW_T)) return true; @@ -7410,14 +7418,14 @@ void parseInline(); return false; } - inline bool jj_3R_530() + inline bool jj_3R_531() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_4()) { jj_scanpos = xsp; - if (jj_3R_575()) return true; + if (jj_3R_576()) return true; } return false; } @@ -7430,37 +7438,37 @@ void parseInline(); return false; } - inline bool jj_3R_536() + inline bool jj_3R_537() { if (jj_done) return true; - if (jj_3R_309()) return true; + if (jj_3R_310()) return true; return false; } - inline bool jj_3R_535() + inline bool jj_3R_536() { if (jj_done) return true; if (jj_scan_token(CHARACTER_LITERAL)) return true; return false; } - inline bool jj_3R_534() + inline bool jj_3R_535() { if (jj_done) return true; if (jj_3R_69()) return true; return false; } - inline bool jj_3R_463() + inline bool jj_3R_464() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_534()) { - jj_scanpos = xsp; if (jj_3R_535()) { jj_scanpos = xsp; - if (jj_3R_536()) return true; + if (jj_3R_536()) { + jj_scanpos = xsp; + if (jj_3R_537()) return true; } } return false; @@ -7474,13 +7482,13 @@ void parseInline(); xsp = jj_scanpos; if (jj_scan_token(15)) { jj_scanpos = xsp; - if (jj_3R_339()) return true; + if (jj_3R_340()) return true; } if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_464() + inline bool jj_3R_465() { if (jj_done) return true; if (jj_scan_token(COLON_T)) return true; @@ -7488,36 +7496,22 @@ void parseInline(); return false; } - inline bool jj_3R_376() + inline bool jj_3R_377() { if (jj_done) return true; if (jj_scan_token(ALIAS_T)) return true; - if (jj_3R_463()) return true; + if (jj_3R_464()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_464()) jj_scanpos = xsp; + if (jj_3R_465()) jj_scanpos = xsp; if (jj_scan_token(IS_T)) return true; if (jj_3R_59()) return true; xsp = jj_scanpos; - if (jj_3R_465()) jj_scanpos = xsp; + if (jj_3R_466()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_108() - { - if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_235()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_236()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(RPAREN_T)) return true; - return false; - } - inline bool jj_3R_188() { if (jj_done) return true; @@ -7526,17 +7520,17 @@ void parseInline(); return false; } - inline bool jj_3R_272() - { - if (jj_done) return true; - if (jj_scan_token(MINUS_T)) return true; - return false; - } - - inline bool jj_3R_273() + inline bool jj_3R_108() { if (jj_done) return true; - if (jj_scan_token(AMPERSAND_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_236()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_237()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(RPAREN_T)) return true; return false; } @@ -7566,32 +7560,24 @@ void parseInline(); return false; } - inline bool jj_3R_340() + inline bool jj_3R_341() { if (jj_done) return true; - if (jj_3R_422()) return true; + if (jj_3R_423()) return true; return false; } - inline bool jj_3R_128() + inline bool jj_3R_273() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_271()) { - jj_scanpos = xsp; - if (jj_3R_272()) { - jj_scanpos = xsp; - if (jj_3R_273()) return true; - } - } + if (jj_scan_token(MINUS_T)) return true; return false; } - inline bool jj_3R_271() + inline bool jj_3R_274() { if (jj_done) return true; - if (jj_scan_token(PLUS_T)) return true; + if (jj_scan_token(AMPERSAND_T)) return true; return false; } @@ -7601,92 +7587,99 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_340()) { jj_scanpos = xsp; break; } + if (jj_3R_341()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3_3() + inline bool jj_3R_128() { if (jj_done) return true; - if (jj_3R_60()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_272()) { + jj_scanpos = xsp; + if (jj_3R_273()) { + jj_scanpos = xsp; + if (jj_3R_274()) return true; + } + } return false; } - inline bool jj_3R_518() + inline bool jj_3R_272() { if (jj_done) return true; - if (jj_3R_382()) return true; + if (jj_scan_token(PLUS_T)) return true; return false; } - inline bool jj_3R_491() + inline bool jj_3R_519() { if (jj_done) return true; - if (jj_scan_token(BOX_T)) return true; + if (jj_3R_383()) return true; return false; } - inline bool jj_3R_492() + inline bool jj_3_3() { if (jj_done) return true; - if (jj_3R_59()) return true; - if (jj_scan_token(LPAREN_T)) return true; if (jj_3R_60()) return true; - if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3_70() + inline bool jj_3R_518() { if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_3R_382()) return true; return false; } - inline bool jj_3R_517() + inline bool jj_3_71() { if (jj_done) return true; - if (jj_3R_381()) return true; + if (jj_3R_65()) return true; return false; } - inline bool jj_3R_516() + inline bool jj_3R_517() { if (jj_done) return true; - if (jj_3R_378()) return true; + if (jj_3R_379()) return true; return false; } - inline bool jj_3R_403() + inline bool jj_3R_492() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_490()) { - jj_scanpos = xsp; - if (jj_3R_491()) { - jj_scanpos = xsp; - if (jj_3R_492()) return true; - } - } + if (jj_scan_token(BOX_T)) return true; return false; } - inline bool jj_3R_490() + inline bool jj_3R_493() { if (jj_done) return true; + if (jj_3R_59()) return true; + if (jj_scan_token(LPAREN_T)) return true; if (jj_3R_60()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3_69() + inline bool jj_3_70() { if (jj_done) return true; if (jj_3R_64()) return true; return false; } + inline bool jj_3R_516() + { + if (jj_done) return true; + if (jj_3R_377()) return true; + return false; + } + inline bool jj_3R_515() { if (jj_done) return true; @@ -7694,10 +7687,25 @@ void parseInline(); return false; } - inline bool jj_3_2() + inline bool jj_3R_404() { if (jj_done) return true; - if (jj_3R_59()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_491()) { + jj_scanpos = xsp; + if (jj_3R_492()) { + jj_scanpos = xsp; + if (jj_3R_493()) return true; + } + } + return false; + } + + inline bool jj_3R_491() + { + if (jj_done) return true; + if (jj_3R_60()) return true; return false; } @@ -7711,14 +7719,14 @@ void parseInline(); inline bool jj_3R_513() { if (jj_done) return true; - if (jj_3R_374()) return true; + if (jj_3R_373()) return true; return false; } - inline bool jj_3R_225() + inline bool jj_3_2() { if (jj_done) return true; - if (jj_3R_165()) return true; + if (jj_3R_59()) return true; return false; } @@ -7736,10 +7744,10 @@ void parseInline(); return false; } - inline bool jj_3R_510() + inline bool jj_3R_226() { if (jj_done) return true; - if (jj_3R_370()) return true; + if (jj_3R_165()) return true; return false; } @@ -7750,13 +7758,11 @@ void parseInline(); return false; } - inline bool jj_3R_422() + inline bool jj_3R_423() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_509()) { - jj_scanpos = xsp; if (jj_3R_510()) { jj_scanpos = xsp; if (jj_3R_511()) { @@ -7769,15 +7775,17 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_515()) { jj_scanpos = xsp; - if (jj_3_69()) { - jj_scanpos = xsp; if (jj_3R_516()) { jj_scanpos = xsp; + if (jj_3_70()) { + jj_scanpos = xsp; if (jj_3R_517()) { jj_scanpos = xsp; - if (jj_3_70()) { + if (jj_3R_518()) { + jj_scanpos = xsp; + if (jj_3_71()) { jj_scanpos = xsp; - if (jj_3R_518()) return true; + if (jj_3R_519()) return true; } } } @@ -7792,18 +7800,18 @@ void parseInline(); return false; } - inline bool jj_3R_509() + inline bool jj_3R_510() { if (jj_done) return true; if (jj_3R_92()) return true; return false; } - inline bool jj_3R_329() + inline bool jj_3R_330() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_225()) return true; + if (jj_3R_226()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } @@ -7815,14 +7823,7 @@ void parseInline(); return false; } - inline bool jj_3R_152() - { - if (jj_done) return true; - if (jj_3R_58()) return true; - return false; - } - - inline bool jj_3_68() + inline bool jj_3_69() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -7835,12 +7836,19 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_68()) jj_scanpos = xsp; + if (jj_3_69()) jj_scanpos = xsp; if (jj_3R_176()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } + inline bool jj_3R_152() + { + if (jj_done) return true; + if (jj_3R_58()) return true; + return false; + } + inline bool jj_3R_151() { if (jj_done) return true; @@ -7863,53 +7871,60 @@ void parseInline(); return false; } - inline bool jj_3R_655() - { - if (jj_done) return true; - if (jj_scan_token(ACCESS_T)) return true; - if (jj_3R_84()) return true; - return false; - } - inline bool jj_3R_176() { if (jj_done) return true; if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_329()) jj_scanpos = xsp; + if (jj_3R_330()) jj_scanpos = xsp; return false; } - inline bool jj_3_66() + inline bool jj_3_67() { if (jj_done) return true; if (jj_3R_86()) return true; return false; } - inline bool jj_3R_224() + inline bool jj_3R_656() { if (jj_done) return true; - if (jj_scan_token(BASED_LITERAL)) return true; + if (jj_scan_token(ACCESS_T)) return true; + if (jj_3R_84()) return true; return false; } inline bool jj_3R_204() { if (jj_done) return true; - if (jj_3R_350()) return true; + if (jj_3R_351()) return true; return false; } - inline bool jj_3R_223() + inline bool jj_3R_225() + { + if (jj_done) return true; + if (jj_scan_token(BASED_LITERAL)) return true; + return false; + } + + inline bool jj_3R_224() { if (jj_done) return true; if (jj_scan_token(INTEGER)) return true; return false; } - inline bool jj_3R_222() + inline bool jj_3_68() + { + if (jj_done) return true; + if (jj_3R_107()) return true; + return false; + } + + inline bool jj_3R_223() { if (jj_done) return true; if (jj_scan_token(DECIMAL_LITERAL)) return true; @@ -7921,23 +7936,16 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_222()) { - jj_scanpos = xsp; if (jj_3R_223()) { jj_scanpos = xsp; - if (jj_3R_224()) return true; + if (jj_3R_224()) { + jj_scanpos = xsp; + if (jj_3R_225()) return true; } } return false; } - inline bool jj_3_67() - { - if (jj_done) return true; - if (jj_3R_107()) return true; - return false; - } - inline bool jj_3R_203() { if (jj_done) return true; @@ -7948,14 +7956,14 @@ void parseInline(); inline bool jj_3R_202() { if (jj_done) return true; - if (jj_3R_349()) return true; + if (jj_3R_350()) return true; return false; } inline bool jj_3R_201() { if (jj_done) return true; - if (jj_3R_348()) return true; + if (jj_3R_349()) return true; return false; } @@ -7970,7 +7978,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_203()) { jj_scanpos = xsp; - if (jj_3_67()) { + if (jj_3_68()) { jj_scanpos = xsp; if (jj_3R_204()) return true; } @@ -7980,56 +7988,56 @@ void parseInline(); return false; } - inline bool jj_3_65() + inline bool jj_3_66() { if (jj_done) return true; if (jj_3R_59()) return true; return false; } - inline bool jj_3_64() + inline bool jj_3_65() { if (jj_done) return true; if (jj_3R_106()) return true; return false; } - inline bool jj_3R_456() + inline bool jj_3R_457() { if (jj_done) return true; if (jj_3R_108()) return true; return false; } - inline bool jj_3_63() + inline bool jj_3_64() { if (jj_done) return true; if (jj_3R_105()) return true; return false; } - inline bool jj_3R_455() + inline bool jj_3R_456() { if (jj_done) return true; - if (jj_3R_530()) return true; + if (jj_3R_531()) return true; return false; } - inline bool jj_3_62() + inline bool jj_3_63() { if (jj_done) return true; if (jj_3R_61()) return true; return false; } - inline bool jj_3R_454() + inline bool jj_3R_455() { if (jj_done) return true; if (jj_3R_59()) return true; return false; } - inline bool jj_3_61() + inline bool jj_3_62() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -8038,42 +8046,42 @@ void parseInline(); return false; } - inline bool jj_3R_453() + inline bool jj_3R_454() { if (jj_done) return true; if (jj_3R_106()) return true; return false; } - inline bool jj_3_60() + inline bool jj_3_61() { if (jj_done) return true; if (jj_3R_104()) return true; return false; } - inline bool jj_3R_241() + inline bool jj_3R_242() { if (jj_done) return true; if (jj_3R_59()) return true; return false; } - inline bool jj_3R_452() + inline bool jj_3R_453() { if (jj_done) return true; if (jj_3R_105()) return true; return false; } - inline bool jj_3R_451() + inline bool jj_3R_452() { if (jj_done) return true; if (jj_3R_61()) return true; return false; } - inline bool jj_3R_450() + inline bool jj_3R_451() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -8082,13 +8090,11 @@ void parseInline(); return false; } - inline bool jj_3R_369() + inline bool jj_3R_370() { 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()) { @@ -8101,7 +8107,9 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_455()) { jj_scanpos = xsp; - if (jj_3R_456()) return true; + if (jj_3R_456()) { + jj_scanpos = xsp; + if (jj_3R_457()) return true; } } } @@ -8112,14 +8120,14 @@ void parseInline(); return false; } - inline bool jj_3R_449() + inline bool jj_3R_450() { if (jj_done) return true; if (jj_3R_104()) return true; return false; } - inline bool jj_3R_328() + inline bool jj_3R_329() { if (jj_done) return true; if (jj_scan_token(PORT_T)) return true; @@ -8130,26 +8138,26 @@ void parseInline(); return false; } - inline bool jj_3R_581() + inline bool jj_3R_582() { if (jj_done) return true; - if (jj_3R_312()) return true; + if (jj_3R_313()) return true; return false; } - inline bool jj_3R_240() + inline bool jj_3R_241() { if (jj_done) return true; - if (jj_3R_359()) return true; + if (jj_3R_360()) return true; return false; } - inline bool jj_3R_537() + inline bool jj_3R_538() { if (jj_done) return true; if (jj_scan_token(PORT_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_581()) return true; + if (jj_3R_582()) return true; if (jj_scan_token(RPAREN_T)) return true; if (jj_scan_token(SEMI_T)) return true; return false; @@ -8164,23 +8172,23 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_240()) { jj_scanpos = xsp; break; } + if (jj_3R_241()) { 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_241()) jj_scanpos = xsp; + if (jj_3R_242()) jj_scanpos = xsp; return false; } - inline bool jj_3_59() + inline bool jj_3_60() { if (jj_done) return true; if (jj_3R_103()) return true; return false; } - inline bool jj_3R_221() + inline bool jj_3R_222() { if (jj_done) return true; if (jj_3R_103()) return true; @@ -8192,12 +8200,12 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_221()) jj_scanpos = xsp; + if (jj_3R_222()) jj_scanpos = xsp; if (jj_3R_59()) return true; return false; } - inline bool jj_3R_407() + inline bool jj_3R_408() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -8206,28 +8214,28 @@ void parseInline(); return false; } - inline bool jj_3_58() + inline bool jj_3_59() { if (jj_done) return true; if (jj_3R_86()) return true; return false; } - inline bool jj_3_56() + inline bool jj_3_57() { if (jj_done) return true; if (jj_3R_64()) return true; return false; } - inline bool jj_3_57() + inline bool jj_3_58() { if (jj_done) return true; if (jj_3R_65()) return true; return false; } - inline bool jj_3R_350() + inline bool jj_3R_351() { if (jj_done) return true; if (jj_scan_token(PACKAGE_T)) return true; @@ -8235,21 +8243,21 @@ void parseInline(); return false; } - inline bool jj_3_55() + inline bool jj_3_56() { if (jj_done) return true; if (jj_3R_65()) return true; return false; } - inline bool jj_3R_316() + inline bool jj_3R_317() { if (jj_done) return true; - if (jj_3R_404()) return true; + if (jj_3R_405()) return true; return false; } - inline bool jj_3R_260() + inline bool jj_3R_261() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -8263,32 +8271,32 @@ void parseInline(); xsp = jj_scanpos; if (jj_scan_token(50)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_316()) jj_scanpos = xsp; + if (jj_3R_317()) jj_scanpos = xsp; return false; } - inline bool jj_3R_309() + inline bool jj_3R_310() { if (jj_done) return true; if (jj_scan_token(STRINGLITERAL)) return true; return false; } - inline bool jj_3R_646() + inline bool jj_3R_647() { if (jj_done) return true; if (jj_scan_token(TYPE_T)) return true; return false; } - inline bool jj_3R_645() + inline bool jj_3R_646() { if (jj_done) return true; if (jj_scan_token(FILE_T)) return true; return false; } - inline bool jj_3R_644() + inline bool jj_3R_645() { if (jj_done) return true; if (jj_scan_token(SHARED_T)) return true; @@ -8296,41 +8304,39 @@ void parseInline(); return false; } - inline bool jj_3_54() + inline bool jj_3_55() { if (jj_done) return true; if (jj_3R_102()) return true; return false; } - inline bool jj_3R_643() + inline bool jj_3R_644() { if (jj_done) return true; if (jj_scan_token(VARIABLE_T)) return true; return false; } - inline bool jj_3R_642() + inline bool jj_3R_643() { if (jj_done) return true; if (jj_scan_token(SIGNAL_T)) return true; return false; } - inline bool jj_3R_641() + inline bool jj_3R_642() { if (jj_done) return true; if (jj_scan_token(CONSTANT_T)) return true; return false; } - inline bool jj_3R_612() + inline bool jj_3R_613() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_641()) { - jj_scanpos = xsp; if (jj_3R_642()) { jj_scanpos = xsp; if (jj_3R_643()) { @@ -8339,7 +8345,9 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_645()) { jj_scanpos = xsp; - if (jj_3R_646()) return true; + if (jj_3R_646()) { + jj_scanpos = xsp; + if (jj_3R_647()) return true; } } } @@ -8348,7 +8356,7 @@ void parseInline(); return false; } - inline bool jj_3R_352() + inline bool jj_3R_353() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; @@ -8382,7 +8390,7 @@ void parseInline(); return false; } - inline bool jj_3R_440() + inline bool jj_3R_441() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -8390,12 +8398,12 @@ void parseInline(); return false; } - inline bool jj_3R_362() + inline bool jj_3R_363() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_440()) jj_scanpos = xsp; + if (jj_3R_441()) jj_scanpos = xsp; if (jj_scan_token(NULL_T)) return true; if (jj_scan_token(SEMI_T)) return true; return false; @@ -8409,7 +8417,7 @@ void parseInline(); return false; } - inline bool jj_3R_261() + inline bool jj_3R_262() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; @@ -8417,14 +8425,14 @@ void parseInline(); return false; } - inline bool jj_3_53() + inline bool jj_3_54() { if (jj_done) return true; if (jj_scan_token(LBRACKET_T)) return true; return false; } - inline bool jj_3R_259() + inline bool jj_3R_260() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -8437,17 +8445,17 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_259()) jj_scanpos = xsp; - if (jj_scan_token(NEXT_T)) return true; - xsp = jj_scanpos; if (jj_3R_260()) jj_scanpos = xsp; + if (jj_scan_token(NEXT_T)) return true; xsp = jj_scanpos; if (jj_3R_261()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_262()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_220() + inline bool jj_3R_221() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -8456,14 +8464,14 @@ void parseInline(); return false; } - inline bool jj_3R_218() + inline bool jj_3R_219() { if (jj_done) return true; - if (jj_3R_233()) return true; + if (jj_3R_234()) return true; return false; } - inline bool jj_3_52() + inline bool jj_3_53() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -8482,38 +8490,38 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_218()) jj_scanpos = xsp; + if (jj_3R_219()) jj_scanpos = xsp; if (jj_scan_token(APOSTROPHE_T)) return true; - if (jj_3R_219()) return true; + if (jj_3R_220()) return true; xsp = jj_scanpos; - if (jj_3R_220()) jj_scanpos = xsp; + if (jj_3R_221()) jj_scanpos = xsp; return false; } - inline bool jj_3_48() + inline bool jj_3_52() { if (jj_done) return true; - if (jj_3R_98()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_67()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3_51() + inline bool jj_3_48() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_67()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_98()) return true; return false; } - inline bool jj_3_50() + inline bool jj_3_51() { if (jj_done) return true; if (jj_3R_100()) return true; return false; } - inline bool jj_3R_213() + inline bool jj_3R_214() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -8521,13 +8529,13 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_352()) { jj_scanpos = xsp; break; } + if (jj_3R_353()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3_49() + inline bool jj_3_50() { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; @@ -8535,14 +8543,15 @@ void parseInline(); return false; } - inline bool jj_3R_209() + inline bool jj_3_49() { if (jj_done) return true; - if (jj_3R_98()) return true; + if (jj_scan_token(APOSTROPHE_T)) return true; + if (jj_scan_token(SUBTYPE_T)) return true; return false; } - inline bool jj_3R_212() + inline bool jj_3R_213() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -8551,21 +8560,28 @@ void parseInline(); return false; } - inline bool jj_3R_149() + inline bool jj_3R_209() { if (jj_done) return true; - if (jj_3R_310()) return true; + if (jj_3R_98()) return true; return false; } - inline bool jj_3R_211() + inline bool jj_3R_212() { if (jj_done) return true; if (jj_3R_100()) return true; return false; } - inline bool jj_3R_210() + inline bool jj_3R_149() + { + if (jj_done) return true; + if (jj_3R_311()) return true; + return false; + } + + inline bool jj_3R_211() { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; @@ -8573,6 +8589,14 @@ void parseInline(); return false; } + inline bool jj_3R_210() + { + if (jj_done) return true; + if (jj_scan_token(APOSTROPHE_T)) return true; + if (jj_scan_token(SUBTYPE_T)) return true; + return false; + } + inline bool jj_3R_98() { if (jj_done) return true; @@ -8584,7 +8608,10 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_212()) { jj_scanpos = xsp; - if (jj_3R_213()) return true; + if (jj_3R_213()) { + jj_scanpos = xsp; + if (jj_3R_214()) return true; + } } } } @@ -8627,7 +8654,7 @@ void parseInline(); inline bool jj_3R_147() { if (jj_done) return true; - if (jj_3R_309()) return true; + if (jj_3R_310()) return true; return false; } @@ -8648,21 +8675,21 @@ void parseInline(); return false; } - inline bool jj_3R_280() + inline bool jj_3R_281() { if (jj_done) return true; if (jj_scan_token(REM_T)) return true; return false; } - inline bool jj_3R_279() + inline bool jj_3R_280() { if (jj_done) return true; if (jj_scan_token(MOD_T)) return true; return false; } - inline bool jj_3R_278() + inline bool jj_3R_279() { if (jj_done) return true; if (jj_scan_token(SLASH_T)) return true; @@ -8674,75 +8701,75 @@ void parseInline(); 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()) return true; + if (jj_3R_280()) { + jj_scanpos = xsp; + if (jj_3R_281()) return true; } } } return false; } - inline bool jj_3R_277() + inline bool jj_3R_278() { if (jj_done) return true; if (jj_scan_token(MULT_T)) return true; return false; } - inline bool jj_3R_628() + inline bool jj_3R_629() { if (jj_done) return true; if (jj_3R_69()) return true; return false; } - inline bool jj_3R_430() + inline bool jj_3R_431() { if (jj_done) return true; if (jj_scan_token(LINKAGE_T)) return true; return false; } - inline bool jj_3R_429() + inline bool jj_3R_430() { if (jj_done) return true; if (jj_scan_token(BUFFER_T)) return true; return false; } - inline bool jj_3R_428() + inline bool jj_3R_429() { if (jj_done) return true; if (jj_scan_token(INOUT_T)) return true; return false; } - inline bool jj_3R_427() + inline bool jj_3R_428() { if (jj_done) return true; if (jj_scan_token(OUT_T)) return true; return false; } - inline bool jj_3R_345() + inline bool jj_3R_346() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_426()) { - jj_scanpos = xsp; if (jj_3R_427()) { jj_scanpos = xsp; if (jj_3R_428()) { jj_scanpos = xsp; if (jj_3R_429()) { jj_scanpos = xsp; - if (jj_3R_430()) return true; + if (jj_3R_430()) { + jj_scanpos = xsp; + if (jj_3R_431()) return true; } } } @@ -8750,21 +8777,21 @@ void parseInline(); return false; } - inline bool jj_3R_426() + inline bool jj_3R_427() { if (jj_done) return true; if (jj_scan_token(IN_T)) return true; return false; } - inline bool jj_3R_257() + inline bool jj_3R_258() { if (jj_done) return true; - if (jj_3R_366()) return true; + if (jj_3R_367()) return true; return false; } - inline bool jj_3R_256() + inline bool jj_3R_257() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -8777,15 +8804,15 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_256()) jj_scanpos = xsp; - xsp = jj_scanpos; if (jj_3R_257()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_258()) jj_scanpos = xsp; if (jj_scan_token(LOOP_T)) return true; - if (jj_3R_258()) return true; + if (jj_3R_259()) return true; if (jj_scan_token(END_T)) return true; if (jj_scan_token(LOOP_T)) return true; xsp = jj_scanpos; - if (jj_3R_628()) jj_scanpos = xsp; + if (jj_3R_629()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -8804,7 +8831,7 @@ void parseInline(); return false; } - inline bool jj_3R_232() + inline bool jj_3R_233() { if (jj_done) return true; if (jj_scan_token(NULL_T)) return true; @@ -8818,48 +8845,41 @@ void parseInline(); return false; } - inline bool jj_3R_231() + inline bool jj_3R_232() { if (jj_done) return true; - if (jj_3R_355()) return true; + if (jj_3R_356()) return true; return false; } - inline bool jj_3R_230() + inline bool jj_3R_231() { if (jj_done) return true; if (jj_3R_96()) return true; return false; } - inline bool jj_3R_229() + inline bool jj_3R_230() { if (jj_done) return true; if (jj_3R_95()) return true; return false; } - 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()) return true; + if (jj_3R_232()) { + jj_scanpos = xsp; + if (jj_3R_233()) return true; } } } @@ -8867,39 +8887,53 @@ void parseInline(); return false; } - public: TokenManager *token_source; - public: CharStream *jj_input_stream; + inline bool jj_3R_229() + { + if (jj_done) return true; + if (jj_3R_94()) return true; + return false; + } + + +public: + TokenManager *token_source; + CharStream *jj_input_stream; /** Current token. */ - public: Token *token; + Token *token; /** Next token. */ - public: Token *jj_nt; - private: int jj_ntk; - private: JJCalls jj_2_rtns[116]; - private: bool jj_rescan; - private: int jj_gc; - private: Token *jj_scanpos, *jj_lastpos; - private: int jj_la; + Token *jj_nt; +private: + int jj_ntk; + JJCalls jj_2_rtns[117]; + bool jj_rescan; + int jj_gc; + Token *jj_scanpos, *jj_lastpos; + int jj_la; /** Whether we are looking ahead. */ - 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) { + bool jj_lookingAhead; + bool jj_semLA; + int jj_gen; + int jj_la1[294]; + ErrorHandler *errorHandler; + 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); - public: virtual ~VhdlParser(); + virtual ~VhdlParser(); void ReInit(TokenManager *tm); +void clear(); + Token * jj_consume_token(int kind); bool jj_scan_token(int kind); @@ -8909,31 +8943,36 @@ 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); + void jj_add_error_token(int kind, int pos); +protected: + /** Generate ParseException. */ + + virtual void parseError(); +private: + int trace_indent; + bool trace_enabled; -protected: virtual void parseError(); - private: int trace_indent; - private: bool trace_enabled; - /** Enable tracing. */ +public: -public: void enable_tracing(); + void enable_tracing(); -public: void disable_tracing(); + 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; static Entry* tempEntry; static Entry* lastEntity ; static Entry* lastCompound ; -static Entry* current; +static std::shared_ptr<Entry> current; static QCString compSpec; static QCString currName; static int levelCounter; @@ -8944,7 +8983,6 @@ static QCString forL; static int param_sec ; static int parse_sec; static int currP; -static Entry* currentCompound; //---------------------------------------- @@ -8970,8 +9008,10 @@ static void mapLibPackage( Entry* root); static void createFlow(); static void error_skipto(int kind); static void oneLineComment(QCString qcs); -static void setMultCommentLine();private: bool jj_done; +static void setMultCommentLine(); +private: + bool jj_done; }; } } diff --git a/vhdlparser/VhdlParserConstants.h b/vhdlparser/VhdlParserConstants.h index 8d4b417..882402b 100644 --- a/vhdlparser/VhdlParserConstants.h +++ b/vhdlparser/VhdlParserConstants.h @@ -430,7 +430,7 @@ const int DEFAULT = 0; static JAVACC_CHAR_TYPE tokenImage_arr_20[] = {0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x22, 0}; static JAVACC_CHAR_TYPE tokenImage_arr_21[] = -{0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x65, 0x22, 0}; +{0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x22, 0}; static JAVACC_CHAR_TYPE tokenImage_arr_22[] = {0x22, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x22, 0}; static JAVACC_CHAR_TYPE tokenImage_arr_23[] = diff --git a/vhdlparser/VhdlParserIF.cpp b/vhdlparser/VhdlParserIF.cpp index 3a6746f..676546b 100644 --- a/vhdlparser/VhdlParserIF.cpp +++ b/vhdlparser/VhdlParserIF.cpp @@ -34,8 +34,6 @@ void VhdlParserIF::parseVhdlfile(const char* inputBuffer,bool inLine) // fprintf(stderr,"\n\nparsed lines: %d\n",yyLineNr); // fprintf(stderr,"\n\nerrors : %d\n\n",myErr->getErrorCount()); delete myParser; - delete myErr; - } void VhdlParser::error_skipto(int kind) diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc index a696fa6..5edbfc5 100644 --- a/vhdlparser/VhdlParserTokenManager.cc +++ b/vhdlparser/VhdlParserTokenManager.cc @@ -1,5 +1,6 @@ /* VhdlParserTokenManager.cc */ -#include "./VhdlParserTokenManager.h" +#include "VhdlParserTokenManager.h" +#include "TokenMgrError.h" namespace vhdl { namespace parser { static const unsigned long long jjbitVec0[] = { @@ -12,10 +13,10 @@ static const unsigned long long jjbitVec3[] = { 0x0ULL, 0x0ULL, 0xffffffff00000000ULL, 0xffffffffffffffffULL }; static const int jjnextStates[] = { - 54, 55, 56, 57, 58, 61, 65, 66, 67, 76, 21, 48, 49, 2, 37, 38, + 58, 59, 60, 61, 62, 65, 69, 70, 71, 80, 21, 50, 51, 2, 37, 38, 0, 3, 4, 5, 7, 12, 13, 15, 16, 24, 23, 25, 33, 34, 36, 39, - 40, 42, 56, 57, 58, 61, 60, 59, 61, 65, 66, 67, 68, 69, 71, 9, - 10, 28, 29, 45, 47, 50, 52, 27, 30, + 40, 42, 46, 47, 49, 53, 54, 56, 60, 61, 62, 65, 64, 63, 65, 69, + 70, 71, 72, 73, 75, 9, 10, 28, 29, 27, 30, }; static JAVACC_CHAR_TYPE jjstrLiteralChars_0[] = {0}; static JAVACC_CHAR_TYPE jjstrLiteralChars_1[] = {0}; @@ -2490,25 +2491,25 @@ void VhdlParserTokenManager::setDebugStream(FILE *ds){ debugStream = ds; } switch(curChar) { case 65: - return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x8000000ULL); + return jjMoveStringLiteralDfa12_0(active0, 0x200000ULL, active1, 0x8000000ULL); case 69: if ((active0 & 0x20000ULL) != 0L) { jjmatchedKind = 17; jjmatchedPos = 11; } - return jjMoveStringLiteralDfa12_0(active0, 0x200000ULL, active1, 0L); + break; case 79: return jjMoveStringLiteralDfa12_0(active0, 0x40000000ULL, active1, 0L); case 97: - return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x8000000ULL); + return jjMoveStringLiteralDfa12_0(active0, 0x200000ULL, active1, 0x8000000ULL); case 101: if ((active0 & 0x20000ULL) != 0L) { jjmatchedKind = 17; jjmatchedPos = 11; } - return jjMoveStringLiteralDfa12_0(active0, 0x200000ULL, active1, 0L); + break; case 111: return jjMoveStringLiteralDfa12_0(active0, 0x40000000ULL, active1, 0L); default : @@ -2686,7 +2687,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ curChar = input_stream->readChar(); curPos = 0; int startsAt = 0; - jjnewStateCnt = 77; + jjnewStateCnt = 81; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -2915,128 +2916,146 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ break; case 44: if (curChar == 33) - { jjCheckNAddTwoStates(45, 47); } + { jjCheckNAddTwoStates(45, 46); } break; case 45: - { jjCheckNAddTwoStates(45, 47); } + if ((0xfffffbffffffffffULL & l) != 0L) + { jjCheckNAddTwoStates(45, 46); } break; case 46: - if (curChar == 47 && kind > 9) - kind = 9; + if (curChar == 42) + { jjCheckNAddStates(34, 36); } break; case 47: - if (curChar == 42) - jjstateSet[jjnewStateCnt++] = 46; + if ((0xffff7bffffffffffULL & l) != 0L) + { jjCheckNAddTwoStates(48, 46); } break; case 48: - if (curChar == 42) - jjstateSet[jjnewStateCnt++] = 44; + if ((0xfffffbffffffffffULL & l) != 0L) + { jjCheckNAddTwoStates(48, 46); } break; case 49: - if (curChar == 42) - { jjCheckNAddTwoStates(50, 52); } + if (curChar == 47 && kind > 9) + kind = 9; break; case 50: - { jjCheckNAddTwoStates(50, 52); } + if (curChar == 42) + jjstateSet[jjnewStateCnt++] = 44; break; case 51: - if (curChar == 47 && kind > 10) - kind = 10; + if (curChar == 42) + { jjCheckNAddTwoStates(52, 53); } break; case 52: - if (curChar == 42) - jjstateSet[jjnewStateCnt++] = 51; + if ((0xfffffbffffffffffULL & l) != 0L) + { jjCheckNAddTwoStates(52, 53); } break; case 53: + if (curChar == 42) + { jjCheckNAddStates(37, 39); } + break; + case 54: + if ((0xffff7bffffffffffULL & l) != 0L) + { jjCheckNAddTwoStates(55, 53); } + break; + case 55: + if ((0xfffffbffffffffffULL & l) != 0L) + { jjCheckNAddTwoStates(55, 53); } + break; + case 56: + if (curChar == 47 && kind > 10) + kind = 10; + break; + case 57: if ((0x3ff000000000000ULL & l) == 0L) break; if (kind > 165) kind = 165; { jjCheckNAddStates(0, 10); } break; - case 55: + case 59: if ((0x3ff000000000000ULL & l) == 0L) break; if (kind > 165) kind = 165; - { jjCheckNAddTwoStates(54, 55); } + { jjCheckNAddTwoStates(58, 59); } break; - case 57: + case 61: if ((0x3ff000000000000ULL & l) == 0L) break; if (kind > 170) kind = 170; - { jjCheckNAddStates(34, 37); } + { jjCheckNAddStates(40, 43); } break; - case 58: + case 62: if (curChar == 46) - { jjCheckNAdd(59); } + { jjCheckNAdd(63); } break; - case 59: + case 63: if ((0x3ff000000000000ULL & l) == 0L) break; if (kind > 170) kind = 170; - { jjCheckNAddStates(38, 40); } + { jjCheckNAddStates(44, 46); } break; - case 62: + case 66: if ((0x280000000000ULL & l) != 0L) - { jjCheckNAdd(63); } + { jjCheckNAdd(67); } break; - case 63: + case 67: if ((0x3ff000000000000ULL & l) == 0L) break; if (kind > 170) kind = 170; - { jjCheckNAddTwoStates(64, 63); } + { jjCheckNAddTwoStates(68, 67); } break; - case 66: + case 70: if ((0x3ff000000000000ULL & l) != 0L) - { jjCheckNAddStates(41, 43); } + { jjCheckNAddStates(47, 49); } break; - case 67: + case 71: if (curChar == 35) - { jjCheckNAdd(68); } + { jjCheckNAdd(72); } break; - case 68: + case 72: if ((0x3ff000000000000ULL & l) != 0L) - { jjCheckNAddStates(44, 46); } + { jjCheckNAddStates(50, 52); } break; - case 69: + case 73: if (curChar == 46) - { jjCheckNAdd(70); } + { jjCheckNAdd(74); } break; - case 70: + case 74: if ((0x3ff000000000000ULL & l) != 0L) - { jjCheckNAddTwoStates(70, 71); } + { jjCheckNAddTwoStates(74, 75); } break; - case 71: + case 75: if (curChar != 35) break; if (kind > 172) kind = 172; - jjstateSet[jjnewStateCnt++] = 72; + jjstateSet[jjnewStateCnt++] = 76; break; - case 73: + case 77: if ((0x280000000000ULL & l) != 0L) - { jjCheckNAdd(74); } + { jjCheckNAdd(78); } break; - case 74: + case 78: if ((0x3ff000000000000ULL & l) == 0L) break; if (kind > 172) kind = 172; - { jjCheckNAddTwoStates(75, 74); } + { jjCheckNAddTwoStates(79, 78); } break; - case 76: + case 80: if ((0x3ff000000000000ULL & l) != 0L) - { jjCheckNAddTwoStates(76, 21); } + { jjCheckNAddTwoStates(80, 21); } break; default : break; } } while(i != startsAt); } - else if ((int)curChar < 128) + else if (curChar < 128) { unsigned long long l = 1ULL << (curChar & 077); (void)l; @@ -3071,7 +3090,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ break; case 9: if ((0x7fffffffffffffffULL & l) != 0L) - { jjAddStates(47, 48); } + { jjAddStates(53, 54); } break; case 12: if (curChar == 95) @@ -3125,7 +3144,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ break; case 28: if ((0x7fffffffffffffffULL & l) != 0L) - { jjAddStates(49, 50); } + { jjAddStates(55, 56); } break; case 30: if ((0x7fffffffffffffffULL & l) == 0L) @@ -3145,50 +3164,58 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ { jjAddStates(31, 33); } break; case 45: - { jjAddStates(51, 52); } + { jjCheckNAddTwoStates(45, 46); } break; - case 50: - { jjAddStates(53, 54); } + case 47: + case 48: + { jjCheckNAddTwoStates(48, 46); } + break; + case 52: + { jjCheckNAddTwoStates(52, 53); } break; case 54: - if (curChar == 95) - jjstateSet[jjnewStateCnt++] = 55; + case 55: + { jjCheckNAddTwoStates(55, 53); } break; - case 56: + case 58: if (curChar == 95) - jjstateSet[jjnewStateCnt++] = 57; + jjstateSet[jjnewStateCnt++] = 59; break; case 60: if (curChar == 95) - jjstateSet[jjnewStateCnt++] = 59; - break; - case 61: - if ((0x2000000020ULL & l) != 0L) - { jjCheckNAddTwoStates(62, 63); } + jjstateSet[jjnewStateCnt++] = 61; break; case 64: if (curChar == 95) - { jjCheckNAdd(63); } + jjstateSet[jjnewStateCnt++] = 63; break; case 65: - if (curChar == 95) - jjstateSet[jjnewStateCnt++] = 66; + if ((0x2000000020ULL & l) != 0L) + { jjCheckNAddTwoStates(66, 67); } break; case 68: + if (curChar == 95) + { jjCheckNAdd(67); } + break; + case 69: + if (curChar == 95) + jjstateSet[jjnewStateCnt++] = 70; + break; + case 72: if ((0x7fffffe07fffffeULL & l) != 0L) - { jjCheckNAddStates(44, 46); } + { jjCheckNAddStates(50, 52); } break; - case 70: + case 74: if ((0x7fffffe07fffffeULL & l) != 0L) - { jjCheckNAddTwoStates(70, 71); } + { jjCheckNAddTwoStates(74, 75); } break; - case 72: + case 76: if ((0x2000000020ULL & l) != 0L) - { jjCheckNAddTwoStates(73, 74); } + { jjCheckNAddTwoStates(77, 78); } break; - case 75: + case 79: if (curChar == 95) - { jjCheckNAdd(74); } + { jjCheckNAdd(78); } break; default : break; } @@ -3214,7 +3241,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ break; case 9: if (jjCanMove_1(hiByte, i1, i2, l1, l2)) - { jjAddStates(47, 48); } + { jjAddStates(53, 54); } break; case 15: if (jjCanMove_1(hiByte, i1, i2, l1, l2)) @@ -3226,14 +3253,14 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ break; case 28: if (jjCanMove_1(hiByte, i1, i2, l1, l2)) - { jjAddStates(49, 50); } + { jjAddStates(55, 56); } break; case 30: if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) break; if (kind > 189) kind = 189; - { jjAddStates(55, 56); } + { jjAddStates(57, 58); } break; case 33: if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) @@ -3251,11 +3278,21 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ break; case 45: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - { jjAddStates(51, 52); } + { jjCheckNAddTwoStates(45, 46); } break; - case 50: + case 47: + case 48: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - { jjAddStates(53, 54); } + { jjCheckNAddTwoStates(48, 46); } + break; + case 52: + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + { jjCheckNAddTwoStates(52, 53); } + break; + case 54: + case 55: + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + { jjCheckNAddTwoStates(55, 53); } break; default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break; } @@ -3268,7 +3305,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt), (jjnewStateCnt = startsAt), (i == (startsAt = 77 - startsAt))) + if ((i = jjnewStateCnt), (jjnewStateCnt = startsAt), (i == (startsAt = 81 - startsAt))) break; if (input_stream->endOfInput()) { break; } curChar = input_stream->readChar(); @@ -3321,10 +3358,10 @@ bool VhdlParserTokenManager::jjCanMove_1(int hiByte, int i1, int i2, unsigned lo Token * VhdlParserTokenManager::jjFillToken(){ Token *t; JAVACC_STRING_TYPE curTokenImage; - int beginLine; - int endLine; - int beginColumn; - int endColumn; + int beginLine = -1; + int endLine = -1; + int beginColumn = -1; + int endColumn = -1; JAVACC_STRING_TYPE im = jjstrLiteralImages[jjmatchedKind]; curTokenImage = (im.length() == 0) ? input_stream->GetImage() : im; if (input_stream->getTrackLineColumn()) { @@ -3333,7 +3370,9 @@ Token * VhdlParserTokenManager::jjFillToken(){ endLine = input_stream->getEndLine(); endColumn = input_stream->getEndColumn(); } - t = Token::newToken(jjmatchedKind, curTokenImage); + t = Token::newToken(jjmatchedKind); + t->kind = jjmatchedKind; + t->image = curTokenImage; t->specialToken = NULL; t->next = NULL; @@ -3444,16 +3483,14 @@ void VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){ case 9 : { image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); { - QCString q(image.data()); - q.stripPrefix("/*!"); - q.resize(q.length()-2); + QCString q = filter2008VhdlComment(image.data()); ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear(); } break; } case 10 : { image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); - ::vhdl::parser::VhdlParser::lineCount(image.data());image.clear(); + ::vhdl::parser::VhdlParser::lineCount(image.data());image.clear(); break; } default : @@ -3591,7 +3628,7 @@ void VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){ } /** Reinitialise parser. */ void VhdlParserTokenManager::ReInit(JAVACC_CHARSTREAM *stream, int lexState, VhdlParser *parserArg) { - if (input_stream) delete input_stream; + clear(); jjmatchedPos = jjnewStateCnt = 0; curLexState = lexState; input_stream = stream; @@ -3606,16 +3643,23 @@ void VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){ void VhdlParserTokenManager::ReInitRounds() { int i; jjround = 0x80000001; - for (i = 77; i-- > 0;) + for (i = 81; i-- > 0;) jjrounds[i] = 0x80000000; } /** Switch to specified lex state. */ void VhdlParserTokenManager::SwitchTo(int lexState) { - if (lexState >= 1 || lexState < 0) - assert(false); - //throw 1;//new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE); - else + 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 curLexState = lexState; } @@ -3623,14 +3667,23 @@ 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 () { - if (input_stream) delete input_stream; - if (errorHandlerCreated) delete errorHandler; + clear(); } + // 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 e6a7245..96a2449 100644 --- a/vhdlparser/VhdlParserTokenManager.h +++ b/vhdlparser/VhdlParserTokenManager.h @@ -1,5 +1,6 @@ #ifndef VHDLPARSERTOKENMANAGER_H #define VHDLPARSERTOKENMANAGER_H +#include "stdio.h" #include "JavaCC.h" #include "CharStream.h" #include "Token.h" @@ -116,23 +117,27 @@ 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[77]; - int jjstateSet[2 * 77]; - 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) { + JAVACC_CHARSTREAM* input_stream; + int jjrounds[81]; + int jjstateSet[2 * 81]; + JAVACC_STRING_TYPE jjimage; + JAVACC_STRING_TYPE image; + int jjimageLen; + int lengthOfMatch; + JAVACC_CHAR_TYPE curChar; + TokenManagerErrorHandler* errorHandler; + bool errorHandlerCreated; + +public: + void setErrorHandler(TokenManagerErrorHandler *eh) { if (errorHandlerCreated && errorHandler != NULL) delete errorHandler; errorHandler = eh; errorHandlerCreated = false; } + }; } } diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj index af1bd34..3151528 100644 --- a/vhdlparser/vhdlparser.jj +++ b/vhdlparser/vhdlparser.jj @@ -31,7 +31,7 @@ static Entry* current_root; static Entry* tempEntry; static Entry* lastEntity ; static Entry* lastCompound ; -static Entry* current; +static std::shared_ptr<Entry> current; static QCString compSpec; static QCString currName; static int levelCounter; @@ -42,7 +42,6 @@ static QCString forL; static int param_sec ; static int parse_sec; static int currP; -static Entry* currentCompound; //---------------------------------------- @@ -108,17 +107,17 @@ SKIP: // VHDL 2008 doxygen comment /*! .... */ SKIP : { - <MULT_DOXYGEN_VHDL_COMMENT_2008 : "/*!" (~[])* "*/" > + <MULT_DOXYGEN_VHDL_COMMENT_2008 : "/*!" (~["*"])* "*" ("*" | ~["*","/"] (~["*"])* "*")* "/"> { { - QCString q(image.data()); - q.stripPrefix("/*!"); - q.resize(q.length()-2); + QCString q = filter2008VhdlComment(image.data()); ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear(); } } - | <MULT_VHDL_2008_COMMENT : "/*" (~[])* "*/" > {::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();} -} + | <MULT_VHDL_2008_COMMENT : "/*" (~["*"])* "*" ("*" | ~["*","/"] (~["*"])* "*")* "/"> + { + ::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();} + } /* KEYWORDS */ @@ -134,7 +133,7 @@ TOKEN [IGNORE_CASE] : | <ARRAY_T: "array"> {VhdlParser::setLineParsed(ARRAY_T);} | <ASSERT_T: "assert"> | <ASSUME_T: "assume"> -| <ASSUME_GUARANTEE_T: "assume_guarentee"> +| <ASSUME_GUARANTEE_T: "assume_guarantee"> | <ATTRIBUTE_T: "attribute"> {::vhdl::parser::VhdlParser::setLineParsed(ATTRIBUTE_T);} | <BEGIN_T: "begin"> | <BLOCK_T: "block"> @@ -409,7 +408,7 @@ void architecture_body() : {QCString s,s1;} QCString t=s1+"::"+s; genLabels.resize(0); pushLabel(genLabels,s1); - lastCompound=current; + lastCompound=current.get(); addVhdlType(t,getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlDocGen::ARCHITECTURE,0,0,Private); } try{ @@ -1012,7 +1011,7 @@ void entity_declaration() : {QCString s;} // try{ <ENTITY_T> s=identifier() <IS_T> { - lastEntity=current; + lastEntity=current.get(); lastCompound=0; addVhdlType(s.data(),getLine(ENTITY_T),Entry::CLASS_SEC,VhdlDocGen::ENTITY,0,0,Public); } @@ -1209,7 +1208,7 @@ QCString full_type_declaration() : {Entry *tmpEntry;QCString s,s1,s2;} { <TYPE_T> s=identifier() <IS_T> { - tmpEntry=current; + tmpEntry=current.get(); addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,0,Public); } try{ @@ -1614,6 +1613,9 @@ QCString name_ext1() : {QCString s,s1,s2;} { ( + LOOKAHEAD(<APOSTROPHE_T><SUBTYPE_T>) + <APOSTROPHE_T><SUBTYPE_T>{s+="'subtype";} +| LOOKAHEAD(<DOT_T> suffix()) <DOT_T> s1=suffix(){s+=".";s+=s1;} | @@ -1693,7 +1695,7 @@ void package_body() : {QCString s;} { <PACKAGE_T> <BODY_T> s=name() <IS_T> { - lastCompound=current; + lastCompound=current.get(); s.prepend("_"); addVhdlType(s,getLine(),Entry::CLASS_SEC,VhdlDocGen::PACKAGE_BODY,0,0,Protected); } @@ -1729,15 +1731,15 @@ void package_declaration(): {QCString s;} <PACKAGE_T> s=identifier() <IS_T> { - lastCompound=current; - Entry *clone=new Entry(*current); + lastCompound=current.get(); + std::shared_ptr<Entry> clone=std::make_shared<Entry>(*current); clone->section=Entry::NAMESPACE_SEC; clone->spec=VhdlDocGen::PACKAGE; clone->name=s; clone->startLine=getLine(PACKAGE_T); clone->bodyLine=getLine(PACKAGE_T); clone->protection=Package; - current_root->addSubEntry(clone); + current_root->moveToSubEntryAndKeep(clone); addVhdlType(s,getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlDocGen::PACKAGE,0,0,Package); } package_declarative_part() @@ -1932,7 +1934,7 @@ void process_statement() : {QCString s,s1,s2;Token *tok=0;} currName=s; current->name=currName; - tempEntry=current; + tempEntry=current.get(); current->endBodyLine=getLine(); currP=0; if(tok) @@ -2292,7 +2294,7 @@ void subprogram_specification() : {QCString s;Token *tok=0;Token *t;} { currP=VhdlDocGen::PROCEDURE; createFunction(s.data(),currP,0); - tempEntry=current; + tempEntry=current.get(); current->startLine=getLine(PROCEDURE_T); current->bodyLine=getLine(PROCEDURE_T); @@ -2309,14 +2311,14 @@ void subprogram_specification() : {QCString s;Token *tok=0;Token *t;} createFunction(tok->image.c_str(),currP,s.data()); else createFunction(0,currP,s.data()); - tempEntry=current; + tempEntry=current.get(); current->startLine=getLine(FUNCTION_T); current->bodyLine=getLine(FUNCTION_T); } [{ param_sec=PARAM_SEC; } <LPAREN_T> formal_parameter_list() <RPAREN_T> { param_sec=0; }] <RETURN_T> s=type_mark() { - tempEntry=current; + tempEntry=current.get(); current->type=s; newEntry(); } |