diff options
43 files changed, 2088 insertions, 2058 deletions
diff --git a/doc/customize.doc b/doc/customize.doc index 46b1d8b..c7359c1 100644 --- a/doc/customize.doc +++ b/doc/customize.doc @@ -117,9 +117,9 @@ This will create 3 files: You should edit these files and then reference them from the config file. - \ref cfg_html_header "HTML_HEADER" = \c header.html - \ref cfg_html_footer "HTML_FOOTER" = \c footer.html -- \ref cfg_html_stylesheet "HTML_STYLESHEET" = \c customdoxygen.css <b>←obsolete</b> +- \ref cfg_html_extra_stylesheet "HTML_EXTRA_STYLESHEET" = \c my_customdoxygen.css -\note it is not longer recommended to use HTML_STYLESHEET this way, +\note it is not longer recommended to use \ref cfg_html_stylesheet "HTML_STYLESHEET", as it make it difficult to upgrade to a newer version of doxygen. Use \ref cfg_html_extra_stylesheet "HTML_EXTRA_STYLESHEET" instead. diff --git a/qtools/qcstring.cpp b/qtools/qcstring.cpp index 49bf842..26df166 100644 --- a/qtools/qcstring.cpp +++ b/qtools/qcstring.cpp @@ -31,7 +31,7 @@ QCString &QCString::sprintf( const char *format, ... ) const int minlen=256; int l = length(); if (l<minlen) { resize(minlen); l=minlen; } - int n=vsnprintf( data(), l, format, ap); + int n=vsnprintf( rawData(), l, format, ap); if (n<0) n=l; resize(n+1); va_end( ap ); @@ -62,7 +62,7 @@ int QCString::find( const char *str, int index, bool cs ) const if (index<0 || index>=l) return -1; // index outside string if (!str) return -1; // no string to search for if (!*str) return index; // empty string matching at index - register char *pos; + register const char *pos; if (cs) // case sensitive { pos = strstr(data()+index,str); @@ -132,7 +132,7 @@ int QCString::findRev( const char *str, int index, bool cs) const else if (index>len) return -1; // bad index else if (index+slen>len) index=len-slen; // str would be too long if (index<0) return -1; // no match possible - register char *pos = data()+index; + register const char *pos = data()+index; if (cs) // case sensitive { for (int i=index; i>=0; i--) if (qstrncmp(pos--,str,slen)==0) return i; @@ -204,9 +204,7 @@ bool QCString::stripPrefix(const char *prefix) int len = qstrlen(prefix); if (qstrncmp(prefix,data(),len)==0) { - int newlen = length()-len+1; - qmemmove(data(),data()+len,newlen); - resize(newlen); + m_rep=mid(len,length()-len).m_rep; // need to make a deep copy return TRUE; } return FALSE; @@ -225,7 +223,7 @@ QCString QCString::left( uint len ) const else { QCString s( len+1 ); - memcpy( s.data(), data(), len); + memcpy( s.rawData(), data(), len); return s; } } @@ -255,9 +253,9 @@ QCString QCString::mid( uint index, uint len) const } else { - register char *p = data()+index; + register const char *p = data()+index; QCString s(len+1); - qstrncpy( s.data(), p, len+1 ); + qstrncpy( s.rawData(), p, len+1 ); return s; } } @@ -266,7 +264,7 @@ QCString QCString::lower() const { if (length()==0) return QCString(); QCString s(data()); - register char *pos = s.data(); + register char *pos = s.rawData(); if (pos) { while (*pos) @@ -282,7 +280,7 @@ QCString QCString::upper() const { if (length()==0) return QCString(); QCString s(data()); - register char *pos = s.data(); + register char *pos = s.rawData(); if (pos) { while (*pos) @@ -299,13 +297,13 @@ QCString QCString::stripWhiteSpace() const if ( isEmpty() ) // nothing to do return *this; - register char *s = data(); + register const char *cs = data(); int reslen = length(); - if ( !isspace((uchar)s[0]) && !isspace((uchar)s[reslen-1]) ) + if ( !isspace((uchar)cs[0]) && !isspace((uchar)cs[reslen-1]) ) return *this; // returns a copy - QCString result(s); - s = result.data(); + QCString result(cs); + register char *s = result.rawData(); int start = 0; int end = reslen - 1; while ( isspace((uchar) s[start]) ) // skip white space from start @@ -317,7 +315,7 @@ QCString QCString::stripWhiteSpace() const while ( end && isspace((uchar) s[end]) ) // skip white space from end end--; end -= start - 1; - qmemmove( result.data(), &s[start], end ); + qmemmove( s, &s[start], end ); result.resize( end + 1 ); return result; } @@ -328,8 +326,8 @@ QCString QCString::simplifyWhiteSpace() const return *this; QCString result( length()+1 ); - char *from = data(); - char *to = result.data(); + const char *from = data(); + char *to = result.rawData(); char *first = to; while ( TRUE ) { @@ -363,14 +361,14 @@ QCString &QCString::insert( uint index, const char *s ) if ((int)index>=olen) { resize(nlen+index-olen+1); - memset(data()+olen, ' ', index-olen); - memcpy(data()+index,s, len+1); + memset(rawData()+olen, ' ', index-olen); + memcpy(rawData()+index,s, len+1); } else { resize(nlen+1); - qmemmove(data()+index+len,data()+index,olen-index+1); - memcpy(data()+index,s,len); + qmemmove(rawData()+index+len,data()+index,olen-index+1); + memcpy(rawData()+index,s,len); } return *this; } @@ -402,8 +400,10 @@ QCString &QCString::remove( uint index, uint len ) } else if ( len != 0 ) { - qmemmove( data()+index, data()+index+len, olen-index-len+1 ); + QCString tmp(olen-index-len+1); + qmemmove( tmp.rawData(), data()+index+len, olen-index-len+1 ); resize( olen-len+1 ); + memcpy( rawData()+index,tmp.data(),tmp.length() ); } return *this; } @@ -635,7 +635,7 @@ QDataStream &operator>>( QDataStream &s, QCString &str ) len = 0; } if ( len > 0 ) // not null array - s.readRawBytes( str.data(), (uint)len ); + s.readRawBytes( str.rawData(), (uint)len ); return s; } diff --git a/qtools/qcstring.h b/qtools/qcstring.h index bc3a091..8854aa7 100644 --- a/qtools/qcstring.h +++ b/qtools/qcstring.h @@ -204,11 +204,20 @@ public: } /** Returns a pointer to the contents of the string in the form of a 0-terminated C string */ - char *data() const + const char *data() const { return m_rep.data(); } + /** Returns a writable pointer to the data. + * @warning if the string is shared it will modifying the string directly and + * this will overwrite all copies as well! + */ + char *rawData() const + { + return m_rep.rawData(); + } + /** Resizes the string to hold \a newlen characters * (this value should include the 0-terminator). If the string is enlarged the contents will * be left unmodified. @@ -242,7 +251,7 @@ public: { if (length()==0) return QCString(); QCString cs(length()+1); - memcpy(cs.data(),data(),length()); + memcpy(cs.rawData(),data(),length()); return cs; } @@ -299,7 +308,7 @@ public: int len1 = length(); int len2 = (int)strlen(str); resize(len1+len2+1); - memcpy(data()+len1,str,len2); + memcpy(rawData()+len1,str,len2); return *this; } @@ -308,7 +317,7 @@ public: { int len = length(); resize(len+2); - data()[len]=c; + rawData()[len]=c; return *this; } @@ -568,9 +577,21 @@ public: } uint length() const { - return u.s.isShort ? u.s.len : u.l.d->len; + uint l = u.s.isShort ? u.s.len : u.l.d->len; + return l; } - char *data() const + const char *data() const + { + if (u.s.isShort) + { + return u.s.len==0 ? 0 : u.s.str; + } + else + { + return u.l.d->len==0 ? 0 : u.l.d->toStr(); + } + } + char *rawData() const { if (u.s.isShort) { @@ -578,6 +599,7 @@ public: } else { + //assert(u.l.d->refCount==0); // string may not be shared when accessed raw return u.l.d->len==0 ? 0 : u.l.d->toStr(); } } @@ -645,24 +667,20 @@ public: bool fill( char c, int len ) { if (len<0) len=length(); - if (len!=(int)length()) + if (!u.s.isShort) // detach from shared string + { + resize(len+1); + } + else if (len!=(int)length()) { if (len>0) { resize(len+1); } - else - { - if (!u.s.isShort) - { - u.l.d->dispose(); - } - initEmpty(); - } } if (len>0) { - memset(data(),c,len); + memset(rawData(),c,len); } return TRUE; } diff --git a/qtools/qstring.cpp b/qtools/qstring.cpp index 3673c20..f51c0d4 100644 --- a/qtools/qstring.cpp +++ b/qtools/qstring.cpp @@ -11963,7 +11963,7 @@ QChar* QString::asciiToUnicode( const QByteArray& ba, uint* len ) int l = 0; while ( l < (int)ba.size() && ba[l] ) l++; - char* str = ba.data(); + const char* str = ba.data(); QChar *uc = new QChar[ l ]; // Can't use macro, since function is public QChar *result = uc; if ( len ) @@ -11982,7 +11982,7 @@ static QChar* internalAsciiToUnicode( const QByteArray& ba, uint* len ) int l = 0; while ( l < (int)ba.size() && ba[l] ) l++; - char* str = ba.data(); + const char* str = ba.data(); QChar *uc = QT_ALLOC_QCHAR_VEC( l ); QChar *result = uc; if ( len ) @@ -15257,7 +15257,7 @@ QCString qt_winQString2MB( const QString& s, int uclen ) QCString mb(bufSize); int len; while ( !(len=WideCharToMultiByte(CP_ACP, 0, (const WCHAR*)s.unicode(), uclen, - mb.data(), bufSize-1, 0, &used_def)) ) + mb.rawData(), bufSize-1, 0, &used_def)) ) { int r = GetLastError(); if ( r == ERROR_INSUFFICIENT_BUFFER ) { diff --git a/qtools/qtextcodec.cpp b/qtools/qtextcodec.cpp index 168445f..bd874bb 100644 --- a/qtools/qtextcodec.cpp +++ b/qtools/qtextcodec.cpp @@ -1192,7 +1192,7 @@ public: lenInOut = uc.length(); int rlen = lenInOut*max_bytes_per_char; QCString rstr(rlen); - char* cursor = rstr.data(); + char* cursor = rstr.rawData(); char* s=0; int l = lenInOut; int lout = 0; @@ -1881,7 +1881,7 @@ QCString QSimpleTextCodec::fromUnicode(const QString& uc, int& len ) const int i = len; int u; const QChar* ucp = uc.unicode(); - char* rp = r.data(); + char* rp = r.rawData(); char* rmp = reverseMap->data(); int rmsize = (int) reverseMap->size(); while( i-- ) diff --git a/qtools/qtextstream.cpp b/qtools/qtextstream.cpp index bae072d..4ebf59e 100644 --- a/qtools/qtextstream.cpp +++ b/qtools/qtextstream.cpp @@ -1443,17 +1443,17 @@ QTextStream &QTextStream::operator>>( QCString &str ) if ( i >= buflen-1 ) { if ( !dynbuf ) { // create dynamic buffer dynbuf = new QCString(buflen*2); - memcpy( dynbuf->data(), s, i ); // copy old data + memcpy( dynbuf->rawData(), s, i ); // copy old data } else if ( i >= (int)dynbuf->size()-1 ) { dynbuf->resize( dynbuf->size()*2 ); } - s = dynbuf->data(); + s = dynbuf->rawData(); } s[i++] = c; c = ts_getc(); } str.resize( i+1 ); - memcpy( str.data(), s, i ); + memcpy( str.rawData(), s, i ); delete dynbuf; return *this; } diff --git a/qtools/qutfcodec.cpp b/qtools/qutfcodec.cpp index c7094ad..a37e37f 100644 --- a/qtools/qutfcodec.cpp +++ b/qtools/qutfcodec.cpp @@ -203,14 +203,14 @@ public: if ( headerdone ) { len_in_out = uc.length()*(int)sizeof(QChar); QCString d(len_in_out); - memcpy(d.data(),uc.unicode(),len_in_out); + memcpy(d.rawData(),uc.unicode(),len_in_out); return d; } else { headerdone = TRUE; len_in_out = (1+uc.length())*(int)sizeof(QChar); QCString d(len_in_out); - memcpy(d.data(),&QChar::byteOrderMark,sizeof(QChar)); - memcpy(d.data()+sizeof(QChar),uc.unicode(),uc.length()*sizeof(QChar)); + memcpy(d.rawData(),&QChar::byteOrderMark,sizeof(QChar)); + memcpy(d.rawData()+sizeof(QChar),uc.unicode(),uc.length()*sizeof(QChar)); return d; } } diff --git a/src/cite.cpp b/src/cite.cpp index 50df02e..2ea6300 100644 --- a/src/cite.cpp +++ b/src/cite.cpp @@ -210,7 +210,7 @@ void CiteDict::generatePage() const QCString doc; QFileInfo fi(citeListFile); QCString input(fi.size()+1); - f.readBlock(input.data(),fi.size()); + f.readBlock(input.rawData(),fi.size()); f.close(); input.at(fi.size())='\0'; int p=0,s; diff --git a/src/config.l b/src/config.l index 26ee1de..a10626e 100644 --- a/src/config.l +++ b/src/config.l @@ -85,7 +85,7 @@ static QCString convertToComment(const QCString &s, const QCString &u) if (!s.isEmpty()) { QCString tmp=s.stripWhiteSpace(); - char *p=tmp.data(); + const char *p=tmp.data(); char c; result+="#"; if (*p && *p!='\n') @@ -487,8 +487,8 @@ static QCString configStringRecode( } size_t iLeft=(size_t)inputSize; size_t oLeft=(size_t)outputSize; - char *inputPtr = str.data(); - char *outputPtr = output.data(); + char *inputPtr = str.rawData(); + char *outputPtr = output.rawData(); if (!portable_iconv(cd, &inputPtr, &iLeft, &outputPtr, &oLeft)) { outputSize-=(int)oLeft; @@ -1687,7 +1687,7 @@ static QCString configFileToString(const char *name) QCString contents(bSize); int totalSize=0; int size; - while ((size=f.readBlock(contents.data()+totalSize,bSize))==bSize) + while ((size=f.readBlock(contents.rawData()+totalSize,bSize))==bSize) { totalSize+=bSize; contents.resize(totalSize+bSize); @@ -1713,7 +1713,7 @@ static QCString configFileToString(const char *name) { int fsize=f.size(); QCString contents(fsize+2); - f.readBlock(contents.data(),fsize); + f.readBlock(contents.rawData(),fsize); f.close(); if (fsize==0 || contents[fsize-1]=='\n') contents[fsize]='\0'; diff --git a/src/definition.cpp b/src/definition.cpp index 6cb26de..8014a37 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -543,7 +543,7 @@ bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList) // double whitespaces... QCString docStr = doc.simplifyWhiteSpace(); MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); + MD5SigToString(md5_sig,sigStr.rawData(),33); //printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n", // name().data(),doc.data(),sigStr.data(),sigList.data()); if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it diff --git a/src/dirdef.cpp b/src/dirdef.cpp index eebbe06..067daa0 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -84,7 +84,7 @@ static QCString encodeDirName(const QCString &anchor) uchar md5_sig[16]; QCString sigStr(33); MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); + MD5SigToString(md5_sig,sigStr.rawData(),33); return sigStr; // old algorithm diff --git a/src/docparser.cpp b/src/docparser.cpp index 4f370c4..5208bbe 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -236,7 +236,8 @@ static void docParserPopContext(bool keepParamInfo=FALSE) // replaces > with < and > with > within string s static void unescapeCRef(QCString &s) { - char *p = s.data(); + QCString tmp(s); + char *p = tmp.rawData(); if (p) { char c; @@ -247,8 +248,9 @@ static void unescapeCRef(QCString &s) } } - s=substitute(s,"<","<"); - s=substitute(s,">",">"); + tmp=substitute(tmp,"<","<"); + tmp=substitute(tmp,">",">"); + s = tmp; } //--------------------------------------------------------------------------- @@ -6935,7 +6937,7 @@ static QCString extractCopyDocId(const char *data, uint &j, uint len) } e=j; QCString id(e-s+1); - if (e>s) memcpy(id.data(),data+s,e-s); + if (e>s) memcpy(id.rawData(),data+s,e-s); id.at(e-s)='\0'; //printf("extractCopyDocId='%s' input='%s'\n",id.data(),&data[s]); return id; diff --git a/src/dot.cpp b/src/dot.cpp index e14d834..036cc86 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -381,7 +381,7 @@ static bool convertMapFile(FTextStream &t,const char *mapName, while (!f.atEnd()) // foreach line { QCString buf(maxLineLen); - int numBytes = f.readLine(buf.data(),maxLineLen); + int numBytes = f.readLine(buf.rawData(),maxLineLen); buf[numBytes-1]='\0'; if (buf.left(5)=="<area") @@ -731,7 +731,7 @@ static bool checkAndUpdateMd5Signature(const QCString &baseName, { // read checksum QCString md5stored(33); - int bytesRead=f.readBlock(md5stored.data(),32); + int bytesRead=f.readBlock(md5stored.rawData(),32); md5stored[32]='\0'; // compare checksum if (bytesRead==32 && md5==md5stored) @@ -986,7 +986,7 @@ bool DotFilePatcher::run() while (!fi.atEnd()) // foreach line { QCString line(maxLineLen); - int numBytes = fi.readLine(line.data(),maxLineLen); + int numBytes = fi.readLine(line.rawData(),maxLineLen); if (numBytes<=0) { break; @@ -1133,11 +1133,12 @@ bool DotFilePatcher::run() while (!fi.atEnd()) // foreach line { QCString line(maxLineLen); - int numBytes = fi.readLine(line.data(),maxLineLen); + int numBytes = fi.readLine(line.rawData(),maxLineLen); if (numBytes<=0) { break; } + line.resize(numBytes+1); Map *map = m_maps.at(0); // there is only one 'map' for a SVG file t << replaceRef(line,map->relPath,map->urlOnly,map->context,"_top"); } @@ -1962,8 +1963,8 @@ void DotNode::writeXML(FTextStream &t,bool isClassGraph) if (!m_url.isEmpty()) { QCString url(m_url); - char *refPtr = url.data(); - char *urlPtr = strchr(url.data(),'$'); + const char *refPtr = url.data(); + char *urlPtr = strchr(url.rawData(),'$'); if (urlPtr) { *urlPtr++='\0'; @@ -2030,8 +2031,8 @@ void DotNode::writeDocbook(FTextStream &t,bool isClassGraph) if (!m_url.isEmpty()) { QCString url(m_url); - char *refPtr = url.data(); - char *urlPtr = strchr(url.data(),'$'); + const char *refPtr = url.data(); + char *urlPtr = strchr(url.rawData(),'$'); if (urlPtr) { *urlPtr++='\0'; @@ -2103,8 +2104,8 @@ void DotNode::writeDEF(FTextStream &t) if (!m_url.isEmpty()) { QCString url(m_url); - char *refPtr = url.data(); - char *urlPtr = strchr(url.data(),'$'); + const char *refPtr = url.data(); + char *urlPtr = strchr(url.rawData(),'$'); if (urlPtr) { *urlPtr++='\0'; @@ -2298,7 +2299,7 @@ void DotGfxHierarchyTable::createGraph(DotNode *n,FTextStream &out, uchar md5_sig[16]; QCString sigStr(33); MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); + MD5SigToString(md5_sig,sigStr.rawData(),33); bool regenerate=FALSE; if (checkAndUpdateMd5Signature(absBaseName,sigStr) || !checkDeliverables(absImgName,absMapName)) @@ -3026,7 +3027,7 @@ QCString computeMd5Signature(DotNode *root, uchar md5_sig[16]; QCString sigStr(33); MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); + MD5SigToString(md5_sig,sigStr.rawData(),33); if (reNumber) { resetReNumbering(); @@ -3956,7 +3957,7 @@ QCString DotDirDeps::writeGraph(FTextStream &out, uchar md5_sig[16]; QCString sigStr(33); MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); + MD5SigToString(md5_sig,sigStr.rawData(),33); bool regenerate=FALSE; if (checkAndUpdateMd5Signature(absBaseName,sigStr) || !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName : @@ -4101,7 +4102,7 @@ void generateGraphLegend(const char *path) uchar md5_sig[16]; QCString sigStr(33); MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); + MD5SigToString(md5_sig,sigStr.rawData(),33); QCString absBaseName = (QCString)path+"/graph_legend"; QCString absDotName = absBaseName+".dot"; QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); @@ -4501,7 +4502,7 @@ QCString DotGroupCollaboration::writeGraph( FTextStream &t, uchar md5_sig[16]; QCString sigStr(33); MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); + MD5SigToString(md5_sig,sigStr.rawData(),33); QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); QCString baseName = m_diskName; QCString imgName = baseName+"."+imgExt; diff --git a/src/doxygen.cpp b/src/doxygen.cpp index e4cc1f0..30ee02b 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -9960,7 +9960,7 @@ static void usage(const char *name) msg(" If - is used for configName doxygen will read from standard input.\n\n"); msg("4) Use doxygen to generate a template file controlling the layout of the\n"); msg(" generated documentation:\n"); - msg(" %s -l layoutFileName.xml\n\n",name); + msg(" %s -l [layoutFileName.xml]\n\n",name); msg("5) Use doxygen to generate a template style sheet file for RTF, HTML or Latex.\n"); msg(" RTF: %s -w rtf styleSheetFile\n",name); msg(" HTML: %s -w html headerFile footerFile styleSheetFile [configFile]\n",name); diff --git a/src/fortrancode.l b/src/fortrancode.l index 51934cd..17a28c3 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -724,7 +724,7 @@ ATTR_SPEC (IMPLICIT|ALLOCATABLE|DIMENSION{ARGS}|EXTERNAL|{INTENT_SPEC}|INTRINSIC ACCESS_SPEC (PROTECTED|PRIVATE|PUBLIC) /* Assume that attribute statements are almost the same as attributes. */ ATTR_STMT {ATTR_SPEC}|DIMENSION -FLOW (DO|SELECT|CASE|SELECT{BS}(CASE|TYPE)|WHERE|IF|THEN|ELSE|WHILE|FORALL|ELSEWHERE|ELSEIF|RETURN|CONTINUE|EXIT) +FLOW (DO|SELECT|CASE|SELECT{BS}(CASE|TYPE)|WHERE|IF|THEN|ELSE|WHILE|FORALL|ELSEWHERE|ELSEIF|RETURN|CONTINUE|EXIT|GO{BS}TO) COMMANDS (FORMAT|CONTAINS|MODULE{BS_}PROCEDURE|WRITE|READ|ALLOCATE|ALLOCATED|ASSOCIATED|PRESENT|DEALLOCATE|NULLIFY|SIZE|INQUIRE|OPEN|CLOSE|FLUSH|DATA|COMMON) IGNORE (CALL) PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|IMPURE|PURE|ELEMENTAL)? diff --git a/src/fortranscanner.l b/src/fortranscanner.l index 8aca236..3c35a7d 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -72,7 +72,7 @@ #define YY_NEVER_INTERACTIVE 1 #define YY_NO_INPUT 1 -enum ScanVar { V_IGNORE, V_VARIABLE, V_PARAMETER}; +enum ScanVar { V_IGNORE, V_VARIABLE, V_PARAMETER, V_RESULT}; enum InterfaceType { IF_NONE, IF_SPECIFIC, IF_GENERIC, IF_ABSTRACT }; // {{{ ----- Helper structs ----- @@ -201,6 +201,7 @@ static int yyread(char *buf,int max_size); static void startCommentBlock(bool); static void handleCommentBlock(const QCString &doc,bool brief); static void subrHandleCommentBlock(const QCString &doc,bool brief); +static void subrHandleCommentBlockResult(const QCString &doc,bool brief); static void addCurrentEntry(int case_insens); static void addModule(const char *name, bool isModule=FALSE); static void addSubprogram(const char *text); @@ -843,6 +844,7 @@ private { QCString rght; if (strt != -1) { + v_type = V_RESULT; lft = ""; rght = ""; if (strt != 0) lft = current_root->type.left(strt).stripWhiteSpace(); @@ -863,6 +865,10 @@ private { } if (current_root->type.length() > 0) current_root->type += " "; current_root->type += "function"; + if (!docBlock.isNull()) + { + subrHandleCommentBlockResult(docBlock,TRUE); + } } else { @@ -981,6 +987,8 @@ private { result=result.stripWhiteSpace(); addSubprogram(result); BEGIN(Subprog); + current->bodyLine = yyLineNr + lineCountPrepass + 1; // we have to be at the line after the definition and we have to take continuation lines into account. + current->startLine = yyLineNr; } <Start,ModuleBody,SubprogBody,InterfaceBody,ModuleBodyContains,SubprogBodyContains>^{BS}({PREFIX}{BS_})?{SUBPROG}{BS_} { @@ -1104,6 +1112,10 @@ private { { subrHandleCommentBlock(docBlock,TRUE); } + else if (v_type == V_RESULT) + { + subrHandleCommentBlockResult(docBlock,TRUE); + } yy_pop_state(); docBlock.resize(0); } @@ -2221,14 +2233,10 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief) current->inbodyDocs = ""; // strip \\param or @param, so we can do some extra checking. We will add it later on again. - if (loc_doc.find("\\param") == 0) - { - loc_doc = loc_doc.right(loc_doc.length()-strlen("\\param")).stripWhiteSpace(); - } - else if (loc_doc.find("@param") == 0) - { - loc_doc = loc_doc.right(loc_doc.length()-strlen("@param")).stripWhiteSpace(); - } + if (!loc_doc.stripPrefix("\\param") && + !loc_doc.stripPrefix("@param") + ); // Do nothing work has been done by stripPrefix + loc_doc.stripWhiteSpace(); // direction as defined with the declaration of the parameter int dir1 = modifiers[current_root][argName.lower()].direction; @@ -2241,6 +2249,7 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief) { // strip direction loc_doc = loc_doc.right(loc_doc.length()-strlen(directionParam[SymbolModifiers::IN])); + loc_doc.stripWhiteSpace(); // in case of emty documentation or (now) just name, consider it as no documemntation if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower())) { @@ -2267,6 +2276,7 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief) (directionParam[dir1] == directionParam[SymbolModifiers::OUT])) { loc_doc = loc_doc.right(loc_doc.length()-strlen(directionParam[SymbolModifiers::OUT])); + loc_doc.stripWhiteSpace(); if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower())) { current=tmp_entry; @@ -2290,6 +2300,7 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief) (directionParam[dir1] == directionParam[SymbolModifiers::INOUT])) { loc_doc = loc_doc.right(loc_doc.length()-strlen(directionParam[SymbolModifiers::INOUT])); + loc_doc.stripWhiteSpace(); if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower())) { current=tmp_entry; @@ -2321,6 +2332,37 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief) // reset current back to the part inside the routine current=tmp_entry; } +//---------------------------------------------------------------------------- +/// Handle result description as defined after the declaration of the parameter +static void subrHandleCommentBlockResult(const QCString &doc,bool brief) +{ + QCString loc_doc; + loc_doc = doc.stripWhiteSpace(); + + Entry *tmp_entry = current; + current = subrCurrent.getFirst(); // temporarily switch to the entry of the subroutine / function + + // Still in the specification section so no inbodyDocs yet, but parameter documentation + current->inbodyDocs = ""; + + // strip \\returns or @returns. We will add it later on again. + if (!loc_doc.stripPrefix("\\returns") && + !loc_doc.stripPrefix("\\return") && + !loc_doc.stripPrefix("@returns") && + !loc_doc.stripPrefix("@return") + ); // Do nothing work has been done by stripPrefix + loc_doc.stripWhiteSpace(); + + if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower())) + { + current=tmp_entry; + return; + } + handleCommentBlock(QCString("\n\n@returns ") + loc_doc,brief); + + // reset current back to the part inside the routine + current=tmp_entry; +} //---------------------------------------------------------------------------- #if 0 diff --git a/src/htags.cpp b/src/htags.cpp index 84076a0..9535be7 100644 --- a/src/htags.cpp +++ b/src/htags.cpp @@ -125,8 +125,10 @@ bool Htags::loadFilemap(const QCString &htmlDir) line.at(maxlen)='\0'; if (f.open(IO_ReadOnly)) { - while (f.readLine(line.data(),maxlen)>0) + int len; + while ((len=f.readLine(line.rawData(),maxlen))>0) { + line.resize(len+1); //printf("Read line: %s",line.data()); int sep = line.find('\t'); if (sep!=-1) diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 3bb6792..582da45 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -125,7 +125,7 @@ QCString clearBlock(const char *s,const char *begin,const char *end) QCString result(resLen+1); char *r; - for (r=result.data(), p=s; (q=strstr(p,begin))!=0; p=q+endLen) + for (r=result.rawData(), p=s; (q=strstr(p,begin))!=0; p=q+endLen) { int l = (int)(q-p); memcpy(r,p,l); @@ -186,7 +186,7 @@ static QCString getSearchBox(bool serverSide, QCString relPath, bool highlightSe static QCString removeEmptyLines(const QCString &s) { BufStr out(s.length()+1); - char *p=s.data(); + const char *p=s.data(); if (p) { char c; @@ -194,7 +194,7 @@ static QCString removeEmptyLines(const QCString &s) { if (c=='\n') { - char *e = p; + const char *e = p; while (*e==' ' || *e=='\t') e++; if (*e=='\n') { diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp index 2629ab3..7c12890 100644 --- a/src/htmlhelp.cpp +++ b/src/htmlhelp.cpp @@ -599,8 +599,8 @@ QCString HtmlHelp::recode(const QCString &s) QCString output(oSize); size_t iLeft = iSize; size_t oLeft = oSize; - char *iPtr = s.data(); - char *oPtr = output.data(); + char *iPtr = s.rawData(); + char *oPtr = output.rawData(); if (!portable_iconv(m_fromUtf8,&iPtr,&iLeft,&oPtr,&oLeft)) { oSize -= (int)oLeft; diff --git a/src/markdown.cpp b/src/markdown.cpp index 692e801..ee66127 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -132,7 +132,7 @@ static void convertStringFragment(QCString &result,const char *data,int size) { if (size<0) size=0; result.resize(size+1); - memcpy(result.data(),data,size); + memcpy(result.rawData(),data,size); result.at(size)='\0'; } diff --git a/src/marshal.cpp b/src/marshal.cpp index 04f426d..af14978 100644 --- a/src/marshal.cpp +++ b/src/marshal.cpp @@ -456,7 +456,7 @@ QCString unmarshalQCString(StorageIntf *s) result.at(len)='\0'; if (len>0) { - s->read(result.data(),len); + s->read(result.rawData(),len); } //printf("unmarshalQCString: result=%s\n",result.data()); return result; diff --git a/src/memberdef.cpp b/src/memberdef.cpp index e465a0e..9198960 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -3330,7 +3330,7 @@ void MemberDef::setAnchor() QCString sigStr(33); MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig); //printf("memAnchor=%s\n",memAnchor.data()); - MD5SigToString(md5_sig,sigStr.data(),33); + MD5SigToString(md5_sig,sigStr.rawData(),33); m_impl->anc = "a"+sigStr; } diff --git a/src/membergroup.cpp b/src/membergroup.cpp index aa0a36e..d073173 100644 --- a/src/membergroup.cpp +++ b/src/membergroup.cpp @@ -312,7 +312,7 @@ QCString MemberGroup::anchor() const QCString locHeader = grpHeader; if (locHeader.isEmpty()) locHeader="[NOHEADER]"; MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); + MD5SigToString(md5_sig,sigStr.rawData(),33); return "amgrp"+sigStr; } diff --git a/src/resourcemgr.cpp b/src/resourcemgr.cpp index a15a702..4b504e4 100644 --- a/src/resourcemgr.cpp +++ b/src/resourcemgr.cpp @@ -132,7 +132,7 @@ bool ResourceMgr::copyResourceAs(const char *name,const char *targetDir,const ch if (f.open(IO_WriteOnly)) { QCString buf(res->size+1); - memcpy(buf.data(),res->data,res->size); + memcpy(buf.rawData(),res->data,res->size); FTextStream t(&f); buf = replaceColorMarkers(buf); if (qstrcmp(name,"navtree.css")==0) @@ -172,7 +172,7 @@ QCString ResourceMgr::getAsString(const char *name) const if (res) { QCString result(res->size+1); - memcpy(result.data(),res->data,res->size); + memcpy(result.rawData(),res->data,res->size); return result; } else diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index a11e42f..20fbf53 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -1414,6 +1414,11 @@ void RTFDocVisitor::visitPre(DocXRefItem *x) if (x->title().isEmpty()) return; bool anonymousEnum = x->file()=="@"; DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocXRefItem)}\n"); + if (!m_lastIsPara) + { + m_t << "\\par" << endl; + m_lastIsPara=TRUE; + } m_t << "{"; // start param list //m_t << "{\\b "; // start bold m_t << "{" << rtf_Style["Heading5"]->reference << endl; diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp index 354469b..3f09eec 100644 --- a/src/rtfgen.cpp +++ b/src/rtfgen.cpp @@ -2362,19 +2362,24 @@ static bool preProcessFile(QDir &d,QCString &infName, FTextStream &t, bool bIncl // this is EXTREEEEEEEMLY brittle. It works on OUR rtf // files because the first line before the body // ALWAYS contains "{\comment begin body}" + int len; do { - if (f.readLine(lineBuf.data(),maxLineLength)==-1) + lineBuf.resize(maxLineLength); + if ((len=f.readLine(lineBuf.rawData(),maxLineLength))==-1) { err("read error in %s before end of RTF header!\n",infName.data()); return FALSE; } + lineBuf.resize(len+1); if (bIncludeHeader) encodeForOutput(t,lineBuf.data()); } while (lineBuf.find("\\comment begin body")==-1); - while (f.readLine(lineBuf.data(),maxLineLength)!=-1) + lineBuf.resize(maxLineLength); + while ((len=f.readLine(lineBuf.rawData(),maxLineLength))!=-1) { + lineBuf.resize(len+1); int pos; if ((pos=lineBuf.find("INCLUDETEXT"))!=-1) { @@ -2406,6 +2411,7 @@ static bool preProcessFile(QDir &d,QCString &infName, FTextStream &t, bool bIncl encodeForOutput(t,lineBuf); } } + lineBuf.resize(maxLineLength); } f.close(); // remove temporary file diff --git a/src/tclscanner.l b/src/tclscanner.l index 4b2275c..6ad2e26 100644 --- a/src/tclscanner.l +++ b/src/tclscanner.l @@ -657,7 +657,7 @@ static void tcl_font_end() } //! Codify 'str' with special font class 's'. -static void tcl_codify(const char *s,char *str) +static void tcl_codify(const char *s,const char *str) { if (!tcl.code || !str) return; if (s && qstrcmp(s,"NULL")!=0) @@ -666,7 +666,7 @@ static void tcl_codify(const char *s,char *str) tcl.code->startFontClass(s); tcl.code_font=s; } - char *p=str,*sp=p; + const char *p=str,*sp=p; char c; bool done=FALSE; while (!done) @@ -676,7 +676,7 @@ static void tcl_codify(const char *s,char *str) if (c=='\n') { tcl.code_line++; - *(p-1)='\0'; + // *(p-1)='\0'; // Dimitri: is this really needed? tcl.code->codify(sp); if (tcl.code_font) { @@ -719,7 +719,6 @@ static void tcl_codify(const char *s,const QString &str) if (tcl.code==NULL) return; tcl_codify(s,str.utf8()); } -#endif //! Codify 'str' with special font class 's'. static void tcl_codify(const char *s,const QCString &str) @@ -727,6 +726,7 @@ static void tcl_codify(const char *s,const QCString &str) if (!tcl.code) return; tcl_codify(s,str.data()); } +#endif static void tcl_codify_cmd(const char *s,int i) { diff --git a/src/template.cpp b/src/template.cpp index 914821f..2a73b89 100644 --- a/src/template.cpp +++ b/src/template.cpp @@ -4394,7 +4394,7 @@ TemplateLexer::TemplateLexer(const TemplateEngine *engine,const QCString &fileNa m_engine(engine), m_fileName(fileName) { m_data.resize(size+1); - memcpy(m_data.data(),data,size); + memcpy(m_data.rawData(),data,size); m_data[size]=0; } @@ -4601,7 +4601,7 @@ void TemplateLexer::addToken(QList<TemplateToken> &tokens, { int len = endPos-startPos+1; QCString text(len); - qstrncpy(text.data(),data+startPos,len); + qstrncpy(text.rawData(),data+startPos,len); if (type!=TemplateToken::Text) text = text.stripWhiteSpace(); tokens.append(new TemplateToken(type,text,line)); } diff --git a/src/tooltip.cpp b/src/tooltip.cpp index 8085bff..8db0394 100644 --- a/src/tooltip.cpp +++ b/src/tooltip.cpp @@ -59,7 +59,7 @@ void TooltipManager::clearTooltips() static QCString escapeId(const char *s) { QCString res=s; - char *p=res.data(); + char *p=res.rawData(); while (*p) { if (!isId(*p)) *p='_'; diff --git a/src/util.cpp b/src/util.cpp index 0ecd11f..00173fb 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1448,7 +1448,7 @@ static ClassDef *getResolvedClassRec(Definition *scope, // below is a more efficient coding of // QCString key=scope->name()+"+"+name+"+"+explicitScopePart; QCString key(scopeNameLen+nameLen+explicitPartLen+fileScopeLen+1); - char *p=key.data(); + char *p=key.rawData(); qstrcpy(p,scope->name()); *(p+scopeNameLen-1)='+'; p+=scopeNameLen; qstrcpy(p,name); *(p+nameLen-1)='+'; @@ -2379,8 +2379,8 @@ QCString transcodeCharacterStringToUTF8(const QCString &input) { size_t iLeft=inputSize; size_t oLeft=outputSize; - char *inputPtr = input.data(); - char *outputPtr = output.data(); + char *inputPtr = input.rawData(); + char *outputPtr = output.rawData(); if (!portable_iconv(cd, &inputPtr, &iLeft, &outputPtr, &oLeft)) { outputSize-=(int)oLeft; @@ -2418,12 +2418,12 @@ QCString fileToString(const char *name,bool filter,bool isSourceCode) QCString contents(bSize); int totalSize=0; int size; - while ((size=f.readBlock(contents.data()+totalSize,bSize))==bSize) + while ((size=f.readBlock(contents.rawData()+totalSize,bSize))==bSize) { totalSize+=bSize; - contents.resize(totalSize+bSize); + contents.resize(totalSize+bSize); } - totalSize = filterCRLF(contents.data(),totalSize+size)+2; + totalSize = filterCRLF(contents.rawData(),totalSize+size)+2; contents.resize(totalSize); contents.at(totalSize-2)='\n'; // to help the scanner contents.at(totalSize-1)='\0'; @@ -5058,7 +5058,7 @@ QCString substitute(const QCString &s,const QCString &src,const QCString &dst) } QCString result(resLen+1); char *r; - for (r=result.data(), p=s; (q=strstr(p,src))!=0; p=q+srcLen) + for (r=result.rawData(), p=s; (q=strstr(p,src))!=0; p=q+srcLen) { int l = (int)(q-p); memcpy(r,p,l); @@ -5338,7 +5338,7 @@ QCString convertNameToFile(const char *name,bool allowDots,bool allowUnderscore) uchar md5_sig[16]; QCString sigStr(33); MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); + MD5SigToString(md5_sig,sigStr.rawData(),33); result=result.left(128-32)+sigStr; } } @@ -6548,7 +6548,7 @@ QCString rtfFormatBmkStr(const char *name) g_tagDict.insert( key, tag ); // This is the increment part - char* nxtTag = g_nextTag.data() + g_nextTag.length() - 1; + char* nxtTag = g_nextTag.rawData() + g_nextTag.length() - 1; for ( unsigned int i = 0; i < g_nextTag.length(); ++i, --nxtTag ) { if ( ( ++(*nxtTag) ) > 'Z' ) diff --git a/src/vhdlcode.l b/src/vhdlcode.l index 498a51f..2b0841e 100644 --- a/src/vhdlcode.l +++ b/src/vhdlcode.l @@ -615,7 +615,7 @@ static void appStringLower(QCString& qcs,const char* text) static QCString g_temp; /* writes and links a port map statement */ -static void codifyMapLines(char *text) +static void codifyMapLines(const char *text) { if (text==0) return; g_temp.resize(0); @@ -623,7 +623,7 @@ static void codifyMapLines(char *text) int wordCounter=0; QCString ctemp; //printf("codifyLines(%d,\"%s\")\n",g_yyLineNr,text); - char *p=text; //,*sp=p; + const char *p=text; //,*sp=p; char c; bool done=FALSE; while (!done) diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index fe8e6c5..170bf5b 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -795,12 +795,9 @@ MemberDef* VhdlDocGen::findMember(const QCString& className, const QCString& mem if (!packages.contains(ecd)) VhdlDocGen::findAllPackages(ecd); } - uint len=packages.count(); - for (uint j=0;j<len;j++) - { - for (QMap<ClassDef*,QList<ClassDef> >::Iterator cList=packages.begin();cList != packages.end();cList++) - { - if (cList.key()==0) continue; + QMap<ClassDef*,QList<ClassDef> >::Iterator cList=packages.find(ecd); + if (cList.key()!=0) + { QList<ClassDef> mlist=cList.data(); for (uint j=0;j<mlist.count();j++) { @@ -809,8 +806,7 @@ MemberDef* VhdlDocGen::findMember(const QCString& className, const QCString& mem mdef=VhdlDocGen::findMemberDef(mlist.at(j),memName,MemberListType_pubMethods); if (mdef) return mdef; } - } - } + } return 0; }//findMember diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp index f675d3f..f3bfb62 100644 --- a/src/vhdljjparser.cpp +++ b/src/vhdljjparser.cpp @@ -396,7 +396,7 @@ void VHDLLanguageScanner::parsePrototype(const char *text) varr=TRUE; } -void VhdlParser::addCompInst(char *n, char* instName, char* comp,int iLine) +void VhdlParser::addCompInst(const char *n, const char* instName, const char* comp,int iLine) { current->spec=VhdlDocGen::INSTANTIATION; current->section=Entry::VARIABLE_SEC; diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index 8e1d02f..8319922 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -1865,7 +1865,7 @@ void generateXML() if (len>0) { QCString s(len+1); - qstrncpy(s.data(),startLine,len); + qstrncpy(s.rawData(),startLine,len); s[len]='\0'; if (s.find("<!-- Automatically insert here the HTML entities -->")!=-1) { diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h index f901e38..409439f 100644 --- a/vhdlparser/CharStream.h +++ b/vhdlparser/CharStream.h @@ -179,12 +179,12 @@ public: } CharStream(ReaderStream *input_stream, int startline, - int startcolumn, int buffersize) : + int startcolumn, int) : bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false), available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true), inputStream(NULL), deleteStream(false) { - ReInit(input_stream, startline, startcolumn, buffersize); + ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE); } CharStream(ReaderStream *input_stream, int startline, int startcolumn) : diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h index f5e53e4..2170489 100644 --- a/vhdlparser/ErrorHandler.h +++ b/vhdlparser/ErrorHandler.h @@ -24,22 +24,22 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str); // expectedKind - token kind that the parser was trying to consume. // expectedToken - the image of the token - tokenImages[expectedKind]. // actual - the actual token that the parser got instead. - virtual void handleUnexpectedToken(int /*expectedKind*/, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser * /*parser*/) { + virtual void handleUnexpectedToken(int, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser *) { error_count++; fprintf(stderr, "Expecting %s at: %d:%d but got %s\n", addUnicodeEscapes(expectedToken).c_str(), actual->beginLine, actual->beginColumn, addUnicodeEscapes(actual->image).c_str()); } // Called when the parser cannot continue parsing. // last - the last token successfully parsed. // unexpected - the token at which the error occurs. - // production - the production in which this error occurs. - virtual void handleParseError(Token * /*last*/, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser * /*parser*/) { + // production - the production in which this error occurrs. + virtual void handleParseError(Token *, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *) { error_count++; fprintf(stderr, "Encountered: %s at: %d:%d while parsing: %s\n", addUnicodeEscapes(unexpected->image).c_str(), unexpected->beginLine, unexpected->beginColumn, production.c_str()); } virtual int getErrorCount() { return error_count; } - virtual void handleOtherError(JAVACC_STRING_TYPE message, VhdlParser * /*parser*/) { + virtual void handleOtherError(JAVACC_STRING_TYPE message, VhdlParser *) { fprintf(stderr, "Error: %s\n", (char*)message.c_str()); } virtual ~ErrorHandler() {} @@ -62,11 +62,11 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str); // errorAfter : prefix that was seen before this error occurred // curchar : the offending character // - virtual void lexicalError(bool EOFSeen, int /*lexState*/, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, VhdlParserTokenManager* /*token_manager*/) { + virtual void lexicalError(bool EOFSeen, int, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, VhdlParserTokenManager*) { // by default, we just print an error message and return. fprintf(stderr, "Lexical error at: %d:%d. Encountered: %c after: %s.\n", errorLine, errorColumn, curChar, (EOFSeen? "EOF" : (const char*)errorAfter.c_str())); } - virtual void lexicalError(JAVACC_STRING_TYPE errorMessage, VhdlParserTokenManager* /*token_manager*/) { + virtual void lexicalError(JAVACC_STRING_TYPE errorMessage, VhdlParserTokenManager*) { fprintf(stderr, "%s\n", (char*)errorMessage.c_str()); } virtual ~TokenManagerErrorHandler() {} diff --git a/vhdlparser/TokenManager.h b/vhdlparser/TokenManager.h index 39353ba..775e43d 100644 --- a/vhdlparser/TokenManager.h +++ b/vhdlparser/TokenManager.h @@ -5,8 +5,6 @@ #include "JavaCC.h" #include "Token.h" -using namespace std; - namespace vhdl { namespace parser { /** @@ -23,6 +21,7 @@ public: virtual ~TokenManager() { } virtual Token *getNextToken() = 0; virtual void lexicalError() { + fprintf(stderr,"Lexical error encountered."); } }; diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc index 5c8b004..c695c93 100644 --- a/vhdlparser/VhdlParser.cc +++ b/vhdlparser/VhdlParser.cc @@ -4,17 +4,17 @@ namespace vhdl { namespace parser { unsigned int jj_la1_0[] = { -0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x90404000,0x20080000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x90404000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x40000000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x40020000,0x40020001,0x0,0x0,0x0,0x40000000,0xd0020000,0x0,0x0,0x800000,0x0,0x0,0x80004000,0x400000,0x0,0x0,0x80404000,0x0,0x0,0x0,0x0,0x8000,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x10000000,0x0,0x50000000,0x8000,0x0,0x80000000,0x0,0x80000000,0x80000000,0x4000000,0x8000000,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x800,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80004000,0x0,0x80004000,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x0,0x90404000,0x0,0x0,0x0,0x40000000,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x8000,0x0,0x0,0x41000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x2000,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90404000,0x20080000,0x20080000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; +0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x90404000,0x20080000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x90404000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x40000000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x40020000,0x40020001,0x0,0x0,0x0,0x40000000,0xd0020000,0x0,0x0,0x800000,0x0,0x0,0x80004000,0x400000,0x0,0x0,0x80404000,0x0,0x0,0x0,0x0,0x8000,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x10000000,0x0,0x50000000,0x8000,0x0,0x80000000,0x0,0x80000000,0x80000000,0x4000000,0x8000000,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x800,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80004000,0x0,0x80004000,0x0,0x0,0x0,0x0,0x90004000,0x400000,0x0,0x0,0x90404000,0x0,0x0,0x0,0x40000000,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x20080000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x0,0x0,0x0,0x0,0x0,0x20080000,0x8000,0x0,0x0,0x41000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x2000,0x0,0x80004000,0x400000,0x0,0x80404000,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90c04000,0x20080000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; unsigned int jj_la1_1[] = { -0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x1000,0x104800,0x1008,0x20000,0x125808,0x10000,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x1000,0x1000000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x20000,0x1000,0x0,0x4000000,0x4000000,0x0,0x400000,0x4000101,0x4000101,0x0,0x10,0x0,0x100,0x12024900,0x0,0x0,0x0,0x100,0x0,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x81000,0x0,0x0,0x0,0x0,0x0,0x40,0x20,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x800,0x0,0x0,0x0,0x8a00000,0x0,0x0,0x1000,0x1,0x0,0x0,0x1000,0x0,0x0,0x8a00000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x40000,0x400000,0x0,0x0,0x104800,0x20000,0x124800,0x0,0x0,0x10000,0x10000,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x0,0x0,0x100,0x0,0x0,0x104800,0x0,0x20000,0x124800,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x20081200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x104000,0x1000000,0x1104800,0x0,0x20000,0x1124800,0x4000,0x0,0x100000,0x100000,0x0,0x104000,0x20081200,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x1104800,0x0,0x20000,0x1124800,0x0,0x104000,0x104000,0x4000001,0x1,0x0,0x4000001,0x10000,0x10000,0x10000,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x20,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x0,0x20,0x104000,0x100000,0x100000,0x0,0x1000000,0x0,0x0,0x104000,}; +0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x1000,0x104800,0x1008,0x20000,0x125808,0x10000,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x1000,0x1000000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x20000,0x1000,0x0,0x4000000,0x4000000,0x0,0x400000,0x4000101,0x4000101,0x0,0x10,0x0,0x100,0x12024900,0x0,0x0,0x0,0x100,0x0,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x81000,0x0,0x0,0x0,0x0,0x0,0x40,0x20,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x800,0x0,0x0,0x0,0x8a00000,0x0,0x0,0x1000,0x1,0x0,0x0,0x1000,0x0,0x0,0x8a00000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x40000,0x400000,0x0,0x0,0x104800,0x20000,0x124800,0x0,0x0,0x10000,0x10000,0x104800,0x8,0x20000,0x0,0x124808,0x0,0x0,0x0,0x100,0x0,0x0,0x104800,0x0,0x20000,0x124800,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x20081200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x104000,0x1000000,0x1104800,0x0,0x20000,0x1124800,0x4000,0x0,0x100000,0x100000,0x0,0x104000,0x20081200,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x1104800,0x0,0x20000,0x1124800,0x0,0x104000,0x104000,0x4000001,0x1,0x0,0x4000001,0x10000,0x10000,0x10000,0x0,0x0,0x125808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x20,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x0,0x20,0x104000,0x100000,0x100000,0x0,0x1000000,0x0,0x0,0x104000,}; unsigned int jj_la1_2[] = { -0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x110000,0x28000,0x0,0x20000000,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x4000,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x4000,0x4000,0x0,0x0,0x0,0x0,0x28000,0x0,0x0,0x0,0x400,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x400000,0x8000,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x1000,0x1000,0x0,0x0,0x0,0x100,0x11000,0x0,0x0,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x4000,0x0,0x400,0x8000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x209,0x209,0x0,0x32,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x0,0x0,0x0,0x400,0x1000,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x1000,0x20,0x0,0x0,0x0,0x10,0x800,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000,0x0,0x110000,0x0,0x110000,0x1000,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x2,0x0,0x1000,0x0,0x110000,0x0,0x0,0x110000,0x0,0x8000,0x0,0x0,0x0,0x8000,0x0,0x20000024,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x200000,0x1000,0x0,0x0,0x20,0xc0000000,0xc0000000,0x0,0x1000000,0x0,0x800000,0x0,0x800000,0x0,0x400,0x0,0x0,0x0,0x0,0x10000,0x0,0x110000,0x0,0x110000,0x0,0x0,0x110000,0x10000,0x0,0x100000,0x100000,0x0,0x110000,0x20000024,0x0,0x0,0x0,0x600000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x32,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x110000,0x110000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x110000,0x28000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x800,0x32,0x0,0x0,0x0,0x0,0x1000000,0x0,0x800,0x0,0x0,0x0,0x800,0x0,0x0,0x110000,0x100000,0x100000,0x0,0x0,0x2000,0x0,0x138000,}; +0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x110000,0x28000,0x0,0x20000000,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x4000,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x4000,0x4000,0x0,0x0,0x0,0x0,0x28000,0x0,0x0,0x0,0x400,0x0,0x4000,0x0,0x0,0x0,0x4000,0x0,0x4000,0x400000,0x8000,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x1000,0x1000,0x0,0x0,0x0,0x100,0x11000,0x0,0x0,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x4000,0x0,0x400,0x8000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x209,0x209,0x0,0x32,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x0,0x0,0x0,0x400,0x1000,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x1000,0x20,0x0,0x0,0x0,0x10,0x800,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000,0x0,0x110000,0x0,0x110000,0x1000,0x0,0x0,0x0,0x110000,0x0,0x0,0x1000,0x111000,0x0,0x0,0x2,0x0,0x1000,0x0,0x110000,0x0,0x0,0x110000,0x0,0x8000,0x0,0x0,0x0,0x8000,0x0,0x20000024,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x200000,0x1000,0x0,0x0,0x20,0xc0000000,0xc0000000,0x0,0x1000000,0x0,0x800000,0x0,0x800000,0x0,0x400,0x0,0x0,0x0,0x0,0x10000,0x0,0x110000,0x0,0x110000,0x0,0x0,0x110000,0x10000,0x0,0x100000,0x100000,0x0,0x110000,0x20000024,0x0,0x0,0x0,0x600000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x32,0x0,0x0,0x110000,0x0,0x0,0x110000,0x0,0x110000,0x110000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x110000,0x28000,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x800,0x32,0x0,0x0,0x0,0x0,0x1000000,0x0,0x800,0x0,0x0,0x0,0x800,0x0,0x0,0x110000,0x100000,0x100000,0x0,0x0,0x2000,0x0,0x138000,}; unsigned int jj_la1_3[] = { -0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x188830,0x8000000,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0x80000,0x0,0x108830,0x80000,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x2000000,0x0,0x0,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x2000000,0x0,0x0,0x80000,0x80000,0x0,0x0,0x80000,0x80000,0x0,0x4000,0x80000,0x80000,0x0,0x2000,0x0,0x0,0x128810,0x0,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x30000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x108030,0x0,0x100030,0x100030,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x108030,0x0,0x4000,0x0,0x0,0x188820,0x0,0x188820,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c0,0x3c0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x8000000,0x20,0x0,0x0,0x0,0x40000,0x0,0x0,0x10000,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x80000,0x80000,0x80000,0x0,0x0,0x80000,0x0,0x0,0x0,0x2000000,0x0,0x188830,0x8000000,0x8000000,0x100010,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x2000000,0x0,0x0,0x8000000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; +0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x188830,0x8000000,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0x80000,0x0,0x108830,0x80000,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x2000000,0x0,0x0,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x2000000,0x0,0x0,0x80000,0x80000,0x0,0x0,0x80000,0x80000,0x0,0x4000,0x80000,0x80000,0x0,0x2000,0x0,0x0,0x128810,0x0,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x30000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x108030,0x0,0x100030,0x100030,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x108030,0x0,0x4000,0x0,0x0,0x188820,0x0,0x188820,0x0,0x0,0x0,0x0,0x108830,0x80000,0x0,0x0,0x188830,0x0,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c0,0x3c0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x0,0x0,0x0,0x0,0x0,0xd000001,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x8000000,0x20,0x0,0x0,0x0,0x40000,0x0,0x0,0x10000,0x0,0x0,0x108820,0x80000,0x0,0x188820,0x0,0x80000,0x80000,0x80000,0x0,0x0,0x80000,0x0,0x0,0x0,0x2000000,0x0,0x188830,0x8000000,0x100010,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x2000000,0x0,0x0,0x8000000,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; unsigned int jj_la1_4[] = { -0x0,0x0,0x60000,0x30,0x40,0x100,0x0,0x0,0x0,0x0,0x40000,0x0,0x40001,0x0,0x0,0x0,0x0,0x40,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x40001,0x0,0x0,0x0,0x0,0x10000000,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x20000,0x40,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x40000,0x40000,0x40000,0x40000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x4,0x40001,0x0,0x0,0x40000,0x1,0x0,0x0,0x40000,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x40031,0x0,0x1,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x40000008,0x40000,0x40,0x1,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x0,0x40001,0x1,0x0,0x40000,0xfc00,0xfc00,0x0,0x0,0x0,0x40031,0x1,0x0,0x40,0x40,0x0,0x0,0x0,0x30,0x0,0x40001,0x0,0x80,0x0,0x40,0x40000,0x40,0x40000,0x0,0x30,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x40001,0x0,0x40001,0x0,0x1,0x0,0x40,0x40,0x40001,0x0,0x80,0x0,0x0,0x0,0x0,0x40,0x40031,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40001,0x40001,0x0,0xa0000000,0x20000000,0x0,0x1,0x40001,0x0,0x0,0x0,0x0,0x40031,0x0,0x8000000,0x40000,0x8000000,0x0,0x8000000,0x0,0x240,0x240,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x1,0x0,}; +0x0,0x0,0x60000,0x30,0x40,0x100,0x0,0x0,0x0,0x0,0x40000,0x0,0x40001,0x0,0x0,0x0,0x0,0x40,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x40001,0x0,0x0,0x0,0x0,0x10000000,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x20000,0x40,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x40000,0x40000,0x40000,0x40000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x4,0x40001,0x0,0x0,0x40000,0x1,0x0,0x0,0x40000,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x40031,0x0,0x1,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x40000008,0x40000,0x40,0x1,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x1,0x0,0x0,0x0,0x40001,0x1,0x0,0x40000,0xfc00,0xfc00,0x0,0x0,0x0,0x40031,0x1,0x0,0x40,0x40,0x0,0x0,0x0,0x30,0x0,0x40001,0x0,0x80,0x0,0x40,0x40000,0x40,0x40000,0x0,0x30,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x40001,0x0,0x40001,0x0,0x1,0x0,0x40,0x40,0x40001,0x0,0x80,0x0,0x0,0x0,0x0,0x40,0x40031,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40001,0x0,0xa0000000,0x20000000,0x0,0x1,0x40001,0x0,0x0,0x0,0x0,0x40031,0x0,0x8000000,0x40000,0x8000000,0x0,0x8000000,0x0,0x240,0x240,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x1,0x0,}; unsigned int jj_la1_5[] = { -0x1420,0x0,0x1c0,0x0,0x0,0x0,0x2,0x3c0,0x0,0x0,0x1c0,0x4000000,0x40001c0,0x0,0x0,0x0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x40001c0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x4000000,0x4000000,0x2,0x0,0x0,0x3c0,0x3c0,0x1c0,0x1c0,0x3c0,0x380,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x817e0,0x0,0x0,0x1e0,0x0,0x180,0x0,0x3c0,0x0,0x180,0x0,0x180,0x0,0x0,0x180,0x0,0x817e0,0x0,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x180,0x0,0x180,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x180,0x180,0x0,0x180,0x1420,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x1c0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x180,0x1c0,0x0,0x0,0x180,0x0,0x180,0x817e0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x1c0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x240,0x1c0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x817e0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x180,0x4000000,0x40001c0,0x40001c0,0x0,0x1,0x0,0x1,0x0,0x1c0,0x0,0x0,0x0,0x0,0x817e0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x180,}; +0x1420,0x0,0x1c0,0x0,0x0,0x0,0x2,0x3c0,0x0,0x0,0x1c0,0x0,0x80001c0,0x0,0x0,0x0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x80001c0,0x180,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x8000000,0x8000000,0x2,0x0,0x0,0x3c0,0x3c0,0x1c0,0x1c0,0x3c0,0x380,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x817e0,0x0,0x0,0x1e0,0x0,0x180,0x0,0x3c0,0x0,0x180,0x0,0x180,0x0,0x0,0x180,0x0,0x817e0,0x0,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x180,0x0,0x180,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x180,0x180,0x0,0x180,0x1420,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x1c0,0x0,0x0,0x0,0x180,0x1c0,0x0,0x180,0x1c0,0x0,0x0,0x180,0x0,0x180,0x817e0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x1c0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x240,0x1c0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x817e0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x80001c0,0x0,0x1,0x0,0x1,0x0,0x1c0,0x0,0x0,0x0,0x0,0x817e0,0x0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x180,}; /** Constructor with user supplied TokenManager. */ @@ -552,8 +552,7 @@ void VhdlParser::architecture_declarative_part() {if (!hasError) { case SUBTYPE_T: case TYPE_T: case USE_T: - case VARIABLE_T: - case VHDL2008TOOLDIR:{ + case VARIABLE_T:{ ; break; } @@ -1253,13 +1252,6 @@ void VhdlParser::block_declarative_item() { break; } - case VHDL2008TOOLDIR:{if (!hasError) { - - jj_consume_token(VHDL2008TOOLDIR); - } - - break; - } default: jj_la1[27] = jj_gen; jj_consume_token(-1); @@ -1293,8 +1285,7 @@ void VhdlParser::block_declarative_part() {if (!hasError) { case SUBTYPE_T: case TYPE_T: case USE_T: - case VARIABLE_T: - case VHDL2008TOOLDIR:{ + case VARIABLE_T:{ ; break; } @@ -11497,35 +11488,33 @@ void VhdlParser::generate_statement_body() {if (!hasError) { } -void VhdlParser::generate_statement_body1() { - if (jj_2_107(2147483647)) {if (!hasError) { +void VhdlParser::generate_statement_body1() {if (!hasError) { + + switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { + case ALIAS_T: + case ATTRIBUTE_T: + case BEGIN_T: + case COMPONENT_T: + case CONSTANT_T: + case DISCONNECT_T: + case FILE_T: + case FOR_T: + case FUNCTION_T: + case GROUP_T: + case IMPURE_T: + case PROCEDURE_T: + case PURE_T: + case SIGNAL_T: + case SHARED_T: + case SUBTYPE_T: + case TYPE_T: + case USE_T: + case VARIABLE_T:{if (!hasError) { while (!hasError) { - switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { - case ALIAS_T: - case ATTRIBUTE_T: - case COMPONENT_T: - case CONSTANT_T: - case DISCONNECT_T: - case FILE_T: - case FOR_T: - case FUNCTION_T: - case GROUP_T: - case IMPURE_T: - case PROCEDURE_T: - case PURE_T: - case SIGNAL_T: - case SHARED_T: - case SUBTYPE_T: - case TYPE_T: - case USE_T: - case VARIABLE_T: - case VHDL2008TOOLDIR:{ + if (jj_2_107(2147483647)) { ; - break; - } - default: - jj_la1[259] = jj_gen; + } else { goto end_label_51; }if (!hasError) { @@ -11539,67 +11528,44 @@ void VhdlParser::generate_statement_body1() { jj_consume_token(BEGIN_T); } - if (!hasError) { - while (!hasError) { - switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { - case ASSERT_T: - case CASE_T: - case POSTPONED_T: - case PROCESS_T: - case WITH_T: - case LPAREN_T: - case SLSL_T: - case STRINGLITERAL: - case BASIC_IDENTIFIER: - case EXTENDED_CHARACTER: - case VHDL2008TOOLDIR:{ - ; - break; - } - default: - jj_la1[260] = jj_gen; - goto end_label_52; - }if (!hasError) { - - concurrent_statement(); - } - - } - end_label_52: ; + break; } - - } else {if (!hasError) { - - while (!hasError) { - switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { - case ASSERT_T: - case CASE_T: - case POSTPONED_T: - case PROCESS_T: - case WITH_T: - case LPAREN_T: - case SLSL_T: - case STRINGLITERAL: - case BASIC_IDENTIFIER: - case EXTENDED_CHARACTER: - case VHDL2008TOOLDIR:{ - ; - break; - } - default: - jj_la1[261] = jj_gen; - goto end_label_53; - }if (!hasError) { - - concurrent_statement(); + default: + jj_la1[259] = jj_gen; + ; + } + } + if (!hasError) { + + while (!hasError) { + switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { + case ASSERT_T: + case CASE_T: + case POSTPONED_T: + case PROCESS_T: + case WITH_T: + case LPAREN_T: + case SLSL_T: + case STRINGLITERAL: + case BASIC_IDENTIFIER: + case EXTENDED_CHARACTER: + case VHDL2008TOOLDIR:{ + ; + break; } - - } - end_label_53: ; + default: + jj_la1[260] = jj_gen; + goto end_label_52; + }if (!hasError) { + + concurrent_statement(); } } + end_label_52: ; + } + } @@ -11671,7 +11637,7 @@ return t->image.data(); break; } default: - jj_la1[262] = jj_gen; + jj_la1[261] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } @@ -11715,7 +11681,7 @@ return s; break; } default: - jj_la1[263] = jj_gen; + jj_la1[262] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } @@ -11759,7 +11725,7 @@ return "."+s; break; } default: - jj_la1[264] = jj_gen; + jj_la1[263] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } @@ -11814,11 +11780,11 @@ s+="^."; break; } default: - jj_la1[265] = jj_gen; - goto end_label_54; + jj_la1[264] = jj_gen; + goto end_label_53; } } - end_label_54: ; + end_label_53: ; } return s; @@ -11849,7 +11815,7 @@ QCString VhdlParser::pathname_element() {QCString s,s1;if (!hasError) { break; } default: - jj_la1[266] = jj_gen; + jj_la1[265] = jj_gen; ; } } @@ -11883,7 +11849,7 @@ s+="."; if (jj_2_110(2147483647)) { ; } else { - goto end_label_55; + goto end_label_54; }if (!hasError) { s1 = pathname_element(); @@ -11898,7 +11864,7 @@ s2+=s1;s2+="."; } } - end_label_55: ; + end_label_54: ; } return s+s2; @@ -11940,7 +11906,7 @@ void VhdlParser::conditional_signal_assignment_wave() { break; } default: - jj_la1[267] = jj_gen; + jj_la1[266] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } @@ -11969,7 +11935,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) { break; } default: - jj_la1[268] = jj_gen; + jj_la1[267] = jj_gen; ; } } @@ -11996,7 +11962,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) { break; } default: - jj_la1[269] = jj_gen; + jj_la1[268] = jj_gen; ; } } @@ -12031,7 +11997,7 @@ void VhdlParser::else_wave_list() {if (!hasError) { break; } default: - jj_la1[270] = jj_gen; + jj_la1[269] = jj_gen; ; } } @@ -12063,7 +12029,7 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) { break; } default: - jj_la1[271] = jj_gen; + jj_la1[270] = jj_gen; ; } } @@ -12105,7 +12071,7 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) { break; } default: - jj_la1[272] = jj_gen; + jj_la1[271] = jj_gen; ; } } @@ -12133,7 +12099,7 @@ void VhdlParser::selected_signal_assignment_wave() { break; } default: - jj_la1[273] = jj_gen; + jj_la1[272] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } @@ -12164,7 +12130,7 @@ void VhdlParser::selected_variable_assignment() {if (!hasError) { break; } default: - jj_la1[274] = jj_gen; + jj_la1[273] = jj_gen; ; } } @@ -12203,7 +12169,7 @@ void VhdlParser::select_name() { break; } default: - jj_la1[275] = jj_gen; + jj_la1[274] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } @@ -12234,7 +12200,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) { break; } default: - jj_la1[276] = jj_gen; + jj_la1[275] = jj_gen; ; } } @@ -12259,7 +12225,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) { break; } default: - jj_la1[277] = jj_gen; + jj_la1[276] = jj_gen; ; } } @@ -12294,7 +12260,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) { break; } default: - jj_la1[278] = jj_gen; + jj_la1[277] = jj_gen; ; } } @@ -12322,7 +12288,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) { break; } default: - jj_la1[279] = jj_gen; + jj_la1[278] = jj_gen; ; } } @@ -12365,7 +12331,7 @@ void VhdlParser::sel_var_list() {if (!hasError) { break; } default: - jj_la1[280] = jj_gen; + jj_la1[279] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } @@ -12378,7 +12344,7 @@ void VhdlParser::sel_var_list() {if (!hasError) { if (jj_2_114(2147483647)) { ; } else { - goto end_label_56; + goto end_label_55; }if (!hasError) { expression(); @@ -12409,14 +12375,14 @@ void VhdlParser::sel_var_list() {if (!hasError) { break; } default: - jj_la1[281] = jj_gen; + jj_la1[280] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } } - end_label_56: ; + end_label_55: ; } } @@ -12443,8 +12409,8 @@ void VhdlParser::sel_wave_list() {if (!hasError) { break; } default: - jj_la1[282] = jj_gen; - goto end_label_57; + jj_la1[281] = jj_gen; + goto end_label_56; }if (!hasError) { jj_consume_token(COMMA_T); @@ -12455,7 +12421,7 @@ void VhdlParser::sel_wave_list() {if (!hasError) { } } - end_label_57: ; + end_label_56: ; } if (!hasError) { @@ -12482,7 +12448,7 @@ void VhdlParser::inout_stat() { break; } default: - jj_la1[283] = jj_gen; + jj_la1[282] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } @@ -12514,7 +12480,7 @@ void VhdlParser::else_stat() {if (!hasError) { break; } default: - jj_la1[284] = jj_gen; + jj_la1[283] = jj_gen; ; } } @@ -12525,11 +12491,11 @@ void VhdlParser::else_stat() {if (!hasError) { break; } default: - jj_la1[285] = jj_gen; - goto end_label_58; + jj_la1[284] = jj_gen; + goto end_label_57; } } - end_label_58: ; + end_label_57: ; } } @@ -12562,7 +12528,7 @@ return s; break; } default: - jj_la1[286] = jj_gen; + jj_la1[285] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } @@ -12610,14 +12576,14 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token * break; } default: - jj_la1[287] = jj_gen; + jj_la1[286] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } break; } default: - jj_la1[288] = jj_gen; + jj_la1[287] = jj_gen; ; } } @@ -12667,7 +12633,7 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token * break; } default: - jj_la1[289] = jj_gen; + jj_la1[288] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } @@ -12676,7 +12642,7 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token * break; } default: - jj_la1[290] = jj_gen; + jj_la1[289] = jj_gen; ; } } @@ -12714,7 +12680,7 @@ QCString VhdlParser::param() {QCString s,s1;Token *tok=0;if (!hasError) { break; } default: - jj_la1[291] = jj_gen; + jj_la1[290] = jj_gen; ; } } @@ -12741,7 +12707,7 @@ param_sec=PARAM_SEC; break; } default: - jj_la1[292] = jj_gen; + jj_la1[291] = jj_gen; ; } } @@ -12779,7 +12745,7 @@ void VhdlParser::parseInline() { break; } default: - jj_la1[293] = jj_gen; + jj_la1[292] = jj_gen; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } @@ -12815,7 +12781,7 @@ void VhdlParser::ReInit(TokenManager *tm){ trace_enabled = false; jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 294; i++) jj_la1[i] = -1; + for (int i = 0; i < 293; i++) jj_la1[i] = -1; } diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h index 12631dd..91bf32d 100644 --- a/vhdlparser/VhdlParser.h +++ b/vhdlparser/VhdlParser.h @@ -1490,35 +1490,35 @@ void parseInline(); { jj_save(113, xla); } } - inline bool jj_3R_258() + inline bool jj_3R_257() { if (jj_done) return true; - if (jj_3R_367()) return true; + if (jj_3R_366()) return true; return false; } - inline bool jj_3R_257() + inline bool jj_3R_256() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_123() + inline bool jj_3R_122() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_257()) jj_scanpos = xsp; + if (jj_3R_256()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_258()) jj_scanpos = xsp; + if (jj_3R_257()) jj_scanpos = xsp; if (jj_scan_token(LOOP_T)) return true; - if (jj_3R_259()) return true; + if (jj_3R_258()) return true; if (jj_scan_token(END_T)) return true; if (jj_scan_token(LOOP_T)) return true; xsp = jj_scanpos; - if (jj_3R_625()) jj_scanpos = xsp; + if (jj_3R_628()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -1526,18 +1526,18 @@ void parseInline(); inline bool jj_3_45() { if (jj_done) return true; - if (jj_3R_97()) return true; + if (jj_3R_96()) return true; return false; } inline bool jj_3_44() { if (jj_done) return true; - if (jj_3R_96()) return true; + if (jj_3R_95()) return true; return false; } - inline bool jj_3R_233() + inline bool jj_3R_232() { if (jj_done) return true; if (jj_scan_token(NULL_T)) return true; @@ -1547,21 +1547,14 @@ void parseInline(); inline bool jj_3_43() { if (jj_done) return true; - if (jj_3R_95()) return true; - return false; - } - - inline bool jj_3R_232() - { - if (jj_done) return true; - if (jj_3R_356()) return true; + if (jj_3R_94()) return true; return false; } inline bool jj_3R_231() { if (jj_done) return true; - if (jj_3R_97()) return true; + if (jj_3R_355()) return true; return false; } @@ -1579,20 +1572,27 @@ void parseInline(); return false; } - inline bool jj_3R_107() + inline bool jj_3R_228() + { + if (jj_done) return true; + if (jj_3R_94()) return true; + return false; + } + + inline bool jj_3R_106() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_228()) { + jj_scanpos = xsp; if (jj_3R_229()) { jj_scanpos = xsp; if (jj_3R_230()) { jj_scanpos = xsp; if (jj_3R_231()) { jj_scanpos = xsp; - if (jj_3R_232()) { - jj_scanpos = xsp; - if (jj_3R_233()) return true; + if (jj_3R_232()) return true; } } } @@ -1603,69 +1603,69 @@ void parseInline(); inline bool jj_3_42() { if (jj_done) return true; - if (jj_3R_94()) return true; + if (jj_3R_93()) return true; return false; } - inline bool jj_3R_140() + inline bool jj_3R_139() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_199() + inline bool jj_3R_198() { if (jj_done) return true; if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_444() + inline bool jj_3R_442() { if (jj_done) return true; if (jj_scan_token(FOR_T)) return true; - if (jj_3R_408()) return true; + if (jj_3R_407()) return true; return false; } - inline bool jj_3R_367() + inline bool jj_3R_366() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_443()) { + if (jj_3R_441()) { jj_scanpos = xsp; - if (jj_3R_444()) return true; + if (jj_3R_442()) return true; } return false; } - inline bool jj_3R_443() + inline bool jj_3R_441() { if (jj_done) return true; if (jj_scan_token(WHILE_T)) return true; - if (jj_3R_80()) return true; + if (jj_3R_79()) return true; return false; } - inline bool jj_3R_198() + inline bool jj_3R_197() { if (jj_done) return true; - if (jj_3R_346()) return true; + if (jj_3R_345()) return true; return false; } - inline bool jj_3R_400() + inline bool jj_3R_399() { if (jj_done) return true; if (jj_scan_token(SEMI_T)) return true; - if (jj_3R_399()) return true; + if (jj_3R_398()) return true; return false; } - inline bool jj_3R_196() + inline bool jj_3R_195() { if (jj_done) return true; Token * xsp; @@ -1683,128 +1683,128 @@ void parseInline(); return false; } - inline bool jj_3R_91() + inline bool jj_3R_90() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_196()) jj_scanpos = xsp; - if (jj_3R_197()) return true; + if (jj_3R_195()) jj_scanpos = xsp; + if (jj_3R_196()) return true; if (jj_scan_token(COLON_T)) return true; xsp = jj_scanpos; - if (jj_3R_198()) jj_scanpos = xsp; - if (jj_3R_85()) return true; + if (jj_3R_197()) jj_scanpos = xsp; + if (jj_3R_84()) return true; xsp = jj_scanpos; if (jj_scan_token(27)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_199()) jj_scanpos = xsp; + if (jj_3R_198()) jj_scanpos = xsp; return false; } - inline bool jj_3R_313() + inline bool jj_3R_312() { if (jj_done) return true; - if (jj_3R_399()) return true; + if (jj_3R_398()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_400()) { jj_scanpos = xsp; break; } + if (jj_3R_399()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_413() + inline bool jj_3R_411() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_92() + inline bool jj_3R_91() { if (jj_done) return true; if (jj_scan_token(FILE_T)) return true; - if (jj_3R_197()) return true; + if (jj_3R_196()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; return false; } - inline bool jj_3R_399() + inline bool jj_3R_398() { if (jj_done) return true; - if (jj_3R_491()) return true; + if (jj_3R_489()) return true; return false; } inline bool jj_3_41() { if (jj_done) return true; - if (jj_3R_93()) return true; + if (jj_3R_92()) return true; return false; } - inline bool jj_3R_552() + inline bool jj_3R_557() { if (jj_done) return true; - if (jj_3R_613()) return true; - if (jj_3R_70()) return true; + if (jj_3R_612()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_551() + inline bool jj_3R_556() { if (jj_done) return true; - if (jj_3R_93()) return true; + if (jj_3R_92()) return true; return false; } inline bool jj_3_40() { if (jj_done) return true; - if (jj_3R_92()) return true; + if (jj_3R_91()) return true; return false; } inline bool jj_3_39() { if (jj_done) return true; - if (jj_3R_91()) return true; + if (jj_3R_90()) return true; return false; } - inline bool jj_3R_550() + inline bool jj_3R_555() { if (jj_done) return true; - if (jj_3R_108()) return true; + if (jj_3R_107()) return true; return false; } inline bool jj_3_38() { if (jj_done) return true; - if (jj_3R_90()) return true; + if (jj_3R_89()) return true; return false; } - inline bool jj_3R_491() + inline bool jj_3R_489() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_38()) { jj_scanpos = xsp; - if (jj_3R_550()) { + if (jj_3R_555()) { jj_scanpos = xsp; if (jj_3_39()) { jj_scanpos = xsp; if (jj_3_40()) { jj_scanpos = xsp; - if (jj_3R_551()) { + if (jj_3R_556()) { jj_scanpos = xsp; - if (jj_3R_552()) return true; + if (jj_3R_557()) return true; } } } @@ -1813,93 +1813,93 @@ void parseInline(); return false; } - inline bool jj_3R_181() + inline bool jj_3R_180() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_69()) return true; + if (jj_3R_68()) return true; return false; } - inline bool jj_3R_621() + inline bool jj_3R_624() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_416() + inline bool jj_3R_414() { if (jj_done) return true; if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_415() + inline bool jj_3R_413() { if (jj_done) return true; if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_331() + inline bool jj_3R_330() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_414()) { + if (jj_3R_412()) { jj_scanpos = xsp; - if (jj_3R_415()) { + if (jj_3R_413()) { jj_scanpos = xsp; - if (jj_3R_416()) return true; + if (jj_3R_414()) return true; } } return false; } - inline bool jj_3R_414() + inline bool jj_3R_412() { if (jj_done) return true; - if (jj_3R_197()) return true; + if (jj_3R_196()) return true; return false; } - inline bool jj_3R_698() + inline bool jj_3R_695() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_328() + inline bool jj_3R_327() { if (jj_done) return true; if (jj_scan_token(CONFIGURATION_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_327() + inline bool jj_3R_326() { if (jj_done) return true; if (jj_scan_token(ENTITY_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_413()) jj_scanpos = xsp; + if (jj_3R_411()) jj_scanpos = xsp; return false; } - inline bool jj_3R_174() + inline bool jj_3R_173() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_326()) { + if (jj_3R_325()) { jj_scanpos = xsp; - if (jj_3R_327()) { + if (jj_3R_326()) { jj_scanpos = xsp; - if (jj_3R_328()) return true; + if (jj_3R_327()) return true; } } return false; @@ -1908,308 +1908,308 @@ void parseInline(); inline bool jj_3_37() { if (jj_done) return true; - if (jj_3R_69()) return true; + if (jj_3R_68()) return true; return false; } - inline bool jj_3R_326() + inline bool jj_3R_325() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(28)) jj_scanpos = xsp; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_155() + inline bool jj_3R_154() { if (jj_done) return true; - if (jj_3R_158()) return true; + if (jj_3R_157()) return true; if (jj_scan_token(RANGE_T)) return true; if (jj_scan_token(BOX_T)) return true; return false; } - inline bool jj_3R_427() + inline bool jj_3R_425() { if (jj_done) return true; if (jj_scan_token(IS_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_698()) { + if (jj_3R_695()) { jj_scanpos = xsp; if (jj_scan_token(145)) return true; } return false; } - inline bool jj_3R_618() + inline bool jj_3R_621() { if (jj_done) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_617() + inline bool jj_3R_620() { if (jj_done) return true; - if (jj_3R_69()) return true; + if (jj_3R_68()) return true; return false; } - inline bool jj_3R_565() + inline bool jj_3R_564() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_617()) { + if (jj_3R_620()) { jj_scanpos = xsp; - if (jj_3R_618()) return true; + if (jj_3R_621()) return true; } return false; } - inline bool jj_3R_83() + inline bool jj_3R_82() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_69()) return true; + if (jj_3R_68()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_181()) { jj_scanpos = xsp; break; } + if (jj_3R_180()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_526() + inline bool jj_3R_531() { if (jj_done) return true; if (jj_scan_token(TYPE_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_620() + inline bool jj_3R_623() { if (jj_done) return true; if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_259()) return true; + if (jj_3R_258()) return true; return false; } - inline bool jj_3R_619() + inline bool jj_3R_622() { if (jj_done) return true; if (jj_scan_token(ELSIF_T)) return true; - if (jj_3R_80()) return true; + if (jj_3R_79()) return true; if (jj_scan_token(THEN_T)) return true; - if (jj_3R_259()) return true; + if (jj_3R_258()) return true; return false; } - inline bool jj_3R_345() + inline bool jj_3R_344() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_514() + inline bool jj_3R_519() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_313()) return true; + if (jj_3R_312()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_255() + inline bool jj_3R_254() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_121() + inline bool jj_3R_120() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_255()) jj_scanpos = xsp; + if (jj_3R_254()) jj_scanpos = xsp; if (jj_scan_token(IF_T)) return true; - if (jj_3R_80()) return true; + if (jj_3R_79()) return true; if (jj_scan_token(THEN_T)) return true; - if (jj_3R_259()) return true; + if (jj_3R_258()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_619()) { jj_scanpos = xsp; break; } + if (jj_3R_622()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_620()) jj_scanpos = xsp; + if (jj_3R_623()) jj_scanpos = xsp; if (jj_scan_token(END_T)) return true; if (jj_scan_token(IF_T)) return true; xsp = jj_scanpos; - if (jj_3R_621()) jj_scanpos = xsp; + if (jj_3R_624()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_197() + inline bool jj_3R_196() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_345()) { jj_scanpos = xsp; break; } + if (jj_3R_344()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_165() + inline bool jj_3R_164() { if (jj_done) return true; if (jj_scan_token(BASIC_IDENTIFIER)) return true; return false; } - inline bool jj_3R_164() + inline bool jj_3R_163() { if (jj_done) return true; if (jj_scan_token(EXTENDED_CHARACTER)) return true; return false; } - inline bool jj_3R_70() + inline bool jj_3R_69() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_164()) { + if (jj_3R_163()) { jj_scanpos = xsp; - if (jj_3R_165()) return true; + if (jj_3R_164()) return true; } return false; } - inline bool jj_3R_539() + inline bool jj_3R_544() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_538()) return true; + if (jj_3R_543()) return true; return false; } - inline bool jj_3R_425() + inline bool jj_3R_423() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(77)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_514()) jj_scanpos = xsp; + if (jj_3R_519()) jj_scanpos = xsp; return false; } inline bool jj_3_114() { if (jj_done) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(WHEN_T)) return true; return false; } - inline bool jj_3R_66() + inline bool jj_3R_385() + { + if (jj_done) return true; + if (jj_3R_58()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_85()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_scan_token(134)) { + jj_scanpos = xsp; + if (jj_scan_token(137)) return true; + } + return false; + } + + inline bool jj_3R_65() { if (jj_done) return true; if (jj_scan_token(GROUP_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(IS_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_475()) return true; + if (jj_3R_473()) return true; if (jj_scan_token(RPAREN_T)) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_386() + inline bool jj_3R_445() { if (jj_done) return true; - if (jj_3R_59()) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_86()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_scan_token(134)) { - jj_scanpos = xsp; - if (jj_scan_token(137)) return true; - } + if (jj_3R_528()) return true; return false; } - inline bool jj_3R_447() + inline bool jj_3R_529() { if (jj_done) return true; - if (jj_3R_523()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_447()) return true; return false; } - inline bool jj_3R_383() + inline bool jj_3R_382() { if (jj_done) return true; if (jj_scan_token(GROUP_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_476()) return true; + if (jj_3R_474()) return true; if (jj_scan_token(RPAREN_T)) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_524() - { - if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_449()) return true; - return false; - } - - inline bool jj_3R_540() + inline bool jj_3R_545() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_305() + inline bool jj_3R_304() { if (jj_done) return true; - if (jj_3R_384()) return true; + if (jj_3R_383()) return true; return false; } - inline bool jj_3R_476() + inline bool jj_3R_474() { if (jj_done) return true; - if (jj_3R_538()) return true; + if (jj_3R_543()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_539()) { jj_scanpos = xsp; break; } + if (jj_3R_544()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_426() + inline bool jj_3R_424() { if (jj_done) return true; Token * xsp; @@ -2221,179 +2221,179 @@ void parseInline(); return false; } - inline bool jj_3R_344() + inline bool jj_3R_343() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_426()) jj_scanpos = xsp; + if (jj_3R_424()) jj_scanpos = xsp; if (jj_scan_token(FUNCTION_T)) return true; - if (jj_3R_60()) return true; - if (jj_3R_425()) return true; + if (jj_3R_59()) return true; + if (jj_3R_423()) return true; if (jj_scan_token(RETURN_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; xsp = jj_scanpos; - if (jj_3R_427()) jj_scanpos = xsp; + if (jj_3R_425()) jj_scanpos = xsp; return false; } - inline bool jj_3R_608() + inline bool jj_3R_607() { if (jj_done) return true; - if (jj_3R_352()) return true; + if (jj_3R_351()) return true; return false; } - inline bool jj_3R_607() + inline bool jj_3R_606() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_538() + inline bool jj_3R_543() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_607()) { + if (jj_3R_606()) { jj_scanpos = xsp; - if (jj_3R_608()) return true; + if (jj_3R_607()) return true; } return false; } - inline bool jj_3R_71() + inline bool jj_3R_70() { if (jj_done) return true; if (jj_scan_token(GENERIC_T)) return true; if (jj_scan_token(MAP_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_166()) return true; + if (jj_3R_165()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_304() - { - if (jj_done) return true; - if (jj_3R_59()) return true; - if (jj_3R_385()) return true; - return false; - } - - inline bool jj_3R_171() + inline bool jj_3R_303() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_58()) return true; + if (jj_3R_384()) return true; return false; } - inline bool jj_3R_343() + inline bool jj_3R_342() { if (jj_done) return true; if (jj_scan_token(PROCEDURE_T)) return true; - if (jj_3R_70()) return true; - if (jj_3R_425()) return true; + if (jj_3R_69()) return true; + if (jj_3R_423()) return true; return false; } - inline bool jj_3R_195() + inline bool jj_3R_170() { if (jj_done) return true; - if (jj_3R_344()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_159() + inline bool jj_3R_194() { if (jj_done) return true; - if (jj_3R_313()) return true; + if (jj_3R_343()) return true; return false; } - inline bool jj_3R_194() + inline bool jj_3R_193() { if (jj_done) return true; - if (jj_3R_343()) return true; + if (jj_3R_342()) return true; return false; } - inline bool jj_3R_90() + inline bool jj_3R_89() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_194()) { + if (jj_3R_193()) { jj_scanpos = xsp; - if (jj_3R_195()) return true; + if (jj_3R_194()) return true; } return false; } - inline bool jj_3R_67() + inline bool jj_3R_158() { if (jj_done) return true; - if (jj_scan_token(GENERIC_T)) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_159()) return true; - if (jj_scan_token(RPAREN_T)) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_312()) return true; return false; } - inline bool jj_3R_477() + inline bool jj_3R_475() { if (jj_done) return true; if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_540()) jj_scanpos = xsp; + if (jj_3R_545()) jj_scanpos = xsp; return false; } - inline bool jj_3R_385() + inline bool jj_3R_66() + { + if (jj_done) return true; + if (jj_scan_token(GENERIC_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_158()) return true; + if (jj_scan_token(RPAREN_T)) return true; + if (jj_scan_token(SEMI_T)) return true; + return false; + } + + inline bool jj_3R_384() { if (jj_done) return true; Token * xsp; - if (jj_3R_477()) return true; + if (jj_3R_475()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_477()) { jj_scanpos = xsp; break; } + if (jj_3R_475()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_322() + inline bool jj_3R_321() { if (jj_done) return true; if (jj_scan_token(IF_T)) return true; - if (jj_3R_80()) return true; + if (jj_3R_79()) return true; return false; } - inline bool jj_3R_169() + inline bool jj_3R_168() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_321()) { + if (jj_3R_320()) { jj_scanpos = xsp; - if (jj_3R_322()) return true; + if (jj_3R_321()) return true; } return false; } - inline bool jj_3R_321() + inline bool jj_3R_320() { if (jj_done) return true; if (jj_scan_token(FOR_T)) return true; - if (jj_3R_408()) return true; + if (jj_3R_407()) return true; return false; } - inline bool jj_3R_384() + inline bool jj_3R_383() { if (jj_done) return true; Token * xsp; @@ -2405,58 +2405,58 @@ void parseInline(); return false; } - inline bool jj_3R_448() + inline bool jj_3R_446() { if (jj_done) return true; - if (jj_3R_405()) return true; + if (jj_3R_404()) return true; return false; } - inline bool jj_3R_449() + inline bool jj_3R_447() { if (jj_done) return true; - if (jj_3R_446()) return true; + if (jj_3R_444()) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_86()) return true; + if (jj_3R_85()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_524()) { jj_scanpos = xsp; break; } + if (jj_3R_529()) { jj_scanpos = xsp; break; } } if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_464() + inline bool jj_3R_462() { if (jj_done) return true; - if (jj_3R_528()) return true; + if (jj_3R_533()) return true; return false; } - inline bool jj_3R_75() + inline bool jj_3R_74() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_169()) return true; + if (jj_3R_168()) return true; if (jj_scan_token(GENERATE_T)) return true; - if (jj_3R_170()) return true; + if (jj_3R_169()) return true; if (jj_scan_token(END_T)) return true; if (jj_scan_token(GENERATE_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_171()) jj_scanpos = xsp; + if (jj_3R_170()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_306() + inline bool jj_3R_305() { if (jj_done) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_86()) return true; + if (jj_3R_85()) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(134)) { @@ -2465,125 +2465,125 @@ void parseInline(); } while (true) { xsp = jj_scanpos; - if (jj_3R_386()) { jj_scanpos = xsp; break; } + if (jj_3R_385()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_105() + inline bool jj_3R_302() { if (jj_done) return true; - if (jj_3R_60()) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_226()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_383()) return true; return false; } - inline bool jj_3R_303() + inline bool jj_3R_104() { if (jj_done) return true; - if (jj_3R_384()) return true; + if (jj_3R_59()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_225()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } inline bool jj_3_110() { if (jj_done) return true; - if (jj_3R_143()) return true; + if (jj_3R_142()) return true; if (jj_scan_token(DOT_T)) return true; return false; } - inline bool jj_3R_145() + inline bool jj_3R_144() { if (jj_done) return true; if (jj_scan_token(WITH_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(SELECT_T)) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(155)) jj_scanpos = xsp; - if (jj_3R_115()) return true; + if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; if (jj_scan_token(FORCE_T)) return true; xsp = jj_scanpos; - if (jj_3R_305()) jj_scanpos = xsp; - if (jj_3R_306()) return true; + if (jj_3R_304()) jj_scanpos = xsp; + if (jj_3R_305()) return true; return false; } - inline bool jj_3R_157() + inline bool jj_3_113() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_312()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_108()) return true; return false; } - inline bool jj_3_113() + inline bool jj_3R_156() { if (jj_done) return true; - if (jj_3R_109()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_311()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_369() + inline bool jj_3R_368() { if (jj_done) return true; if (jj_scan_token(WITH_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(SELECT_T)) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(155)) jj_scanpos = xsp; - if (jj_3R_115()) return true; + if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; xsp = jj_scanpos; - if (jj_3R_448()) jj_scanpos = xsp; - if (jj_3R_449()) return true; + if (jj_3R_446()) jj_scanpos = xsp; + if (jj_3R_447()) return true; return false; } - inline bool jj_3R_301() + inline bool jj_3R_300() { if (jj_done) return true; - if (jj_3R_143()) return true; + if (jj_3R_142()) return true; if (jj_scan_token(DOT_T)) return true; return false; } - inline bool jj_3R_689() + inline bool jj_3R_686() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_137() + inline bool jj_3R_136() { if (jj_done) return true; if (jj_scan_token(TYPE_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(IS_T)) return true; - if (jj_3R_577()) return true; + if (jj_3R_576()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_575() + inline bool jj_3R_574() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_688() + inline bool jj_3R_685() { if (jj_done) return true; - if (jj_3R_109()) return true; + if (jj_3R_108()) return true; return false; } @@ -2592,258 +2592,265 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_688()) { + if (jj_3R_685()) { jj_scanpos = xsp; - if (jj_3R_689()) return true; + if (jj_3R_686()) return true; } return false; } - inline bool jj_3R_64() + inline bool jj_3R_63() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_157()) jj_scanpos = xsp; + if (jj_3R_156()) jj_scanpos = xsp; return false; } inline bool jj_3_112() { if (jj_done) return true; - if (jj_3R_145()) return true; - return false; - } - - inline bool jj_3R_570() - { - if (jj_done) return true; - if (jj_3R_313()) return true; + if (jj_3R_144()) return true; return false; } - inline bool jj_3R_521() + inline bool jj_3R_526() { if (jj_done) return true; if (jj_scan_token(WITH_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(SELECT_T)) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(155)) jj_scanpos = xsp; if (jj_3R_662()) return true; if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_306()) return true; + if (jj_3R_305()) return true; return false; } - inline bool jj_3R_445() + inline bool jj_3R_443() { if (jj_done) return true; - if (jj_3R_405()) return true; + if (jj_3R_404()) return true; return false; } - inline bool jj_3R_398() + inline bool jj_3R_569() + { + if (jj_done) return true; + if (jj_3R_312()) return true; + return false; + } + + inline bool jj_3R_397() { if (jj_done) return true; if (jj_scan_token(INTEGER)) return true; return false; } - inline bool jj_3R_312() + inline bool jj_3R_311() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_397()) { + if (jj_3R_396()) { jj_scanpos = xsp; - if (jj_3R_398()) return true; + if (jj_3R_397()) return true; } return false; } - inline bool jj_3R_397() + inline bool jj_3R_396() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_271() + inline bool jj_3R_270() { if (jj_done) return true; - if (jj_3R_369()) return true; + if (jj_3R_368()) return true; return false; } - inline bool jj_3R_128() + inline bool jj_3R_127() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_270()) { + if (jj_3R_269()) { jj_scanpos = xsp; - if (jj_3R_271()) return true; + if (jj_3R_270()) return true; } return false; } - inline bool jj_3R_270() + inline bool jj_3R_269() { if (jj_done) return true; - if (jj_3R_145()) return true; + if (jj_3R_144()) return true; return false; } - inline bool jj_3R_144() + inline bool jj_3R_143() { if (jj_done) return true; - if (jj_3R_115()) return true; + if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; if (jj_scan_token(FORCE_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_303()) jj_scanpos = xsp; - if (jj_3R_59()) return true; + if (jj_3R_302()) jj_scanpos = xsp; + if (jj_3R_58()) return true; if (jj_scan_token(WHEN_T)) return true; xsp = jj_scanpos; - if (jj_3R_304()) jj_scanpos = xsp; + if (jj_3R_303()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_654() + inline bool jj_3R_656() { if (jj_done) return true; if (jj_scan_token(FILE_T)) return true; if (jj_scan_token(OF_T)) return true; - if (jj_3R_158()) return true; + if (jj_3R_157()) return true; return false; } - inline bool jj_3R_523() + inline bool jj_3R_528() { if (jj_done) return true; if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_575()) jj_scanpos = xsp; + if (jj_3R_574()) jj_scanpos = xsp; return false; } inline bool jj_3_111() { if (jj_done) return true; - if (jj_3R_144()) return true; + if (jj_3R_143()) return true; return false; } - inline bool jj_3R_580() + inline bool jj_3R_323() + { + if (jj_done) return true; + if (jj_3R_409()) return true; + return false; + } + + inline bool jj_3R_579() { if (jj_done) return true; if (jj_scan_token(OPEN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_528() + inline bool jj_3R_533() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_580()) jj_scanpos = xsp; + if (jj_3R_579()) jj_scanpos = xsp; if (jj_scan_token(IS_T)) return true; - if (jj_3R_581()) return true; + if (jj_3R_580()) return true; return false; } - inline bool jj_3R_368() + inline bool jj_3R_367() { if (jj_done) return true; - if (jj_3R_115()) return true; + if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_445()) jj_scanpos = xsp; - if (jj_3R_446()) return true; + if (jj_3R_443()) jj_scanpos = xsp; + if (jj_3R_444()) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; xsp = jj_scanpos; - if (jj_3R_447()) jj_scanpos = xsp; + if (jj_3R_445()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_269() + inline bool jj_3R_268() { if (jj_done) return true; - if (jj_3R_368()) return true; + if (jj_3R_367()) return true; return false; } - inline bool jj_3R_581() + inline bool jj_3R_580() { if (jj_done) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_127() + inline bool jj_3R_126() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_268()) { + if (jj_3R_267()) { jj_scanpos = xsp; - if (jj_3R_269()) return true; + if (jj_3R_268()) return true; } return false; } - inline bool jj_3R_268() + inline bool jj_3R_267() { if (jj_done) return true; - if (jj_3R_144()) return true; + if (jj_3R_143()) return true; return false; } - inline bool jj_3R_450() + inline bool jj_3R_448() { if (jj_done) return true; if (jj_scan_token(DOUBLEMULT_T)) return true; - if (jj_3R_370()) return true; + if (jj_3R_369()) return true; return false; } - inline bool jj_3R_142() + inline bool jj_3R_141() { if (jj_done) return true; - if (jj_3R_143()) return true; + if (jj_3R_142()) return true; if (jj_scan_token(DOT_T)) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_301()) { jj_scanpos = xsp; break; } + if (jj_3R_300()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_549() + inline bool jj_3R_554() { if (jj_done) return true; if (jj_scan_token(AT_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_302() + inline bool jj_3R_301() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } @@ -2851,134 +2858,127 @@ void parseInline(); inline bool jj_3_109() { if (jj_done) return true; - if (jj_3R_142()) return true; + if (jj_3R_141()) return true; return false; } - inline bool jj_3R_376() + inline bool jj_3R_375() { if (jj_done) return true; if (jj_scan_token(FILE_T)) return true; - if (jj_3R_197()) return true; + if (jj_3R_196()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_464()) jj_scanpos = xsp; + if (jj_3R_462()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_264() + inline bool jj_3R_263() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_284() + inline bool jj_3R_283() { if (jj_done) return true; if (jj_scan_token(NOT_T)) return true; - if (jj_3R_370()) return true; + if (jj_3R_369()) return true; return false; } - inline bool jj_3R_283() + inline bool jj_3R_282() { if (jj_done) return true; if (jj_scan_token(ABS_T)) return true; - if (jj_3R_370()) return true; + if (jj_3R_369()) return true; return false; } - inline bool jj_3R_136() + inline bool jj_3R_135() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_282()) { + if (jj_3R_281()) { jj_scanpos = xsp; - if (jj_3R_283()) { + if (jj_3R_282()) { jj_scanpos = xsp; - if (jj_3R_284()) return true; + if (jj_3R_283()) return true; } } return false; } - inline bool jj_3R_282() + inline bool jj_3R_281() { if (jj_done) return true; - if (jj_3R_370()) return true; + if (jj_3R_369()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_450()) jj_scanpos = xsp; + if (jj_3R_448()) jj_scanpos = xsp; return false; } - inline bool jj_3R_612() + inline bool jj_3R_611() { if (jj_done) return true; - if (jj_3R_142()) return true; + if (jj_3R_141()) return true; return false; } - inline bool jj_3R_699() + inline bool jj_3R_696() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_97()) return true; - return false; - } - - inline bool jj_3R_147() - { - if (jj_done) return true; - if (jj_3R_309()) return true; - if (jj_3R_146()) return true; + if (jj_3R_96()) return true; return false; } - inline bool jj_3R_143() + inline bool jj_3R_142() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_302()) jj_scanpos = xsp; + if (jj_3R_301()) jj_scanpos = xsp; return false; } - inline bool jj_3R_394() + inline bool jj_3R_146() { if (jj_done) return true; - if (jj_scan_token(OR_T)) return true; + if (jj_3R_308()) return true; + if (jj_3R_145()) return true; return false; } inline bool jj_3R_393() { if (jj_done) return true; - if (jj_scan_token(XOR_T)) return true; + if (jj_scan_token(OR_T)) return true; return false; } inline bool jj_3R_392() { if (jj_done) return true; - if (jj_scan_token(XNOR_T)) return true; + if (jj_scan_token(XOR_T)) return true; return false; } inline bool jj_3R_391() { if (jj_done) return true; - if (jj_scan_token(NOR_T)) return true; + if (jj_scan_token(XNOR_T)) return true; return false; } - inline bool jj_3R_636() + inline bool jj_3R_639() { if (jj_done) return true; if (jj_scan_token(NEG_T)) return true; @@ -2989,34 +2989,36 @@ void parseInline(); inline bool jj_3R_390() { if (jj_done) return true; - if (jj_scan_token(NAND_T)) return true; + if (jj_scan_token(NOR_T)) return true; return false; } - inline bool jj_3R_611() + inline bool jj_3R_610() { if (jj_done) return true; Token * xsp; - if (jj_3R_636()) return true; + if (jj_3R_639()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_636()) { jj_scanpos = xsp; break; } + if (jj_3R_639()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_410() + inline bool jj_3R_389() { if (jj_done) return true; - if (jj_3R_498()) return true; + if (jj_scan_token(NAND_T)) return true; return false; } - inline bool jj_3R_309() + inline bool jj_3R_308() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_388()) { + jj_scanpos = xsp; if (jj_3R_389()) { jj_scanpos = xsp; if (jj_3R_390()) { @@ -3025,9 +3027,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_392()) { jj_scanpos = xsp; - if (jj_3R_393()) { - jj_scanpos = xsp; - if (jj_3R_394()) return true; + if (jj_3R_393()) return true; } } } @@ -3036,7 +3036,7 @@ void parseInline(); return false; } - inline bool jj_3R_389() + inline bool jj_3R_388() { if (jj_done) return true; if (jj_scan_token(AND_T)) return true; @@ -3047,314 +3047,292 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; - if (jj_3R_142()) return true; + if (jj_3R_141()) return true; return false; } - inline bool jj_3R_548() + inline bool jj_3R_553() { if (jj_done) return true; - if (jj_3R_611()) return true; + if (jj_3R_610()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_612()) jj_scanpos = xsp; - if (jj_3R_70()) return true; + if (jj_3R_611()) jj_scanpos = xsp; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_610() + inline bool jj_3R_609() { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_59() + inline bool jj_3R_58() { if (jj_done) return true; - if (jj_3R_146()) return true; + if (jj_3R_145()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_147()) { jj_scanpos = xsp; break; } + if (jj_3R_146()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_609() + inline bool jj_3R_608() { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; - if (jj_3R_142()) return true; - if (jj_3R_70()) return true; + if (jj_3R_141()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_547() + inline bool jj_3R_552() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_609()) { + if (jj_3R_608()) { jj_scanpos = xsp; - if (jj_3R_610()) return true; + if (jj_3R_609()) return true; } return false; } - inline bool jj_3R_490() + inline bool jj_3R_488() { if (jj_done) return true; - if (jj_3R_549()) return true; + if (jj_3R_554()) return true; return false; } - inline bool jj_3R_489() + inline bool jj_3R_487() { if (jj_done) return true; - if (jj_3R_548()) return true; + if (jj_3R_553()) return true; return false; } - inline bool jj_3R_396() + inline bool jj_3R_395() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_488()) { + if (jj_3R_486()) { jj_scanpos = xsp; - if (jj_3R_489()) { + if (jj_3R_487()) { jj_scanpos = xsp; - if (jj_3R_490()) return true; + if (jj_3R_488()) return true; } } return false; } - inline bool jj_3R_488() + inline bool jj_3R_486() { if (jj_done) return true; - if (jj_3R_547()) return true; + if (jj_3R_552()) return true; return false; } inline bool jj_3_105() { if (jj_done) return true; - if (jj_3R_139()) return true; + if (jj_3R_138()) return true; return false; } - inline bool jj_3R_265() + inline bool jj_3R_264() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_80()) return true; + if (jj_3R_79()) return true; return false; } - inline bool jj_3R_263() + inline bool jj_3R_262() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_487() + inline bool jj_3R_485() { if (jj_done) return true; if (jj_scan_token(VARIABLE_T)) return true; return false; } - inline bool jj_3R_125() + inline bool jj_3R_484() + { + if (jj_done) return true; + if (jj_scan_token(SIGNAL_T)) return true; + return false; + } + + inline bool jj_3R_124() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_263()) jj_scanpos = xsp; + if (jj_3R_262()) jj_scanpos = xsp; if (jj_scan_token(EXIT_T)) return true; xsp = jj_scanpos; - if (jj_3R_264()) jj_scanpos = xsp; + if (jj_3R_263()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_265()) jj_scanpos = xsp; + if (jj_3R_264()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_486() - { - if (jj_done) return true; - if (jj_scan_token(SIGNAL_T)) return true; - return false; - } - - inline bool jj_3R_395() + inline bool jj_3R_394() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_485()) { + if (jj_3R_483()) { jj_scanpos = xsp; - if (jj_3R_486()) { + if (jj_3R_484()) { jj_scanpos = xsp; - if (jj_3R_487()) return true; + if (jj_3R_485()) return true; } } return false; } - inline bool jj_3R_485() + inline bool jj_3R_483() { if (jj_done) return true; if (jj_scan_token(CONSTANT_T)) return true; return false; } - inline bool jj_3R_690() + inline bool jj_3R_687() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_97()) return true; + if (jj_3R_96()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_699()) { jj_scanpos = xsp; break; } + if (jj_3R_696()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_275() + inline bool jj_3_107() { if (jj_done) return true; - if (jj_3R_133()) return true; + if (jj_3R_140()) return true; return false; } - inline bool jj_3R_209() + inline bool jj_3R_274() { if (jj_done) return true; - if (jj_3R_352()) return true; + if (jj_3R_132()) return true; return false; } - inline bool jj_3_107() + inline bool jj_3R_208() { if (jj_done) return true; - if (jj_3R_141()) return true; - if (jj_scan_token(BEGIN_T)) return true; + if (jj_3R_351()) return true; return false; } - inline bool jj_3R_208() + inline bool jj_3R_207() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_97() + inline bool jj_3R_96() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_208()) { + if (jj_3R_207()) { jj_scanpos = xsp; - if (jj_3R_209()) return true; + if (jj_3R_208()) return true; } return false; } - inline bool jj_3R_311() + inline bool jj_3R_310() { if (jj_done) return true; if (jj_scan_token(SLSL_T)) return true; + if (jj_3R_394()) return true; if (jj_3R_395()) return true; - if (jj_3R_396()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; if (jj_scan_token(RSRS_T)) return true; return false; } - inline bool jj_3R_411() + inline bool jj_3R_694() { if (jj_done) return true; - if (jj_3R_498()) return true; + if (jj_3R_351()) return true; return false; } - inline bool jj_3R_697() + inline bool jj_3R_408() { if (jj_done) return true; - if (jj_3R_352()) return true; + if (jj_3R_140()) return true; return false; } - inline bool jj_3R_324() + inline bool jj_3R_322() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_411()) { jj_scanpos = xsp; break; } + if (jj_3R_408()) { jj_scanpos = xsp; break; } } + if (jj_scan_token(BEGIN_T)) return true; return false; } - inline bool jj_3R_409() - { - if (jj_done) return true; - if (jj_3R_141()) return true; - return false; - } - - inline bool jj_3R_696() - { - if (jj_done) return true; - if (jj_3R_60()) return true; - return false; - } - - inline bool jj_3R_683() + inline bool jj_3R_169() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_696()) { - jj_scanpos = xsp; - if (jj_3R_697()) return true; + if (jj_3R_322()) jj_scanpos = xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_323()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_170() + inline bool jj_3R_693() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_323()) { - jj_scanpos = xsp; - if (jj_3R_324()) return true; - } + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_323() + inline bool jj_3R_683() { if (jj_done) return true; Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_409()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(BEGIN_T)) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3R_410()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_693()) { + jj_scanpos = xsp; + if (jj_3R_694()) return true; } return false; } @@ -3362,165 +3340,165 @@ void parseInline(); inline bool jj_3_36() { if (jj_done) return true; - if (jj_3R_89()) return true; + if (jj_3R_88()) return true; return false; } - inline bool jj_3R_285() + inline bool jj_3R_284() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_687() + inline bool jj_3R_661() { if (jj_done) return true; if (jj_scan_token(BEGIN_T)) return true; - if (jj_3R_687()) return true; + if (jj_3R_661()) return true; return false; } inline bool jj_3_35() { if (jj_done) return true; - if (jj_3R_88()) return true; + if (jj_3R_87()) return true; return false; } - inline bool jj_3R_235() + inline bool jj_3R_234() { if (jj_done) return true; - if (jj_3R_133()) return true; + if (jj_3R_132()) return true; return false; } inline bool jj_3_106() { if (jj_done) return true; - if (jj_3R_140()) return true; + if (jj_3R_139()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_139() + inline bool jj_3R_138() { if (jj_done) return true; if (jj_scan_token(END_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_285()) jj_scanpos = xsp; + if (jj_3R_284()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_637() + inline bool jj_3R_640() { if (jj_done) return true; - if (jj_3R_133()) return true; + if (jj_3R_132()) return true; return false; } - inline bool jj_3R_661() + inline bool jj_3R_651() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_106()) jj_scanpos = xsp; - if (jj_3R_86()) return true; + if (jj_3R_85()) return true; if (jj_scan_token(ARROW_T)) return true; - if (jj_3R_687()) return true; + if (jj_3R_661()) return true; return false; } - inline bool jj_3R_649() + inline bool jj_3R_618() { if (jj_done) return true; Token * xsp; - if (jj_3R_661()) return true; + if (jj_3R_651()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_661()) { jj_scanpos = xsp; break; } + if (jj_3R_651()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_471() + inline bool jj_3R_469() { if (jj_done) return true; - if (jj_3R_533()) return true; + if (jj_3R_538()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_534()) return true; + if (jj_3R_539()) return true; return false; } inline bool jj_3R_684() { if (jj_done) return true; - if (jj_3R_234()) return true; + if (jj_3R_233()) return true; return false; } - inline bool jj_3R_585() + inline bool jj_3R_584() { if (jj_done) return true; if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_584() + inline bool jj_3R_583() { if (jj_done) return true; if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_615() + inline bool jj_3R_560() { if (jj_done) return true; if (jj_scan_token(CASE_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(GENERATE_T)) return true; - if (jj_3R_649()) return true; + if (jj_3R_618()) return true; return false; } - inline bool jj_3R_634() + inline bool jj_3R_637() { if (jj_done) return true; - if (jj_3R_656()) return true; + if (jj_3R_658()) return true; return false; } - inline bool jj_3R_583() + inline bool jj_3R_582() { if (jj_done) return true; Token * xsp; - if (jj_3R_634()) return true; + if (jj_3R_637()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_634()) { jj_scanpos = xsp; break; } + if (jj_3R_637()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_533() + inline bool jj_3R_538() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_583()) { + if (jj_3R_582()) { jj_scanpos = xsp; - if (jj_3R_584()) { + if (jj_3R_583()) { jj_scanpos = xsp; - if (jj_3R_585()) return true; + if (jj_3R_584()) return true; } } return false; } - inline bool jj_3R_656() + inline bool jj_3R_658() { if (jj_done) return true; if (jj_3R_683()) return true; @@ -3530,23 +3508,23 @@ void parseInline(); return false; } - inline bool jj_3R_132() + inline bool jj_3R_131() { if (jj_done) return true; if (jj_scan_token(GENERIC_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_313()) return true; + if (jj_3R_312()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_133() + inline bool jj_3R_132() { if (jj_done) return true; if (jj_scan_token(GENERIC_T)) return true; if (jj_scan_token(MAP_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_166()) return true; + if (jj_3R_165()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } @@ -3554,154 +3532,154 @@ void parseInline(); inline bool jj_3_32() { if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_3R_64()) return true; return false; } inline bool jj_3_34() { if (jj_done) return true; - if (jj_3R_87()) return true; + if (jj_3R_86()) return true; return false; } inline bool jj_3_33() { if (jj_done) return true; - if (jj_3R_66()) return true; + if (jj_3R_65()) return true; return false; } - inline bool jj_3R_537() + inline bool jj_3R_542() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_536()) return true; + if (jj_3R_541()) return true; return false; } - inline bool jj_3R_131() + inline bool jj_3R_130() { if (jj_done) return true; if (jj_scan_token(FUNCTION_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(IS_T)) return true; if (jj_scan_token(NEW_T)) return true; - if (jj_3R_60()) return true; - if (jj_3R_234()) return true; + if (jj_3R_59()) return true; + if (jj_3R_233()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_275()) jj_scanpos = xsp; + if (jj_3R_274()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_108() + inline bool jj_3R_107() { if (jj_done) return true; if (jj_scan_token(PACKAGE_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(IS_T)) return true; if (jj_scan_token(NEW_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_637()) jj_scanpos = xsp; + if (jj_3R_640()) jj_scanpos = xsp; return false; } - inline bool jj_3R_87() + inline bool jj_3R_86() { if (jj_done) return true; if (jj_scan_token(PACKAGE_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(IS_T)) return true; if (jj_scan_token(NEW_T)) return true; - if (jj_3R_60()) return true; - if (jj_3R_234()) return true; + if (jj_3R_59()) return true; + if (jj_3R_233()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_235()) jj_scanpos = xsp; + if (jj_3R_234()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_606() + inline bool jj_3R_605() { if (jj_done) return true; if (jj_scan_token(BOX_T)) return true; return false; } - inline bool jj_3R_349() + inline bool jj_3R_348() { if (jj_done) return true; if (jj_scan_token(ENTITY_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } inline bool jj_3R_682() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_475() + inline bool jj_3R_473() { if (jj_done) return true; - if (jj_3R_536()) return true; + if (jj_3R_541()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_537()) { jj_scanpos = xsp; break; } + if (jj_3R_542()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_254() + inline bool jj_3R_253() { if (jj_done) return true; - if (jj_3R_366()) return true; + if (jj_3R_365()) return true; return false; } - inline bool jj_3R_536() + inline bool jj_3R_541() { if (jj_done) return true; - if (jj_3R_534()) return true; + if (jj_3R_539()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_606()) jj_scanpos = xsp; + if (jj_3R_605()) jj_scanpos = xsp; return false; } - inline bool jj_3R_616() + inline bool jj_3R_619() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_602() + inline bool jj_3R_601() { if (jj_done) return true; if (jj_scan_token(FILE_T)) return true; return false; } - inline bool jj_3R_695() + inline bool jj_3R_692() { if (jj_done) return true; - if (jj_3R_705()) return true; + if (jj_3R_702()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_601() + inline bool jj_3R_600() { if (jj_done) return true; if (jj_scan_token(GROUP_T)) return true; @@ -3714,139 +3692,139 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_695()) { jj_scanpos = xsp; break; } + if (jj_3R_692()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_600() + inline bool jj_3R_599() { if (jj_done) return true; if (jj_scan_token(UNITS_T)) return true; return false; } - inline bool jj_3R_599() + inline bool jj_3R_598() { if (jj_done) return true; if (jj_scan_token(LITERAL_T)) return true; return false; } - inline bool jj_3R_598() + inline bool jj_3R_597() { if (jj_done) return true; if (jj_scan_token(LABEL_T)) return true; return false; } - inline bool jj_3R_722() + inline bool jj_3R_719() { if (jj_done) return true; - if (jj_3R_382()) return true; + if (jj_3R_381()) return true; return false; } - inline bool jj_3R_597() + inline bool jj_3R_596() { if (jj_done) return true; if (jj_scan_token(COMPONENT_T)) return true; return false; } - inline bool jj_3R_721() + inline bool jj_3R_718() { if (jj_done) return true; - if (jj_3R_379()) return true; + if (jj_3R_378()) return true; return false; } - inline bool jj_3R_596() + inline bool jj_3R_595() { if (jj_done) return true; if (jj_scan_token(VARIABLE_T)) return true; return false; } - inline bool jj_3R_595() + inline bool jj_3R_594() { if (jj_done) return true; if (jj_scan_token(SIGNAL_T)) return true; return false; } - inline bool jj_3R_594() + inline bool jj_3R_593() { if (jj_done) return true; if (jj_scan_token(CONSTANT_T)) return true; return false; } - inline bool jj_3R_720() + inline bool jj_3R_717() { if (jj_done) return true; - if (jj_3R_347()) return true; + if (jj_3R_346()) return true; return false; } - inline bool jj_3R_705() + inline bool jj_3R_702() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_720()) { + if (jj_3R_717()) { jj_scanpos = xsp; - if (jj_3R_721()) { + if (jj_3R_718()) { jj_scanpos = xsp; - if (jj_3R_722()) return true; + if (jj_3R_719()) return true; } } return false; } - inline bool jj_3R_593() + inline bool jj_3R_592() { if (jj_done) return true; if (jj_scan_token(SUBTYPE_T)) return true; return false; } - inline bool jj_3R_592() + inline bool jj_3R_591() { if (jj_done) return true; if (jj_scan_token(TYPE_T)) return true; return false; } - inline bool jj_3R_591() + inline bool jj_3R_590() { if (jj_done) return true; if (jj_scan_token(PACKAGE_T)) return true; return false; } - inline bool jj_3R_590() + inline bool jj_3R_589() { if (jj_done) return true; if (jj_scan_token(FUNCTION_T)) return true; return false; } - inline bool jj_3R_589() + inline bool jj_3R_588() { if (jj_done) return true; if (jj_scan_token(PROCEDURE_T)) return true; return false; } - inline bool jj_3R_588() + inline bool jj_3R_587() { if (jj_done) return true; if (jj_scan_token(CONFIGURATION_T)) return true; return false; } - inline bool jj_3R_587() + inline bool jj_3R_586() { if (jj_done) return true; if (jj_scan_token(ARCHITECTURE_T)) return true; @@ -3856,22 +3834,24 @@ void parseInline(); inline bool jj_3R_680() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_586() + inline bool jj_3R_585() { if (jj_done) return true; if (jj_scan_token(ENTITY_T)) return true; return false; } - inline bool jj_3R_534() + inline bool jj_3R_539() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_585()) { + jj_scanpos = xsp; if (jj_3R_586()) { jj_scanpos = xsp; if (jj_3R_587()) { @@ -3902,9 +3882,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_600()) { jj_scanpos = xsp; - if (jj_3R_601()) { - jj_scanpos = xsp; - if (jj_3R_602()) return true; + if (jj_3R_601()) return true; } } } @@ -3924,14 +3902,14 @@ void parseInline(); return false; } - inline bool jj_3R_253() + inline bool jj_3R_252() { if (jj_done) return true; - if (jj_3R_365()) return true; + if (jj_3R_364()) return true; return false; } - inline bool jj_3R_655() + inline bool jj_3R_657() { if (jj_done) return true; if (jj_scan_token(PROTECTED_T)) return true; @@ -3944,32 +3922,32 @@ void parseInline(); return false; } - inline bool jj_3R_564() + inline bool jj_3R_563() { if (jj_done) return true; if (jj_scan_token(OPEN_T)) return true; return false; } - inline bool jj_3R_563() + inline bool jj_3R_562() { if (jj_done) return true; if (jj_scan_token(CONFIGURATION_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_694() + inline bool jj_3R_691() { if (jj_done) return true; - if (jj_3R_704()) return true; + if (jj_3R_701()) return true; return false; } inline bool jj_3_103() { if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_3R_64()) return true; return false; } @@ -3979,58 +3957,58 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_694()) { jj_scanpos = xsp; break; } + if (jj_3R_691()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_562() + inline bool jj_3R_561() { if (jj_done) return true; if (jj_scan_token(ENTITY_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_616()) jj_scanpos = xsp; + if (jj_3R_619()) jj_scanpos = xsp; return false; } - inline bool jj_3R_500() + inline bool jj_3R_505() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_562()) { + if (jj_3R_561()) { jj_scanpos = xsp; - if (jj_3R_563()) { + if (jj_3R_562()) { jj_scanpos = xsp; - if (jj_3R_564()) return true; + if (jj_3R_563()) return true; } } return false; } - inline bool jj_3R_719() + inline bool jj_3R_716() { if (jj_done) return true; - if (jj_3R_383()) return true; + if (jj_3R_382()) return true; return false; } inline bool jj_3_31() { if (jj_done) return true; - if (jj_3R_86()) return true; + if (jj_3R_85()) return true; if (jj_scan_token(ARROW_T)) return true; return false; } - inline bool jj_3R_707() + inline bool jj_3R_704() { if (jj_done) return true; - if (jj_3R_197()) return true; + if (jj_3R_196()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -4038,131 +4016,137 @@ void parseInline(); inline bool jj_3_104() { if (jj_done) return true; - if (jj_3R_66()) return true; + if (jj_3R_65()) return true; return false; } - inline bool jj_3R_718() + inline bool jj_3R_715() { if (jj_done) return true; - if (jj_3R_382()) return true; + if (jj_3R_381()) return true; return false; } - inline bool jj_3R_717() + inline bool jj_3R_714() { if (jj_done) return true; - if (jj_3R_379()) return true; + if (jj_3R_378()) return true; return false; } - inline bool jj_3R_716() + inline bool jj_3R_713() { if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_3R_64()) return true; return false; } inline bool jj_3_30() { if (jj_done) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; return false; } - inline bool jj_3R_715() + inline bool jj_3R_712() { if (jj_done) return true; - if (jj_3R_377()) return true; + if (jj_3R_376()) return true; return false; } - inline bool jj_3R_714() + inline bool jj_3R_711() { if (jj_done) return true; - if (jj_3R_376()) return true; + if (jj_3R_375()) return true; return false; } inline bool jj_3_29() { if (jj_done) return true; - if (jj_3R_84()) return true; + if (jj_3R_83()) return true; return false; } - inline bool jj_3R_713() + inline bool jj_3R_710() { if (jj_done) return true; - if (jj_3R_375()) return true; + if (jj_3R_374()) return true; return false; } - inline bool jj_3R_712() + inline bool jj_3R_709() { if (jj_done) return true; - if (jj_3R_373()) return true; + if (jj_3R_372()) return true; return false; } - inline bool jj_3R_359() + inline bool jj_3R_358() { if (jj_done) return true; - if (jj_3R_86()) return true; + if (jj_3R_85()) return true; if (jj_scan_token(ARROW_T)) return true; return false; } - inline bool jj_3R_711() + inline bool jj_3R_708() { if (jj_done) return true; - if (jj_3R_372()) return true; + if (jj_3R_371()) return true; return false; } - inline bool jj_3R_236() + inline bool jj_3R_235() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_359()) jj_scanpos = xsp; - if (jj_3R_59()) return true; + if (jj_3R_358()) jj_scanpos = xsp; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_710() + inline bool jj_3R_707() { if (jj_done) return true; - if (jj_3R_371()) return true; + if (jj_3R_370()) return true; return false; } - inline bool jj_3R_709() + inline bool jj_3R_706() { if (jj_done) return true; - if (jj_3R_519()) return true; + if (jj_3R_524()) return true; return false; } - inline bool jj_3R_163() + inline bool jj_3R_162() { if (jj_done) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; return false; } - inline bool jj_3R_708() + inline bool jj_3R_705() { if (jj_done) return true; - if (jj_3R_93()) return true; + if (jj_3R_92()) return true; return false; } - inline bool jj_3R_704() + inline bool jj_3R_701() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_705()) { + jj_scanpos = xsp; + if (jj_3R_706()) { + jj_scanpos = xsp; + if (jj_3R_707()) { + jj_scanpos = xsp; if (jj_3R_708()) { jj_scanpos = xsp; if (jj_3R_709()) { @@ -4179,15 +4163,9 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_715()) { jj_scanpos = xsp; - if (jj_3R_716()) { - jj_scanpos = xsp; - if (jj_3R_717()) { - jj_scanpos = xsp; - if (jj_3R_718()) { - jj_scanpos = xsp; if (jj_3_104()) { jj_scanpos = xsp; - if (jj_3R_719()) return true; + if (jj_3R_716()) return true; } } } @@ -4203,50 +4181,50 @@ void parseInline(); return false; } - inline bool jj_3R_252() + inline bool jj_3R_251() { if (jj_done) return true; - if (jj_3R_364()) return true; + if (jj_3R_363()) return true; return false; } - inline bool jj_3R_162() + inline bool jj_3R_161() { if (jj_done) return true; - if (jj_3R_84()) return true; + if (jj_3R_83()) return true; return false; } - inline bool jj_3R_69() + inline bool jj_3R_68() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_162()) { + if (jj_3R_161()) { jj_scanpos = xsp; - if (jj_3R_163()) return true; + if (jj_3R_162()) return true; } return false; } - inline bool jj_3R_522() + inline bool jj_3R_527() { if (jj_done) return true; if (jj_scan_token(AFTER_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_472() + inline bool jj_3R_470() { if (jj_done) return true; - if (jj_3R_535()) return true; + if (jj_3R_540()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_138() + inline bool jj_3R_137() { if (jj_done) return true; if (jj_scan_token(PROTECTED_T)) return true; @@ -4261,182 +4239,182 @@ void parseInline(); return false; } - inline bool jj_3R_497() + inline bool jj_3R_495() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_446()) return true; + if (jj_3R_444()) return true; return false; } - inline bool jj_3R_381() + inline bool jj_3R_380() { if (jj_done) return true; if (jj_scan_token(DISCONNECT_T)) return true; - if (jj_3R_472()) return true; + if (jj_3R_470()) return true; if (jj_scan_token(AFTER_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_460() + inline bool jj_3R_458() { if (jj_done) return true; if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_239() + inline bool jj_3R_238() { if (jj_done) return true; if (jj_scan_token(DOWNTO_T)) return true; return false; } - inline bool jj_3R_110() + inline bool jj_3R_109() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_238()) { + if (jj_3R_237()) { jj_scanpos = xsp; - if (jj_3R_239()) return true; + if (jj_3R_238()) return true; } return false; } - inline bool jj_3R_238() + inline bool jj_3R_237() { if (jj_done) return true; if (jj_scan_token(TO_T)) return true; return false; } - inline bool jj_3R_569() + inline bool jj_3R_568() { if (jj_done) return true; - if (jj_3R_310()) return true; + if (jj_3R_309()) return true; return false; } - inline bool jj_3R_446() + inline bool jj_3R_444() { if (jj_done) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_522()) jj_scanpos = xsp; + if (jj_3R_527()) jj_scanpos = xsp; return false; } - inline bool jj_3R_568() + inline bool jj_3R_567() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_515() + inline bool jj_3R_520() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_568()) { + if (jj_3R_567()) { jj_scanpos = xsp; - if (jj_3R_569()) return true; + if (jj_3R_568()) return true; } return false; } - inline bool jj_3R_407() + inline bool jj_3R_406() { if (jj_done) return true; if (jj_scan_token(UNAFFECTED_T)) return true; return false; } - inline bool jj_3R_318() + inline bool jj_3R_317() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_406()) { + if (jj_3R_405()) { jj_scanpos = xsp; - if (jj_3R_407()) return true; + if (jj_3R_406()) return true; } return false; } - inline bool jj_3R_406() + inline bool jj_3R_405() { if (jj_done) return true; - if (jj_3R_446()) return true; + if (jj_3R_444()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_497()) { jj_scanpos = xsp; break; } + if (jj_3R_495()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_553() + inline bool jj_3R_558() { if (jj_done) return true; if (jj_scan_token(REJECT_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_251() + inline bool jj_3R_250() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_496() + inline bool jj_3R_494() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_553()) jj_scanpos = xsp; + if (jj_3R_558()) jj_scanpos = xsp; if (jj_scan_token(INERTIAL_T)) return true; return false; } - inline bool jj_3R_118() + inline bool jj_3R_117() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_251()) jj_scanpos = xsp; + if (jj_3R_250()) jj_scanpos = xsp; if (jj_scan_token(WAIT_T)) return true; xsp = jj_scanpos; + if (jj_3R_251()) jj_scanpos = xsp; + xsp = jj_scanpos; if (jj_3R_252()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_3R_253()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_254()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_405() + inline bool jj_3R_404() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_495()) { + if (jj_3R_493()) { jj_scanpos = xsp; - if (jj_3R_496()) return true; + if (jj_3R_494()) return true; } return false; } - inline bool jj_3R_495() + inline bool jj_3R_493() { if (jj_done) return true; if (jj_scan_token(TRANSPORT_T)) return true; @@ -4446,143 +4424,143 @@ void parseInline(); inline bool jj_3_28() { if (jj_done) return true; - if (jj_3R_83()) return true; + if (jj_3R_82()) return true; return false; } inline bool jj_3_27() { if (jj_done) return true; - if (jj_3R_82()) return true; + if (jj_3R_81()) return true; return false; } - inline bool jj_3R_156() + inline bool jj_3R_155() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_155()) return true; + if (jj_3R_154()) return true; return false; } - inline bool jj_3R_277() + inline bool jj_3R_276() { if (jj_done) return true; - if (jj_3R_83()) return true; + if (jj_3R_82()) return true; return false; } - inline bool jj_3R_134() + inline bool jj_3R_133() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_276()) { + if (jj_3R_275()) { jj_scanpos = xsp; - if (jj_3R_277()) return true; + if (jj_3R_276()) return true; } return false; } - inline bool jj_3R_276() + inline bool jj_3R_275() { if (jj_done) return true; - if (jj_3R_82()) return true; + if (jj_3R_81()) return true; return false; } - inline bool jj_3R_463() + inline bool jj_3R_461() { if (jj_done) return true; if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_375() + inline bool jj_3R_374() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(101)) jj_scanpos = xsp; if (jj_scan_token(VARIABLE_T)) return true; - if (jj_3R_197()) return true; + if (jj_3R_196()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; xsp = jj_scanpos; - if (jj_3R_463()) jj_scanpos = xsp; + if (jj_3R_461()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_474() + inline bool jj_3R_472() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_473()) return true; + if (jj_3R_471()) return true; return false; } - inline bool jj_3R_706() + inline bool jj_3R_703() { if (jj_done) return true; if (jj_scan_token(ARRAY_T)) return true; - if (jj_3R_83()) return true; + if (jj_3R_82()) return true; if (jj_scan_token(OF_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; return false; } - inline bool jj_3R_441() + inline bool jj_3R_439() { if (jj_done) return true; - if (jj_3R_521()) return true; + if (jj_3R_526()) return true; return false; } inline bool jj_3_102() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_362() + inline bool jj_3R_361() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_440()) { + if (jj_3R_438()) { jj_scanpos = xsp; - if (jj_3R_441()) return true; + if (jj_3R_439()) return true; } return false; } - inline bool jj_3R_440() + inline bool jj_3R_438() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_102()) jj_scanpos = xsp; - if (jj_3R_115()) return true; + if (jj_3R_114()) return true; if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_373() + inline bool jj_3R_372() { if (jj_done) return true; if (jj_scan_token(CONSTANT_T)) return true; - if (jj_3R_197()) return true; + if (jj_3R_196()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_460()) jj_scanpos = xsp; + if (jj_3R_458()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -4590,142 +4568,142 @@ void parseInline(); inline bool jj_3_26() { if (jj_done) return true; - if (jj_3R_81()) return true; + if (jj_3R_80()) return true; return false; } - inline bool jj_3R_380() + inline bool jj_3R_379() { if (jj_done) return true; if (jj_scan_token(FOR_T)) return true; - if (jj_3R_178()) return true; - if (jj_3R_332()) return true; + if (jj_3R_177()) return true; + if (jj_3R_331()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_567() + inline bool jj_3R_566() { if (jj_done) return true; - if (jj_3R_333()) return true; + if (jj_3R_332()) return true; return false; } - inline bool jj_3R_382() + inline bool jj_3R_381() { if (jj_done) return true; if (jj_scan_token(USE_T)) return true; - if (jj_3R_473()) return true; + if (jj_3R_471()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_474()) { jj_scanpos = xsp; break; } + if (jj_3R_472()) { jj_scanpos = xsp; break; } } if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_566() + inline bool jj_3R_565() { if (jj_done) return true; - if (jj_3R_81()) return true; + if (jj_3R_80()) return true; return false; } - inline bool jj_3R_502() + inline bool jj_3R_507() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_566()) { + if (jj_3R_565()) { jj_scanpos = xsp; - if (jj_3R_567()) return true; + if (jj_3R_566()) return true; } return false; } - inline bool jj_3R_63() + inline bool jj_3R_62() { if (jj_done) return true; if (jj_scan_token(ARRAY_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_155()) return true; + if (jj_3R_154()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_156()) { jj_scanpos = xsp; break; } + if (jj_3R_155()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN_T)) return true; if (jj_scan_token(OF_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; return false; } - inline bool jj_3R_158() + inline bool jj_3R_157() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_633() + inline bool jj_3R_636() { if (jj_done) return true; - if (jj_3R_655()) return true; + if (jj_3R_657()) return true; return false; } inline bool jj_3_101() { if (jj_done) return true; - if (jj_3R_138()) return true; + if (jj_3R_137()) return true; return false; } - inline bool jj_3R_632() + inline bool jj_3R_635() { if (jj_done) return true; - if (jj_3R_654()) return true; + if (jj_3R_656()) return true; return false; } - inline bool jj_3R_631() + inline bool jj_3R_634() { if (jj_done) return true; - if (jj_3R_653()) return true; + if (jj_3R_655()) return true; return false; } - inline bool jj_3R_630() + inline bool jj_3R_633() { if (jj_done) return true; - if (jj_3R_652()) return true; + if (jj_3R_654()) return true; return false; } - inline bool jj_3R_629() + inline bool jj_3R_632() { if (jj_done) return true; - if (jj_3R_651()) return true; + if (jj_3R_653()) return true; return false; } - inline bool jj_3R_577() + inline bool jj_3R_576() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_629()) { + if (jj_3R_632()) { jj_scanpos = xsp; - if (jj_3R_630()) { + if (jj_3R_633()) { jj_scanpos = xsp; - if (jj_3R_631()) { + if (jj_3R_634()) { jj_scanpos = xsp; - if (jj_3R_632()) { + if (jj_3R_635()) { jj_scanpos = xsp; if (jj_3_101()) { jj_scanpos = xsp; - if (jj_3R_633()) return true; + if (jj_3R_636()) return true; } } } @@ -4738,132 +4716,132 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_80()) return true; + if (jj_3R_79()) return true; if (jj_scan_token(ELSE_T)) return true; return false; } - inline bool jj_3R_350() + inline bool jj_3R_349() { if (jj_done) return true; if (jj_scan_token(CONFIGURATION_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } inline bool jj_3_97() { if (jj_done) return true; - if (jj_3R_134()) return true; + if (jj_3R_133()) return true; return false; } - inline bool jj_3R_459() + inline bool jj_3R_457() { if (jj_done) return true; - if (jj_3R_526()) return true; + if (jj_3R_531()) return true; return false; } inline bool jj_3_100() { if (jj_done) return true; - if (jj_3R_137()) return true; + if (jj_3R_136()) return true; return false; } - inline bool jj_3R_371() + inline bool jj_3R_370() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_100()) { jj_scanpos = xsp; - if (jj_3R_459()) return true; + if (jj_3R_457()) return true; } return false; } - inline bool jj_3R_320() + inline bool jj_3R_319() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_80()) return true; + if (jj_3R_79()) return true; return false; } - inline bool jj_3R_106() + inline bool jj_3R_105() { if (jj_done) return true; - if (jj_3R_60()) return true; - if (jj_scan_token(LPAREN_T)) return true; if (jj_3R_59()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_58()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_319() + inline bool jj_3R_318() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_80()) return true; + if (jj_3R_79()) return true; if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_318()) return true; + if (jj_3R_317()) return true; return false; } inline bool jj_3_99() { if (jj_done) return true; + if (jj_3R_134()) return true; if (jj_3R_135()) return true; - if (jj_3R_136()) return true; return false; } - inline bool jj_3R_185() + inline bool jj_3R_184() { if (jj_done) return true; - if (jj_3R_134()) return true; + if (jj_3R_133()) return true; return false; } - inline bool jj_3R_168() + inline bool jj_3R_167() { if (jj_done) return true; - if (jj_3R_318()) return true; + if (jj_3R_317()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_319()) { jj_scanpos = xsp; break; } + if (jj_3R_318()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_320()) jj_scanpos = xsp; + if (jj_3R_319()) jj_scanpos = xsp; return false; } - inline bool jj_3R_366() + inline bool jj_3R_365() { if (jj_done) return true; if (jj_scan_token(FOR_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_72() + inline bool jj_3R_71() { if (jj_done) return true; - if (jj_3R_115()) return true; + if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; + if (jj_3R_166()) return true; if (jj_3R_167()) return true; - if (jj_3R_168()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_130() + inline bool jj_3R_129() { if (jj_done) return true; - if (jj_3R_136()) return true; + if (jj_3R_135()) return true; Token * xsp; while (true) { xsp = jj_scanpos; @@ -4872,29 +4850,29 @@ void parseInline(); return false; } - inline bool jj_3R_247() + inline bool jj_3R_246() { if (jj_done) return true; - if (jj_3R_109()) return true; + if (jj_3R_108()) return true; return false; } - inline bool jj_3R_365() + inline bool jj_3R_364() { if (jj_done) return true; if (jj_scan_token(UNTIL_T)) return true; - if (jj_3R_80()) return true; + if (jj_3R_79()) return true; return false; } - inline bool jj_3R_115() + inline bool jj_3R_114() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_246()) { + if (jj_3R_245()) { jj_scanpos = xsp; - if (jj_3R_247()) return true; + if (jj_3R_246()) return true; } return false; } @@ -4902,78 +4880,78 @@ void parseInline(); inline bool jj_3_98() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_246() + inline bool jj_3R_245() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } inline bool jj_3_96() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_218() + inline bool jj_3R_217() { if (jj_done) return true; if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_80() + inline bool jj_3R_79() { if (jj_done) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_217() + inline bool jj_3R_216() { if (jj_done) return true; - if (jj_3R_310()) return true; + if (jj_3R_309()) return true; return false; } - inline bool jj_3R_216() + inline bool jj_3R_215() { if (jj_done) return true; - if (jj_3R_352()) return true; + if (jj_3R_351()) return true; return false; } inline bool jj_3_24() { if (jj_done) return true; - if (jj_3R_79()) return true; + if (jj_3R_78()) return true; return false; } - inline bool jj_3R_215() + inline bool jj_3R_214() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_100() + inline bool jj_3R_99() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_214()) { + jj_scanpos = xsp; if (jj_3R_215()) { jj_scanpos = xsp; if (jj_3R_216()) { jj_scanpos = xsp; - if (jj_3R_217()) { - jj_scanpos = xsp; - if (jj_3R_218()) return true; + if (jj_3R_217()) return true; } } } @@ -4983,40 +4961,40 @@ void parseInline(); inline bool jj_3_23() { if (jj_done) return true; - if (jj_3R_78()) return true; + if (jj_3R_77()) return true; return false; } - inline bool jj_3R_184() + inline bool jj_3R_183() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } inline bool jj_3_22() { if (jj_done) return true; - if (jj_3R_77()) return true; + if (jj_3R_76()) return true; return false; } - inline bool jj_3R_85() + inline bool jj_3R_84() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_184()) jj_scanpos = xsp; + if (jj_3R_183()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_185()) jj_scanpos = xsp; + if (jj_3R_184()) jj_scanpos = xsp; return false; } - inline bool jj_3R_76() + inline bool jj_3R_75() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } @@ -5026,56 +5004,56 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_76()) jj_scanpos = xsp; + if (jj_3R_75()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(79)) jj_scanpos = xsp; if (jj_scan_token(ASSERT_T)) return true; return false; } - inline bool jj_3R_561() + inline bool jj_3R_503() { if (jj_done) return true; - if (jj_3R_79()) return true; + if (jj_3R_78()) return true; return false; } - inline bool jj_3R_560() + inline bool jj_3R_502() { if (jj_done) return true; - if (jj_3R_78()) return true; + if (jj_3R_77()) return true; return false; } inline bool jj_3_20() { if (jj_done) return true; - if (jj_3R_75()) return true; + if (jj_3R_74()) return true; return false; } - inline bool jj_3R_559() + inline bool jj_3R_73() { if (jj_done) return true; - if (jj_3R_77()) return true; + if (jj_3R_69()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_74() + inline bool jj_3R_501() { if (jj_done) return true; - if (jj_3R_70()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_76()) return true; return false; } - inline bool jj_3R_372() + inline bool jj_3R_371() { if (jj_done) return true; if (jj_scan_token(SUBTYPE_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(IS_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -5085,43 +5063,43 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_74()) jj_scanpos = xsp; + if (jj_3R_73()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(79)) jj_scanpos = xsp; if (jj_scan_token(PROCESS_T)) return true; return false; } - inline bool jj_3R_627() + inline bool jj_3R_630() { if (jj_done) return true; - if (jj_3R_113()) return true; + if (jj_3R_112()) return true; return false; } - inline bool jj_3R_572() + inline bool jj_3R_571() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_627()) { jj_scanpos = xsp; break; } + if (jj_3R_630()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_558() + inline bool jj_3R_72() { if (jj_done) return true; - if (jj_3R_88()) return true; + if (jj_3R_69()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_73() + inline bool jj_3R_500() { if (jj_done) return true; - if (jj_3R_70()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_87()) return true; return false; } @@ -5130,61 +5108,63 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_73()) jj_scanpos = xsp; + if (jj_3R_72()) jj_scanpos = xsp; if (jj_scan_token(BLOCK_T)) return true; return false; } - inline bool jj_3R_557() + inline bool jj_3R_499() { if (jj_done) return true; - if (jj_3R_615()) return true; + if (jj_3R_560()) return true; return false; } - inline bool jj_3R_556() + inline bool jj_3R_498() { if (jj_done) return true; - if (jj_3R_75()) return true; + if (jj_3R_74()) return true; return false; } - inline bool jj_3R_555() + inline bool jj_3R_497() { if (jj_done) return true; - if (jj_3R_89()) return true; + if (jj_3R_88()) return true; return false; } - inline bool jj_3R_554() + inline bool jj_3R_523() { if (jj_done) return true; - if (jj_3R_614()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_569()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_498() + inline bool jj_3R_409() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_554()) { + if (jj_3R_496()) { jj_scanpos = xsp; - if (jj_3R_555()) { + if (jj_3R_497()) { jj_scanpos = xsp; - if (jj_3R_556()) { + if (jj_3R_498()) { jj_scanpos = xsp; - if (jj_3R_557()) { + if (jj_3R_499()) { jj_scanpos = xsp; - if (jj_3R_558()) { + if (jj_3R_500()) { jj_scanpos = xsp; - if (jj_3R_559()) { + if (jj_3R_501()) { jj_scanpos = xsp; - if (jj_3R_560()) { + if (jj_3R_502()) { jj_scanpos = xsp; - if (jj_3R_561()) { + if (jj_3R_503()) { jj_scanpos = xsp; - if (jj_scan_token(186)) return true; + if (jj_scan_token(187)) return true; } } } @@ -5196,53 +5176,51 @@ void parseInline(); return false; } - inline bool jj_3R_518() + inline bool jj_3R_496() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_570()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_559()) return true; return false; } inline bool jj_3_17() { if (jj_done) return true; - if (jj_3R_72()) return true; + if (jj_3R_71()) return true; return false; } - inline bool jj_3_95() + inline bool jj_3R_521() { if (jj_done) return true; - if (jj_3R_133()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_312()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_516() + inline bool jj_3_95() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_313()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_132()) return true; return false; } inline bool jj_3_94() { if (jj_done) return true; - if (jj_3R_132()) return true; + if (jj_3R_131()) return true; return false; } - inline bool jj_3R_173() + inline bool jj_3R_172() { if (jj_done) return true; - if (jj_3R_325()) return true; + if (jj_3R_324()) return true; return false; } - inline bool jj_3R_517() + inline bool jj_3R_522() { if (jj_done) return true; Token * xsp; @@ -5254,37 +5232,37 @@ void parseInline(); return false; } - inline bool jj_3R_172() + inline bool jj_3R_171() { if (jj_done) return true; - if (jj_3R_72()) return true; + if (jj_3R_71()) return true; return false; } inline bool jj_3_16() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_434() + inline bool jj_3R_432() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_517()) jj_scanpos = xsp; + if (jj_3R_522()) jj_scanpos = xsp; if (jj_scan_token(FUNCTION_T)) return true; - if (jj_3R_515()) return true; + if (jj_3R_520()) return true; xsp = jj_scanpos; - if (jj_3R_518()) jj_scanpos = xsp; + if (jj_3R_523()) jj_scanpos = xsp; if (jj_scan_token(RETURN_T)) return true; - if (jj_3R_158()) return true; + if (jj_3R_157()) return true; return false; } - inline bool jj_3R_77() + inline bool jj_3R_76() { if (jj_done) return true; Token * xsp; @@ -5293,9 +5271,9 @@ void parseInline(); xsp = jj_scanpos; if (jj_scan_token(79)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_172()) { + if (jj_3R_171()) { jj_scanpos = xsp; - if (jj_3R_173()) return true; + if (jj_3R_172()) return true; } return false; } @@ -5303,12 +5281,12 @@ void parseInline(); inline bool jj_3_15() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_79() + inline bool jj_3R_78() { if (jj_done) return true; Token * xsp; @@ -5316,7 +5294,7 @@ void parseInline(); if (jj_3_15()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(79)) jj_scanpos = xsp; - if (jj_3R_177()) return true; + if (jj_3R_176()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -5324,7 +5302,7 @@ void parseInline(); inline bool jj_3_14() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } @@ -5332,11 +5310,11 @@ void parseInline(); inline bool jj_3_13() { if (jj_done) return true; - if (jj_3R_71()) return true; + if (jj_3R_70()) return true; return false; } - inline bool jj_3R_88() + inline bool jj_3R_87() { if (jj_done) return true; Token * xsp; @@ -5344,7 +5322,7 @@ void parseInline(); if (jj_3_14()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(79)) jj_scanpos = xsp; - if (jj_3R_188()) return true; + if (jj_3R_187()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -5352,53 +5330,53 @@ void parseInline(); inline bool jj_3R_678() { if (jj_done) return true; - if (jj_3R_693()) return true; + if (jj_3R_690()) return true; return false; } - inline bool jj_3R_470() + inline bool jj_3R_468() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_347() + inline bool jj_3R_346() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_433()) { + if (jj_3R_431()) { jj_scanpos = xsp; - if (jj_3R_434()) return true; + if (jj_3R_432()) return true; } return false; } - inline bool jj_3R_433() + inline bool jj_3R_431() { if (jj_done) return true; if (jj_scan_token(PROCEDURE_T)) return true; - if (jj_3R_515()) return true; + if (jj_3R_520()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_516()) jj_scanpos = xsp; + if (jj_3R_521()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_3_94()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_3_95()) jj_scanpos = xsp; - if (jj_3R_425()) return true; + if (jj_3R_423()) return true; return false; } inline bool jj_3R_677() { if (jj_done) return true; - if (jj_3R_692()) return true; + if (jj_3R_689()) return true; return false; } - inline bool jj_3R_652() + inline bool jj_3R_654() { if (jj_done) return true; Token * xsp; @@ -5410,21 +5388,21 @@ void parseInline(); return false; } - inline bool jj_3R_176() + inline bool jj_3R_175() { if (jj_done) return true; - if (jj_3R_329()) return true; + if (jj_3R_328()) return true; return false; } - inline bool jj_3R_175() + inline bool jj_3R_174() { if (jj_done) return true; - if (jj_3R_71()) return true; + if (jj_3R_70()) return true; return false; } - inline bool jj_3R_628() + inline bool jj_3R_631() { if (jj_done) return true; Token * xsp; @@ -5436,29 +5414,29 @@ void parseInline(); return false; } - inline bool jj_3R_178() + inline bool jj_3R_177() { if (jj_done) return true; - if (jj_3R_331()) return true; + if (jj_3R_330()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_626() + inline bool jj_3R_629() { if (jj_done) return true; - if (jj_3R_650()) return true; + if (jj_3R_652()) return true; return false; } - inline bool jj_3R_571() + inline bool jj_3R_570() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_626()) { jj_scanpos = xsp; break; } + if (jj_3R_629()) { jj_scanpos = xsp; break; } } return false; } @@ -5466,35 +5444,35 @@ void parseInline(); inline bool jj_3_92() { if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_3R_64()) return true; return false; } inline bool jj_3R_674() { if (jj_done) return true; - if (jj_3R_383()) return true; + if (jj_3R_382()) return true; return false; } inline bool jj_3R_673() { if (jj_done) return true; - if (jj_3R_382()) return true; + if (jj_3R_381()) return true; return false; } - inline bool jj_3R_78() + inline bool jj_3R_77() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_174()) return true; + if (jj_3R_173()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_175()) jj_scanpos = xsp; + if (jj_3R_174()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_176()) jj_scanpos = xsp; + if (jj_3R_175()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -5502,98 +5480,98 @@ void parseInline(); inline bool jj_3_93() { if (jj_done) return true; - if (jj_3R_66()) return true; + if (jj_3R_65()) return true; return false; } inline bool jj_3R_672() { if (jj_done) return true; - if (jj_3R_379()) return true; + if (jj_3R_378()) return true; return false; } inline bool jj_3R_671() { if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_3R_64()) return true; return false; } inline bool jj_3R_670() { if (jj_done) return true; - if (jj_3R_377()) return true; + if (jj_3R_376()) return true; return false; } inline bool jj_3R_669() { if (jj_done) return true; - if (jj_3R_376()) return true; + if (jj_3R_375()) return true; return false; } inline bool jj_3R_668() { if (jj_done) return true; - if (jj_3R_375()) return true; + if (jj_3R_374()) return true; return false; } - inline bool jj_3R_574() + inline bool jj_3R_573() { if (jj_done) return true; - if (jj_3R_515()) return true; + if (jj_3R_520()) return true; return false; } inline bool jj_3R_667() { if (jj_done) return true; - if (jj_3R_373()) return true; + if (jj_3R_372()) return true; return false; } - inline bool jj_3R_469() + inline bool jj_3R_467() { if (jj_done) return true; - if (jj_3R_532()) return true; + if (jj_3R_537()) return true; return false; } inline bool jj_3R_666() { if (jj_done) return true; - if (jj_3R_372()) return true; + if (jj_3R_371()) return true; return false; } inline bool jj_3R_665() { if (jj_done) return true; - if (jj_3R_519()) return true; + if (jj_3R_524()) return true; return false; } - inline bool jj_3R_468() + inline bool jj_3R_466() { if (jj_done) return true; - if (jj_3R_67()) return true; + if (jj_3R_66()) return true; return false; } - inline bool jj_3R_180() + inline bool jj_3R_179() { if (jj_done) return true; - if (jj_3R_333()) return true; + if (jj_3R_332()) return true; return false; } - inline bool jj_3R_179() + inline bool jj_3R_178() { if (jj_done) return true; - if (jj_3R_332()) return true; + if (jj_3R_331()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -5601,26 +5579,26 @@ void parseInline(); inline bool jj_3R_664() { if (jj_done) return true; - if (jj_3R_371()) return true; + if (jj_3R_370()) return true; return false; } - inline bool jj_3R_187() + inline bool jj_3R_186() { if (jj_done) return true; if (jj_scan_token(BAR_T)) return true; - if (jj_3R_186()) return true; + if (jj_3R_185()) return true; return false; } inline bool jj_3R_663() { if (jj_done) return true; - if (jj_3R_93()) return true; + if (jj_3R_92()) return true; return false; } - inline bool jj_3R_650() + inline bool jj_3R_652() { if (jj_done) return true; Token * xsp; @@ -5665,44 +5643,44 @@ void parseInline(); return false; } - inline bool jj_3R_378() + inline bool jj_3R_377() { if (jj_done) return true; if (jj_scan_token(COMPONENT_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(56)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_468()) jj_scanpos = xsp; + if (jj_3R_466()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_469()) jj_scanpos = xsp; + if (jj_3R_467()) jj_scanpos = xsp; if (jj_scan_token(END_T)) return true; if (jj_scan_token(COMPONENT_T)) return true; xsp = jj_scanpos; - if (jj_3R_470()) jj_scanpos = xsp; + if (jj_3R_468()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_462() + inline bool jj_3R_460() { if (jj_done) return true; if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_81() + inline bool jj_3R_80() { if (jj_done) return true; if (jj_scan_token(FOR_T)) return true; - if (jj_3R_178()) return true; + if (jj_3R_177()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_179()) jj_scanpos = xsp; + if (jj_3R_178()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_180()) jj_scanpos = xsp; + if (jj_3R_179()) jj_scanpos = xsp; if (jj_scan_token(END_T)) return true; if (jj_scan_token(FOR_T)) return true; if (jj_scan_token(SEMI_T)) return true; @@ -5712,99 +5690,99 @@ void parseInline(); inline bool jj_3_91() { if (jj_done) return true; - if (jj_3R_131()) return true; + if (jj_3R_130()) return true; return false; } - inline bool jj_3R_348() + inline bool jj_3R_347() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_435()) { + if (jj_3R_433()) { jj_scanpos = xsp; if (jj_scan_token(137)) return true; } return false; } - inline bool jj_3R_435() + inline bool jj_3R_433() { if (jj_done) return true; - if (jj_3R_519()) return true; + if (jj_3R_524()) return true; return false; } inline bool jj_3_12() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } inline bool jj_3_11() { if (jj_done) return true; - if (jj_3R_69()) return true; + if (jj_3R_68()) return true; return false; } - inline bool jj_3R_86() + inline bool jj_3R_85() { if (jj_done) return true; - if (jj_3R_186()) return true; + if (jj_3R_185()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_187()) { jj_scanpos = xsp; break; } + if (jj_3R_186()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_201() + inline bool jj_3R_200() { if (jj_done) return true; + if (jj_3R_346()) return true; if (jj_3R_347()) return true; - if (jj_3R_348()) return true; return false; } inline bool jj_3_10() { if (jj_done) return true; - if (jj_3R_68()) return true; + if (jj_3R_67()) return true; return false; } - inline bool jj_3R_337() + inline bool jj_3R_336() { if (jj_done) return true; if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_573() + inline bool jj_3R_572() { if (jj_done) return true; - if (jj_3R_628()) return true; + if (jj_3R_631()) return true; return false; } - inline bool jj_3R_200() + inline bool jj_3R_199() { if (jj_done) return true; - if (jj_3R_131()) return true; + if (jj_3R_130()) return true; return false; } - inline bool jj_3R_93() + inline bool jj_3R_92() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_200()) { + if (jj_3R_199()) { jj_scanpos = xsp; - if (jj_3R_201()) return true; + if (jj_3R_200()) return true; } return false; } @@ -5812,365 +5790,365 @@ void parseInline(); inline bool jj_3_90() { if (jj_done) return true; + if (jj_3R_128()) return true; if (jj_3R_129()) return true; - if (jj_3R_130()) return true; return false; } - inline bool jj_3R_336() + inline bool jj_3R_335() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_335() + inline bool jj_3R_334() { if (jj_done) return true; - if (jj_3R_69()) return true; + if (jj_3R_68()) return true; return false; } - inline bool jj_3R_186() + inline bool jj_3R_185() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_333()) { + jj_scanpos = xsp; if (jj_3R_334()) { jj_scanpos = xsp; if (jj_3R_335()) { jj_scanpos = xsp; - if (jj_3R_336()) { - jj_scanpos = xsp; - if (jj_3R_337()) return true; + if (jj_3R_336()) return true; } } } return false; } - inline bool jj_3R_334() + inline bool jj_3R_333() { if (jj_done) return true; - if (jj_3R_68()) return true; + if (jj_3R_67()) return true; return false; } - inline bool jj_3R_624() + inline bool jj_3R_627() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_461() + inline bool jj_3R_459() { if (jj_done) return true; - if (jj_3R_527()) return true; + if (jj_3R_532()) return true; return false; } - inline bool jj_3R_161() + inline bool jj_3R_160() { if (jj_done) return true; + if (jj_3R_128()) return true; if (jj_3R_129()) return true; - if (jj_3R_130()) return true; return false; } - inline bool jj_3R_352() + inline bool jj_3R_351() { if (jj_done) return true; if (jj_scan_token(CHARACTER_LITERAL)) return true; return false; } - inline bool jj_3R_644() + inline bool jj_3R_613() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_519() + inline bool jj_3R_524() { if (jj_done) return true; if (jj_scan_token(IS_T)) return true; - if (jj_3R_571()) return true; + if (jj_3R_570()) return true; if (jj_scan_token(BEGIN_T)) return true; - if (jj_3R_572()) return true; + if (jj_3R_571()) return true; if (jj_scan_token(END_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_573()) jj_scanpos = xsp; + if (jj_3R_572()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_574()) jj_scanpos = xsp; + if (jj_3R_573()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_622() + inline bool jj_3R_625() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_86()) return true; + if (jj_3R_85()) return true; if (jj_scan_token(ARROW_T)) return true; - if (jj_3R_259()) return true; + if (jj_3R_258()) return true; return false; } - inline bool jj_3R_648() + inline bool jj_3R_617() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_623() + inline bool jj_3R_626() { if (jj_done) return true; - if (jj_3R_622()) return true; + if (jj_3R_625()) return true; return false; } - inline bool jj_3R_685() + inline bool jj_3R_659() { if (jj_done) return true; - if (jj_3R_71()) return true; + if (jj_3R_70()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_356() + inline bool jj_3R_355() { if (jj_done) return true; if (jj_scan_token(STRINGLITERAL)) return true; return false; } - inline bool jj_3R_436() + inline bool jj_3R_434() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_160() + inline bool jj_3R_159() { if (jj_done) return true; - if (jj_3R_314()) return true; + if (jj_3R_313()) return true; return false; } - inline bool jj_3R_256() + inline bool jj_3R_255() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_68() + inline bool jj_3R_67() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_160()) jj_scanpos = xsp; - if (jj_3R_130()) return true; + if (jj_3R_159()) jj_scanpos = xsp; + if (jj_3R_129()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_161()) { jj_scanpos = xsp; break; } + if (jj_3R_160()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_122() + inline bool jj_3R_121() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_256()) jj_scanpos = xsp; + if (jj_3R_255()) jj_scanpos = xsp; if (jj_scan_token(CASE_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(IS_T)) return true; - if (jj_3R_622()) return true; + if (jj_3R_625()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_623()) { jj_scanpos = xsp; break; } + if (jj_3R_626()) { jj_scanpos = xsp; break; } } if (jj_scan_token(END_T)) return true; if (jj_scan_token(CASE_T)) return true; xsp = jj_scanpos; - if (jj_3R_624()) jj_scanpos = xsp; + if (jj_3R_627()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_660() + inline bool jj_3R_650() { if (jj_done) return true; - if (jj_3R_498()) return true; + if (jj_3R_409()) return true; return false; } - inline bool jj_3R_647() + inline bool jj_3R_616() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_660()) { jj_scanpos = xsp; break; } + if (jj_3R_650()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_358() + inline bool jj_3R_357() { if (jj_done) return true; if (jj_scan_token(RETURN_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_635() + inline bool jj_3R_638() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_357() + inline bool jj_3R_356() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_436()) { jj_scanpos = xsp; break; } + if (jj_3R_434()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_234() + inline bool jj_3R_233() { if (jj_done) return true; if (jj_scan_token(LBRACKET_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_357()) jj_scanpos = xsp; + if (jj_3R_356()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_358()) jj_scanpos = xsp; + if (jj_3R_357()) jj_scanpos = xsp; if (jj_scan_token(RBRACKET_T)) return true; return false; } - inline bool jj_3R_686() + inline bool jj_3R_660() { if (jj_done) return true; - if (jj_3R_329()) return true; + if (jj_3R_328()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_605() + inline bool jj_3R_604() { if (jj_done) return true; if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_604() + inline bool jj_3R_603() { if (jj_done) return true; if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_603() + inline bool jj_3R_602() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_635()) { jj_scanpos = xsp; break; } + if (jj_3R_638()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_535() + inline bool jj_3R_540() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_603()) { + if (jj_3R_602()) { jj_scanpos = xsp; - if (jj_3R_604()) { + if (jj_3R_603()) { jj_scanpos = xsp; - if (jj_3R_605()) return true; + if (jj_3R_604()) return true; } } return false; } - inline bool jj_3R_501() + inline bool jj_3R_506() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_565()) return true; + if (jj_3R_564()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_579() + inline bool jj_3R_578() { if (jj_done) return true; if (jj_scan_token(BUS_T)) return true; return false; } - inline bool jj_3R_614() + inline bool jj_3R_559() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; if (jj_scan_token(BLOCK_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_644()) jj_scanpos = xsp; + if (jj_3R_613()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(56)) jj_scanpos = xsp; - if (jj_3R_645()) return true; - if (jj_3R_646()) return true; + if (jj_3R_614()) return true; + if (jj_3R_615()) return true; if (jj_scan_token(BEGIN_T)) return true; - if (jj_3R_647()) return true; + if (jj_3R_616()) return true; if (jj_scan_token(END_T)) return true; if (jj_scan_token(BLOCK_T)) return true; xsp = jj_scanpos; - if (jj_3R_648()) jj_scanpos = xsp; + if (jj_3R_617()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_578() + inline bool jj_3R_577() { if (jj_done) return true; if (jj_scan_token(REGISTER_T)) return true; return false; } - inline bool jj_3R_527() + inline bool jj_3R_532() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_578()) { + if (jj_3R_577()) { jj_scanpos = xsp; - if (jj_3R_579()) return true; + if (jj_3R_578()) return true; } return false; } @@ -6178,247 +6156,240 @@ void parseInline(); inline bool jj_3_9() { if (jj_done) return true; - if (jj_3R_67()) return true; + if (jj_3R_66()) return true; return false; } - inline bool jj_3R_420() + inline bool jj_3R_418() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_501()) jj_scanpos = xsp; + if (jj_3R_506()) jj_scanpos = xsp; return false; } - inline bool jj_3R_658() + inline bool jj_3R_648() { if (jj_done) return true; - if (jj_3R_532()) return true; + if (jj_3R_537()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_686()) jj_scanpos = xsp; + if (jj_3R_660()) jj_scanpos = xsp; return false; } - inline bool jj_3R_657() + inline bool jj_3R_647() { if (jj_done) return true; - if (jj_3R_67()) return true; + if (jj_3R_66()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_685()) jj_scanpos = xsp; + if (jj_3R_659()) jj_scanpos = xsp; return false; } - inline bool jj_3R_645() + inline bool jj_3R_614() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_657()) jj_scanpos = xsp; + if (jj_3R_647()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_658()) jj_scanpos = xsp; + if (jj_3R_648()) jj_scanpos = xsp; return false; } - inline bool jj_3R_659() + inline bool jj_3R_649() { if (jj_done) return true; - if (jj_3R_141()) return true; + if (jj_3R_140()) return true; return false; } - inline bool jj_3R_374() + inline bool jj_3R_373() { if (jj_done) return true; if (jj_scan_token(SIGNAL_T)) return true; - if (jj_3R_197()) return true; + if (jj_3R_196()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_461()) jj_scanpos = xsp; + if (jj_3R_459()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_462()) jj_scanpos = xsp; + if (jj_3R_460()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_646() + inline bool jj_3R_615() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_659()) { jj_scanpos = xsp; break; } + if (jj_3R_649()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_300() + inline bool jj_3R_299() { if (jj_done) return true; - if (jj_3R_383()) return true; + if (jj_3R_382()) return true; return false; } inline bool jj_3_89() { if (jj_done) return true; - if (jj_3R_128()) return true; + if (jj_3R_127()) return true; return false; } inline bool jj_3_7() { if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_3R_64()) return true; return false; } inline bool jj_3_88() { if (jj_done) return true; - if (jj_3R_127()) return true; + if (jj_3R_126()) return true; return false; } inline bool jj_3_8() { if (jj_done) return true; - if (jj_3R_66()) return true; + if (jj_3R_65()) return true; return false; } - inline bool jj_3R_299() + inline bool jj_3R_298() { if (jj_done) return true; - if (jj_3R_382()) return true; + if (jj_3R_381()) return true; return false; } - inline bool jj_3R_520() + inline bool jj_3R_525() { if (jj_done) return true; - if (jj_3R_405()) return true; + if (jj_3R_404()) return true; return false; } - inline bool jj_3R_298() + inline bool jj_3R_297() { if (jj_done) return true; - if (jj_3R_381()) return true; + if (jj_3R_380()) return true; return false; } - inline bool jj_3R_297() + inline bool jj_3R_296() { if (jj_done) return true; - if (jj_3R_380()) return true; + if (jj_3R_379()) return true; return false; } inline bool jj_3_87() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_296() + inline bool jj_3R_295() { if (jj_done) return true; - if (jj_3R_379()) return true; + if (jj_3R_378()) return true; return false; } - inline bool jj_3R_439() + inline bool jj_3R_437() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_87()) jj_scanpos = xsp; - if (jj_3R_115()) return true; + if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; xsp = jj_scanpos; - if (jj_3R_520()) jj_scanpos = xsp; - if (jj_3R_318()) return true; + if (jj_3R_525()) jj_scanpos = xsp; + if (jj_3R_317()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_438() + inline bool jj_3R_436() { if (jj_done) return true; - if (jj_3R_128()) return true; + if (jj_3R_127()) return true; return false; } - inline bool jj_3R_294() + inline bool jj_3R_293() { if (jj_done) return true; - if (jj_3R_378()) return true; + if (jj_3R_377()) return true; return false; } - inline bool jj_3R_295() + inline bool jj_3R_294() { if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_3R_64()) return true; return false; } - inline bool jj_3R_387() + inline bool jj_3R_386() { if (jj_done) return true; - if (jj_3R_478()) return true; - if (jj_3R_68()) return true; + if (jj_3R_476()) return true; + if (jj_3R_67()) return true; return false; } - inline bool jj_3R_293() + inline bool jj_3R_292() { if (jj_done) return true; - if (jj_3R_377()) return true; + if (jj_3R_376()) return true; return false; } - inline bool jj_3R_292() + inline bool jj_3R_291() { if (jj_done) return true; - if (jj_3R_376()) return true; + if (jj_3R_375()) return true; return false; } - inline bool jj_3R_361() + inline bool jj_3R_360() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_437()) { + if (jj_3R_435()) { jj_scanpos = xsp; - if (jj_3R_438()) { + if (jj_3R_436()) { jj_scanpos = xsp; - if (jj_3R_439()) return true; + if (jj_3R_437()) return true; } } return false; } - inline bool jj_3R_437() - { - if (jj_done) return true; - if (jj_3R_127()) return true; - return false; - } - - inline bool jj_3R_291() + inline bool jj_3R_435() { if (jj_done) return true; - if (jj_3R_375()) return true; + if (jj_3R_126()) return true; return false; } @@ -6450,32 +6421,41 @@ void parseInline(); return false; } - inline bool jj_3R_422() + inline bool jj_3R_286() { if (jj_done) return true; - if (jj_3R_502()) return true; + if (jj_3R_370()) return true; return false; } - inline bool jj_3R_402() + inline bool jj_3R_420() + { + if (jj_done) return true; + if (jj_3R_507()) return true; + return false; + } + + inline bool jj_3R_401() { if (jj_done) return true; if (jj_scan_token(MINUS_T)) return true; return false; } - inline bool jj_3R_421() + inline bool jj_3R_419() { if (jj_done) return true; - if (jj_3R_382()) return true; + if (jj_3R_381()) return true; return false; } - inline bool jj_3R_141() + inline bool jj_3R_140() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_285()) { + jj_scanpos = xsp; if (jj_3R_286()) { jj_scanpos = xsp; if (jj_3R_287()) { @@ -6502,14 +6482,9 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_298()) { jj_scanpos = xsp; - if (jj_3R_299()) { - jj_scanpos = xsp; if (jj_3_8()) { jj_scanpos = xsp; - if (jj_3R_300()) { - jj_scanpos = xsp; - if (jj_scan_token(186)) return true; - } + if (jj_3R_299()) return true; } } } @@ -6528,73 +6503,73 @@ void parseInline(); return false; } - inline bool jj_3R_286() + inline bool jj_3R_285() { if (jj_done) return true; - if (jj_3R_93()) return true; + if (jj_3R_92()) return true; return false; } - inline bool jj_3R_314() + inline bool jj_3R_313() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_401()) { + if (jj_3R_400()) { jj_scanpos = xsp; - if (jj_3R_402()) return true; + if (jj_3R_401()) return true; } return false; } - inline bool jj_3R_401() + inline bool jj_3R_400() { if (jj_done) return true; if (jj_scan_token(PLUS_T)) return true; return false; } - inline bool jj_3R_546() + inline bool jj_3R_551() { if (jj_done) return true; if (jj_scan_token(ROR_T)) return true; return false; } - inline bool jj_3R_545() + inline bool jj_3R_550() { if (jj_done) return true; if (jj_scan_token(ROL_T)) return true; return false; } - inline bool jj_3R_544() + inline bool jj_3R_549() { if (jj_done) return true; if (jj_scan_token(SRA_T)) return true; return false; } - inline bool jj_3R_543() + inline bool jj_3R_548() { if (jj_done) return true; if (jj_scan_token(SLA_T)) return true; return false; } - inline bool jj_3R_333() + inline bool jj_3R_332() { if (jj_done) return true; if (jj_scan_token(FOR_T)) return true; - if (jj_3R_420()) return true; + if (jj_3R_418()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_421()) { jj_scanpos = xsp; break; } + if (jj_3R_419()) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; - if (jj_3R_422()) { jj_scanpos = xsp; break; } + if (jj_3R_420()) { jj_scanpos = xsp; break; } } if (jj_scan_token(END_T)) return true; if (jj_scan_token(FOR_T)) return true; @@ -6602,36 +6577,36 @@ void parseInline(); return false; } - inline bool jj_3R_542() + inline bool jj_3R_547() { if (jj_done) return true; if (jj_scan_token(SRL_T)) return true; return false; } - inline bool jj_3R_541() + inline bool jj_3R_546() { if (jj_done) return true; if (jj_scan_token(SLL_T)) return true; return false; } - inline bool jj_3R_478() + inline bool jj_3R_476() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_541()) { + if (jj_3R_546()) { jj_scanpos = xsp; - if (jj_3R_542()) { + if (jj_3R_547()) { jj_scanpos = xsp; - if (jj_3R_543()) { + if (jj_3R_548()) { jj_scanpos = xsp; - if (jj_3R_544()) { + if (jj_3R_549()) { jj_scanpos = xsp; - if (jj_3R_545()) { + if (jj_3R_550()) { jj_scanpos = xsp; - if (jj_3R_546()) return true; + if (jj_3R_551()) return true; } } } @@ -6640,35 +6615,35 @@ void parseInline(); return false; } - inline bool jj_3R_307() + inline bool jj_3R_306() { if (jj_done) return true; - if (jj_3R_68()) return true; + if (jj_3R_67()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_387()) jj_scanpos = xsp; + if (jj_3R_386()) jj_scanpos = xsp; return false; } - inline bool jj_3R_245() + inline bool jj_3R_244() { if (jj_done) return true; - if (jj_3R_363()) return true; + if (jj_3R_362()) return true; return false; } - inline bool jj_3R_95() + inline bool jj_3R_94() { if (jj_done) return true; if (jj_scan_token(BIT_STRING_LITERAL)) return true; return false; } - inline bool jj_3R_240() + inline bool jj_3R_239() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } @@ -6676,63 +6651,63 @@ void parseInline(); inline bool jj_3_86() { if (jj_done) return true; - if (jj_3R_126()) return true; + if (jj_3R_125()) return true; return false; } - inline bool jj_3R_419() + inline bool jj_3R_417() { if (jj_done) return true; - if (jj_3R_329()) return true; + if (jj_3R_328()) return true; return false; } inline bool jj_3_85() { if (jj_done) return true; - if (jj_3R_125()) return true; + if (jj_3R_124()) return true; return false; } - inline bool jj_3R_418() + inline bool jj_3R_416() { if (jj_done) return true; - if (jj_3R_71()) return true; + if (jj_3R_70()) return true; return false; } - inline bool jj_3R_417() + inline bool jj_3R_415() { if (jj_done) return true; if (jj_scan_token(USE_T)) return true; - if (jj_3R_500()) return true; + if (jj_3R_505()) return true; return false; } inline bool jj_3_84() { if (jj_done) return true; - if (jj_3R_124()) return true; + if (jj_3R_123()) return true; return false; } - inline bool jj_3R_332() + inline bool jj_3R_331() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_417()) jj_scanpos = xsp; + if (jj_3R_415()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_418()) jj_scanpos = xsp; + if (jj_3R_416()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_419()) jj_scanpos = xsp; + if (jj_3R_417()) jj_scanpos = xsp; return false; } - inline bool jj_3R_119() + inline bool jj_3R_118() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } @@ -6742,8 +6717,8 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_119()) jj_scanpos = xsp; - if (jj_3R_115()) return true; + if (jj_3R_118()) jj_scanpos = xsp; + if (jj_3R_114()) return true; if (jj_scan_token(VARASSIGN_T)) return true; return false; } @@ -6751,43 +6726,43 @@ void parseInline(); inline bool jj_3_83() { if (jj_done) return true; - if (jj_3R_123()) return true; + if (jj_3R_122()) return true; return false; } inline bool jj_3_82() { if (jj_done) return true; - if (jj_3R_122()) return true; + if (jj_3R_121()) return true; return false; } inline bool jj_3_81() { if (jj_done) return true; - if (jj_3R_121()) return true; + if (jj_3R_120()) return true; return false; } inline bool jj_3_80() { if (jj_done) return true; - if (jj_3R_120()) return true; + if (jj_3R_119()) return true; return false; } - inline bool jj_3R_114() + inline bool jj_3R_113() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_244() + inline bool jj_3R_243() { if (jj_done) return true; - if (jj_3R_362()) return true; + if (jj_3R_361()) return true; return false; } @@ -6796,8 +6771,8 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_114()) jj_scanpos = xsp; - if (jj_3R_115()) return true; + if (jj_3R_113()) jj_scanpos = xsp; + if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; return false; } @@ -6805,40 +6780,40 @@ void parseInline(); inline bool jj_3_78() { if (jj_done) return true; - if (jj_3R_118()) return true; + if (jj_3R_117()) return true; return false; } inline bool jj_3_77() { if (jj_done) return true; - if (jj_3R_117()) return true; + if (jj_3R_116()) return true; return false; } inline bool jj_3_76() { if (jj_done) return true; - if (jj_3R_116()) return true; + if (jj_3R_115()) return true; return false; } - inline bool jj_3R_499() + inline bool jj_3R_504() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_318()) return true; + if (jj_3R_317()) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_86()) return true; + if (jj_3R_85()) return true; return false; } - inline bool jj_3R_113() + inline bool jj_3R_112() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_243()) { + if (jj_3R_242()) { jj_scanpos = xsp; if (jj_3_76()) { jj_scanpos = xsp; @@ -6846,7 +6821,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3_78()) { jj_scanpos = xsp; - if (jj_3R_244()) { + if (jj_3R_243()) { jj_scanpos = xsp; if (jj_3_80()) { jj_scanpos = xsp; @@ -6862,7 +6837,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3_86()) { jj_scanpos = xsp; - if (jj_3R_245()) return true; + if (jj_3R_244()) return true; } } } @@ -6878,37 +6853,37 @@ void parseInline(); return false; } - inline bool jj_3R_243() + inline bool jj_3R_242() { if (jj_done) return true; - if (jj_3R_361()) return true; + if (jj_3R_360()) return true; return false; } - inline bool jj_3R_503() + inline bool jj_3R_508() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_339() + inline bool jj_3R_338() { if (jj_done) return true; if (jj_scan_token(SEVERITY_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } inline bool jj_3_74() { if (jj_done) return true; - if (jj_3R_113()) return true; + if (jj_3R_112()) return true; return false; } - inline bool jj_3R_259() + inline bool jj_3R_258() { if (jj_done) return true; Token * xsp; @@ -6919,130 +6894,130 @@ void parseInline(); return false; } - inline bool jj_3R_267() + inline bool jj_3R_266() { if (jj_done) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_423() + inline bool jj_3R_421() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_503()) { jj_scanpos = xsp; break; } + if (jj_3R_508()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_379() + inline bool jj_3R_378() { if (jj_done) return true; if (jj_scan_token(ATTRIBUTE_T)) return true; - if (jj_3R_220()) return true; + if (jj_3R_219()) return true; if (jj_scan_token(OF_T)) return true; - if (jj_3R_471()) return true; + if (jj_3R_469()) return true; if (jj_scan_token(IS_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_316() + inline bool jj_3R_315() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_315()) return true; + if (jj_3R_314()) return true; return false; } - inline bool jj_3R_111() + inline bool jj_3R_110() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(APOSTROPHE_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_240()) jj_scanpos = xsp; + if (jj_3R_239()) jj_scanpos = xsp; return false; } inline bool jj_3_73() { if (jj_done) return true; - if (jj_3R_112()) return true; + if (jj_3R_111()) return true; return false; } - inline bool jj_3R_364() + inline bool jj_3R_363() { if (jj_done) return true; if (jj_scan_token(ON_T)) return true; - if (jj_3R_423()) return true; + if (jj_3R_421()) return true; return false; } - inline bool jj_3R_355() + inline bool jj_3R_354() { if (jj_done) return true; if (jj_scan_token(RANGE_T)) return true; return false; } - inline bool jj_3R_220() + inline bool jj_3R_219() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_354()) { + if (jj_3R_353()) { jj_scanpos = xsp; - if (jj_3R_355()) return true; + if (jj_3R_354()) return true; } return false; } - inline bool jj_3R_354() + inline bool jj_3R_353() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_412() + inline bool jj_3R_410() { if (jj_done) return true; - if (jj_3R_318()) return true; + if (jj_3R_317()) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_86()) return true; + if (jj_3R_85()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_499()) { jj_scanpos = xsp; break; } + if (jj_3R_504()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_691() + inline bool jj_3R_688() { if (jj_done) return true; - if (jj_3R_112()) return true; + if (jj_3R_111()) return true; return false; } - inline bool jj_3R_325() + inline bool jj_3R_324() { if (jj_done) return true; if (jj_scan_token(WITH_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(SELECT_T)) return true; - if (jj_3R_115()) return true; + if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; - if (jj_3R_167()) return true; - if (jj_3R_412()) return true; + if (jj_3R_166()) return true; + if (jj_3R_410()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -7050,83 +7025,83 @@ void parseInline(); inline bool jj_3_6() { if (jj_done) return true; - if (jj_3R_64()) return true; + if (jj_3R_63()) return true; if (jj_scan_token(ARROW_T)) return true; return false; } - inline bool jj_3R_65() + inline bool jj_3R_64() { if (jj_done) return true; if (jj_scan_token(ATTRIBUTE_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_158()) return true; + if (jj_3R_157()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_338() + inline bool jj_3R_337() { if (jj_done) return true; if (jj_scan_token(REPORT_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_473() + inline bool jj_3R_471() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(DOT_T)) return true; - if (jj_3R_100()) return true; + if (jj_3R_99()) return true; return false; } - inline bool jj_3R_166() + inline bool jj_3R_165() { if (jj_done) return true; - if (jj_3R_315()) return true; + if (jj_3R_314()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_316()) { jj_scanpos = xsp; break; } + if (jj_3R_315()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_360() + inline bool jj_3R_359() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(EQU_T)) return true; - if (jj_3R_103()) return true; + if (jj_3R_102()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_403() + inline bool jj_3R_402() { if (jj_done) return true; - if (jj_3R_64()) return true; + if (jj_3R_63()) return true; if (jj_scan_token(ARROW_T)) return true; return false; } - inline bool jj_3R_315() + inline bool jj_3R_314() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_403()) jj_scanpos = xsp; - if (jj_3R_404()) return true; + if (jj_3R_402()) jj_scanpos = xsp; + if (jj_3R_403()) return true; return false; } - inline bool jj_3R_248() + inline bool jj_3R_247() { if (jj_done) return true; - if (jj_3R_140()) return true; + if (jj_3R_139()) return true; if (jj_scan_token(COLON_T)) return true; return false; } @@ -7134,20 +7109,20 @@ void parseInline(); inline bool jj_3R_676() { if (jj_done) return true; - if (jj_3R_82()) return true; + if (jj_3R_81()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_691()) jj_scanpos = xsp; + if (jj_3R_688()) jj_scanpos = xsp; return false; } - inline bool jj_3R_116() + inline bool jj_3R_115() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_248()) jj_scanpos = xsp; - if (jj_3R_188()) return true; + if (jj_3R_247()) jj_scanpos = xsp; + if (jj_3R_187()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -7155,11 +7130,11 @@ void parseInline(); inline bool jj_3R_675() { if (jj_done) return true; - if (jj_3R_690()) return true; + if (jj_3R_687()) return true; return false; } - inline bool jj_3R_651() + inline bool jj_3R_653() { if (jj_done) return true; Token * xsp; @@ -7171,36 +7146,36 @@ void parseInline(); return false; } - inline bool jj_3R_266() + inline bool jj_3R_265() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_188() + inline bool jj_3R_187() { if (jj_done) return true; if (jj_scan_token(ASSERT_T)) return true; - if (jj_3R_80()) return true; + if (jj_3R_79()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_338()) jj_scanpos = xsp; + if (jj_3R_337()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_339()) jj_scanpos = xsp; + if (jj_3R_338()) jj_scanpos = xsp; return false; } - inline bool jj_3R_126() + inline bool jj_3R_125() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_266()) jj_scanpos = xsp; + if (jj_3R_265()) jj_scanpos = xsp; if (jj_scan_token(RETURN_T)) return true; xsp = jj_scanpos; - if (jj_3R_267()) jj_scanpos = xsp; + if (jj_3R_266()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } @@ -7208,132 +7183,132 @@ void parseInline(); inline bool jj_3_5() { if (jj_done) return true; - if (jj_3R_63()) return true; + if (jj_3R_62()) return true; return false; } - inline bool jj_3R_250() + inline bool jj_3R_249() { if (jj_done) return true; if (jj_scan_token(SEVERITY_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_701() + inline bool jj_3R_698() { if (jj_done) return true; - if (jj_3R_706()) return true; + if (jj_3R_703()) return true; return false; } - inline bool jj_3R_308() + inline bool jj_3R_307() { if (jj_done) return true; - if (jj_3R_388()) return true; - if (jj_3R_307()) return true; + if (jj_3R_387()) return true; + if (jj_3R_306()) return true; return false; } - inline bool jj_3R_700() + inline bool jj_3R_697() { if (jj_done) return true; - if (jj_3R_63()) return true; + if (jj_3R_62()) return true; return false; } - inline bool jj_3R_692() + inline bool jj_3R_689() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_700()) { + if (jj_3R_697()) { jj_scanpos = xsp; - if (jj_3R_701()) return true; + if (jj_3R_698()) return true; } return false; } - inline bool jj_3R_249() + inline bool jj_3R_248() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_117() + inline bool jj_3R_116() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_249()) jj_scanpos = xsp; + if (jj_3R_248()) jj_scanpos = xsp; if (jj_scan_token(REPORT_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; xsp = jj_scanpos; - if (jj_3R_250()) jj_scanpos = xsp; + if (jj_3R_249()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_703() + inline bool jj_3R_700() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_484() + inline bool jj_3R_482() { if (jj_done) return true; if (jj_scan_token(NOTEQU_T)) return true; return false; } - inline bool jj_3R_483() + inline bool jj_3R_481() { if (jj_done) return true; if (jj_scan_token(LESSTHAN_T)) return true; return false; } - inline bool jj_3R_482() + inline bool jj_3R_480() { if (jj_done) return true; if (jj_scan_token(GREATERTHAN_T)) return true; return false; } - inline bool jj_3R_481() + inline bool jj_3R_479() { if (jj_done) return true; if (jj_scan_token(EQU_T)) return true; return false; } - inline bool jj_3R_480() + inline bool jj_3R_478() { if (jj_done) return true; if (jj_scan_token(GT_T)) return true; return false; } - inline bool jj_3R_388() + inline bool jj_3R_387() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_477()) { + jj_scanpos = xsp; + if (jj_3R_478()) { + jj_scanpos = xsp; if (jj_3R_479()) { jj_scanpos = xsp; if (jj_3R_480()) { jj_scanpos = xsp; if (jj_3R_481()) { jj_scanpos = xsp; - if (jj_3R_482()) { - jj_scanpos = xsp; - if (jj_3R_483()) { - jj_scanpos = xsp; - if (jj_3R_484()) return true; + if (jj_3R_482()) return true; } } } @@ -7342,137 +7317,137 @@ void parseInline(); return false; } - inline bool jj_3R_479() + inline bool jj_3R_477() { if (jj_done) return true; if (jj_scan_token(LT_T)) return true; return false; } - inline bool jj_3R_467() + inline bool jj_3R_465() { if (jj_done) return true; - if (jj_3R_234()) return true; + if (jj_3R_233()) return true; return false; } - inline bool jj_3R_146() + inline bool jj_3R_145() { if (jj_done) return true; - if (jj_3R_307()) return true; + if (jj_3R_306()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_308()) jj_scanpos = xsp; + if (jj_3R_307()) jj_scanpos = xsp; return false; } - inline bool jj_3R_702() + inline bool jj_3R_699() { if (jj_done) return true; - if (jj_3R_707()) return true; + if (jj_3R_704()) return true; return false; } - inline bool jj_3R_693() + inline bool jj_3R_690() { if (jj_done) return true; if (jj_scan_token(RECORD_T)) return true; Token * xsp; - if (jj_3R_702()) return true; + if (jj_3R_699()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_702()) { jj_scanpos = xsp; break; } + if (jj_3R_699()) { jj_scanpos = xsp; break; } } if (jj_scan_token(END_T)) return true; if (jj_scan_token(RECORD_T)) return true; xsp = jj_scanpos; - if (jj_3R_703()) jj_scanpos = xsp; + if (jj_3R_700()) jj_scanpos = xsp; return false; } - inline bool jj_3R_237() + inline bool jj_3R_236() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_236()) return true; + if (jj_3R_235()) return true; return false; } inline bool jj_3_71() { if (jj_done) return true; - if (jj_3R_68()) return true; - if (jj_3R_110()) return true; - if (jj_3R_68()) return true; + if (jj_3R_67()) return true; + if (jj_3R_109()) return true; + if (jj_3R_67()) return true; return false; } inline bool jj_3_72() { if (jj_done) return true; - if (jj_3R_111()) return true; + if (jj_3R_110()) return true; return false; } - inline bool jj_3R_82() + inline bool jj_3R_81() { if (jj_done) return true; if (jj_scan_token(RANGE_T)) return true; - if (jj_3R_84()) return true; + if (jj_3R_83()) return true; return false; } - inline bool jj_3R_576() + inline bool jj_3R_575() { if (jj_done) return true; if (jj_scan_token(NEW_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; return false; } inline bool jj_3_70() { if (jj_done) return true; - if (jj_3R_109()) return true; + if (jj_3R_108()) return true; return false; } - inline bool jj_3R_183() + inline bool jj_3R_182() { if (jj_done) return true; - if (jj_3R_111()) return true; + if (jj_3R_110()) return true; return false; } - inline bool jj_3R_182() + inline bool jj_3R_181() { if (jj_done) return true; - if (jj_3R_68()) return true; - if (jj_3R_110()) return true; - if (jj_3R_68()) return true; + if (jj_3R_67()) return true; + if (jj_3R_109()) return true; + if (jj_3R_67()) return true; return false; } - inline bool jj_3R_84() + inline bool jj_3R_83() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_182()) { + if (jj_3R_181()) { jj_scanpos = xsp; - if (jj_3R_183()) return true; + if (jj_3R_182()) return true; } return false; } - inline bool jj_3R_525() + inline bool jj_3R_530() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_4()) { jj_scanpos = xsp; - if (jj_3R_576()) return true; + if (jj_3R_575()) return true; } return false; } @@ -7481,176 +7456,176 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(NEW_T)) return true; - if (jj_3R_62()) return true; + if (jj_3R_61()) return true; return false; } - inline bool jj_3R_531() + inline bool jj_3R_536() { if (jj_done) return true; - if (jj_3R_310()) return true; + if (jj_3R_309()) return true; return false; } - inline bool jj_3R_228() + inline bool jj_3R_227() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_530() + inline bool jj_3R_535() { if (jj_done) return true; if (jj_scan_token(CHARACTER_LITERAL)) return true; return false; } - inline bool jj_3R_529() + inline bool jj_3R_534() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_465() + inline bool jj_3R_463() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_529()) { + if (jj_3R_534()) { jj_scanpos = xsp; - if (jj_3R_530()) { + if (jj_3R_535()) { jj_scanpos = xsp; - if (jj_3R_531()) return true; + if (jj_3R_536()) return true; } } return false; } - inline bool jj_3R_227() + inline bool jj_3R_226() { if (jj_done) return true; - if (jj_3R_109()) return true; + if (jj_3R_108()) return true; return false; } - inline bool jj_3R_62() + inline bool jj_3R_61() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(APOSTROPHE_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_227()) { + if (jj_3R_226()) { jj_scanpos = xsp; - if (jj_3R_228()) return true; + if (jj_3R_227()) return true; } return false; } - inline bool jj_3R_342() + inline bool jj_3R_341() { if (jj_done) return true; - if (jj_3R_113()) return true; + if (jj_3R_112()) return true; return false; } - inline bool jj_3R_192() + inline bool jj_3R_191() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_342()) { jj_scanpos = xsp; break; } + if (jj_3R_341()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_466() + inline bool jj_3R_464() { if (jj_done) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; return false; } - inline bool jj_3R_193() + inline bool jj_3R_192() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_377() + inline bool jj_3R_376() { if (jj_done) return true; if (jj_scan_token(ALIAS_T)) return true; - if (jj_3R_465()) return true; + if (jj_3R_463()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_466()) jj_scanpos = xsp; + if (jj_3R_464()) jj_scanpos = xsp; if (jj_scan_token(IS_T)) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; xsp = jj_scanpos; - if (jj_3R_467()) jj_scanpos = xsp; + if (jj_3R_465()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_340() + inline bool jj_3R_339() { if (jj_done) return true; - if (jj_3R_423()) return true; + if (jj_3R_421()) return true; return false; } - inline bool jj_3R_109() + inline bool jj_3R_108() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_236()) return true; + if (jj_3R_235()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_237()) { jj_scanpos = xsp; break; } + if (jj_3R_236()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_273() + inline bool jj_3R_272() { if (jj_done) return true; if (jj_scan_token(MINUS_T)) return true; return false; } - inline bool jj_3R_274() + inline bool jj_3R_273() { if (jj_done) return true; if (jj_scan_token(AMPERSAND_T)) return true; return false; } - inline bool jj_3R_129() + inline bool jj_3R_128() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_272()) { + if (jj_3R_271()) { jj_scanpos = xsp; - if (jj_3R_273()) { + if (jj_3R_272()) { jj_scanpos = xsp; - if (jj_3R_274()) return true; + if (jj_3R_273()) return true; } } return false; } - inline bool jj_3R_272() + inline bool jj_3R_271() { if (jj_done) return true; if (jj_scan_token(PLUS_T)) return true; @@ -7660,64 +7635,64 @@ void parseInline(); inline bool jj_3_3() { if (jj_done) return true; - if (jj_3R_61()) return true; + if (jj_3R_60()) return true; return false; } - inline bool jj_3R_493() + inline bool jj_3R_491() { if (jj_done) return true; if (jj_scan_token(BOX_T)) return true; return false; } - inline bool jj_3R_494() + inline bool jj_3R_492() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_61()) return true; + if (jj_3R_60()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_404() + inline bool jj_3R_403() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_492()) { + if (jj_3R_490()) { jj_scanpos = xsp; - if (jj_3R_493()) { + if (jj_3R_491()) { jj_scanpos = xsp; - if (jj_3R_494()) return true; + if (jj_3R_492()) return true; } } return false; } - inline bool jj_3R_492() + inline bool jj_3R_490() { if (jj_done) return true; - if (jj_3R_61()) return true; + if (jj_3R_60()) return true; return false; } inline bool jj_3_2() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_226() + inline bool jj_3R_225() { if (jj_done) return true; - if (jj_3R_166()) return true; + if (jj_3R_165()) return true; return false; } - inline bool jj_3R_190() + inline bool jj_3R_189() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -7725,7 +7700,7 @@ void parseInline(); xsp = jj_scanpos; if (jj_scan_token(15)) { jj_scanpos = xsp; - if (jj_3R_340()) return true; + if (jj_3R_339()) return true; } if (jj_scan_token(RPAREN_T)) return true; return false; @@ -7734,114 +7709,114 @@ void parseInline(); inline bool jj_3_1() { if (jj_done) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_154() + inline bool jj_3R_153() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_189() + inline bool jj_3R_188() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_89() + inline bool jj_3R_88() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_189()) jj_scanpos = xsp; + if (jj_3R_188()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(79)) jj_scanpos = xsp; if (jj_scan_token(PROCESS_T)) return true; xsp = jj_scanpos; - if (jj_3R_190()) jj_scanpos = xsp; + if (jj_3R_189()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(56)) jj_scanpos = xsp; - if (jj_3R_191()) return true; + if (jj_3R_190()) return true; if (jj_scan_token(BEGIN_T)) return true; - if (jj_3R_192()) return true; + if (jj_3R_191()) return true; if (jj_scan_token(END_T)) return true; xsp = jj_scanpos; if (jj_scan_token(79)) jj_scanpos = xsp; if (jj_scan_token(PROCESS_T)) return true; xsp = jj_scanpos; - if (jj_3R_193()) jj_scanpos = xsp; + if (jj_3R_192()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_153() + inline bool jj_3R_152() { if (jj_done) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_341() + inline bool jj_3R_340() { if (jj_done) return true; - if (jj_3R_424()) return true; + if (jj_3R_422()) return true; return false; } - inline bool jj_3R_152() + inline bool jj_3R_151() { if (jj_done) return true; if (jj_scan_token(OPEN_T)) return true; return false; } - inline bool jj_3R_61() + inline bool jj_3R_60() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_152()) { + if (jj_3R_151()) { jj_scanpos = xsp; - if (jj_3R_153()) { + if (jj_3R_152()) { jj_scanpos = xsp; - if (jj_3R_154()) return true; + if (jj_3R_153()) return true; } } return false; } - inline bool jj_3R_191() + inline bool jj_3R_190() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_341()) { jj_scanpos = xsp; break; } + if (jj_3R_340()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_653() + inline bool jj_3R_655() { if (jj_done) return true; if (jj_scan_token(ACCESS_T)) return true; - if (jj_3R_85()) return true; + if (jj_3R_84()) return true; return false; } - inline bool jj_3R_513() + inline bool jj_3R_518() { if (jj_done) return true; - if (jj_3R_383()) return true; + if (jj_3R_382()) return true; return false; } - inline bool jj_3R_225() + inline bool jj_3R_224() { if (jj_done) return true; if (jj_scan_token(BASED_LITERAL)) return true; @@ -7851,48 +7826,48 @@ void parseInline(); inline bool jj_3_69() { if (jj_done) return true; - if (jj_3R_66()) return true; + if (jj_3R_65()) return true; return false; } - inline bool jj_3R_512() + inline bool jj_3R_517() { if (jj_done) return true; - if (jj_3R_382()) return true; + if (jj_3R_381()) return true; return false; } - inline bool jj_3R_224() + inline bool jj_3R_223() { if (jj_done) return true; if (jj_scan_token(INTEGER)) return true; return false; } - inline bool jj_3R_511() + inline bool jj_3R_516() { if (jj_done) return true; - if (jj_3R_379()) return true; + if (jj_3R_378()) return true; return false; } - inline bool jj_3R_223() + inline bool jj_3R_222() { if (jj_done) return true; if (jj_scan_token(DECIMAL_LITERAL)) return true; return false; } - inline bool jj_3R_104() + inline bool jj_3R_103() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_223()) { + if (jj_3R_222()) { jj_scanpos = xsp; - if (jj_3R_224()) { + if (jj_3R_223()) { jj_scanpos = xsp; - if (jj_3R_225()) return true; + if (jj_3R_224()) return true; } } return false; @@ -7901,80 +7876,80 @@ void parseInline(); inline bool jj_3_68() { if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_3R_64()) return true; return false; } - inline bool jj_3R_510() + inline bool jj_3R_515() { if (jj_done) return true; - if (jj_3R_377()) return true; + if (jj_3R_376()) return true; return false; } - inline bool jj_3R_509() + inline bool jj_3R_514() { if (jj_done) return true; - if (jj_3R_376()) return true; + if (jj_3R_375()) return true; return false; } - inline bool jj_3R_508() + inline bool jj_3R_513() { if (jj_done) return true; - if (jj_3R_375()) return true; + if (jj_3R_374()) return true; return false; } - inline bool jj_3R_507() + inline bool jj_3R_512() { if (jj_done) return true; - if (jj_3R_373()) return true; + if (jj_3R_372()) return true; return false; } - inline bool jj_3R_506() + inline bool jj_3R_511() { if (jj_done) return true; - if (jj_3R_372()) return true; + if (jj_3R_371()) return true; return false; } - inline bool jj_3R_505() + inline bool jj_3R_510() { if (jj_done) return true; - if (jj_3R_371()) return true; + if (jj_3R_370()) return true; return false; } - inline bool jj_3R_424() + inline bool jj_3R_422() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_504()) { + if (jj_3R_509()) { jj_scanpos = xsp; - if (jj_3R_505()) { + if (jj_3R_510()) { jj_scanpos = xsp; - if (jj_3R_506()) { + if (jj_3R_511()) { jj_scanpos = xsp; - if (jj_3R_507()) { + if (jj_3R_512()) { jj_scanpos = xsp; - if (jj_3R_508()) { + if (jj_3R_513()) { jj_scanpos = xsp; - if (jj_3R_509()) { + if (jj_3R_514()) { jj_scanpos = xsp; - if (jj_3R_510()) { + if (jj_3R_515()) { jj_scanpos = xsp; if (jj_3_68()) { jj_scanpos = xsp; - if (jj_3R_511()) { + if (jj_3R_516()) { jj_scanpos = xsp; - if (jj_3R_512()) { + if (jj_3R_517()) { jj_scanpos = xsp; if (jj_3_69()) { jj_scanpos = xsp; - if (jj_3R_513()) return true; + if (jj_3R_518()) return true; } } } @@ -7989,18 +7964,18 @@ void parseInline(); return false; } - inline bool jj_3R_504() + inline bool jj_3R_509() { if (jj_done) return true; - if (jj_3R_93()) return true; + if (jj_3R_92()) return true; return false; } - inline bool jj_3R_330() + inline bool jj_3R_329() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_226()) return true; + if (jj_3R_225()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } @@ -8008,88 +7983,88 @@ void parseInline(); inline bool jj_3_67() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_120() + inline bool jj_3R_119() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_67()) jj_scanpos = xsp; - if (jj_3R_177()) return true; + if (jj_3R_176()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_177() + inline bool jj_3R_176() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_330()) jj_scanpos = xsp; + if (jj_3R_329()) jj_scanpos = xsp; return false; } inline bool jj_3_65() { if (jj_done) return true; - if (jj_3R_87()) return true; + if (jj_3R_86()) return true; return false; } - inline bool jj_3R_205() + inline bool jj_3R_204() { if (jj_done) return true; - if (jj_3R_351()) return true; + if (jj_3R_350()) return true; return false; } inline bool jj_3_66() { if (jj_done) return true; - if (jj_3R_108()) return true; + if (jj_3R_107()) return true; return false; } - inline bool jj_3R_204() + inline bool jj_3R_203() { if (jj_done) return true; - if (jj_3R_87()) return true; + if (jj_3R_86()) return true; return false; } - inline bool jj_3R_203() + inline bool jj_3R_202() { if (jj_done) return true; - if (jj_3R_350()) return true; + if (jj_3R_349()) return true; return false; } - inline bool jj_3R_202() + inline bool jj_3R_201() { if (jj_done) return true; - if (jj_3R_349()) return true; + if (jj_3R_348()) return true; return false; } - inline bool jj_3R_94() + inline bool jj_3R_93() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_201()) { + jj_scanpos = xsp; if (jj_3R_202()) { jj_scanpos = xsp; if (jj_3R_203()) { jj_scanpos = xsp; - if (jj_3R_204()) { - jj_scanpos = xsp; if (jj_3_66()) { jj_scanpos = xsp; - if (jj_3R_205()) return true; + if (jj_3R_204()) return true; } } } @@ -8100,49 +8075,49 @@ void parseInline(); inline bool jj_3_64() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } inline bool jj_3_63() { if (jj_done) return true; - if (jj_3R_107()) return true; + if (jj_3R_106()) return true; return false; } - inline bool jj_3R_458() + inline bool jj_3R_456() { if (jj_done) return true; - if (jj_3R_109()) return true; + if (jj_3R_108()) return true; return false; } inline bool jj_3_62() { if (jj_done) return true; - if (jj_3R_106()) return true; + if (jj_3R_105()) return true; return false; } - inline bool jj_3R_457() + inline bool jj_3R_455() { if (jj_done) return true; - if (jj_3R_525()) return true; + if (jj_3R_530()) return true; return false; } inline bool jj_3_61() { if (jj_done) return true; - if (jj_3R_62()) return true; + if (jj_3R_61()) return true; return false; } - inline bool jj_3R_456() + inline bool jj_3R_454() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } @@ -8150,60 +8125,64 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_455() + inline bool jj_3R_453() { if (jj_done) return true; - if (jj_3R_107()) return true; + if (jj_3R_106()) return true; return false; } inline bool jj_3_59() { if (jj_done) return true; - if (jj_3R_105()) return true; + if (jj_3R_104()) return true; return false; } - inline bool jj_3R_454() + inline bool jj_3R_452() { if (jj_done) return true; - if (jj_3R_106()) return true; + if (jj_3R_105()) return true; return false; } - inline bool jj_3R_242() + inline bool jj_3R_241() { if (jj_done) return true; - if (jj_3R_60()) return true; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_453() + inline bool jj_3R_451() { if (jj_done) return true; - if (jj_3R_62()) return true; + if (jj_3R_61()) return true; return false; } - inline bool jj_3R_452() + inline bool jj_3R_450() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_370() + inline bool jj_3R_369() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_449()) { + jj_scanpos = xsp; + if (jj_3R_450()) { + jj_scanpos = xsp; if (jj_3R_451()) { jj_scanpos = xsp; if (jj_3R_452()) { @@ -8214,11 +8193,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_455()) { jj_scanpos = xsp; - if (jj_3R_456()) { - jj_scanpos = xsp; - if (jj_3R_457()) { - jj_scanpos = xsp; - if (jj_3R_458()) return true; + if (jj_3R_456()) return true; } } } @@ -8229,183 +8204,183 @@ void parseInline(); return false; } - inline bool jj_3R_451() + inline bool jj_3R_449() { if (jj_done) return true; - if (jj_3R_105()) return true; + if (jj_3R_104()) return true; return false; } - inline bool jj_3R_329() + inline bool jj_3R_328() { if (jj_done) return true; if (jj_scan_token(PORT_T)) return true; if (jj_scan_token(MAP_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_166()) return true; + if (jj_3R_165()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_582() + inline bool jj_3R_581() { if (jj_done) return true; - if (jj_3R_313()) return true; + if (jj_3R_312()) return true; return false; } - inline bool jj_3R_532() + inline bool jj_3R_537() { if (jj_done) return true; if (jj_scan_token(PORT_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_582()) return true; + if (jj_3R_581()) return true; if (jj_scan_token(RPAREN_T)) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_241() + inline bool jj_3R_240() { if (jj_done) return true; - if (jj_3R_360()) return true; + if (jj_3R_359()) return true; return false; } - inline bool jj_3R_112() + inline bool jj_3R_111() { if (jj_done) return true; if (jj_scan_token(UNITS_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(SEMI_T)) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_241()) { jj_scanpos = xsp; break; } + if (jj_3R_240()) { jj_scanpos = xsp; break; } } if (jj_scan_token(END_T)) return true; if (jj_scan_token(UNITS_T)) return true; xsp = jj_scanpos; - if (jj_3R_242()) jj_scanpos = xsp; + if (jj_3R_241()) jj_scanpos = xsp; return false; } inline bool jj_3_58() { if (jj_done) return true; - if (jj_3R_104()) return true; + if (jj_3R_103()) return true; return false; } - inline bool jj_3R_222() + inline bool jj_3R_221() { if (jj_done) return true; - if (jj_3R_104()) return true; + if (jj_3R_103()) return true; return false; } - inline bool jj_3R_103() + inline bool jj_3R_102() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_222()) jj_scanpos = xsp; - if (jj_3R_60()) return true; + if (jj_3R_221()) jj_scanpos = xsp; + if (jj_3R_59()) return true; return false; } - inline bool jj_3R_408() + inline bool jj_3R_407() { if (jj_done) return true; - if (jj_3R_70()) return true; - if (jj_scan_token(IN_T)) return true; if (jj_3R_69()) return true; + if (jj_scan_token(IN_T)) return true; + if (jj_3R_68()) return true; return false; } inline bool jj_3_57() { if (jj_done) return true; - if (jj_3R_87()) return true; + if (jj_3R_86()) return true; return false; } inline bool jj_3_55() { if (jj_done) return true; - if (jj_3R_65()) return true; + if (jj_3R_64()) return true; return false; } inline bool jj_3_56() { if (jj_done) return true; - if (jj_3R_66()) return true; + if (jj_3R_65()) return true; return false; } - inline bool jj_3R_351() + inline bool jj_3R_350() { if (jj_done) return true; if (jj_scan_token(PACKAGE_T)) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } inline bool jj_3_54() { if (jj_done) return true; - if (jj_3R_66()) return true; + if (jj_3R_65()) return true; return false; } - inline bool jj_3R_317() + inline bool jj_3R_316() { if (jj_done) return true; - if (jj_3R_405()) return true; + if (jj_3R_404()) return true; return false; } - inline bool jj_3R_261() + inline bool jj_3R_260() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_167() + inline bool jj_3R_166() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(50)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_317()) jj_scanpos = xsp; + if (jj_3R_316()) jj_scanpos = xsp; return false; } - inline bool jj_3R_310() + inline bool jj_3R_309() { if (jj_done) return true; if (jj_scan_token(STRINGLITERAL)) return true; return false; } - inline bool jj_3R_643() + inline bool jj_3R_646() { if (jj_done) return true; if (jj_scan_token(TYPE_T)) return true; return false; } - inline bool jj_3R_642() + inline bool jj_3R_645() { if (jj_done) return true; if (jj_scan_token(FILE_T)) return true; return false; } - inline bool jj_3R_641() + inline bool jj_3R_644() { if (jj_done) return true; if (jj_scan_token(SHARED_T)) return true; @@ -8416,47 +8391,47 @@ void parseInline(); inline bool jj_3_53() { if (jj_done) return true; - if (jj_3R_103()) return true; + if (jj_3R_102()) return true; return false; } - inline bool jj_3R_640() + inline bool jj_3R_643() { if (jj_done) return true; if (jj_scan_token(VARIABLE_T)) return true; return false; } - inline bool jj_3R_639() + inline bool jj_3R_642() { if (jj_done) return true; if (jj_scan_token(SIGNAL_T)) return true; return false; } - inline bool jj_3R_638() + inline bool jj_3R_641() { if (jj_done) return true; if (jj_scan_token(CONSTANT_T)) return true; return false; } - inline bool jj_3R_613() + inline bool jj_3R_612() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_638()) { + if (jj_3R_641()) { jj_scanpos = xsp; - if (jj_3R_639()) { + if (jj_3R_642()) { jj_scanpos = xsp; - if (jj_3R_640()) { + if (jj_3R_643()) { jj_scanpos = xsp; - if (jj_3R_641()) { + if (jj_3R_644()) { jj_scanpos = xsp; - if (jj_3R_642()) { + if (jj_3R_645()) { jj_scanpos = xsp; - if (jj_3R_643()) return true; + if (jj_3R_646()) return true; } } } @@ -8465,72 +8440,72 @@ void parseInline(); return false; } - inline bool jj_3R_353() + inline bool jj_3R_352() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_207() + inline bool jj_3R_206() { if (jj_done) return true; - if (jj_3R_104()) return true; + if (jj_3R_103()) return true; return false; } - inline bool jj_3R_206() + inline bool jj_3R_205() { if (jj_done) return true; - if (jj_3R_103()) return true; + if (jj_3R_102()) return true; return false; } - inline bool jj_3R_96() + inline bool jj_3R_95() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_206()) { + if (jj_3R_205()) { jj_scanpos = xsp; - if (jj_3R_207()) return true; + if (jj_3R_206()) return true; } return false; } - inline bool jj_3R_442() + inline bool jj_3R_440() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_363() + inline bool jj_3R_362() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_442()) jj_scanpos = xsp; + if (jj_3R_440()) jj_scanpos = xsp; if (jj_scan_token(NULL_T)) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_102() + inline bool jj_3R_101() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; return false; } - inline bool jj_3R_262() + inline bool jj_3R_261() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_80()) return true; + if (jj_3R_79()) return true; return false; } @@ -8541,42 +8516,42 @@ void parseInline(); return false; } - inline bool jj_3R_260() + inline bool jj_3R_259() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_124() + inline bool jj_3R_123() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_260()) jj_scanpos = xsp; + if (jj_3R_259()) jj_scanpos = xsp; if (jj_scan_token(NEXT_T)) return true; xsp = jj_scanpos; - if (jj_3R_261()) jj_scanpos = xsp; + if (jj_3R_260()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_262()) jj_scanpos = xsp; + if (jj_3R_261()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_221() + inline bool jj_3R_220() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_219() + inline bool jj_3R_218() { if (jj_done) return true; - if (jj_3R_234()) return true; + if (jj_3R_233()) return true; return false; } @@ -8584,33 +8559,33 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_102()) { jj_scanpos = xsp; break; } + if (jj_3R_101()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_101() + inline bool jj_3R_100() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_219()) jj_scanpos = xsp; + if (jj_3R_218()) jj_scanpos = xsp; if (jj_scan_token(APOSTROPHE_T)) return true; - if (jj_3R_220()) return true; + if (jj_3R_219()) return true; xsp = jj_scanpos; - if (jj_3R_221()) jj_scanpos = xsp; + if (jj_3R_220()) jj_scanpos = xsp; return false; } inline bool jj_3_47() { if (jj_done) return true; - if (jj_3R_99()) return true; + if (jj_3R_98()) return true; return false; } @@ -8618,7 +8593,7 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_69()) return true; + if (jj_3R_68()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } @@ -8626,19 +8601,19 @@ void parseInline(); inline bool jj_3_49() { if (jj_done) return true; - if (jj_3R_101()) return true; + if (jj_3R_100()) return true; return false; } - inline bool jj_3R_214() + inline bool jj_3R_213() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_59()) return true; + if (jj_3R_58()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_353()) { jj_scanpos = xsp; break; } + if (jj_3R_352()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN_T)) return true; return false; @@ -8648,60 +8623,60 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; - if (jj_3R_100()) return true; + if (jj_3R_99()) return true; return false; } - inline bool jj_3R_210() + inline bool jj_3R_209() { if (jj_done) return true; - if (jj_3R_99()) return true; + if (jj_3R_98()) return true; return false; } - inline bool jj_3R_213() + inline bool jj_3R_212() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_69()) return true; + if (jj_3R_68()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_150() + inline bool jj_3R_149() { if (jj_done) return true; - if (jj_3R_311()) return true; + if (jj_3R_310()) return true; return false; } - inline bool jj_3R_212() + inline bool jj_3R_211() { if (jj_done) return true; - if (jj_3R_101()) return true; + if (jj_3R_100()) return true; return false; } - inline bool jj_3R_211() + inline bool jj_3R_210() { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; - if (jj_3R_100()) return true; + if (jj_3R_99()) return true; return false; } - inline bool jj_3R_99() + inline bool jj_3R_98() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_210()) { + jj_scanpos = xsp; if (jj_3R_211()) { jj_scanpos = xsp; if (jj_3R_212()) { jj_scanpos = xsp; - if (jj_3R_213()) { - jj_scanpos = xsp; - if (jj_3R_214()) return true; + if (jj_3R_213()) return true; } } } @@ -8711,155 +8686,155 @@ void parseInline(); inline bool jj_3_46() { if (jj_done) return true; - if (jj_3R_98()) return true; + if (jj_3R_97()) return true; return false; } - inline bool jj_3R_98() + inline bool jj_3R_97() { if (jj_done) return true; - if (jj_3R_99()) return true; + if (jj_3R_98()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_210()) { jj_scanpos = xsp; break; } + if (jj_3R_209()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_149() + inline bool jj_3R_148() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_151() + inline bool jj_3R_150() { if (jj_done) return true; - if (jj_3R_98()) return true; + if (jj_3R_97()) return true; return false; } - inline bool jj_3R_148() + inline bool jj_3R_147() { if (jj_done) return true; - if (jj_3R_310()) return true; + if (jj_3R_309()) return true; return false; } - inline bool jj_3R_60() + inline bool jj_3R_59() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_148()) { + if (jj_3R_147()) { jj_scanpos = xsp; - if (jj_3R_149()) { + if (jj_3R_148()) { jj_scanpos = xsp; - if (jj_3R_150()) return true; + if (jj_3R_149()) return true; } } xsp = jj_scanpos; - if (jj_3R_151()) jj_scanpos = xsp; + if (jj_3R_150()) jj_scanpos = xsp; return false; } - inline bool jj_3R_281() + inline bool jj_3R_280() { if (jj_done) return true; if (jj_scan_token(REM_T)) return true; return false; } - inline bool jj_3R_280() + inline bool jj_3R_279() { if (jj_done) return true; if (jj_scan_token(MOD_T)) return true; return false; } - inline bool jj_3R_279() + inline bool jj_3R_278() { if (jj_done) return true; if (jj_scan_token(SLASH_T)) return true; return false; } - inline bool jj_3R_135() + inline bool jj_3R_134() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3R_277()) { + jj_scanpos = xsp; if (jj_3R_278()) { jj_scanpos = xsp; if (jj_3R_279()) { jj_scanpos = xsp; - if (jj_3R_280()) { - jj_scanpos = xsp; - if (jj_3R_281()) return true; + if (jj_3R_280()) return true; } } } return false; } - inline bool jj_3R_278() + inline bool jj_3R_277() { if (jj_done) return true; if (jj_scan_token(MULT_T)) return true; return false; } - inline bool jj_3R_625() + inline bool jj_3R_628() { if (jj_done) return true; - if (jj_3R_70()) return true; + if (jj_3R_69()) return true; return false; } - inline bool jj_3R_432() + inline bool jj_3R_430() { if (jj_done) return true; if (jj_scan_token(LINKAGE_T)) return true; return false; } - inline bool jj_3R_431() + inline bool jj_3R_429() { if (jj_done) return true; if (jj_scan_token(BUFFER_T)) return true; return false; } - inline bool jj_3R_430() + inline bool jj_3R_428() { if (jj_done) return true; if (jj_scan_token(INOUT_T)) return true; return false; } - inline bool jj_3R_429() + inline bool jj_3R_427() { if (jj_done) return true; if (jj_scan_token(OUT_T)) return true; return false; } - inline bool jj_3R_346() + inline bool jj_3R_345() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_428()) { + if (jj_3R_426()) { jj_scanpos = xsp; - if (jj_3R_429()) { + if (jj_3R_427()) { jj_scanpos = xsp; - if (jj_3R_430()) { + if (jj_3R_428()) { jj_scanpos = xsp; - if (jj_3R_431()) { + if (jj_3R_429()) { jj_scanpos = xsp; - if (jj_3R_432()) return true; + if (jj_3R_430()) return true; } } } @@ -8867,7 +8842,7 @@ void parseInline(); return false; } - inline bool jj_3R_428() + inline bool jj_3R_426() { if (jj_done) return true; if (jj_scan_token(IN_T)) return true; @@ -8893,7 +8868,7 @@ private: bool jj_lookingAhead; bool jj_semLA; int jj_gen; - int jj_la1[295]; + int jj_la1[294]; ErrorHandler *errorHandler; bool errorHandlerCreated; protected: @@ -8976,7 +8951,7 @@ static void addProto(const char *s1,const char *s2,const char *s3,const char *s4 static void addConfigureNode(const char* a,const char*b, bool,bool isLeaf,bool inlineConf); static void createFunction(const char *impure,uint64 spec,const char *fname); static void addVhdlType(const char *n,int startLine,int section, uint64 spec,const char* args,const char* type,Protection prot); -static void addCompInst(char *n, char* instName, char* comp,int iLine); +static void addCompInst(const char *n, const char* instName, const char* comp,int iLine); static void handleCommentBlock(const char* doc,bool brief); static void handleFlowComment(const char*); static void initEntry(Entry *e); diff --git a/vhdlparser/VhdlParserConstants.h b/vhdlparser/VhdlParserConstants.h index 0c2c0e5..73f2a43 100644 --- a/vhdlparser/VhdlParserConstants.h +++ b/vhdlparser/VhdlParserConstants.h @@ -375,7 +375,9 @@ const int SPACE_CHARACTER = 184; /** RegularExpression Id. */ const int LOWER_CASE_LETTER = 185; /** RegularExpression Id. */ -const int VHDL2008TOOLDIR = 186; +const int QUOTE = 186; + /** RegularExpression Id. */ +const int VHDL2008TOOLDIR = 187; /** Lexical state. */ const int DEFAULT = 0; @@ -754,6 +756,8 @@ const int DEFAULT = 0; static JAVACC_CHAR_TYPE tokenImage_arr_185[] = {0x22, 0x3c, 0x4c, 0x4f, 0x57, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0}; static JAVACC_CHAR_TYPE tokenImage_arr_186[] = +{0x22, 0x3c, 0x51, 0x55, 0x4f, 0x54, 0x45, 0x3e, 0x22, 0}; + static JAVACC_CHAR_TYPE tokenImage_arr_187[] = {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x32, 0x30, 0x30, 0x38, 0x54, 0x4f, 0x4f, 0x4c, 0x44, 0x49, 0x52, 0x3e, 0x22, 0}; static JAVACC_STRING_TYPE tokenImage[] = { tokenImage_arr_0, @@ -943,6 +947,7 @@ tokenImage_arr_183, tokenImage_arr_184, tokenImage_arr_185, tokenImage_arr_186, +tokenImage_arr_187, }; } diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc index 9733acd..ca09e99 100644 --- a/vhdlparser/VhdlParserTokenManager.cc +++ b/vhdlparser/VhdlParserTokenManager.cc @@ -235,6 +235,7 @@ static JAVACC_CHAR_TYPE jjstrLiteralChars_183[] = {0}; static JAVACC_CHAR_TYPE jjstrLiteralChars_184[] = {0}; static JAVACC_CHAR_TYPE jjstrLiteralChars_185[] = {0}; static JAVACC_CHAR_TYPE jjstrLiteralChars_186[] = {0}; +static JAVACC_CHAR_TYPE jjstrLiteralChars_187[] = {0}; static const JAVACC_STRING_TYPE jjstrLiteralImages[] = { jjstrLiteralChars_0, jjstrLiteralChars_1, @@ -423,6 +424,7 @@ jjstrLiteralChars_183, jjstrLiteralChars_184, jjstrLiteralChars_185, jjstrLiteralChars_186, +jjstrLiteralChars_187, }; /** Lexer state names. */ @@ -432,7 +434,7 @@ static const JAVACC_STRING_TYPE lexStateNames[] = { lexStateNames_arr_0, }; static const unsigned long long jjtoToken[] = { - 0xfffffffffffff801ULL, 0xffffffffffffffffULL, 0x4081fffffffffffULL, + 0xfffffffffffff801ULL, 0xffffffffffffffffULL, 0x8081fffffffffffULL, }; static const unsigned long long jjtoSkip[] = { 0x7deULL, 0x0ULL, 0x0ULL, @@ -2796,7 +2798,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ jjstateSet[jjnewStateCnt++] = 18; break; case 18: - if ((0xfffffffb00000200ULL & l) != 0L) + if ((0xffffffff00000200ULL & l) != 0L) jjstateSet[jjnewStateCnt++] = 19; break; case 19: @@ -2833,15 +2835,15 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ case 28: if (curChar != 34) break; - if (kind > 186) - kind = 186; + if (kind > 187) + kind = 187; { jjCheckNAddTwoStates(26, 29); } break; case 29: if ((0xfffffffb00000200ULL & l) == 0L) break; - if (kind > 186) - kind = 186; + if (kind > 187) + kind = 187; { jjCheckNAddTwoStates(26, 29); } break; case 30: @@ -3117,8 +3119,8 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ case 29: if ((0x7fffffffffffffffULL & l) == 0L) break; - if (kind > 186) - kind = 186; + if (kind > 187) + kind = 187; { jjCheckNAddTwoStates(26, 29); } break; case 32: @@ -3218,8 +3220,8 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){ case 29: if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) break; - if (kind > 186) - kind = 186; + if (kind > 187) + kind = 187; { jjAddStates(52, 53); } break; case 32: @@ -3408,6 +3410,7 @@ void VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){ } case 6 : { image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); + { QCString doc(image.data()); int count=doc.contains("--!"); ::vhdl::parser::VhdlParser::setMultCommentLine(); @@ -3416,6 +3419,7 @@ void VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){ ::vhdl::parser::VhdlParser::oneLineComment(doc); else ::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),FALSE); ; + } break; } case 7 : { @@ -3430,10 +3434,12 @@ 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); - ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear(); + { + QCString q(image.data()); + q.stripPrefix("/*!"); + q.resize(q.length()-2); + ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear(); + } break; } case 10 : { diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj index 0225183..befc4e0 100644 --- a/vhdlparser/vhdlparser.jj +++ b/vhdlparser/vhdlparser.jj @@ -55,7 +55,7 @@ static void addProto(const char *s1,const char *s2,const char *s3,const char *s4 static void addConfigureNode(const char* a,const char*b, bool,bool isLeaf,bool inlineConf); static void createFunction(const char *impure,uint64 spec,const char *fname); static void addVhdlType(const char *n,int startLine,int section, uint64 spec,const char* args,const char* type,Protection prot); -static void addCompInst(char *n, char* instName, char* comp,int iLine); +static void addCompInst(const char *n, const char* instName, const char* comp,int iLine); static void handleCommentBlock(const char* doc,bool brief); static void handleFlowComment(const char*); static void initEntry(Entry *e); @@ -86,6 +86,7 @@ SKIP: <#DOXYGEN_VHDL_COMMENT: (" "|"\t")*"--!"(~["\n", "\r"])* ("\n" | "\r" | "\r\n")?> | <MULT_DOXYGEN_COMMENT: (<DOXYGEN_VHDL_COMMENT>)+ > { + { QCString doc(image.data()); int count=doc.contains("--!"); ::vhdl::parser::VhdlParser::setMultCommentLine(); @@ -94,6 +95,7 @@ SKIP: ::vhdl::parser::VhdlParser::oneLineComment(doc); else ::vhdl::parser::VhdlParser::handleCommentBlock(image.data(),FALSE); ; + } } |<VHDL_FLOWCHART_COMMENT: "--#" (~["\n", "\r"])* ("\n" | "\r" | "\r\n")?> { ::vhdl::parser::VhdlParser::handleFlowComment(image.data());} @@ -108,10 +110,12 @@ SKIP : { <MULT_DOXYGEN_VHDL_COMMENT_2008 : "/*!" (~[])* "*/" > { - QCString q(image.data()); - q.stripPrefix("/*!"); - q.resize(q.length()-2); - ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear(); + { + QCString q(image.data()); + q.stripPrefix("/*!"); + q.resize(q.length()-2); + ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear(); + } } | <MULT_VHDL_2008_COMMENT : "/*" (~[])* "*/" > {::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();} } @@ -289,7 +293,7 @@ TOKEN: | <STRINGLITERAL: (( ["\""](<GRAPHIC_CHARACTER>)*) "\"")+ > | <BASIC_IDENTIFIER: (<LETTER> ( (["_"])* <LETTER_OR_DIGIT> )*) > | <EXTENDED_CHARACTER: ( ["\\"](<GRAPHIC_CHARACTER>)*["\\"] ) > - | <CHARACTER_LITERAL: (["'"]<GRAPHIC_CHARACTER>["'"]) > + | <CHARACTER_LITERAL: (["'"](<GRAPHIC_CHARACTER>|<QUOTE>)["'"]) > | <DECIMAL_LITERAL: (<INTEGER> (["."]<INTEGER>)? (<EXPONENT>)? ) > | <BASED_INTEGER: <LETTER_OR_DIGIT>( <LETTER_OR_DIGIT>)* > | <BASED_LITERAL: <INTEGER>["#"]<BASED_INTEGER>(["."] <BASED_INTEGER>)? ["#"] (<EXPONENT>)? > @@ -306,6 +310,7 @@ TOKEN: | < #OTHER_SPECIAL_CHARACTER: ["%","!","$","@","?","[","\\","]","^","`","{","}","~","\u00A0"-"\u00FF"]> | < #SPACE_CHARACTER: [" ","\t"] > | < #LOWER_CASE_LETTER: ["a"-"z"] > + | < #QUOTE: ["\""] > | <VHDL2008TOOLDIR : ["`"](<GRAPHIC_CHARACTER>|<STRINGLITERAL>)+ > } @@ -577,7 +582,7 @@ attribute_declaration() LOOKAHEAD(3) group_template_declaration() | group_declaration() -| <VHDL2008TOOLDIR> +//| <VHDL2008TOOLDIR> } void block_declarative_part() : {} @@ -2612,9 +2617,10 @@ void generate_statement_body() : {} void generate_statement_body1() : {} { - LOOKAHEAD(block_declarative_item()<BEGIN_T> ) - (block_declarative_item() )* <BEGIN_T> (concurrent_statement())* - | (concurrent_statement())* + // [LOOKAHEAD(block_declarative_item()<BEGIN_T> )(block_declarative_item() )* <BEGIN_T>] (concurrent_statement())* + + [(LOOKAHEAD(block_declarative_item())block_declarative_item() )* <BEGIN_T>] (concurrent_statement())* + // | (concurrent_statement())* } QCString external_name(): {QCString s,s1,s2;} diff --git a/vhdlparser/vhdlstring.h b/vhdlparser/vhdlstring.h index f15ef6c..fde6ce4 100644 --- a/vhdlparser/vhdlstring.h +++ b/vhdlparser/vhdlstring.h @@ -5,6 +5,7 @@ #include <stdlib.h> #include <string.h> + /** @brief Minimal string class with std::string like behaviour that fulfills the JavaCC * string requirements. */ |