From 4bef27771fec1892331df637dd6184abac36fd8f Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sun, 20 Dec 2015 10:37:34 +0100 Subject: Bug 758495 - Bug in VHDL parser + other fixes --- src/vhdldocgen.cpp | 139 ++++++-- src/vhdldocgen.h | 3 + src/vhdljjparser.cpp | 17 +- vhdlparser/CharStream.h | 34 +- vhdlparser/ErrorHandler.h | 10 +- vhdlparser/Makefile | 22 ++ vhdlparser/Makefile.in | 39 --- vhdlparser/TokenManager.h | 7 +- vhdlparser/TokenMgrError.cc | 2 +- vhdlparser/VhdlParser.cc | 743 ++++++++++++++++++++++--------------------- vhdlparser/VhdlParser.h | 466 ++++++++++++++------------- vhdlparser/vhdlparser.jj | 6 +- vhdlparser/vhdlparser.pro.in | 33 -- 13 files changed, 822 insertions(+), 699 deletions(-) create mode 100644 vhdlparser/Makefile delete mode 100644 vhdlparser/Makefile.in delete mode 100644 vhdlparser/vhdlparser.pro.in diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index 3ea9b18..2d473b2 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -27,10 +27,7 @@ #include #include #include - -//#ifdef DEBUGFLOW #include -//#endif /* --------------------------------------------------------------- */ @@ -47,7 +44,6 @@ #include "searchindex.h" #include "outputlist.h" #include "parserintf.h" - #include "layout.h" #include "arguments.h" #include "portable.h" @@ -59,11 +55,12 @@ #include "filename.h" #include "membergroup.h" #include "memberdef.h" - +#include "plantuml.h" #include "vhdljjparser.h" #include "VhdlParser.h" - #include "vhdlcode.h" +#include "plantuml.h" +//#define DEBUGFLOW #define theTranslator_vhdlType VhdlDocGen::trVhdlType static QDict g_vhdlKeyDict0(17,FALSE); @@ -95,7 +92,7 @@ void VhdlDocGen::setFlowMember( const MemberDef* mem) flowMember=mem; } -const MemberDef* VhdlDocGen::getFlowMember() + const MemberDef* VhdlDocGen::getFlowMember() { return flowMember; } @@ -2266,10 +2263,11 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol, ol.endMemberItem(); if (!mdef->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC") /* && !annMemb */) { - ol.startMemberDescription(mdef->anchor()); + QCString s=mdef->briefDescription(); + ol.startMemberDescription(mdef->anchor()); ol.generateDoc(mdef->briefFile(),mdef->briefLine(), mdef->getOuterScope()?mdef->getOuterScope():d, - mdef,mdef->briefDescription(),TRUE,FALSE,0,TRUE,FALSE); + mdef,s.data(),TRUE,FALSE,0,TRUE,FALSE); if (detailsVisible) { ol.pushGeneratorState(); @@ -2610,7 +2608,7 @@ void VhdlDocGen::writeSource(MemberDef *mdef,OutputList& ol,QCString & cname) codeFragment, // input SrcLangExt_VHDL, // lang FALSE, // isExample - 0, // exampleName + 0, // exampleName mdef->getFileDef(), // fileDef mdef->getStartBodyLine(), // startLine mdef->getEndBodyLine(), // endLine @@ -3559,7 +3557,7 @@ void FlowChart::printNode(const FlowChart* flo) } else { - printf("\n NO: %s%s[%d,%d]",q.data(),t.data(),flo->stamp,flo->id); + printf("\n NO: %s[%d,%d]",t.data(),flo->stamp,flo->id); } } } @@ -3745,8 +3743,13 @@ void FlowChart::buildCommentNodes(FTextStream & t) FlowChart *fll=flowList.at(j); if (fll->type & (COMMENT_NO | BEGIN_NO)) { + int diff=FLOWLEN-(j+1); flowList.remove(j); - delete fll; + + if ((fll->type & COMMENT_NO) && diff > 1) + flowList.at(j+1)->label=fll->label; + + delete fll; fll=0; size--; if (j>0) j--; @@ -3841,7 +3844,6 @@ void FlowChart::addFlowChart(int type,const char* text,const char* exp, const ch { flowList.append(fl); } - } void FlowChart::moveToPrevLevel() @@ -3850,6 +3852,88 @@ void FlowChart::moveToPrevLevel() ifcounter--; } +QCString FlowChart::printPlantUmlNode(const FlowChart *flo,bool ca,bool endL) +{ + QCString t; + QCString exp=flo->exp.stripWhiteSpace(); + QCString text=flo->text.stripWhiteSpace(); + switch (flo->type) + { + case START_NO: t=":"+text+"|"; break; + case IF_NO : t="\nif ("+exp+") then (yes)"; break; + case ELSIF_NO: t="\nelseif ("+exp+") then (yes)"; break; + case ELSE_NO: t="\nelse"; break; + case CASE_NO: t="\n:"+exp+";"; break; + case WHEN_NO: t="\n"; + if (!ca) t+="else"; + t+="if ("+exp+") then (yes)"; + break; + case EXIT_NO: break; + case END_NO: if (text.contains(" function")==0) t="\n:"+text+";"; + break; + case TEXT_NO: t="\n:"+text+"]"; break; + case ENDIF_NO: t="\nendif"; break; + case FOR_NO: t="\nwhile ("+exp+") is (yes)"; break; + case WHILE_NO: t="\nwhile ("+exp+") is (yes)"; break; + case END_LOOP: t="\nendwhile"; break; + case END_CASE: t="\nendif\n:end case;"; break; + case VARIABLE_NO:t="\n:"+text+";"; break; + case RETURN_NO: t="\n:"+text+";"; + if (!endL) t+="\nstop"; + break; + case LOOP_NO: t="\nwhile (infinite loop)"; break; + case NEXT_NO: break; + case EMPTY_NO: break; + case COMMENT_NO: t="\n note left \n "+flo->label+"\nend note \n"; break; + case BEGIN_NO: t="\n:begin;"; break; + default: assert(false); break; + } + return t; +} + +void FlowChart::printUmlTree() +{ + int caseCounter = 0; + int whenCounter = 0; + + QCString qcs; + uint size=flowList.count(); + bool endList; + for (uint j=0;jtype==CASE_NO) + { + caseCounter++; + whenCounter=0; + } + + if (flo->type==END_CASE) + { + caseCounter--; + } + + bool ca = (caseCounter>0 && whenCounter==0); + + qcs+=printPlantUmlNode(flo,ca,endList); + + if (flo->type==WHEN_NO) + { + whenCounter++; + } + + } + qcs+="\n"; + + QCString & outDir = Config_getString("OUTPUT_DIRECTORY"); + QCString & htmlOutDir = Config_getString("HTML_OUTPUT"); + + QCString n=convertNameToFileName(); + QCString tmp=htmlOutDir; + n=writePlantUMLSource(tmp,n,qcs); + generatePlantUMLOutput(n.data(),tmp.data(),PUML_SVG); +} QCString FlowChart::convertNameToFileName() { @@ -3857,16 +3941,19 @@ QCString FlowChart::convertNameToFileName() QCString temp,qcs; const MemberDef* md=VhdlDocGen::getFlowMember(); - temp.sprintf("%p",md); + // temp.sprintf("%p",md); qcs=md->name(); + #if 0 if (qcs.find(exp,0)>=0) { qcs.prepend("Z"); qcs=qcs.replace(exp,"_"); } + #endif - return qcs+temp; + //QCString tt= qcs;VhdlDocGen::getRecordNumber(); + return qcs; } const char* FlowChart::getNodeType(int c) @@ -3889,7 +3976,7 @@ const char* FlowChart::getNodeType(int c) case END_CASE: return "end_case "; case VARIABLE_NO: return "variable_decl "; case RETURN_NO: return "return "; - case LOOP_NO: return "infinte loop "; + case LOOP_NO: return "infinite loop "; case NEXT_NO: return "next "; case COMMENT_NO: return "comment "; case EMPTY_NO: return "empty "; @@ -3949,14 +4036,23 @@ void FlowChart::writeFlowChart() } colTextNodes(); + // buildCommentNodes(t); #ifdef DEBUGFLOW - printFlowTree(); + printFlowTree(); #endif + const MemberDef *p=VhdlDocGen::getFlowMember(); + + if (p->isStatic()) + { + printUmlTree(); + delFlowList(); + f.close(); + return; + } startDot(t); buildCommentNodes(t); - uint size=flowList.count(); for (uint j=0;j flowList; FlowChart(int typ,const char* t,const char* ex,const char* label=0); diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp index acef592..c29bc69 100644 --- a/src/vhdljjparser.cpp +++ b/src/vhdljjparser.cpp @@ -164,6 +164,9 @@ void VHDLLanguageScanner::parseInput(const char *fileName,const char *fileBuf,En g_thisParser=this; bool inLine=false; inputString=fileBuf; + + // fprintf(stderr,"\n ============= %s\n ==========\n",fileBuf); + if (strlen(fileName)==0) { inLine=true; @@ -291,6 +294,8 @@ bool checkInlineCode(QCString & doc) void VhdlParser::handleFlowComment(const char* doc) { + lineCount(doc); + if (VhdlDocGen::getFlowMember()) { QCString qcs(doc); @@ -305,7 +310,9 @@ void VhdlParser::handleCommentBlock(const char* doc1,bool brief) { int position=0; static bool isIn; - QCString doc(doc1); + QCString doc; + doc.append(doc1); + // fprintf(stderr,"\n %s",doc.data()); if (doc.isEmpty()) return; if (checkMultiComment(doc,yyLineNr)) @@ -359,6 +366,14 @@ void VhdlParser::handleCommentBlock(const char* doc1,bool brief) current->docLine = yyLineNr; } // printf("parseCommentBlock file<%s>\n [%s]\n at line [%d] \n ",yyFileName.data(),doc.data(),iDocLine); + + int j=doc.find("[plant]"); + if (j>=0) + { + doc=doc.remove(j,7); + current->stat=true; + } + while (parseCommentBlock( g_thisParser, current, diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h index 409439f..2543ad1 100644 --- a/vhdlparser/CharStream.h +++ b/vhdlparser/CharStream.h @@ -30,13 +30,29 @@ namespace parser { class CharStream { public: void setTabSize(int i) { tabSize = i; } - int getTabSize(int) { return tabSize; } - virtual int getColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; } - virtual int getLine() { return trackLineColumn ? bufline[bufpos] : -1; } - virtual int getEndColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; } - virtual int getEndLine() { return trackLineColumn ? bufline[bufpos] : -1; } - virtual int getBeginColumn() { return trackLineColumn ? bufcolumn[tokenBegin] : -1; } - virtual int getBeginLine() { return trackLineColumn ? bufline[tokenBegin] : -1; } + int getTabSize(int i) { return tabSize; } + private: + int getBufcolumn(int pos) { + if (trackLineColumn && pos>=0) { + return bufcolumn[pos]; + } else { + return -1; + } + } + int getBufline(int pos) { + if (trackLineColumn && pos>=0) { + return bufline[pos]; + } else { + return -1; + } + } + public: + virtual int getColumn() { return getBufcolumn(bufpos); } + virtual int getLine() { return getBufline(bufpos); } + virtual int getEndColumn() { return getBufcolumn(bufpos); } + virtual int getEndLine() { return getBufline(bufpos); } + virtual int getBeginColumn() { return getBufcolumn(tokenBegin); } + virtual int getBeginLine() { return getBufline(tokenBegin); } virtual bool getTrackLineColumn() { return trackLineColumn; } virtual void setTrackLineColumn(bool val) { trackLineColumn = val; } @@ -179,7 +195,7 @@ public: } CharStream(ReaderStream *input_stream, int startline, - int startcolumn, int) : + int startcolumn, int buffersize) : bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false), available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true), @@ -248,4 +264,4 @@ public: } } #endif -/* JavaCC - OriginalChecksum=89f4cb30f0d3487ee809cca18a2924f2 (do not edit this line) */ +/* JavaCC - OriginalChecksum=3f0e693d1617236429891c8c95713d73 (do not edit this line) */ diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h index 2170489..9f7dc07 100644 --- a/vhdlparser/ErrorHandler.h +++ b/vhdlparser/ErrorHandler.h @@ -24,7 +24,7 @@ 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, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser *) { + virtual void handleUnexpectedToken(int expectedKind, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser *parser) { 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()); } @@ -32,14 +32,14 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str); // last - the last token successfully parsed. // unexpected - the token at which the error occurs. // production - the production in which this error occurrs. - virtual void handleParseError(Token *, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *) { + virtual void handleParseError(Token *last, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *parser) { 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 *) { + virtual void handleOtherError(JAVACC_STRING_TYPE message, VhdlParser *parser) { 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, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, VhdlParserTokenManager*) { + virtual void lexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, VhdlParserTokenManager* token_manager) { // by default, we just print an error message and return. fprintf(stderr, "Lexical error at: %d:%d. Encountered: %c after: %s.\n", errorLine, errorColumn, curChar, (EOFSeen? "EOF" : (const char*)errorAfter.c_str())); } - virtual void lexicalError(JAVACC_STRING_TYPE errorMessage, VhdlParserTokenManager*) { + virtual void lexicalError(JAVACC_STRING_TYPE errorMessage, VhdlParserTokenManager* token_manager) { fprintf(stderr, "%s\n", (char*)errorMessage.c_str()); } virtual ~TokenManagerErrorHandler() {} diff --git a/vhdlparser/Makefile b/vhdlparser/Makefile new file mode 100644 index 0000000..4725470 --- /dev/null +++ b/vhdlparser/Makefile @@ -0,0 +1,22 @@ +# +# Copyright (C) 1997-2015 by Dimitri van Heesch. +# +# Permission to use, copy, modify, and distribute this software and its +# documentation under the terms of the GNU General Public License is hereby +# granted. No representations are made about the suitability of this software +# for any purpose. It is provided "as is" without express or implied warranty. +# See the GNU General Public License for more details. +# +# Documents produced by Doxygen are derivative works derived from the +# input used in their production; they are not affected by this license. +# + +regenerate: + rm -f CharStream.cc CharStream.h ErrorHandler.h ParseException.cc ParseException.h \ + Token.cc Token.h TokenManager.h TokenMgrError.cc TokenMgrError.h VhdlParser.cc VhdlParser.h \ + VhdlParserConstants.h VhdlParserTokenManager.cc VhdlParserTokenManager.h \ + JavaCC.h + javacc vhdlparser.jj + cp JavaCC.h.in JavaCC.h + +FORCE: diff --git a/vhdlparser/Makefile.in b/vhdlparser/Makefile.in deleted file mode 100644 index ef2c774..0000000 --- a/vhdlparser/Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ -# -# -# -# Copyright (C) 1997-2000 by Dimitri van Heesch. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation under the terms of the GNU General Public License is hereby -# granted. No representations are made about the suitability of this software -# for any purpose. It is provided "as is" without express or implied warranty. -# See the GNU General Public License for more details. -# -# Documents produced by Doxygen are derivative works derived from the -# input used in their production; they are not affected by this license. -# - -all: Makefile.vhdlparser Makefile - $(MAKE) -f Makefile.vhdlparser $@ - -Makefile.vhdlparser: vhdlparser.pro - $(ENV) $(PERL) "$(TMAKE)" vhdlparser.pro >Makefile.vhdlparser - -tmake: - $(ENV) $(PERL) "$(TMAKE)" vhdlparser.pro >Makefile.vhdlparser - -clean: Makefile.vhdlparser - $(MAKE) -f Makefile.vhdlparser clean - -regenerate: - $(RM) CharStream.cc CharStream.h ErrorHandler.h ParseException.cc ParseException.h \ - Token.cc Token.h TokenManager.h TokenMgrError.cc TokenMgrError.h VhdlParser.cc VhdlParser.h \ - VhdlParserConstants.h VhdlParserTokenManager.cc VhdlParserTokenManager.h \ - JavaCC.h - javacc vhdlparser.jj - $(CP) JavaCC.h.in JavaCC.h - -distclean: clean - $(RM) Makefile vhdlparser.pro - -FORCE: diff --git a/vhdlparser/TokenManager.h b/vhdlparser/TokenManager.h index 68fbe2f..0c2caa6 100644 --- a/vhdlparser/TokenManager.h +++ b/vhdlparser/TokenManager.h @@ -2,9 +2,12 @@ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ #ifndef TOKENMANAGER_H #define TOKENMANAGER_H +#include #include "JavaCC.h" #include "Token.h" +using namespace std; + namespace vhdl { namespace parser { /** @@ -16,12 +19,12 @@ namespace parser { class TokenManager { public: /** This gets the next token from the input stream. - * A token of kind 0 (\) should be returned on EOF. + * A token of kind 0 () should be returned on EOF. */ virtual ~TokenManager() { } virtual Token *getNextToken() = 0; virtual void lexicalError() { - fprintf(stderr,"Lexical error encountered."); + cerr << "Lexical error encountered." << endl; } }; diff --git a/vhdlparser/TokenMgrError.cc b/vhdlparser/TokenMgrError.cc index 2749940..74908f0 100644 --- a/vhdlparser/TokenMgrError.cc +++ b/vhdlparser/TokenMgrError.cc @@ -115,4 +115,4 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) { } } -/* JavaCC - OriginalChecksum=2fe11435e6701b2fca885354b08bfdf6 (do not edit this line) */ +/* JavaCC - OriginalChecksum=72f292bc267bd0602e63291bf864f942 (do not edit this line) */ diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc index 949f227..acdea91 100644 --- a/vhdlparser/VhdlParser.cc +++ b/vhdlparser/VhdlParser.cc @@ -62,7 +62,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;if (!hasError) { @@ -76,7 +76,7 @@ QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;if str=tok->image.c_str(); return str+str1; assert(false); - } +} QCString VhdlParser::actual_designator() {QCString str;Token *t=0; @@ -118,7 +118,7 @@ return str; } } assert(false); - } +} QCString VhdlParser::actual_parameter_part() {QCString s;if (!hasError) { @@ -128,7 +128,7 @@ QCString VhdlParser::actual_parameter_part() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::actual_part() {QCString s,s1; @@ -187,7 +187,7 @@ s+="(";s+=s1+")";return s; } } assert(false); - } +} QCString VhdlParser::adding_operator() { @@ -231,7 +231,7 @@ return "&"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::aggregate() {QCString s,s1,s2;if (!hasError) { @@ -276,7 +276,7 @@ s+=","+s1; return "("+s+")"; assert(false); - } +} QCString VhdlParser::alias_declaration() {QCString s,s1,s2;if (!hasError) { @@ -358,7 +358,7 @@ addVhdlType(s2.data(),getLine(ALIAS_T),Entry::VARIABLE_SEC,VhdlDocGen::ALIAS,0,s return s2+" "+s+";"; assert(false); - } +} QCString VhdlParser::alias_designator() {Token *tok=0;QCString s; @@ -403,7 +403,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::allocator() { @@ -435,7 +435,7 @@ void VhdlParser::allocator() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::architecture_body() {QCString s,s1;if (!hasError) { @@ -528,7 +528,7 @@ error_skipto(BEGIN_T); } lastEntity=0;lastCompound=0; genLabels.resize(0); - } +} void VhdlParser::architecture_declarative_part() {if (!hasError) { @@ -568,7 +568,7 @@ void VhdlParser::architecture_declarative_part() {if (!hasError) { end_label_2: ; } - } +} void VhdlParser::architecture_statement_part() {if (!hasError) { @@ -601,7 +601,7 @@ void VhdlParser::architecture_statement_part() {if (!hasError) { end_label_3: ; } - } +} QCString VhdlParser::array_type_definition() {QCString s; @@ -634,7 +634,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) { @@ -689,7 +689,7 @@ s.prepend("assert "); if(t1) s2.prepend(" report "); return s+s1+s2; assert(false); - } +} QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;if (!hasError) { @@ -724,7 +724,7 @@ QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;if (!has if(t) s+=":"; return s+s1+";"; assert(false); - } +} QCString VhdlParser::association_element() {QCString s,s1;if (!hasError) { @@ -749,7 +749,7 @@ QCString VhdlParser::association_element() {QCString s,s1;if (!hasError) { return s+" => "+s1; assert(false); - } +} QCString VhdlParser::association_list() {QCString s,s1;if (!hasError) { @@ -786,7 +786,7 @@ s+=","+s1; return s; assert(false); - } +} QCString VhdlParser::attribute_declaration() {QCString s,s1;if (!hasError) { @@ -813,7 +813,7 @@ QCString VhdlParser::attribute_declaration() {QCString s,s1;if (!hasError) { addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,s1.data(),Public); return " attribute "+s+":"+s1+";"; assert(false); - } +} QCString VhdlParser::attribute_designator() {QCString s;Token *tok=0; @@ -847,7 +847,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::attribute_name() {QCString s,s1;if (!hasError) { @@ -896,7 +896,7 @@ s+"("+s1+")"; return s; assert(false); - } +} QCString VhdlParser::attribute_specification() {QCString s,s1,s2;if (!hasError) { @@ -932,7 +932,7 @@ QCString t= s1+" is "+s2; addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,t.data(),Public); return " attribute "+s+" of "+s1+ " is "+s2+";"; assert(false); - } +} QCString VhdlParser::base() {Token *tok=0;if (!hasError) { @@ -942,7 +942,7 @@ QCString VhdlParser::base() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::base_specifier() {Token *tok=0;if (!hasError) { @@ -952,7 +952,7 @@ QCString VhdlParser::base_specifier() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::base_unit_declaration() {QCString s;if (!hasError) { @@ -962,7 +962,7 @@ QCString VhdlParser::base_unit_declaration() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::based_integer() {Token *tok=0;if (!hasError) { @@ -972,7 +972,7 @@ QCString VhdlParser::based_integer() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::based_literal() {Token *tok=0;if (!hasError) { @@ -982,7 +982,7 @@ QCString VhdlParser::based_literal() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::basic_identifier() {Token *tok=0;if (!hasError) { @@ -992,7 +992,7 @@ QCString VhdlParser::basic_identifier() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} void VhdlParser::binding_indication() {if (!hasError) { @@ -1045,7 +1045,7 @@ void VhdlParser::binding_indication() {if (!hasError) { } } - } +} QCString VhdlParser::bit_string_literal() {Token *tok=0;if (!hasError) { @@ -1055,7 +1055,7 @@ QCString VhdlParser::bit_string_literal() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::bit_value() {Token *tok=0;if (!hasError) { @@ -1065,7 +1065,7 @@ QCString VhdlParser::bit_value() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} void VhdlParser::block_configuration() {if (!hasError) { @@ -1127,7 +1127,7 @@ void VhdlParser::block_configuration() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::block_declarative_item() { @@ -1261,7 +1261,7 @@ void VhdlParser::block_declarative_item() { } } } - } +} void VhdlParser::block_declarative_part() {if (!hasError) { @@ -1301,7 +1301,7 @@ void VhdlParser::block_declarative_part() {if (!hasError) { end_label_7: ; } - } +} void VhdlParser::block_header() {if (!hasError) { @@ -1369,7 +1369,7 @@ void VhdlParser::block_header() {if (!hasError) { } } - } +} void VhdlParser::block_specification() {if (!hasError) { @@ -1400,7 +1400,7 @@ void VhdlParser::block_specification() {if (!hasError) { } } - } +} void VhdlParser::block_statement() {QCString s;if (!hasError) { @@ -1503,7 +1503,7 @@ pushLabel(genLabels,s); } genLabels=popLabel(genLabels); - } +} void VhdlParser::block_statement_part() {if (!hasError) { @@ -1536,7 +1536,7 @@ void VhdlParser::block_statement_part() {if (!hasError) { end_label_8: ; } - } +} void VhdlParser::case_statement() {QCString s;if (!hasError) { @@ -1630,7 +1630,7 @@ QCString ca="case "+s; FlowChart::moveToPrevLevel(); FlowChart::addFlowChart(FlowChart::END_CASE,"end case",0); - } +} void VhdlParser::case_statement_alternative() {QCString s;if (!hasError) { @@ -1657,7 +1657,7 @@ QCString t="when "; } FlowChart::moveToPrevLevel(); - } +} QCString VhdlParser::character_literal() {Token *tok=0;if (!hasError) { @@ -1667,7 +1667,7 @@ QCString VhdlParser::character_literal() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::choice() {QCString s; @@ -1718,7 +1718,7 @@ return " others "; } } assert(false); - } +} QCString VhdlParser::choices() {QCString s,s1;if (!hasError) { @@ -1755,7 +1755,7 @@ s+="|";s+=s1; return s; assert(false); - } +} void VhdlParser::component_configuration() {if (!hasError) { @@ -1816,7 +1816,7 @@ void VhdlParser::component_configuration() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::component_declaration() {QCString s;if (!hasError) { @@ -1910,7 +1910,7 @@ addVhdlType(s.data(),getLine(COMPONENT_T),Entry::VARIABLE_SEC,VhdlDocGen::COMPON jj_consume_token(SEMI_T); } - } +} void VhdlParser::component_instantiation_statement() {QCString s,s1;if (!hasError) { @@ -1960,7 +1960,7 @@ addCompInst(s.lower().data(),s1.lower().data(),0,getLine()); jj_consume_token(SEMI_T); } - } +} void VhdlParser::component_specification() {if (!hasError) { @@ -1976,7 +1976,7 @@ void VhdlParser::component_specification() {if (!hasError) { name(); } - } +} QCString VhdlParser::composite_type_definition() {QCString s,s1; @@ -2009,7 +2009,7 @@ return s+"#"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::concurrent_assertion_statement() {if (!hasError) { @@ -2051,7 +2051,7 @@ void VhdlParser::concurrent_assertion_statement() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) { @@ -2093,7 +2093,7 @@ void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) { @@ -2150,7 +2150,7 @@ void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) { } } - } +} void VhdlParser::concurrent_statement() { @@ -2217,7 +2217,7 @@ void VhdlParser::concurrent_statement() { } } } - } +} QCString VhdlParser::condition() {QCString s;if (!hasError) { @@ -2227,7 +2227,7 @@ QCString VhdlParser::condition() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::condition_clause() {QCString s;if (!hasError) { @@ -2241,7 +2241,7 @@ QCString VhdlParser::condition_clause() {QCString s;if (!hasError) { return " until "+s; assert(false); - } +} void VhdlParser::conditional_signal_assignment() {if (!hasError) { @@ -2265,7 +2265,7 @@ void VhdlParser::conditional_signal_assignment() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::conditional_waveforms() {if (!hasError) { @@ -2319,7 +2319,7 @@ void VhdlParser::conditional_waveforms() {if (!hasError) { } } - } +} void VhdlParser::configuration_declaration() {QCString s,s1;if (!hasError) { @@ -2398,7 +2398,7 @@ confName=s+"::"+s1; } genLabels.resize(0); confName=""; - } +} void VhdlParser::configuration_declarative_item() { @@ -2429,7 +2429,7 @@ void VhdlParser::configuration_declarative_item() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::configuration_declarative_part() {if (!hasError) { @@ -2454,7 +2454,7 @@ void VhdlParser::configuration_declarative_part() {if (!hasError) { end_label_12: ; } - } +} void VhdlParser::configuration_item() { @@ -2478,7 +2478,7 @@ void VhdlParser::configuration_item() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::configuration_specification() {if (!hasError) { @@ -2498,7 +2498,7 @@ void VhdlParser::configuration_specification() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0;if (!hasError) { @@ -2548,7 +2548,7 @@ if(t) it.prepend("constant "); return it; assert(false); - } +} QCString VhdlParser::constraint_array_definition() {QCString s,s1;if (!hasError) { @@ -2570,7 +2570,7 @@ QCString VhdlParser::constraint_array_definition() {QCString s,s1;if (!hasError) return s+" "+s1; assert(false); - } +} void VhdlParser::context_clause() {if (!hasError) { @@ -2594,7 +2594,7 @@ void VhdlParser::context_clause() {if (!hasError) { end_label_13: ; } - } +} QCString VhdlParser::constraint() {QCString s; @@ -2621,7 +2621,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::context_item() { @@ -2645,7 +2645,7 @@ void VhdlParser::context_item() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} QCString VhdlParser::decimal_literal() {Token *tok=0;if (!hasError) { @@ -2655,7 +2655,7 @@ QCString VhdlParser::decimal_literal() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} QCString VhdlParser::delay_mechanism() {QCString s; @@ -2712,7 +2712,7 @@ return s+" inertial "; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::design_file() { @@ -2767,7 +2767,7 @@ void VhdlParser::design_file() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::design_unit() {if (!hasError) { @@ -2779,7 +2779,7 @@ void VhdlParser::design_unit() {if (!hasError) { library_unit(); } - } +} QCString VhdlParser::designator() {QCString s; @@ -2813,7 +2813,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::direction() {Token *tok=0; @@ -2846,7 +2846,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::disconnection_specification() {if (!hasError) { @@ -2870,7 +2870,7 @@ void VhdlParser::disconnection_specification() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::guarded_signal_specificatio() {if (!hasError) { @@ -2886,7 +2886,7 @@ void VhdlParser::guarded_signal_specificatio() {if (!hasError) { name(); } - } +} QCString VhdlParser::discrete_range() {QCString s; @@ -2913,7 +2913,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::element_association() {QCString s,s1;if (!hasError) { @@ -2940,7 +2940,7 @@ if(!s.isEmpty()) return s+"=>"+s1; return s1; assert(false); - } +} QCString VhdlParser::element_declaration() {QCString s,s1;if (!hasError) { @@ -2964,7 +2964,7 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data( //addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public); return s+":"+s1; assert(false); - } +} QCString VhdlParser::entity_aspect() {Token *tok=0;QCString s,s1; @@ -3043,7 +3043,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::entity_class() { @@ -3241,7 +3241,7 @@ return "file"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::entity_class_entry() {QCString s;if (!hasError) { @@ -3270,7 +3270,7 @@ s+="<>"; return s; assert(false); - } +} QCString VhdlParser::entity_class_entry_list() {QCString s,s1,s2;if (!hasError) { @@ -3314,7 +3314,7 @@ s2+=",";s2+=s; return s1+s2; assert(false); - } +} void VhdlParser::entity_declaration() {QCString s;if (!hasError) { @@ -3405,7 +3405,7 @@ lastEntity=current; } lastEntity=0;lastCompound=0; genLabels.resize(0); - } +} void VhdlParser::entity_declarative_item() { @@ -3550,7 +3550,7 @@ void VhdlParser::entity_declarative_item() { } } } - } +} void VhdlParser::entity_declarative_part() {if (!hasError) { @@ -3590,7 +3590,7 @@ void VhdlParser::entity_declarative_part() {if (!hasError) { end_label_16: ; } - } +} QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) { @@ -3615,7 +3615,7 @@ QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) { return s+s1; assert(false); - } +} void VhdlParser::entity_header() {if (!hasError) { @@ -3657,7 +3657,7 @@ currP=VhdlDocGen::PORT; } } - } +} QCString VhdlParser::entity_name_list() {QCString s,s1; @@ -3728,7 +3728,7 @@ return "all"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::entity_specification() {QCString s,s1;if (!hasError) { @@ -3746,7 +3746,7 @@ QCString VhdlParser::entity_specification() {QCString s,s1;if (!hasError) { return s+":"+s1; assert(false); - } +} void VhdlParser::entity_statement() { @@ -3779,7 +3779,7 @@ void VhdlParser::entity_statement() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::entity_statement_part() {if (!hasError) { @@ -3808,7 +3808,7 @@ void VhdlParser::entity_statement_part() {if (!hasError) { end_label_18: ; } - } +} QCString VhdlParser::entity_tag() {QCString s; @@ -3844,7 +3844,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::enumeration_literal() {QCString s; @@ -3878,7 +3878,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::enumeration_type_definition() {QCString s,s1;if (!hasError) { @@ -3923,7 +3923,7 @@ s+=",";s+=s1; return "("+s+")"; assert(false); - } +} QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) { @@ -3997,7 +3997,7 @@ lab.resize(0); return s+s1+s2+";"; assert(false); - } +} QCString VhdlParser::expression() {QCString s,s1,s2;if (!hasError) { @@ -4039,7 +4039,7 @@ s+=s1;s+=s2; return s; assert(false); - } +} QCString VhdlParser::logop() { @@ -4116,7 +4116,7 @@ return "or" ; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::extended_identifier() {Token *t;if (!hasError) { @@ -4126,7 +4126,7 @@ QCString VhdlParser::extended_identifier() {Token *t;if (!hasError) { return t->image.c_str(); assert(false); - } +} QCString VhdlParser::factor() {QCString s,s1; @@ -4212,7 +4212,7 @@ s1="not ";return s1+s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3;if (!hasError) { @@ -4256,7 +4256,7 @@ QCString t1=s2+" "+s3; addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,t1.data(),Public); return " file "+s+":"+s2+" "+s3+";"; assert(false); - } +} QCString VhdlParser::file_logical_name() {QCString s;if (!hasError) { @@ -4266,7 +4266,7 @@ QCString VhdlParser::file_logical_name() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) { @@ -4299,7 +4299,7 @@ QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) { s2="open "+s+" is "+s1; return s2; assert(false); - } +} QCString VhdlParser::file_type_definition() {QCString s,s1;if (!hasError) { @@ -4317,7 +4317,7 @@ QCString VhdlParser::file_type_definition() {QCString s,s1;if (!hasError) { s1=" file of "+s; return s1; assert(false); - } +} QCString VhdlParser::floating_type_definition() {QCString s;if (!hasError) { @@ -4327,7 +4327,7 @@ QCString VhdlParser::floating_type_definition() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::formal_designator() {QCString s;Token *tok=0; @@ -4363,7 +4363,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::formal_parameter_list() {QCString s;if (!hasError) { @@ -4373,7 +4373,7 @@ QCString VhdlParser::formal_parameter_list() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::formal_part() {QCString s,s1;if (!hasError) { @@ -4410,7 +4410,7 @@ s+"("+s1+")"; return s; assert(false); - } +} QCString VhdlParser::full_type_declaration() {Entry *tmpEntry;QCString s,s1,s2;if (!hasError) { @@ -4466,7 +4466,7 @@ if (s2.contains("#")) { tmpEntry=0; return "type "+s+" is "+s2+";"; assert(false); - } +} QCString VhdlParser::function_call() {QCString s,s1;if (!hasError) { @@ -4488,7 +4488,7 @@ QCString VhdlParser::function_call() {QCString s,s1;if (!hasError) { return s+"("+s1+")"; assert(false); - } +} void VhdlParser::generate_statement() {QCString s;if (!hasError) { @@ -4552,7 +4552,7 @@ error_skipto(GENERATE_T); } genLabels=popLabel(genLabels); - } +} void VhdlParser::generate_scheme() { @@ -4584,7 +4584,7 @@ void VhdlParser::generate_scheme() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::generic_clause() {QCString s;if (!hasError) { @@ -4613,7 +4613,7 @@ parse_sec=GEN_SEC; } parse_sec=0; - } +} QCString VhdlParser::generic_list() {QCString s;if (!hasError) { @@ -4623,7 +4623,7 @@ QCString VhdlParser::generic_list() {QCString s;if (!hasError) { return s; assert(false); - } +} void VhdlParser::generic_map_aspect() {if (!hasError) { @@ -4647,7 +4647,7 @@ void VhdlParser::generic_map_aspect() {if (!hasError) { jj_consume_token(RPAREN_T); } - } +} QCString VhdlParser::group_constituent() {QCString s; @@ -4683,7 +4683,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::group_constituent_list() {QCString s,s1,s2;if (!hasError) { @@ -4723,7 +4723,7 @@ s2+=",";s2+=s1; return s+s2; assert(false); - } +} QCString VhdlParser::group_declaration() {QCString s,s1,s2;if (!hasError) { @@ -4761,7 +4761,7 @@ QCString VhdlParser::group_declaration() {QCString s,s1,s2;if (!hasError) { return "group "+s+":"+s1+"("+s2+");"; assert(false); - } +} QCString VhdlParser::group_template_declaration() {QCString s,s1;if (!hasError) { @@ -4795,7 +4795,7 @@ QCString VhdlParser::group_template_declaration() {QCString s,s1;if (!hasError) return "group "+s+ "is ("+s1+");"; assert(false); - } +} void VhdlParser::guarded_signal_specification() {if (!hasError) { @@ -4811,7 +4811,7 @@ void VhdlParser::guarded_signal_specification() {if (!hasError) { type_mark(); } - } +} QCString VhdlParser::identifier() {Token *tok=0; @@ -4844,7 +4844,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::identifier_list() {QCString str,str1;if (!hasError) { @@ -4881,7 +4881,7 @@ str+=",";str+=str1; return str; assert(false); - } +} void VhdlParser::if_statement() {QCString s,s1;if (!hasError) { @@ -5015,7 +5015,7 @@ FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0); FlowChart::moveToPrevLevel(); FlowChart::addFlowChart(FlowChart::ENDIF_NO,0,0); - } +} QCString VhdlParser::incomplete_type_declaration() {QCString s;if (!hasError) { @@ -5033,7 +5033,7 @@ QCString VhdlParser::incomplete_type_declaration() {QCString s;if (!hasError) { return "type "+s+";"; assert(false); - } +} QCString VhdlParser::index_constraint() {QCString s="("; QCString s1,s2;if (!hasError) { @@ -5082,7 +5082,7 @@ s+=",";s+=s1; return s+")"; assert(false); - } +} QCString VhdlParser::index_specification() {QCString s; @@ -5130,7 +5130,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::index_subtype_definition() {QCString s;if (!hasError) { @@ -5148,10 +5148,10 @@ QCString VhdlParser::index_subtype_definition() {QCString s;if (!hasError) { return s+" range <> "; assert(false); - } +} -QCString VhdlParser::instantiation_unit() {QCString s,s1,s2;Token *tok=0; +QCString VhdlParser::instantiation_unit() {QCString s,s1,s2; switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case COMPONENT_T: case BASIC_IDENTIFIER: @@ -5160,7 +5160,7 @@ QCString VhdlParser::instantiation_unit() {QCString s,s1,s2;Token *tok=0; switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case COMPONENT_T:{if (!hasError) { - tok = jj_consume_token(COMPONENT_T); + jj_consume_token(COMPONENT_T); } break; @@ -5176,14 +5176,29 @@ QCString VhdlParser::instantiation_unit() {QCString s,s1,s2;Token *tok=0; } if (!hasError) { -s1="component"; return s; +s1="component "; return s; } break; } case ENTITY_T:{if (!hasError) { - tok = jj_consume_token(ENTITY_T); + jj_consume_token(ENTITY_T); + } + if (!hasError) { + + if (jj_2_38(2)) {if (!hasError) { + + jj_consume_token(BASIC_IDENTIFIER); + } + if (!hasError) { + + jj_consume_token(DOT_T); + } + + } else { + ; + } } if (!hasError) { @@ -5191,7 +5206,7 @@ s1="component"; return s; } if (!hasError) { -s=tok->image.c_str()+s2; +s="entity "+s2; } if (!hasError) { @@ -5248,7 +5263,7 @@ s1="configuration ";return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::instantiation_list() {QCString s;Token *tok=0; @@ -5293,7 +5308,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::integer() {Token *t;if (!hasError) { @@ -5303,7 +5318,7 @@ QCString VhdlParser::integer() {Token *t;if (!hasError) { return t->image.c_str(); assert(false); - } +} QCString VhdlParser::integer_type_definition() {QCString s;if (!hasError) { @@ -5313,11 +5328,11 @@ QCString VhdlParser::integer_type_definition() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::interface_declaration() {QCString s,s1; - if (jj_2_38(5)) {if (!hasError) { + if (jj_2_39(5)) {if (!hasError) { s = interface_subprogram_declaration(); } @@ -5341,7 +5356,7 @@ return s; } default: jj_la1[121] = jj_gen; - if (jj_2_39(5)) {if (!hasError) { + if (jj_2_40(5)) {if (!hasError) { s = interface_variable_declaration(); } @@ -5350,7 +5365,7 @@ return s; return s; } - } else if (jj_2_40(5)) {if (!hasError) { + } else if (jj_2_41(5)) {if (!hasError) { interface_file_declaration(); } @@ -5359,7 +5374,7 @@ return s; return s; } - } else if (jj_2_41(2147483647)) {if (!hasError) { + } else if (jj_2_42(2147483647)) {if (!hasError) { subprogram_declaration(); } @@ -5401,7 +5416,7 @@ if (parse_sec==GEN_SEC) } } assert(false); - } +} QCString VhdlParser::interface_element() {QCString s;if (!hasError) { @@ -5411,7 +5426,7 @@ QCString VhdlParser::interface_element() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::interface_file_declaration() {QCString s,s1;if (!hasError) { @@ -5434,7 +5449,7 @@ QCString VhdlParser::interface_file_declaration() {QCString s,s1;if (!hasError) addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public); return " file "+s+":"+s1; assert(false); - } +} QCString VhdlParser::interface_list() {QCString s,s1,s2;if (!hasError) { @@ -5471,7 +5486,7 @@ s2+=";";s2+=s1; return s+s2; assert(false); - } +} QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=0;Token *tok2=0;QCString s,s1,s2,s3,s4,s5;if (!hasError) { @@ -5619,7 +5634,7 @@ if(tok) } // if component return it; assert(false); - } +} QCString VhdlParser::iteration_scheme() {QCString s; @@ -5666,7 +5681,7 @@ QCString q=lab+" for "+s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::label() {QCString s;if (!hasError) { @@ -5676,7 +5691,7 @@ QCString VhdlParser::label() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::library_clause() {QCString s;if (!hasError) { @@ -5702,11 +5717,11 @@ if ( parse_sec==0 && Config_getBool("SHOW_INCLUDE_FILES") ) QCString s1="library "+s; return s1; assert(false); - } +} QCString VhdlParser::library_unit() {QCString s; - if (jj_2_42(2)) {if (!hasError) { + if (jj_2_43(2)) {if (!hasError) { primary_unit(); } @@ -5743,11 +5758,11 @@ return s; } } assert(false); - } +} QCString VhdlParser::literal() {QCString s; - if (jj_2_43(2147483647)) {if (!hasError) { + if (jj_2_44(2147483647)) {if (!hasError) { s = bit_string_literal(); } @@ -5756,7 +5771,7 @@ QCString VhdlParser::literal() {QCString s; return s; } - } else if (jj_2_44(2147483647)) {if (!hasError) { + } else if (jj_2_45(2147483647)) {if (!hasError) { s = numeric_literal(); } @@ -5765,7 +5780,7 @@ return s; return s; } - } else if (jj_2_45(2147483647)) {if (!hasError) { + } else if (jj_2_46(2147483647)) {if (!hasError) { s = enumeration_literal(); } @@ -5805,7 +5820,7 @@ return "null"; } } assert(false); - } +} QCString VhdlParser::logical_operator() {QCString s;if (!hasError) { @@ -5815,7 +5830,7 @@ QCString VhdlParser::logical_operator() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::loop_statement() {QCString s,s1,s2,s3;if (!hasError) { @@ -5906,7 +5921,7 @@ QCString q = s+" loop "+s2+" end loop" +s3; FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop.data(),0); return q; assert(false); - } +} QCString VhdlParser::miscellaneous_operator() {Token *t=0; @@ -5950,7 +5965,7 @@ return "not"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::mode() {Token *tok=0; @@ -6016,7 +6031,7 @@ return "linkage"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::multiplying_operation() {Token *tok=0; @@ -6071,7 +6086,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::name() {QCString s,s1;if (!hasError) { @@ -6107,7 +6122,7 @@ QCString VhdlParser::name() {QCString s,s1;if (!hasError) { } if (!hasError) { - if (jj_2_46(2147483647)) {if (!hasError) { + if (jj_2_47(2147483647)) {if (!hasError) { s1 = name_ext1(); } @@ -6123,7 +6138,7 @@ s+=s1; return s; assert(false); - } +} QCString VhdlParser::name_ext1() {QCString s,s1,s2;if (!hasError) { @@ -6133,7 +6148,7 @@ QCString VhdlParser::name_ext1() {QCString s,s1,s2;if (!hasError) { if (!hasError) { while (!hasError) { - if (jj_2_47(2147483647)) { + if (jj_2_48(2147483647)) { ; } else { goto end_label_26; @@ -6152,12 +6167,12 @@ s+=s1; return s; assert(false); - } +} QCString VhdlParser::name_ext() {QCString s,s1,s2;if (!hasError) { - if (jj_2_48(2147483647)) {if (!hasError) { + if (jj_2_49(2147483647)) {if (!hasError) { jj_consume_token(DOT_T); } @@ -6170,7 +6185,7 @@ QCString VhdlParser::name_ext() {QCString s,s1,s2;if (!hasError) { s+=".";s+=s1; } - } else if (jj_2_49(2147483647)) {if (!hasError) { + } else if (jj_2_50(2147483647)) {if (!hasError) { s1 = test_att_name(); } @@ -6179,7 +6194,7 @@ s+=".";s+=s1; s+=s1; } - } else if (jj_2_50(2147483647)) {if (!hasError) { + } else if (jj_2_51(2147483647)) {if (!hasError) { jj_consume_token(LPAREN_T); } @@ -6196,7 +6211,7 @@ s+=s1; s+="(";s+=s1;s+=")"; } - } else if (jj_2_51(2147483647)) {if (!hasError) { + } else if (jj_2_52(2147483647)) {if (!hasError) { jj_consume_token(LPAREN_T); } @@ -6252,12 +6267,12 @@ s+=")"; return s; assert(false); - } +} QCString VhdlParser::test_att_name() {QCString s,s1;if (!hasError) { - if (jj_2_52(2147483647)) {if (!hasError) { + if (jj_2_53(2147483647)) {if (!hasError) { s1 = signature(); } @@ -6312,7 +6327,7 @@ s+="(";s+=s1;s+=")"; return s; assert(false); - } +} QCString VhdlParser::indexed_name() {QCString s,s1,s2;if (!hasError) { @@ -6365,7 +6380,7 @@ s+=",";s+=s1; return s+")"; assert(false); - } +} QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) { @@ -6438,7 +6453,7 @@ if(t) s+=":"; if(t1) s2.prepend("when "); return s+s1+s2+";"; assert(false); - } +} QCString VhdlParser::null_statement() {QCString s;if (!hasError) { @@ -6476,11 +6491,11 @@ s+=":"; return s+="null"; assert(false); - } +} QCString VhdlParser::numeric_literal() {QCString s; - if (jj_2_53(2147483647)) {if (!hasError) { + if (jj_2_54(2147483647)) {if (!hasError) { s = physical_literal(); } @@ -6511,7 +6526,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::object_class() { @@ -6592,7 +6607,7 @@ return "type"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::operator_symbol() {Token *tok=0;if (!hasError) { @@ -6602,7 +6617,7 @@ QCString VhdlParser::operator_symbol() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} void VhdlParser::options() {if (!hasError) { @@ -6638,7 +6653,7 @@ void VhdlParser::options() {if (!hasError) { } } - } +} void VhdlParser::package_body() {QCString s;if (!hasError) { @@ -6714,7 +6729,7 @@ lastCompound=current; } lastCompound=0; genLabels.resize(0); - } +} void VhdlParser::package_body_declarative_item() { @@ -6781,7 +6796,7 @@ void VhdlParser::package_body_declarative_item() { } default: jj_la1[152] = jj_gen; - if (jj_2_54(3)) {if (!hasError) { + if (jj_2_55(3)) {if (!hasError) { group_template_declaration(); } @@ -6802,7 +6817,7 @@ void VhdlParser::package_body_declarative_item() { } } } - } +} void VhdlParser::package_body_declarative_part() {if (!hasError) { @@ -6837,7 +6852,7 @@ void VhdlParser::package_body_declarative_part() {if (!hasError) { end_label_29: ; } - } +} void VhdlParser::package_declaration() {QCString s;if (!hasError) { @@ -6912,7 +6927,7 @@ lastCompound=current; } lastEntity=0;lastCompound=0; genLabels.resize(0); - } +} void VhdlParser::geninter() {if (!hasError) { @@ -6954,7 +6969,7 @@ void VhdlParser::geninter() {if (!hasError) { } } - } +} void VhdlParser::package_declarative_item() { @@ -7028,7 +7043,7 @@ void VhdlParser::package_declarative_item() { } default: jj_la1[159] = jj_gen; - if (jj_2_55(2147483647)) {if (!hasError) { + if (jj_2_56(2147483647)) {if (!hasError) { attribute_declaration(); } @@ -7058,7 +7073,7 @@ void VhdlParser::package_declarative_item() { } default: jj_la1[160] = jj_gen; - if (jj_2_56(3)) {if (!hasError) { + if (jj_2_57(3)) {if (!hasError) { group_template_declaration(); } @@ -7074,7 +7089,7 @@ void VhdlParser::package_declarative_item() { } default: jj_la1[161] = jj_gen; - if (jj_2_57(5)) {if (!hasError) { + if (jj_2_58(5)) {if (!hasError) { package_instantiation_declaration(); } @@ -7099,7 +7114,7 @@ void VhdlParser::package_declarative_item() { } } } - } +} void VhdlParser::package_declarative_part() {if (!hasError) { @@ -7139,7 +7154,7 @@ void VhdlParser::package_declarative_part() {if (!hasError) { end_label_30: ; } - } +} QCString VhdlParser::parameter_specification() {QCString s,s1;if (!hasError) { @@ -7157,12 +7172,12 @@ QCString VhdlParser::parameter_specification() {QCString s,s1;if (!hasError) { return s+" in "+s1; assert(false); - } +} QCString VhdlParser::physical_literal() {QCString s,s1;if (!hasError) { - if (jj_2_58(2147483647)) {if (!hasError) { + if (jj_2_59(2147483647)) {if (!hasError) { s = abstract_literal(); } @@ -7178,7 +7193,7 @@ QCString VhdlParser::physical_literal() {QCString s,s1;if (!hasError) { s+=" ";s+=s1;s.prepend(" "); return s; assert(false); - } +} QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;if (!hasError) { @@ -7246,7 +7261,7 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public) return s+"%"; assert(false); - } +} void VhdlParser::port_clause() {if (!hasError) { @@ -7271,7 +7286,7 @@ void VhdlParser::port_clause() {if (!hasError) { } currP=0; - } +} QCString VhdlParser::port_list() {QCString s;if (!hasError) { @@ -7281,7 +7296,7 @@ QCString VhdlParser::port_list() {QCString s;if (!hasError) { return s; assert(false); - } +} void VhdlParser::port_map_aspect() {if (!hasError) { @@ -7305,11 +7320,11 @@ void VhdlParser::port_map_aspect() {if (!hasError) { jj_consume_token(RPAREN_T); } - } +} QCString VhdlParser::primary() {QCString s,s1; - if (jj_2_59(2147483647)) {if (!hasError) { + if (jj_2_60(2147483647)) {if (!hasError) { s = function_call(); } @@ -7318,7 +7333,7 @@ QCString VhdlParser::primary() {QCString s,s1; return s; } - } else if (jj_2_60(2147483647)) {if (!hasError) { + } else if (jj_2_61(2147483647)) {if (!hasError) { jj_consume_token(LPAREN_T); } @@ -7335,7 +7350,7 @@ return s; s="("+s1+")"; return s; } - } else if (jj_2_61(2147483647)) {if (!hasError) { + } else if (jj_2_62(2147483647)) {if (!hasError) { s = qualified_expression(); } @@ -7344,7 +7359,7 @@ s="("+s1+")"; return s; return s; } - } else if (jj_2_62(2147483647)) {if (!hasError) { + } else if (jj_2_63(2147483647)) {if (!hasError) { s = type_conversion(); } @@ -7353,7 +7368,7 @@ return s; return s; } - } else if (jj_2_63(2147483647)) {if (!hasError) { + } else if (jj_2_64(2147483647)) {if (!hasError) { s = literal(); } @@ -7362,7 +7377,7 @@ return s; s.prepend(" ");return s; } - } else if (jj_2_64(2147483647)) {if (!hasError) { + } else if (jj_2_65(2147483647)) {if (!hasError) { s = name(); } @@ -7402,7 +7417,7 @@ return s; } } assert(false); - } +} void VhdlParser::primary_unit() { @@ -7423,12 +7438,12 @@ void VhdlParser::primary_unit() { } default: jj_la1[167] = jj_gen; - if (jj_2_65(2147483647)) {if (!hasError) { + if (jj_2_66(2147483647)) {if (!hasError) { package_instantiation_declaration(); } - } else if (jj_2_66(4)) {if (!hasError) { + } else if (jj_2_67(4)) {if (!hasError) { interface_package_declaration(); } @@ -7449,7 +7464,7 @@ void VhdlParser::primary_unit() { } } } - } +} QCString VhdlParser::procedure_call() {QCString s,s1;if (!hasError) { @@ -7486,12 +7501,12 @@ s1.prepend("("); s1.append(")"); return s+s1; assert(false); - } +} QCString VhdlParser::procedure_call_statement() {QCString s,s1;if (!hasError) { - if (jj_2_67(2)) {if (!hasError) { + if (jj_2_68(2)) {if (!hasError) { s = identifier(); } @@ -7519,7 +7534,7 @@ s+=":"; return s+s1+";"; assert(false); - } +} QCString VhdlParser::process_declarative_item() {QCString s; @@ -7607,7 +7622,7 @@ return s; } default: jj_la1[170] = jj_gen; - if (jj_2_68(3)) {if (!hasError) { + if (jj_2_69(3)) {if (!hasError) { s = attribute_declaration(); } @@ -7642,7 +7657,7 @@ return s; } default: jj_la1[171] = jj_gen; - if (jj_2_69(3)) {if (!hasError) { + if (jj_2_70(3)) {if (!hasError) { s = group_template_declaration(); } @@ -7674,7 +7689,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::process_declarative_part() {QCString s,s1;if (!hasError) { @@ -7716,7 +7731,7 @@ s+=s1; return s; assert(false); - } +} void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;if (!hasError) { @@ -7901,7 +7916,7 @@ if(s.isEmpty()) createFlow(); currName=""; newEntry(); - } +} void VhdlParser::process_statement_part() {if (!hasError) { @@ -7941,7 +7956,7 @@ void VhdlParser::process_statement_part() {if (!hasError) { end_label_33: ; } - } +} QCString VhdlParser::qualified_expression() {QCString s,s1;if (!hasError) { @@ -7958,7 +7973,7 @@ s=s1+"'"; } if (!hasError) { - if (jj_2_70(2147483647)) {if (!hasError) { + if (jj_2_71(2147483647)) {if (!hasError) { s1 = aggregate(); } @@ -7998,11 +8013,11 @@ s+="(";s+=s1;s+=")"; return s; assert(false); - } +} QCString VhdlParser::range() {QCString s,s1,s2; - if (jj_2_71(2147483647)) {if (!hasError) { + if (jj_2_72(2147483647)) {if (!hasError) { s = simple_expression(); } @@ -8019,7 +8034,7 @@ QCString VhdlParser::range() {QCString s,s1,s2; return s+" "+s1+" "+s2; } - } else if (jj_2_72(2147483647)) {if (!hasError) { + } else if (jj_2_73(2147483647)) {if (!hasError) { s = attribute_name(); } @@ -8033,7 +8048,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::range_constraint() {QCString s,s1;if (!hasError) { @@ -8047,7 +8062,7 @@ QCString VhdlParser::range_constraint() {QCString s,s1;if (!hasError) { return " range "+s; assert(false); - } +} void VhdlParser::record_type_definition() {if (!hasError) { @@ -8101,7 +8116,7 @@ void VhdlParser::record_type_definition() {if (!hasError) { } } - } +} QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) { @@ -8135,7 +8150,7 @@ QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) { return s+s1+s2; assert(false); - } +} QCString VhdlParser::relation_operator() { @@ -8212,7 +8227,7 @@ return "/="; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2;if (!hasError) { @@ -8272,7 +8287,7 @@ if(t) s.append(":"); if(t1) s2.prepend(" severity "); return s+s1+s2+";"; assert(false); - } +} QCString VhdlParser::return_statement() {QCString s,s1;if (!hasError) { @@ -8340,7 +8355,7 @@ s+=":"; return s+" return "+s1+";"; assert(false); - } +} QCString VhdlParser::scalar_type_definition() {QCString s,s1; @@ -8362,7 +8377,7 @@ return s; } if (!hasError) { - if (jj_2_73(2147483647)) {if (!hasError) { + if (jj_2_74(2147483647)) {if (!hasError) { s1 = physical_type_definition(); } @@ -8384,7 +8399,7 @@ return s+" "+s1+"%"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::secondary_unit() { @@ -8408,7 +8423,7 @@ void VhdlParser::secondary_unit() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;if (!hasError) { @@ -8433,7 +8448,7 @@ QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;if (!hasError) return s+"="+s1; assert(false); - } +} QCString VhdlParser::selected_name() {QCString s,s1;if (!hasError) { @@ -8451,7 +8466,7 @@ QCString VhdlParser::selected_name() {QCString s,s1;if (!hasError) { return s+"."+s1; assert(false); - } +} void VhdlParser::selected_signal_assignment() {if (!hasError) { @@ -8487,7 +8502,7 @@ void VhdlParser::selected_signal_assignment() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::selected_waveforms() {if (!hasError) { @@ -8534,7 +8549,7 @@ void VhdlParser::selected_waveforms() {if (!hasError) { end_label_35: ; } - } +} QCString VhdlParser::sensitivity_clause() {QCString s;if (!hasError) { @@ -8549,7 +8564,7 @@ QCString VhdlParser::sensitivity_clause() {QCString s;if (!hasError) { s.prepend(" on "); return s; assert(false); - } +} QCString VhdlParser::sensitivity_list() {QCString s,s1;if (!hasError) { @@ -8586,13 +8601,13 @@ s+=",";s+=s1; return s; assert(false); - } +} QCString VhdlParser::sequence_of_statement() {QCString s,s1;if (!hasError) { while (!hasError) { - if (jj_2_74(3)) { + if (jj_2_75(3)) { ; } else { goto end_label_37; @@ -8611,11 +8626,11 @@ s+=s1; return s; assert(false); - } +} QCString VhdlParser::sequential_statement() {QCString s; - if (jj_2_75(2147483647)) {if (!hasError) { + if (jj_2_76(2147483647)) {if (!hasError) { s = signal_assignment_statement(); } @@ -8624,7 +8639,7 @@ QCString VhdlParser::sequential_statement() {QCString s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_76(3)) {if (!hasError) { + } else if (jj_2_77(3)) {if (!hasError) { s = assertion_statement(); } @@ -8633,7 +8648,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_77(3)) {if (!hasError) { + } else if (jj_2_78(3)) {if (!hasError) { s = report_statement(); } @@ -8642,7 +8657,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_78(3)) {if (!hasError) { + } else if (jj_2_79(3)) {if (!hasError) { s = wait_statement(); } @@ -8651,7 +8666,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_79(2147483647)) {if (!hasError) { + } else if (jj_2_80(2147483647)) {if (!hasError) { s = variable_assignment_statement(); } @@ -8660,7 +8675,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_80(3)) {if (!hasError) { + } else if (jj_2_81(3)) {if (!hasError) { s = procedure_call_statement(); } @@ -8669,7 +8684,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } - } else if (jj_2_81(3)) {if (!hasError) { + } else if (jj_2_82(3)) {if (!hasError) { if_statement(); } @@ -8678,7 +8693,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; return s; } - } else if (jj_2_82(3)) {if (!hasError) { + } else if (jj_2_83(3)) {if (!hasError) { case_statement(); } @@ -8687,7 +8702,7 @@ return s; return s; } - } else if (jj_2_83(3)) {if (!hasError) { + } else if (jj_2_84(3)) {if (!hasError) { loop_statement(); } @@ -8696,7 +8711,7 @@ return s; return s; } - } else if (jj_2_84(3)) {if (!hasError) { + } else if (jj_2_85(3)) {if (!hasError) { s = next_statement(); } @@ -8705,7 +8720,7 @@ return s; return s; } - } else if (jj_2_85(3)) {if (!hasError) { + } else if (jj_2_86(3)) {if (!hasError) { s = exit_statement(); } @@ -8714,7 +8729,7 @@ return s; return s; } - } else if (jj_2_86(3)) {if (!hasError) { + } else if (jj_2_87(3)) {if (!hasError) { s = return_statement(); } @@ -8745,7 +8760,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; } } assert(false); - } +} QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) { @@ -8779,7 +8794,7 @@ QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) { return s+s1+s2; assert(false); - } +} QCString VhdlParser::shift_operator() { @@ -8856,7 +8871,7 @@ return "ror"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::sign() { @@ -8889,11 +8904,11 @@ return "-"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3; - if (jj_2_88(2147483647)) {if (!hasError) { + if (jj_2_89(2147483647)) {if (!hasError) { conditional_signal_assignment_wave(); } @@ -8902,7 +8917,7 @@ QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3; return ""; } - } else if (jj_2_89(2147483647)) {if (!hasError) { + } else if (jj_2_90(2147483647)) {if (!hasError) { selected_signal_assignment_wave(); } @@ -8919,7 +8934,7 @@ return ""; case BASIC_IDENTIFIER: case EXTENDED_CHARACTER:{if (!hasError) { - if (jj_2_87(2)) {if (!hasError) { + if (jj_2_88(2)) {if (!hasError) { s = identifier(); } @@ -8983,7 +8998,7 @@ return s+s1+"<="+s2+s3+";"; } } assert(false); - } +} void VhdlParser::semi() {if (!hasError) { @@ -8991,7 +9006,7 @@ void VhdlParser::semi() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;if (!hasError) { @@ -9054,7 +9069,7 @@ if(tok) s3.prepend(":="); s4=s1+s2+s3; addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SIGNAL,0,s4.data(),Public); - } +} QCString VhdlParser::signal_kind() { @@ -9087,7 +9102,7 @@ return "bus"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::signal_list() {QCString s,s1; @@ -9157,7 +9172,7 @@ return "all"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::signature() {QCString s,s1,s2;if (!hasError) { @@ -9239,7 +9254,7 @@ s+="return ";s+=s1; s1="["+s+"]";return s1; assert(false); - } +} QCString VhdlParser::simple_expression() {QCString s,s1,s2;if (!hasError) { @@ -9269,7 +9284,7 @@ s+=s1; if (!hasError) { while (!hasError) { - if (jj_2_90(2147483647)) { + if (jj_2_91(2147483647)) { ; } else { goto end_label_40; @@ -9292,7 +9307,7 @@ s+=s1;s+=s2; return s; assert(false); - } +} void VhdlParser::simple_name() {if (!hasError) { @@ -9300,7 +9315,7 @@ void VhdlParser::simple_name() {if (!hasError) { name(); } - } +} QCString VhdlParser::slice_name() {QCString s,s1;if (!hasError) { @@ -9322,7 +9337,7 @@ QCString VhdlParser::slice_name() {QCString s,s1;if (!hasError) { return s+"("+s1+")"; assert(false); - } +} QCString VhdlParser::string_literal() {Token *tok=0;if (!hasError) { @@ -9332,7 +9347,7 @@ QCString VhdlParser::string_literal() {Token *tok=0;if (!hasError) { return tok->image.c_str(); assert(false); - } +} void VhdlParser::subprogram_body() {QCString s;if (!hasError) { @@ -9405,11 +9420,11 @@ if (s.data()) tempEntry->endBodyLine=getLine(END_T); createFlow(); currP=0; - } +} void VhdlParser::subprogram_declaration() { - if (jj_2_91(2147483647)) {if (!hasError) { + if (jj_2_92(2147483647)) {if (!hasError) { subprogram_instantiation_declaration(); } @@ -9440,7 +9455,7 @@ currP=0; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::subprogram_1() { @@ -9464,7 +9479,7 @@ void VhdlParser::subprogram_1() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} QCString VhdlParser::subprogram_declarative_item() {QCString s; @@ -9563,7 +9578,7 @@ return s; } default: jj_la1[214] = jj_gen; - if (jj_2_92(2147483647)) {if (!hasError) { + if (jj_2_93(2147483647)) {if (!hasError) { s = attribute_declaration(); } @@ -9598,7 +9613,7 @@ return s; } default: jj_la1[215] = jj_gen; - if (jj_2_93(3)) {if (!hasError) { + if (jj_2_94(3)) {if (!hasError) { s = group_template_declaration(); } @@ -9630,7 +9645,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;if (!hasError) { @@ -9673,7 +9688,7 @@ s+=s1; return s; assert(false); - } +} void VhdlParser::subprogram_kind() { @@ -9697,7 +9712,7 @@ void VhdlParser::subprogram_kind() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::subprogram_specification() {QCString s;Token *tok=0;Token *t; @@ -9751,7 +9766,7 @@ param_sec=0; } if (!hasError) { - if (jj_2_94(2)) {if (!hasError) { + if (jj_2_95(2)) {if (!hasError) { gen_interface_list(); } @@ -9762,7 +9777,7 @@ param_sec=0; } if (!hasError) { - if (jj_2_95(2)) {if (!hasError) { + if (jj_2_96(2)) {if (!hasError) { gen_assoc_list(); } @@ -9891,7 +9906,7 @@ tempEntry=current; jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::subprogram_statement_part() {if (!hasError) { @@ -9931,7 +9946,7 @@ void VhdlParser::subprogram_statement_part() {if (!hasError) { end_label_42: ; } - } +} QCString VhdlParser::subtype_declaration() {QCString s,s1;if (!hasError) { @@ -9958,7 +9973,7 @@ QCString VhdlParser::subtype_declaration() {QCString s,s1;if (!hasError) { addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SUBTYPE,0,s1.data(),Public); return " subtype "+s+" is "+s1+";"; assert(false); - } +} QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) { @@ -9967,7 +9982,7 @@ QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) { } if (!hasError) { - if (jj_2_96(2147483647)) {if (!hasError) { + if (jj_2_97(2147483647)) {if (!hasError) { s1 = name(); } @@ -9978,7 +9993,7 @@ QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) { } if (!hasError) { - if (jj_2_97(2147483647)) {if (!hasError) { + if (jj_2_98(2147483647)) {if (!hasError) { s2 = constraint(); } @@ -9990,11 +10005,11 @@ QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) { return s+" "+s1+" "+s2; assert(false); - } +} QCString VhdlParser::suffix() {QCString s; - if (jj_2_98(2147483647)) {if (!hasError) { + if (jj_2_99(2147483647)) {if (!hasError) { s = name(); } @@ -10045,7 +10060,7 @@ return " all "; } } assert(false); - } +} QCString VhdlParser::target() {QCString s; @@ -10081,7 +10096,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::term() {QCString s,s1,s2;if (!hasError) { @@ -10091,7 +10106,7 @@ QCString VhdlParser::term() {QCString s,s1,s2;if (!hasError) { if (!hasError) { while (!hasError) { - if (jj_2_99(2)) { + if (jj_2_100(2)) { ; } else { goto end_label_43; @@ -10114,7 +10129,7 @@ s+=s1;s+=s2; return s; assert(false); - } +} QCString VhdlParser::timeout_clause() {QCString s;if (!hasError) { @@ -10128,7 +10143,7 @@ QCString VhdlParser::timeout_clause() {QCString s;if (!hasError) { return " for "+s; assert(false); - } +} QCString VhdlParser::type_conversion() {QCString s,s1;if (!hasError) { @@ -10150,11 +10165,11 @@ QCString VhdlParser::type_conversion() {QCString s,s1;if (!hasError) { return s+"("+s1+")"; assert(false); - } +} QCString VhdlParser::type_declaration() {QCString s; - if (jj_2_100(3)) {if (!hasError) { + if (jj_2_101(3)) {if (!hasError) { s = full_type_declaration(); } @@ -10183,7 +10198,7 @@ return s; } } assert(false); - } +} QCString VhdlParser::type_definition() {QCString s; @@ -10237,7 +10252,7 @@ return s; } default: jj_la1[228] = jj_gen; - if (jj_2_101(2)) {if (!hasError) { + if (jj_2_102(2)) {if (!hasError) { protected_type_body(); } @@ -10267,7 +10282,7 @@ return ""; } } assert(false); - } +} QCString VhdlParser::type_mark() {QCString s;if (!hasError) { @@ -10277,7 +10292,7 @@ QCString VhdlParser::type_mark() {QCString s;if (!hasError) { return s; assert(false); - } +} QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;if (!hasError) { @@ -10334,7 +10349,7 @@ s3+=",";s3+=s1; return "array("+s+s3+") of "+s2; assert(false); - } +} QCString VhdlParser::use_clause() {QCString s,s1;if (!hasError) { @@ -10390,7 +10405,7 @@ QStringList ql1=QStringList::split(",",s,FALSE); s1="use "+s; return s1; assert(false); - } +} QCString VhdlParser::variable_assignment_statement() {QCString s,s1,s2; @@ -10401,7 +10416,7 @@ QCString VhdlParser::variable_assignment_statement() {QCString s,s1,s2; case BASIC_IDENTIFIER: case EXTENDED_CHARACTER:{if (!hasError) { - if (jj_2_102(2)) {if (!hasError) { + if (jj_2_103(2)) {if (!hasError) { s = identifier(); } @@ -10458,7 +10473,7 @@ return ""; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s,s1,s2;if (!hasError) { @@ -10537,7 +10552,7 @@ int spec; addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,spec,0,it.data(),Public); return val; assert(false); - } +} QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasError) { @@ -10617,7 +10632,7 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr if(t) s.append(":"); return s+" wait "+s1+s2+s3+";"; assert(false); - } +} QCString VhdlParser::waveform() {QCString s,s1; @@ -10692,7 +10707,7 @@ return " unaffected "; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::waveform_element() {QCString s,s1;if (!hasError) { @@ -10725,7 +10740,7 @@ s1.prepend(" after "); return s+s1; assert(false); - } +} QCString VhdlParser::protected_type_body() {if (!hasError) { @@ -10771,7 +10786,7 @@ QCString VhdlParser::protected_type_body() {if (!hasError) { return ""; assert(false); - } +} void VhdlParser::protected_type_body_declarative_item() { @@ -10838,7 +10853,7 @@ void VhdlParser::protected_type_body_declarative_item() { } default: jj_la1[243] = jj_gen; - if (jj_2_103(2147483647)) {if (!hasError) { + if (jj_2_104(2147483647)) {if (!hasError) { attribute_declaration(); } @@ -10861,7 +10876,7 @@ void VhdlParser::protected_type_body_declarative_item() { } default: jj_la1[244] = jj_gen; - if (jj_2_104(3)) {if (!hasError) { + if (jj_2_105(3)) {if (!hasError) { group_template_declaration(); } @@ -10884,7 +10899,7 @@ void VhdlParser::protected_type_body_declarative_item() { } } } - } +} void VhdlParser::protected_type_body_declarative_part() {if (!hasError) { @@ -10921,7 +10936,7 @@ void VhdlParser::protected_type_body_declarative_part() {if (!hasError) { end_label_47: ; } - } +} QCString VhdlParser::protected_type_declaration() {if (!hasError) { @@ -10966,7 +10981,7 @@ error_skipto(END_T); return ""; assert(false); - } +} void VhdlParser::protected_type_declarative_item() { @@ -11000,7 +11015,7 @@ void VhdlParser::protected_type_declarative_item() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::protected_type_declarative_part() {if (!hasError) { @@ -11032,7 +11047,7 @@ void VhdlParser::protected_type_declarative_part() {if (!hasError) { end_label_48: ; } - } +} QCString VhdlParser::context_ref() {QCString s;if (!hasError) { @@ -11050,7 +11065,7 @@ QCString VhdlParser::context_ref() {QCString s;if (!hasError) { return "context "+s ; assert(false); - } +} void VhdlParser::context_declaration() {QCString s,s1;if (!hasError) { @@ -11132,7 +11147,7 @@ parse_sec=CONTEXT_SEC; parse_sec=0; addVhdlType(s.data(),getLine(LIBRARY_T),Entry::VARIABLE_SEC,VhdlDocGen::LIBRARY,"context",s1.data(),Public); - } +} QCString VhdlParser::libustcont_stats() {QCString s; @@ -11176,7 +11191,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasError) { @@ -11225,7 +11240,7 @@ void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasE QCString q=" is new "+s1+s2; addVhdlType(s.data(),getLine(PACKAGE_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"package",q.data(),Public); - } +} QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasError) { @@ -11267,7 +11282,7 @@ QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasErro current->name=s; return "package "+s+" is new "+s1; assert(false); - } +} QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;if (!hasError) { @@ -11318,7 +11333,7 @@ QCString q= " is new "+s1+s2; addVhdlType(s.data(),getLine(FUNCTION_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"function ",q.data(),Public); return q; assert(false); - } +} void VhdlParser::gen_assoc_list() {if (!hasError) { @@ -11342,7 +11357,7 @@ void VhdlParser::gen_assoc_list() {if (!hasError) { jj_consume_token(RPAREN_T); } - } +} void VhdlParser::gen_interface_list() {if (!hasError) { @@ -11372,7 +11387,7 @@ void VhdlParser::gen_interface_list() {if (!hasError) { jj_consume_token(RPAREN_T); } - } +} void VhdlParser::case_scheme() {if (!hasError) { @@ -11393,7 +11408,7 @@ void VhdlParser::case_scheme() {if (!hasError) { } if (!hasError) { - if (jj_2_105(3)) {if (!hasError) { + if (jj_2_106(3)) {if (!hasError) { ttend(); } @@ -11419,7 +11434,7 @@ void VhdlParser::case_scheme() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::when_stats() {if (!hasError) { @@ -11430,7 +11445,7 @@ void VhdlParser::when_stats() {if (!hasError) { } if (!hasError) { - if (jj_2_106(2)) {if (!hasError) { + if (jj_2_107(2)) {if (!hasError) { label(); } @@ -11469,7 +11484,7 @@ void VhdlParser::when_stats() {if (!hasError) { end_label_50: ; } - } +} void VhdlParser::ttend() {if (!hasError) { @@ -11497,7 +11512,7 @@ void VhdlParser::ttend() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::generate_statement_body() {if (!hasError) { @@ -11509,7 +11524,7 @@ void VhdlParser::generate_statement_body() {if (!hasError) { generate_statement_body(); } - } +} void VhdlParser::generate_statement_body1() {if (!hasError) { @@ -11536,7 +11551,7 @@ void VhdlParser::generate_statement_body1() {if (!hasError) { case VARIABLE_T:{if (!hasError) { while (!hasError) { - if (jj_2_107(2147483647)) { + if (jj_2_108(2147483647)) { ; } else { goto end_label_51; @@ -11590,7 +11605,7 @@ void VhdlParser::generate_statement_body1() {if (!hasError) { end_label_52: ; } - } +} QCString VhdlParser::external_name() {QCString s,s1,s2;if (!hasError) { @@ -11622,7 +11637,7 @@ QCString t="<<"+s; QCString t1=s1+":"+s2+">>"; return s+s1; assert(false); - } +} QCString VhdlParser::sig_stat() {Token *t; @@ -11666,7 +11681,7 @@ return t->image.data(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::external_pathname() {QCString s; @@ -11710,11 +11725,11 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::absolute_pathname() {QCString s,s1; - if (jj_2_108(2147483647)) {if (!hasError) { + if (jj_2_109(2147483647)) {if (!hasError) { jj_consume_token(DOT_T); } @@ -11755,7 +11770,7 @@ return "."+s; } } assert(false); - } +} QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) { @@ -11764,7 +11779,7 @@ QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) { } if (!hasError) { - if (jj_2_109(2147483647)) {if (!hasError) { + if (jj_2_110(2147483647)) {if (!hasError) { s1 = pathname_element_list(); } @@ -11780,7 +11795,7 @@ QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) { return s+s1+s2; assert(false); - } +} QCString VhdlParser::neg_list() {QCString s;if (!hasError) { @@ -11813,7 +11828,7 @@ s+="^."; return s; assert(false); - } +} QCString VhdlParser::pathname_element() {QCString s,s1;if (!hasError) { @@ -11849,7 +11864,7 @@ if(!s1.isEmpty()) return s; assert(false); - } +} QCString VhdlParser::pathname_element_list() {QCString s,s1,s2;if (!hasError) { @@ -11870,7 +11885,7 @@ s+="."; if (!hasError) { while (!hasError) { - if (jj_2_110(2147483647)) { + if (jj_2_111(2147483647)) { ; } else { goto end_label_54; @@ -11893,7 +11908,7 @@ s2+=s1;s2+="."; return s+s2; assert(false); - } +} QCString VhdlParser::package_path_name() {QCString s;if (!hasError) { @@ -11907,11 +11922,11 @@ QCString VhdlParser::package_path_name() {QCString s;if (!hasError) { return "@"+s; assert(false); - } +} void VhdlParser::conditional_signal_assignment_wave() { - if (jj_2_111(2147483647)) {if (!hasError) { + if (jj_2_112(2147483647)) {if (!hasError) { conditional_force_assignment(); } @@ -11935,7 +11950,7 @@ void VhdlParser::conditional_signal_assignment_wave() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::conditional_waveform_assignment() {if (!hasError) { @@ -11995,7 +12010,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::else_wave_list() {if (!hasError) { @@ -12026,7 +12041,7 @@ void VhdlParser::else_wave_list() {if (!hasError) { } } - } +} void VhdlParser::conditional_force_assignment() {if (!hasError) { @@ -12104,11 +12119,11 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::selected_signal_assignment_wave() { - if (jj_2_112(2147483647)) {if (!hasError) { + if (jj_2_113(2147483647)) {if (!hasError) { selected_force_assignment(); } @@ -12128,7 +12143,7 @@ void VhdlParser::selected_signal_assignment_wave() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::selected_variable_assignment() {if (!hasError) { @@ -12171,11 +12186,11 @@ void VhdlParser::selected_variable_assignment() {if (!hasError) { sel_var_list(); } - } +} void VhdlParser::select_name() { - if (jj_2_113(2147483647)) {if (!hasError) { + if (jj_2_114(2147483647)) {if (!hasError) { aggregate(); } @@ -12198,7 +12213,7 @@ void VhdlParser::select_name() { errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } } - } +} void VhdlParser::selected_waveform_assignment() {if (!hasError) { @@ -12258,7 +12273,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) { sel_wave_list(); } - } +} void VhdlParser::selected_force_assignment() {if (!hasError) { @@ -12321,7 +12336,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) { sel_var_list(); } - } +} void VhdlParser::sel_var_list() {if (!hasError) { @@ -12365,7 +12380,7 @@ void VhdlParser::sel_var_list() {if (!hasError) { if (!hasError) { while (!hasError) { - if (jj_2_114(2147483647)) { + if (jj_2_115(2147483647)) { ; } else { goto end_label_55; @@ -12409,7 +12424,7 @@ void VhdlParser::sel_var_list() {if (!hasError) { end_label_55: ; } - } +} void VhdlParser::sel_wave_list() {if (!hasError) { @@ -12452,7 +12467,7 @@ void VhdlParser::sel_wave_list() {if (!hasError) { jj_consume_token(SEMI_T); } - } +} void VhdlParser::inout_stat() { @@ -12476,7 +12491,7 @@ void VhdlParser::inout_stat() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} void VhdlParser::else_stat() {if (!hasError) { @@ -12522,7 +12537,7 @@ void VhdlParser::else_stat() {if (!hasError) { end_label_57: ; } - } +} QCString VhdlParser::interface_subprogram_declaration() {QCString s; @@ -12557,7 +12572,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); - } +} QCString VhdlParser::iproc() {QCString s,s1;if (!hasError) { @@ -12576,7 +12591,7 @@ QCString VhdlParser::iproc() {QCString s,s1;if (!hasError) { current->name=s; return "procedure "+s+s1; assert(false); - } +} QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *t2=0;if (!hasError) { @@ -12690,7 +12705,7 @@ QCString q; } currP=0;return ""; assert(false); - } +} QCString VhdlParser::param() {QCString s,s1;Token *tok=0;if (!hasError) { @@ -12743,7 +12758,7 @@ if(tok) } return s+"("+s1+")"; assert(false); - } +} void VhdlParser::parseInline() { @@ -12773,7 +12788,7 @@ void VhdlParser::parseInline() { jj_consume_token(-1); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } - } +} VhdlParser::VhdlParser(TokenManager *tm){ @@ -12836,7 +12851,7 @@ Token * VhdlParser::jj_consume_token(int kind) { jj_gen++; if (++jj_gc > 100) { jj_gc = 0; - for (int i = 0; i < 114; i++) { + for (int i = 0; i < 115; i++) { JJCalls *c = &jj_2_rtns[i]; while (c != NULL) { if (c->gen < jj_gen) c->first = NULL; @@ -12849,7 +12864,8 @@ Token * VhdlParser::jj_consume_token(int kind) { token = oldToken; jj_kind = kind; JAVACC_STRING_TYPE image = kind >= 0 ? tokenImage[kind] : tokenImage[0]; - errorHandler->handleUnexpectedToken(kind, image.substr(1, image.size() - 2), getToken(1), this), hasError = true; + errorHandler->handleUnexpectedToken(kind, image.substr(1, image.size() - 2), getToken(1), this); + hasError = true; return token; } @@ -12924,7 +12940,7 @@ int VhdlParser::jj_ntk_f(){ void VhdlParser::jj_rescan_token(){ jj_rescan = true; - for (int i = 0; i < 114; i++) { + for (int i = 0; i < 115; i++) { JJCalls *p = &jj_2_rtns[i]; do { if (p->gen > jj_gen) { @@ -13044,6 +13060,7 @@ int VhdlParser::jj_ntk_f(){ case 111: jj_3_112(); break; case 112: jj_3_113(); break; case 113: jj_3_114(); break; + case 114: jj_3_115(); break; } } p = p->next; diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h index 1c4c73d..08a9a63 100644 --- a/vhdlparser/VhdlParser.h +++ b/vhdlparser/VhdlParser.h @@ -582,7 +582,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_1() || jj_done; + return (!jj_3_1() || jj_done); { jj_save(0, xla); } } @@ -590,7 +590,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_2() || jj_done; + return (!jj_3_2() || jj_done); { jj_save(1, xla); } } @@ -598,7 +598,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_3() || jj_done; + return (!jj_3_3() || jj_done); { jj_save(2, xla); } } @@ -606,7 +606,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_4() || jj_done; + return (!jj_3_4() || jj_done); { jj_save(3, xla); } } @@ -614,7 +614,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_5() || jj_done; + return (!jj_3_5() || jj_done); { jj_save(4, xla); } } @@ -622,7 +622,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_6() || jj_done; + return (!jj_3_6() || jj_done); { jj_save(5, xla); } } @@ -630,7 +630,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_7() || jj_done; + return (!jj_3_7() || jj_done); { jj_save(6, xla); } } @@ -638,7 +638,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_8() || jj_done; + return (!jj_3_8() || jj_done); { jj_save(7, xla); } } @@ -646,7 +646,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_9() || jj_done; + return (!jj_3_9() || jj_done); { jj_save(8, xla); } } @@ -654,7 +654,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_10() || jj_done; + return (!jj_3_10() || jj_done); { jj_save(9, xla); } } @@ -662,7 +662,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_11() || jj_done; + return (!jj_3_11() || jj_done); { jj_save(10, xla); } } @@ -670,7 +670,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_12() || jj_done; + return (!jj_3_12() || jj_done); { jj_save(11, xla); } } @@ -678,7 +678,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_13() || jj_done; + return (!jj_3_13() || jj_done); { jj_save(12, xla); } } @@ -686,7 +686,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_14() || jj_done; + return (!jj_3_14() || jj_done); { jj_save(13, xla); } } @@ -694,7 +694,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_15() || jj_done; + return (!jj_3_15() || jj_done); { jj_save(14, xla); } } @@ -702,7 +702,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_16() || jj_done; + return (!jj_3_16() || jj_done); { jj_save(15, xla); } } @@ -710,7 +710,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_17() || jj_done; + return (!jj_3_17() || jj_done); { jj_save(16, xla); } } @@ -718,7 +718,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_18() || jj_done; + return (!jj_3_18() || jj_done); { jj_save(17, xla); } } @@ -726,7 +726,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_19() || jj_done; + return (!jj_3_19() || jj_done); { jj_save(18, xla); } } @@ -734,7 +734,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_20() || jj_done; + return (!jj_3_20() || jj_done); { jj_save(19, xla); } } @@ -742,7 +742,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_21() || jj_done; + return (!jj_3_21() || jj_done); { jj_save(20, xla); } } @@ -750,7 +750,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_22() || jj_done; + return (!jj_3_22() || jj_done); { jj_save(21, xla); } } @@ -758,7 +758,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_23() || jj_done; + return (!jj_3_23() || jj_done); { jj_save(22, xla); } } @@ -766,7 +766,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_24() || jj_done; + return (!jj_3_24() || jj_done); { jj_save(23, xla); } } @@ -774,7 +774,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_25() || jj_done; + return (!jj_3_25() || jj_done); { jj_save(24, xla); } } @@ -782,7 +782,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_26() || jj_done; + return (!jj_3_26() || jj_done); { jj_save(25, xla); } } @@ -790,7 +790,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_27() || jj_done; + return (!jj_3_27() || jj_done); { jj_save(26, xla); } } @@ -798,7 +798,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_28() || jj_done; + return (!jj_3_28() || jj_done); { jj_save(27, xla); } } @@ -806,7 +806,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_29() || jj_done; + return (!jj_3_29() || jj_done); { jj_save(28, xla); } } @@ -814,7 +814,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_30() || jj_done; + return (!jj_3_30() || jj_done); { jj_save(29, xla); } } @@ -822,7 +822,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_31() || jj_done; + return (!jj_3_31() || jj_done); { jj_save(30, xla); } } @@ -830,7 +830,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_32() || jj_done; + return (!jj_3_32() || jj_done); { jj_save(31, xla); } } @@ -838,7 +838,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_33() || jj_done; + return (!jj_3_33() || jj_done); { jj_save(32, xla); } } @@ -846,7 +846,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_34() || jj_done; + return (!jj_3_34() || jj_done); { jj_save(33, xla); } } @@ -854,7 +854,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_35() || jj_done; + return (!jj_3_35() || jj_done); { jj_save(34, xla); } } @@ -862,7 +862,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_36() || jj_done; + return (!jj_3_36() || jj_done); { jj_save(35, xla); } } @@ -870,7 +870,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_37() || jj_done; + return (!jj_3_37() || jj_done); { jj_save(36, xla); } } @@ -878,7 +878,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_38() || jj_done; + return (!jj_3_38() || jj_done); { jj_save(37, xla); } } @@ -886,7 +886,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_39() || jj_done; + return (!jj_3_39() || jj_done); { jj_save(38, xla); } } @@ -894,7 +894,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_40() || jj_done; + return (!jj_3_40() || jj_done); { jj_save(39, xla); } } @@ -902,7 +902,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_41() || jj_done; + return (!jj_3_41() || jj_done); { jj_save(40, xla); } } @@ -910,7 +910,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_42() || jj_done; + return (!jj_3_42() || jj_done); { jj_save(41, xla); } } @@ -918,7 +918,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_43() || jj_done; + return (!jj_3_43() || jj_done); { jj_save(42, xla); } } @@ -926,7 +926,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_44() || jj_done; + return (!jj_3_44() || jj_done); { jj_save(43, xla); } } @@ -934,7 +934,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_45() || jj_done; + return (!jj_3_45() || jj_done); { jj_save(44, xla); } } @@ -942,7 +942,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_46() || jj_done; + return (!jj_3_46() || jj_done); { jj_save(45, xla); } } @@ -950,7 +950,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_47() || jj_done; + return (!jj_3_47() || jj_done); { jj_save(46, xla); } } @@ -958,7 +958,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_48() || jj_done; + return (!jj_3_48() || jj_done); { jj_save(47, xla); } } @@ -966,7 +966,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_49() || jj_done; + return (!jj_3_49() || jj_done); { jj_save(48, xla); } } @@ -974,7 +974,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_50() || jj_done; + return (!jj_3_50() || jj_done); { jj_save(49, xla); } } @@ -982,7 +982,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_51() || jj_done; + return (!jj_3_51() || jj_done); { jj_save(50, xla); } } @@ -990,7 +990,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_52() || jj_done; + return (!jj_3_52() || jj_done); { jj_save(51, xla); } } @@ -998,7 +998,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_53() || jj_done; + return (!jj_3_53() || jj_done); { jj_save(52, xla); } } @@ -1006,7 +1006,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_54() || jj_done; + return (!jj_3_54() || jj_done); { jj_save(53, xla); } } @@ -1014,7 +1014,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_55() || jj_done; + return (!jj_3_55() || jj_done); { jj_save(54, xla); } } @@ -1022,7 +1022,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_56() || jj_done; + return (!jj_3_56() || jj_done); { jj_save(55, xla); } } @@ -1030,7 +1030,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_57() || jj_done; + return (!jj_3_57() || jj_done); { jj_save(56, xla); } } @@ -1038,7 +1038,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_58() || jj_done; + return (!jj_3_58() || jj_done); { jj_save(57, xla); } } @@ -1046,7 +1046,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_59() || jj_done; + return (!jj_3_59() || jj_done); { jj_save(58, xla); } } @@ -1054,7 +1054,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_60() || jj_done; + return (!jj_3_60() || jj_done); { jj_save(59, xla); } } @@ -1062,7 +1062,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_61() || jj_done; + return (!jj_3_61() || jj_done); { jj_save(60, xla); } } @@ -1070,7 +1070,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_62() || jj_done; + return (!jj_3_62() || jj_done); { jj_save(61, xla); } } @@ -1078,7 +1078,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_63() || jj_done; + return (!jj_3_63() || jj_done); { jj_save(62, xla); } } @@ -1086,7 +1086,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_64() || jj_done; + return (!jj_3_64() || jj_done); { jj_save(63, xla); } } @@ -1094,7 +1094,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_65() || jj_done; + return (!jj_3_65() || jj_done); { jj_save(64, xla); } } @@ -1102,7 +1102,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_66() || jj_done; + return (!jj_3_66() || jj_done); { jj_save(65, xla); } } @@ -1110,7 +1110,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_67() || jj_done; + return (!jj_3_67() || jj_done); { jj_save(66, xla); } } @@ -1118,7 +1118,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_68() || jj_done; + return (!jj_3_68() || jj_done); { jj_save(67, xla); } } @@ -1126,7 +1126,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_69() || jj_done; + return (!jj_3_69() || jj_done); { jj_save(68, xla); } } @@ -1134,7 +1134,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_70() || jj_done; + return (!jj_3_70() || jj_done); { jj_save(69, xla); } } @@ -1142,7 +1142,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_71() || jj_done; + return (!jj_3_71() || jj_done); { jj_save(70, xla); } } @@ -1150,7 +1150,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_72() || jj_done; + return (!jj_3_72() || jj_done); { jj_save(71, xla); } } @@ -1158,7 +1158,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_73() || jj_done; + return (!jj_3_73() || jj_done); { jj_save(72, xla); } } @@ -1166,7 +1166,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_74() || jj_done; + return (!jj_3_74() || jj_done); { jj_save(73, xla); } } @@ -1174,7 +1174,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_75() || jj_done; + return (!jj_3_75() || jj_done); { jj_save(74, xla); } } @@ -1182,7 +1182,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_76() || jj_done; + return (!jj_3_76() || jj_done); { jj_save(75, xla); } } @@ -1190,7 +1190,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_77() || jj_done; + return (!jj_3_77() || jj_done); { jj_save(76, xla); } } @@ -1198,7 +1198,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_78() || jj_done; + return (!jj_3_78() || jj_done); { jj_save(77, xla); } } @@ -1206,7 +1206,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_79() || jj_done; + return (!jj_3_79() || jj_done); { jj_save(78, xla); } } @@ -1214,7 +1214,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_80() || jj_done; + return (!jj_3_80() || jj_done); { jj_save(79, xla); } } @@ -1222,7 +1222,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_81() || jj_done; + return (!jj_3_81() || jj_done); { jj_save(80, xla); } } @@ -1230,7 +1230,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_82() || jj_done; + return (!jj_3_82() || jj_done); { jj_save(81, xla); } } @@ -1238,7 +1238,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_83() || jj_done; + return (!jj_3_83() || jj_done); { jj_save(82, xla); } } @@ -1246,7 +1246,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_84() || jj_done; + return (!jj_3_84() || jj_done); { jj_save(83, xla); } } @@ -1254,7 +1254,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_85() || jj_done; + return (!jj_3_85() || jj_done); { jj_save(84, xla); } } @@ -1262,7 +1262,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_86() || jj_done; + return (!jj_3_86() || jj_done); { jj_save(85, xla); } } @@ -1270,7 +1270,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_87() || jj_done; + return (!jj_3_87() || jj_done); { jj_save(86, xla); } } @@ -1278,7 +1278,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_88() || jj_done; + return (!jj_3_88() || jj_done); { jj_save(87, xla); } } @@ -1286,7 +1286,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_89() || jj_done; + return (!jj_3_89() || jj_done); { jj_save(88, xla); } } @@ -1294,7 +1294,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_90() || jj_done; + return (!jj_3_90() || jj_done); { jj_save(89, xla); } } @@ -1302,7 +1302,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_91() || jj_done; + return (!jj_3_91() || jj_done); { jj_save(90, xla); } } @@ -1310,7 +1310,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_92() || jj_done; + return (!jj_3_92() || jj_done); { jj_save(91, xla); } } @@ -1318,7 +1318,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_93() || jj_done; + return (!jj_3_93() || jj_done); { jj_save(92, xla); } } @@ -1326,7 +1326,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_94() || jj_done; + return (!jj_3_94() || jj_done); { jj_save(93, xla); } } @@ -1334,7 +1334,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_95() || jj_done; + return (!jj_3_95() || jj_done); { jj_save(94, xla); } } @@ -1342,7 +1342,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_96() || jj_done; + return (!jj_3_96() || jj_done); { jj_save(95, xla); } } @@ -1350,7 +1350,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_97() || jj_done; + return (!jj_3_97() || jj_done); { jj_save(96, xla); } } @@ -1358,7 +1358,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_98() || jj_done; + return (!jj_3_98() || jj_done); { jj_save(97, xla); } } @@ -1366,7 +1366,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_99() || jj_done; + return (!jj_3_99() || jj_done); { jj_save(98, xla); } } @@ -1374,7 +1374,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_100() || jj_done; + return (!jj_3_100() || jj_done); { jj_save(99, xla); } } @@ -1382,7 +1382,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_101() || jj_done; + return (!jj_3_101() || jj_done); { jj_save(100, xla); } } @@ -1390,7 +1390,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_102() || jj_done; + return (!jj_3_102() || jj_done); { jj_save(101, xla); } } @@ -1398,7 +1398,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_103() || jj_done; + return (!jj_3_103() || jj_done); { jj_save(102, xla); } } @@ -1406,7 +1406,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_104() || jj_done; + return (!jj_3_104() || jj_done); { jj_save(103, xla); } } @@ -1414,7 +1414,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_105() || jj_done; + return (!jj_3_105() || jj_done); { jj_save(104, xla); } } @@ -1422,7 +1422,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_106() || jj_done; + return (!jj_3_106() || jj_done); { jj_save(105, xla); } } @@ -1430,7 +1430,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_107() || jj_done; + return (!jj_3_107() || jj_done); { jj_save(106, xla); } } @@ -1438,7 +1438,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_108() || jj_done; + return (!jj_3_108() || jj_done); { jj_save(107, xla); } } @@ -1446,7 +1446,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_109() || jj_done; + return (!jj_3_109() || jj_done); { jj_save(108, xla); } } @@ -1454,7 +1454,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_110() || jj_done; + return (!jj_3_110() || jj_done); { jj_save(109, xla); } } @@ -1462,7 +1462,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_111() || jj_done; + return (!jj_3_111() || jj_done); { jj_save(110, xla); } } @@ -1470,7 +1470,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_112() || jj_done; + return (!jj_3_112() || jj_done); { jj_save(111, xla); } } @@ -1478,7 +1478,7 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_113() || jj_done; + return (!jj_3_113() || jj_done); { jj_save(112, xla); } } @@ -1486,10 +1486,18 @@ void parseInline(); { jj_la = xla; jj_lastpos = jj_scanpos = token; jj_done = false; - return !jj_3_114() || jj_done; + return (!jj_3_114() || jj_done); { jj_save(113, xla); } } + inline bool jj_2_115(int xla) + { + jj_la = xla; jj_lastpos = jj_scanpos = token; + jj_done = false; + return (!jj_3_115() || jj_done); + { jj_save(114, xla); } + } + inline bool jj_3R_230() { if (jj_done) return true; @@ -1532,7 +1540,7 @@ void parseInline(); return false; } - inline bool jj_3_42() + inline bool jj_3_43() { if (jj_done) return true; if (jj_3R_93()) return true; @@ -1597,6 +1605,15 @@ void parseInline(); return false; } + inline bool jj_3R_411() + { + if (jj_done) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_69()) return true; + if (jj_scan_token(RPAREN_T)) return true; + return false; + } + inline bool jj_3R_195() { if (jj_done) return true; @@ -1645,15 +1662,6 @@ void parseInline(); return false; } - inline bool jj_3R_411() - { - if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_69()) return true; - if (jj_scan_token(RPAREN_T)) return true; - return false; - } - inline bool jj_3R_91() { if (jj_done) return true; @@ -1671,7 +1679,7 @@ void parseInline(); return false; } - inline bool jj_3_41() + inline bool jj_3_42() { if (jj_done) return true; if (jj_3R_92()) return true; @@ -1693,14 +1701,14 @@ void parseInline(); return false; } - inline bool jj_3_40() + inline bool jj_3_41() { if (jj_done) return true; if (jj_3R_91()) return true; return false; } - inline bool jj_3_39() + inline bool jj_3_40() { if (jj_done) return true; if (jj_3R_90()) return true; @@ -1714,7 +1722,7 @@ void parseInline(); return false; } - inline bool jj_3_38() + inline bool jj_3_39() { if (jj_done) return true; if (jj_3R_89()) return true; @@ -1726,14 +1734,14 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_38()) { + if (jj_3_39()) { jj_scanpos = xsp; if (jj_3R_555()) { jj_scanpos = xsp; - if (jj_3_39()) { - jj_scanpos = xsp; if (jj_3_40()) { jj_scanpos = xsp; + if (jj_3_41()) { + jj_scanpos = xsp; if (jj_3R_556()) { jj_scanpos = xsp; if (jj_3R_557()) return true; @@ -1753,6 +1761,14 @@ void parseInline(); return false; } + inline bool jj_3_38() + { + if (jj_done) return true; + if (jj_scan_token(BASIC_IDENTIFIER)) return true; + if (jj_scan_token(DOT_T)) return true; + return false; + } + inline bool jj_3R_624() { if (jj_done) return true; @@ -1815,9 +1831,11 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(ENTITY_T)) return true; - if (jj_3R_59()) return true; Token * xsp; xsp = jj_scanpos; + if (jj_3_38()) jj_scanpos = xsp; + if (jj_3R_59()) return true; + xsp = jj_scanpos; if (jj_3R_411()) jj_scanpos = xsp; return false; } @@ -2041,7 +2059,7 @@ void parseInline(); return false; } - inline bool jj_3_114() + inline bool jj_3_115() { if (jj_done) return true; if (jj_3R_58()) return true; @@ -2402,7 +2420,7 @@ void parseInline(); return false; } - inline bool jj_3_110() + inline bool jj_3_111() { if (jj_done) return true; if (jj_3R_142()) return true; @@ -2438,7 +2456,7 @@ void parseInline(); return false; } - inline bool jj_3_113() + inline bool jj_3_114() { if (jj_done) return true; if (jj_3R_108()) return true; @@ -2511,7 +2529,7 @@ void parseInline(); return false; } - inline bool jj_3_112() + inline bool jj_3_113() { if (jj_done) return true; if (jj_3R_144()) return true; @@ -2614,7 +2632,7 @@ void parseInline(); return false; } - inline bool jj_3_111() + inline bool jj_3_112() { if (jj_done) return true; if (jj_3R_143()) return true; @@ -2744,7 +2762,7 @@ void parseInline(); return false; } - inline bool jj_3_109() + inline bool jj_3_110() { if (jj_done) return true; if (jj_3R_141()) return true; @@ -2831,7 +2849,7 @@ void parseInline(); return false; } - inline bool jj_3_108() + inline bool jj_3_109() { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; @@ -3000,7 +3018,7 @@ void parseInline(); return false; } - inline bool jj_3_105() + inline bool jj_3_106() { if (jj_done) return true; if (jj_3R_138()) return true; @@ -3102,7 +3120,7 @@ void parseInline(); return false; } - inline bool jj_3_107() + inline bool jj_3_108() { if (jj_done) return true; if (jj_3R_140()) return true; @@ -3225,7 +3243,7 @@ void parseInline(); return false; } - inline bool jj_3_106() + inline bool jj_3_107() { if (jj_done) return true; if (jj_3R_139()) return true; @@ -3297,7 +3315,7 @@ void parseInline(); if (jj_scan_token(WHEN_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_106()) jj_scanpos = xsp; + if (jj_3_107()) jj_scanpos = xsp; if (jj_3R_85()) return true; if (jj_scan_token(ARROW_T)) return true; if (jj_3R_661()) return true; @@ -3692,7 +3710,7 @@ void parseInline(); return false; } - inline bool jj_3_103() + inline bool jj_3_104() { if (jj_done) return true; if (jj_3R_64()) return true; @@ -3766,7 +3784,7 @@ void parseInline(); return false; } - inline bool jj_3_104() + inline bool jj_3_105() { if (jj_done) return true; if (jj_3R_65()) return true; @@ -4004,7 +4022,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_715()) { jj_scanpos = xsp; - if (jj_3_104()) { + if (jj_3_105()) { jj_scanpos = xsp; if (jj_3R_716()) return true; } @@ -4407,7 +4425,7 @@ void parseInline(); return false; } - inline bool jj_3_102() + inline bool jj_3_103() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -4439,7 +4457,7 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_102()) jj_scanpos = xsp; + if (jj_3_103()) jj_scanpos = xsp; if (jj_3R_114()) return true; if (jj_scan_token(VARASSIGN_T)) return true; if (jj_3R_58()) return true; @@ -4542,7 +4560,7 @@ void parseInline(); return false; } - inline bool jj_3_101() + inline bool jj_3_102() { if (jj_done) return true; if (jj_3R_137()) return true; @@ -4607,7 +4625,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_635()) { jj_scanpos = xsp; - if (jj_3_101()) { + if (jj_3_102()) { jj_scanpos = xsp; if (jj_3R_636()) return true; } @@ -4625,7 +4643,7 @@ void parseInline(); return false; } - inline bool jj_3_97() + inline bool jj_3_98() { if (jj_done) return true; if (jj_3R_133()) return true; @@ -4658,7 +4676,7 @@ void parseInline(); return false; } - inline bool jj_3_100() + inline bool jj_3_101() { if (jj_done) return true; if (jj_3R_136()) return true; @@ -4670,7 +4688,7 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_100()) { + if (jj_3_101()) { jj_scanpos = xsp; if (jj_3R_457()) return true; } @@ -4687,7 +4705,7 @@ void parseInline(); return false; } - inline bool jj_3_99() + inline bool jj_3_100() { if (jj_done) return true; if (jj_3R_134()) return true; @@ -4717,7 +4735,7 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3_99()) { jj_scanpos = xsp; break; } + if (jj_3_100()) { jj_scanpos = xsp; break; } } return false; } @@ -4741,7 +4759,7 @@ void parseInline(); return false; } - inline bool jj_3_98() + inline bool jj_3_99() { if (jj_done) return true; if (jj_3R_59()) return true; @@ -4772,7 +4790,7 @@ void parseInline(); return false; } - inline bool jj_3_96() + inline bool jj_3_97() { if (jj_done) return true; if (jj_3R_59()) return true; @@ -4956,7 +4974,7 @@ void parseInline(); return false; } - inline bool jj_3_95() + inline bool jj_3_96() { if (jj_done) return true; if (jj_3R_132()) return true; @@ -4970,7 +4988,7 @@ void parseInline(); return false; } - inline bool jj_3_94() + inline bool jj_3_95() { if (jj_done) return true; if (jj_3R_131()) return true; @@ -5139,9 +5157,9 @@ void parseInline(); xsp = jj_scanpos; 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; + xsp = jj_scanpos; + if (jj_3_96()) jj_scanpos = xsp; if (jj_3R_423()) return true; return false; } @@ -5237,7 +5255,7 @@ void parseInline(); return false; } - inline bool jj_3_92() + inline bool jj_3_93() { if (jj_done) return true; if (jj_3R_64()) return true; @@ -5297,7 +5315,7 @@ void parseInline(); return false; } - inline bool jj_3_93() + inline bool jj_3_94() { if (jj_done) return true; if (jj_3R_65()) return true; @@ -5482,7 +5500,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_673()) { jj_scanpos = xsp; - if (jj_3_93()) { + if (jj_3_94()) { jj_scanpos = xsp; if (jj_3R_674()) return true; } @@ -5531,7 +5549,7 @@ void parseInline(); return false; } - inline bool jj_3_91() + inline bool jj_3_92() { if (jj_done) return true; if (jj_3R_130()) return true; @@ -5591,7 +5609,7 @@ void parseInline(); return false; } - inline bool jj_3_90() + inline bool jj_3_91() { if (jj_done) return true; if (jj_3R_128()) return true; @@ -6061,7 +6079,7 @@ void parseInline(); return false; } - inline bool jj_3_89() + inline bool jj_3_90() { if (jj_done) return true; if (jj_3R_127()) return true; @@ -6076,7 +6094,7 @@ void parseInline(); return false; } - inline bool jj_3_88() + inline bool jj_3_89() { if (jj_done) return true; if (jj_3R_126()) return true; @@ -6099,7 +6117,7 @@ void parseInline(); return false; } - inline bool jj_3_87() + inline bool jj_3_88() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -6112,7 +6130,7 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_87()) jj_scanpos = xsp; + if (jj_3_88()) jj_scanpos = xsp; if (jj_3R_114()) return true; if (jj_scan_token(LESSTHAN_T)) return true; xsp = jj_scanpos; @@ -6406,7 +6424,7 @@ void parseInline(); return false; } - inline bool jj_3_86() + inline bool jj_3_87() { if (jj_done) return true; if (jj_3R_125()) return true; @@ -6441,7 +6459,7 @@ void parseInline(); return false; } - inline bool jj_3_85() + inline bool jj_3_86() { if (jj_done) return true; if (jj_3R_124()) return true; @@ -6469,7 +6487,7 @@ void parseInline(); return false; } - inline bool jj_3_84() + inline bool jj_3_85() { if (jj_done) return true; if (jj_3R_123()) return true; @@ -6512,7 +6530,7 @@ void parseInline(); return false; } - inline bool jj_3_79() + inline bool jj_3_80() { if (jj_done) return true; Token * xsp; @@ -6523,7 +6541,7 @@ void parseInline(); return false; } - inline bool jj_3_83() + inline bool jj_3_84() { if (jj_done) return true; if (jj_3R_122()) return true; @@ -6591,14 +6609,14 @@ void parseInline(); return false; } - inline bool jj_3_82() + inline bool jj_3_83() { if (jj_done) return true; if (jj_3R_121()) return true; return false; } - inline bool jj_3_81() + inline bool jj_3_82() { if (jj_done) return true; if (jj_3R_120()) return true; @@ -6625,7 +6643,7 @@ void parseInline(); return false; } - inline bool jj_3_80() + inline bool jj_3_81() { if (jj_done) return true; if (jj_3R_119()) return true; @@ -6647,7 +6665,7 @@ void parseInline(); return false; } - inline bool jj_3_75() + inline bool jj_3_76() { if (jj_done) return true; Token * xsp; @@ -6658,14 +6676,14 @@ void parseInline(); return false; } - inline bool jj_3_78() + inline bool jj_3_79() { if (jj_done) return true; if (jj_3R_117()) return true; return false; } - inline bool jj_3_77() + inline bool jj_3_78() { if (jj_done) return true; if (jj_3R_116()) return true; @@ -6688,7 +6706,7 @@ void parseInline(); return false; } - inline bool jj_3_76() + inline bool jj_3_77() { if (jj_done) return true; if (jj_3R_115()) return true; @@ -6719,15 +6737,13 @@ void parseInline(); xsp = jj_scanpos; if (jj_3R_242()) { jj_scanpos = xsp; - if (jj_3_76()) { - jj_scanpos = xsp; if (jj_3_77()) { jj_scanpos = xsp; if (jj_3_78()) { jj_scanpos = xsp; - if (jj_3R_243()) { + if (jj_3_79()) { jj_scanpos = xsp; - if (jj_3_80()) { + if (jj_3R_243()) { jj_scanpos = xsp; if (jj_3_81()) { jj_scanpos = xsp; @@ -6741,6 +6757,8 @@ void parseInline(); jj_scanpos = xsp; if (jj_3_86()) { jj_scanpos = xsp; + if (jj_3_87()) { + jj_scanpos = xsp; if (jj_3R_244()) return true; } } @@ -6800,7 +6818,7 @@ void parseInline(); return false; } - inline bool jj_3_74() + inline bool jj_3_75() { if (jj_done) return true; if (jj_3R_112()) return true; @@ -6813,7 +6831,7 @@ void parseInline(); Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3_74()) { jj_scanpos = xsp; break; } + if (jj_3_75()) { jj_scanpos = xsp; break; } } return false; } @@ -6845,7 +6863,7 @@ void parseInline(); return false; } - inline bool jj_3_73() + inline bool jj_3_74() { if (jj_done) return true; if (jj_3R_111()) return true; @@ -7290,7 +7308,7 @@ void parseInline(); return false; } - inline bool jj_3_71() + inline bool jj_3_72() { if (jj_done) return true; if (jj_3R_68()) return true; @@ -7299,7 +7317,7 @@ void parseInline(); return false; } - inline bool jj_3_72() + inline bool jj_3_73() { if (jj_done) return true; if (jj_3R_110()) return true; @@ -7314,7 +7332,7 @@ void parseInline(); return false; } - inline bool jj_3_70() + inline bool jj_3_71() { if (jj_done) return true; if (jj_3R_108()) return true; @@ -7690,7 +7708,7 @@ void parseInline(); return false; } - inline bool jj_3_69() + inline bool jj_3_70() { if (jj_done) return true; if (jj_3R_65()) return true; @@ -7725,7 +7743,7 @@ void parseInline(); return false; } - inline bool jj_3_68() + inline bool jj_3_69() { if (jj_done) return true; if (jj_3R_64()) return true; @@ -7807,13 +7825,13 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_515()) { jj_scanpos = xsp; - if (jj_3_68()) { + if (jj_3_69()) { jj_scanpos = xsp; if (jj_3R_516()) { jj_scanpos = xsp; if (jj_3R_517()) { jj_scanpos = xsp; - if (jj_3_69()) { + if (jj_3_70()) { jj_scanpos = xsp; if (jj_3R_518()) return true; } @@ -7876,7 +7894,7 @@ void parseInline(); return false; } - inline bool jj_3_67() + inline bool jj_3_68() { if (jj_done) return true; if (jj_3R_69()) return true; @@ -7889,7 +7907,7 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_67()) jj_scanpos = xsp; + if (jj_3_68()) jj_scanpos = xsp; if (jj_3R_176()) return true; if (jj_scan_token(SEMI_T)) return true; return false; @@ -7941,7 +7959,7 @@ void parseInline(); return false; } - inline bool jj_3_65() + inline bool jj_3_66() { if (jj_done) return true; if (jj_3R_86()) return true; @@ -7955,7 +7973,7 @@ void parseInline(); return false; } - inline bool jj_3_66() + inline bool jj_3_67() { if (jj_done) return true; if (jj_3R_107()) return true; @@ -7994,7 +8012,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3R_203()) { jj_scanpos = xsp; - if (jj_3_66()) { + if (jj_3_67()) { jj_scanpos = xsp; if (jj_3R_204()) return true; } @@ -8004,14 +8022,14 @@ void parseInline(); return false; } - inline bool jj_3_64() + inline bool jj_3_65() { if (jj_done) return true; if (jj_3R_59()) return true; return false; } - inline bool jj_3_63() + inline bool jj_3_64() { if (jj_done) return true; if (jj_3R_106()) return true; @@ -8025,7 +8043,7 @@ void parseInline(); return false; } - inline bool jj_3_62() + inline bool jj_3_63() { if (jj_done) return true; if (jj_3R_105()) return true; @@ -8039,7 +8057,7 @@ void parseInline(); return false; } - inline bool jj_3_61() + inline bool jj_3_62() { if (jj_done) return true; if (jj_3R_61()) return true; @@ -8053,7 +8071,7 @@ void parseInline(); return false; } - inline bool jj_3_60() + inline bool jj_3_61() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -8069,7 +8087,7 @@ void parseInline(); return false; } - inline bool jj_3_59() + inline bool jj_3_60() { if (jj_done) return true; if (jj_3R_104()) return true; @@ -8197,7 +8215,7 @@ void parseInline(); return false; } - inline bool jj_3_58() + inline bool jj_3_59() { if (jj_done) return true; if (jj_3R_103()) return true; @@ -8230,21 +8248,21 @@ void parseInline(); return false; } - inline bool jj_3_57() + inline bool jj_3_58() { if (jj_done) return true; if (jj_3R_86()) return true; return false; } - inline bool jj_3_55() + inline bool jj_3_56() { if (jj_done) return true; if (jj_3R_64()) return true; return false; } - inline bool jj_3_56() + inline bool jj_3_57() { if (jj_done) return true; if (jj_3R_65()) return true; @@ -8259,7 +8277,7 @@ void parseInline(); return false; } - inline bool jj_3_54() + inline bool jj_3_55() { if (jj_done) return true; if (jj_3R_65()) return true; @@ -8320,7 +8338,7 @@ void parseInline(); return false; } - inline bool jj_3_53() + inline bool jj_3_54() { if (jj_done) return true; if (jj_3R_102()) return true; @@ -8441,7 +8459,7 @@ void parseInline(); return false; } - inline bool jj_3_52() + inline bool jj_3_53() { if (jj_done) return true; if (jj_scan_token(LBRACKET_T)) return true; @@ -8487,7 +8505,7 @@ void parseInline(); return false; } - inline bool jj_3_51() + inline bool jj_3_52() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -8514,14 +8532,14 @@ void parseInline(); return false; } - inline bool jj_3_47() + inline bool jj_3_48() { if (jj_done) return true; if (jj_3R_98()) return true; return false; } - inline bool jj_3_50() + inline bool jj_3_51() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; @@ -8530,7 +8548,7 @@ void parseInline(); return false; } - inline bool jj_3_49() + inline bool jj_3_50() { if (jj_done) return true; if (jj_3R_100()) return true; @@ -8551,7 +8569,7 @@ void parseInline(); return false; } - inline bool jj_3_48() + inline bool jj_3_49() { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; @@ -8615,7 +8633,7 @@ void parseInline(); return false; } - inline bool jj_3_46() + inline bool jj_3_47() { if (jj_done) return true; if (jj_3R_97()) return true; @@ -8814,14 +8832,14 @@ void parseInline(); return false; } - inline bool jj_3_45() + inline bool jj_3_46() { if (jj_done) return true; if (jj_3R_96()) return true; return false; } - inline bool jj_3_44() + inline bool jj_3_45() { if (jj_done) return true; if (jj_3R_95()) return true; @@ -8835,7 +8853,7 @@ void parseInline(); return false; } - inline bool jj_3_43() + inline bool jj_3_44() { if (jj_done) return true; if (jj_3R_94()) return true; @@ -8859,7 +8877,7 @@ public: Token *jj_nt; private: int jj_ntk; - JJCalls jj_2_rtns[115]; + JJCalls jj_2_rtns[116]; bool jj_rescan; int jj_gc; Token *jj_scanpos, *jj_lastpos; diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj index 7b56cef..2886d29 100644 --- a/vhdlparser/vhdlparser.jj +++ b/vhdlparser/vhdlparser.jj @@ -1367,10 +1367,10 @@ QCString index_subtype_definition() : {QCString s;} s=type_mark() { return s+" range <> ";} } -QCString instantiation_unit() : {QCString s,s1,s2;Token *tok=0;} +QCString instantiation_unit() : {QCString s,s1,s2;} { -[ tok= ] s=identifier() {s1="component"; return s; } -| tok= s2=name() {s=tok->image.c_str()+s2;} [ s1=identifier() {s+="(";s+=s1;s+=")" ;}] { return s;} +[ ] s=identifier() {s1="component "; return s; } +| [LOOKAHEAD(2) ] s2=name() {s="entity "+s2;} [ s1=identifier() {s+="(";s+=s1;s+=")" ;}] { return s;} | s=name() {s1="configuration ";return s;} } diff --git a/vhdlparser/vhdlparser.pro.in b/vhdlparser/vhdlparser.pro.in deleted file mode 100644 index 0232fd5..0000000 --- a/vhdlparser/vhdlparser.pro.in +++ /dev/null @@ -1,33 +0,0 @@ -TEMPLATE = lib -CONFIG = warn_on staticlib $extraopts -HEADERS = CharStream.h \ - ErrorHandler.h \ - JavaCC.h \ - ParseException.h \ - TokenManager.h \ - Token.h \ - vhdlstring.h \ - VhdlParser.h \ - VhdlParserConstants.h \ - VhdlParserTokenManager.h \ - TokenMgrError.h \ - VhdlParserIF.h \ - VhdlParserErrorHandler.hpp - -SOURCES = CharStream.cc \ - ParseException.cc \ - Token.cc \ - TokenMgrError.cc \ - VhdlParser.cc \ - VhdlParserTokenManager.cc \ - VhdlParserIF.cpp - -INCLUDEPATH = . ../src ../qtools generated_src/doxygen -#TMAKE_CXXFLAGS += -DQT_NO_CODECS -DQ T_LITE_UNICODE - -#must enable -fexceptions because we have try catch blocks in VhdlParser.cc -TMAKE_CXXFLAGS +=-w -fexceptions -DQT_LITE_UNICODE -win32:TMAKE_CXXFLAGS += -fexceptions -DQT_NODLL -win32-g++:TMAKE_CXXFLAGS += -fexceptions -D__CYGWIN__ -DALL_STATIC -OBJECTS_DIR = ../objects/vhdlparser -DESTDIR = ../lib -- cgit v0.12