diff --git a/src/classdef.cpp b/src/classdef.cpp index b77c040cf15..9302a94f5d2 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -826,8 +826,7 @@ void ClassDefImpl::IMPL::init(const QCString &defFileName, const QCString &name, // we cannot use getLanguage at this point, as setLanguage has not been called. SrcLangExt lang = getLanguageFromFileName(defFileName); - if ((lang==SrcLangExt_Cpp || lang==SrcLangExt_ObjC) && - guessSection(defFileName)==Entry::SOURCE_SEC) + if ((lang==SrcLangExt_Cpp || lang==SrcLangExt_ObjC) && guessSection(defFileName).isSource()) { isLocal=TRUE; } diff --git a/src/commentscan.l b/src/commentscan.l index f997754f5d5..6356c0efa07 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -483,12 +483,11 @@ static std::mutex g_citeMutex; //----------------------------------------------------------------------------- static QCString stripQuotes(const char *s); -static bool getDocSectionName(int s); static SectionType sectionLevelToType(int level); static void stripTrailingWhiteSpace(QCString &s); static void initParser(yyscan_t yyscanner); -static bool makeStructuralIndicator(yyscan_t yyscanner,Entry::Sections s); +static bool makeStructuralIndicator(yyscan_t yyscanner,EntryType t); static void lineCount(yyscan_t yyscanner); static void addXRefItem(yyscan_t yyscanner, const QCString &listName,const QCString &itemTitle, @@ -1272,7 +1271,7 @@ STopt [^\n@\\]* {SCOPENAME} { // first argument lineCount(yyscanner); yyextra->current->name = substitute(QCString(yytext),".","::"); - if (yyextra->current->section==Entry::PROTOCOLDOC_SEC) + if (yyextra->current->section.isProtocolDoc()) { yyextra->current->name+="-p"; } @@ -2146,7 +2145,7 @@ STopt [^\n@\\]* } else // overload declaration { - makeStructuralIndicator(yyscanner,Entry::OVERLOADDOC_SEC); + makeStructuralIndicator(yyscanner,EntryType::makeOverloadDoc()); yyextra->langParser->parsePrototype(yyextra->functionProto); } BEGIN( Comment ); @@ -2309,7 +2308,7 @@ static bool handleBrief(yyscan_t yyscanner,const QCString &, const StringVector static bool handleFn(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::MEMBERDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeMemberDoc()); yyextra->functionProto.resize(0); yyextra->braceCount=0; BEGIN(FnParam); @@ -2319,7 +2318,7 @@ static bool handleFn(yyscan_t yyscanner,const QCString &, const StringVector &) static bool handleDef(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::DEFINEDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeDefineDoc()); yyextra->functionProto.resize(0); BEGIN(FnParam); return stop; @@ -2336,7 +2335,7 @@ static bool handleOverload(yyscan_t yyscanner,const QCString &, const StringVect static bool handleEnum(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::ENUMDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeEnumDoc()); BEGIN(EnumDocArg1); return stop; } @@ -2344,7 +2343,7 @@ static bool handleEnum(yyscan_t yyscanner,const QCString &, const StringVector & static bool handleDefGroup(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::GROUPDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeGroupDoc()); yyextra->current->groupDocType = Entry::GROUPDOC_NORMAL; BEGIN( GroupDocArg1 ); return stop; @@ -2353,7 +2352,7 @@ static bool handleDefGroup(yyscan_t yyscanner,const QCString &, const StringVect static bool handleAddToGroup(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::GROUPDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeGroupDoc()); yyextra->current->groupDocType = Entry::GROUPDOC_ADD; BEGIN( GroupDocArg1 ); return stop; @@ -2362,7 +2361,7 @@ static bool handleAddToGroup(yyscan_t yyscanner,const QCString &, const StringVe static bool handleWeakGroup(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::GROUPDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeGroupDoc()); yyextra->current->groupDocType = Entry::GROUPDOC_WEAK; BEGIN( GroupDocArg1 ); return stop; @@ -2371,7 +2370,7 @@ static bool handleWeakGroup(yyscan_t yyscanner,const QCString &, const StringVec static bool handleNamespace(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::NAMESPACEDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeNamespaceDoc()); BEGIN( NameSpaceDocArg1 ); return stop; } @@ -2379,7 +2378,7 @@ static bool handleNamespace(yyscan_t yyscanner,const QCString &, const StringVec static bool handlePackage(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::PACKAGEDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makePackageDoc()); BEGIN( PackageDocArg1 ); return stop; } @@ -2387,7 +2386,7 @@ static bool handlePackage(yyscan_t yyscanner,const QCString &, const StringVecto static bool handleClass(yyscan_t yyscanner,const QCString &cmd, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::CLASSDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeClassDoc()); yyextra->currentCmd = cmd; BEGIN( ClassDocArg1 ); return stop; @@ -2396,7 +2395,7 @@ static bool handleClass(yyscan_t yyscanner,const QCString &cmd, const StringVect static bool handleConcept(yyscan_t yyscanner,const QCString &cmd, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::CONCEPTDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeConceptDoc()); yyextra->currentCmd = cmd; BEGIN( ConceptDocArg1 ); return stop; @@ -2405,7 +2404,7 @@ static bool handleConcept(yyscan_t yyscanner,const QCString &cmd, const StringVe static bool handleModule(yyscan_t yyscanner,const QCString &cmd, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::MODULEDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeModuleDoc()); yyextra->currentCmd = cmd; BEGIN( ModuleDocArg1 ); return stop; @@ -2422,7 +2421,7 @@ static bool handleHeaderFile(yyscan_t yyscanner,const QCString &, const StringVe static bool handleProtocol(yyscan_t yyscanner,const QCString &cmd, const StringVector &) { // Obj-C protocol struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::PROTOCOLDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeProtocolDoc()); yyextra->currentCmd = cmd; BEGIN( ClassDocArg1 ); return stop; @@ -2431,7 +2430,7 @@ static bool handleProtocol(yyscan_t yyscanner,const QCString &cmd, const StringV static bool handleCategory(yyscan_t yyscanner,const QCString &cmd, const StringVector &) { // Obj-C category struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::CATEGORYDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeCategoryDoc()); yyextra->currentCmd = cmd; BEGIN( CategoryDocArg1 ); return stop; @@ -2440,7 +2439,7 @@ static bool handleCategory(yyscan_t yyscanner,const QCString &cmd, const StringV static bool handleUnion(yyscan_t yyscanner,const QCString &cmd, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::UNIONDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeUnionDoc()); yyextra->currentCmd = cmd; BEGIN( ClassDocArg1 ); return stop; @@ -2449,7 +2448,7 @@ static bool handleUnion(yyscan_t yyscanner,const QCString &cmd, const StringVect static bool handleStruct(yyscan_t yyscanner,const QCString &cmd, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::STRUCTDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeStructDoc()); yyextra->currentCmd = cmd; BEGIN( ClassDocArg1 ); return stop; @@ -2458,7 +2457,7 @@ static bool handleStruct(yyscan_t yyscanner,const QCString &cmd, const StringVec static bool handleInterface(yyscan_t yyscanner,const QCString &cmd, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::INTERFACEDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeInterfaceDoc()); yyextra->currentCmd = cmd; BEGIN( ClassDocArg1 ); return stop; @@ -2467,7 +2466,7 @@ static bool handleInterface(yyscan_t yyscanner,const QCString &cmd, const String static bool handleIdlException(yyscan_t yyscanner,const QCString &cmd, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::EXCEPTIONDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeExceptionDoc()); yyextra->currentCmd = cmd; BEGIN( ClassDocArg1 ); return stop; @@ -2476,7 +2475,7 @@ static bool handleIdlException(yyscan_t yyscanner,const QCString &cmd, const Str static bool handlePage(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::PAGEDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makePageDoc()); BEGIN( PageDocArg1 ); return stop; } @@ -2484,7 +2483,7 @@ static bool handlePage(yyscan_t yyscanner,const QCString &, const StringVector & static bool handleMainpage(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::MAINPAGEDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeMainpageDoc()); if (!stop) { yyextra->current->name = "mainpage"; @@ -2497,7 +2496,7 @@ static bool handleMainpage(yyscan_t yyscanner,const QCString &, const StringVect static bool handleFile(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::FILEDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeFileDoc()); if (!stop) { yyextra->current->name = yyextra->fileName; @@ -2527,7 +2526,7 @@ static bool handleRetval(yyscan_t yyscanner,const QCString &, const StringVector static bool handleDir(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::DIRDOC_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeDirDoc()); if (!stop) yyextra->current->name = yyextra->fileName; BEGIN( FileDocArg1 ); return stop; @@ -2536,12 +2535,12 @@ static bool handleDir(yyscan_t yyscanner,const QCString &, const StringVector &) static bool handleExample(yyscan_t yyscanner,const QCString &cmd, const StringVector &optList) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - Entry::Sections section=Entry::EXAMPLE_SEC; + EntryType section = EntryType::makeExample(); for (const auto &opt : optList) { if (opt=="lineno") { - section=Entry::EXAMPLE_LINENO_SEC; + section=EntryType::makeExampleLineno(); } else { @@ -2585,7 +2584,7 @@ static bool handleNoop(yyscan_t yyscanner,const QCString &, const StringVector & static bool handleName(yyscan_t yyscanner,const QCString &, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - bool stop=makeStructuralIndicator(yyscanner,Entry::MEMBERGRP_SEC); + bool stop=makeStructuralIndicator(yyscanner,EntryType::makeMemberGrp()); if (!stop) { yyextra->docGroup.clearHeader(); @@ -2740,9 +2739,9 @@ static bool handleSection(yyscan_t yyscanner,const QCString &s, const StringVect static bool handleSubpage(yyscan_t yyscanner,const QCString &s, const StringVector &) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - if (yyextra->current->section!=Entry::EMPTY_SEC && - yyextra->current->section!=Entry::PAGEDOC_SEC && - yyextra->current->section!=Entry::MAINPAGEDOC_SEC + if (!yyextra->current->section.isEmpty() && + !yyextra->current->section.isPageDoc() && + !yyextra->current->section.isMainpageDoc() ) { warn(yyextra->fileName,yyextra->lineNr, @@ -3349,8 +3348,8 @@ static bool handlePublicSection(yyscan_t yyscanner,const QCString &, const Strin static bool handleToc(yyscan_t yyscanner,const QCString &, const StringVector &optList) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - if (yyextra->current->section==Entry::PAGEDOC_SEC || - yyextra->current->section==Entry::MAINPAGEDOC_SEC) + if (yyextra->current->section.isPageDoc() || + yyextra->current->section.isMainpageDoc()) { for (const auto &opt_ : optList) { @@ -3484,52 +3483,20 @@ static void initParser(yyscan_t yyscanner) yyextra->insideParBlock = FALSE; } - -static bool getDocSectionName(int s) -{ - switch(s) - { - case Entry::CLASSDOC_SEC: - case Entry::STRUCTDOC_SEC: - case Entry::UNIONDOC_SEC: - case Entry::EXCEPTIONDOC_SEC: - case Entry::NAMESPACEDOC_SEC: - case Entry::PROTOCOLDOC_SEC: - case Entry::CATEGORYDOC_SEC: - case Entry::ENUMDOC_SEC: - case Entry::PAGEDOC_SEC: - case Entry::VARIABLEDOC_SEC: - case Entry::MEMBERDOC_SEC: - case Entry::OVERLOADDOC_SEC: - case Entry::FILEDOC_SEC: - case Entry::DEFINEDOC_SEC: - case Entry::GROUPDOC_SEC: - case Entry::MAINPAGEDOC_SEC: - case Entry::PACKAGEDOC_SEC: - case Entry::DIRDOC_SEC: - case Entry::EXAMPLE_SEC: - case Entry::MEMBERGRP_SEC: - case Entry::CONCEPTDOC_SEC: - return TRUE; - default: - return FALSE; - } -} - //----------------------------------------------------------------------------- -static bool makeStructuralIndicator(yyscan_t yyscanner,Entry::Sections s) +static bool makeStructuralIndicator(yyscan_t yyscanner,EntryType t) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; //printf("yyextra->current->section=%x\n",yyextra->current->section); - if (getDocSectionName(yyextra->current->section)) + if (yyextra->current->section.isDoc()) { return TRUE; } else { yyextra->needNewEntry = TRUE; - yyextra->current->section = s; + yyextra->current->section = t; yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->lineNr; yyextra->current->docLine = yyextra->lineNr; @@ -4115,13 +4082,13 @@ bool CommentScanner::parseCommentBlock(/* in */ OutlineParserInterface *pars yyextra->current->doc=stripLeadingAndTrailingEmptyLines(yyextra->current->doc,yyextra->current->docLine); - if (yyextra->current->section==Entry::FILEDOC_SEC && yyextra->current->doc.isEmpty()) + if (yyextra->current->section.isFileDoc() && yyextra->current->doc.isEmpty()) { // to allow a comment block with just a @file command. yyextra->current->doc="\n\n"; } - if (yyextra->current->section==Entry::MEMBERGRP_SEC && + if (yyextra->current->section.isMemberGrp() && yyextra->docGroup.isEmpty()) // @name section but no group started yet { yyextra->docGroup.open(yyextra->current,yyextra->fileName,yyextra->lineNr,true); diff --git a/src/docgroup.cpp b/src/docgroup.cpp index 2125465b713..7cbaffbe28e 100644 --- a/src/docgroup.cpp +++ b/src/docgroup.cpp @@ -110,7 +110,7 @@ void DocGroup::open(Entry *e,const QCString &,int, bool implicit) if (!implicit) m_openCount++; //printf("==> openGroup(name=%s,sec=%x) m_autoGroupStack=%zu\n", // qPrint(e->name),e->section,m_autoGroupStack.size()); - if (e->section==Entry::GROUPDOC_SEC) // auto group + if (e->section.isGroupDoc()) // auto group { m_autoGroupStack.push_back(Grouping(e->name,e->groupingPri())); } @@ -200,7 +200,7 @@ void DocGroup::initGroupInfo(Entry *e) void DocGroup::addDocs(Entry *e) { - if (e->section==Entry::MEMBERGRP_SEC) + if (e->section.isMemberGrp()) { m_memberGroupDocs=e->brief.stripWhiteSpace(); e->doc = stripLeadingAndTrailingEmptyLines(e->doc,e->docLine); diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 81efd303db0..5390c0f9144 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -294,7 +294,7 @@ static void addPageToContext(PageDef *pd,Entry *root) if (root->parent()) // add the page to it's scope { QCString scope = root->parent()->name; - if (root->parent()->section==Entry::PACKAGEDOC_SEC) + if (root->parent()->section.isPackageDoc()) { scope=substitute(scope,".","::"); } @@ -338,7 +338,7 @@ static void addRelatedPage(Entry *root) static void buildGroupListFiltered(const Entry *root,bool additional, bool includeExternal) { - if (root->section==Entry::GROUPDOC_SEC && !root->name.isEmpty() && + if (root->section.isGroupDoc() && !root->name.isEmpty() && ((!includeExternal && root->tagInfo()==0) || ( includeExternal && root->tagInfo()!=0)) ) @@ -422,14 +422,14 @@ static void buildGroupList(const Entry *root) static void findGroupScope(const Entry *root) { - if (root->section==Entry::GROUPDOC_SEC && !root->name.isEmpty() && + if (root->section.isGroupDoc() && !root->name.isEmpty() && root->parent() && !root->parent()->name.isEmpty()) { GroupDef *gd; if ((gd=Doxygen::groupLinkedMap->find(root->name))) { QCString scope = root->parent()->name; - if (root->parent()->section==Entry::PACKAGEDOC_SEC) + if (root->parent()->section.isPackageDoc()) { scope=substitute(scope,".","::"); } @@ -447,7 +447,7 @@ static void findGroupScope(const Entry *root) static void organizeSubGroupsFiltered(const Entry *root,bool additional) { - if (root->section==Entry::GROUPDOC_SEC && !root->name.isEmpty()) + if (root->section.isGroupDoc() && !root->name.isEmpty()) { AUTO_TRACE("additional={}",additional); if ((root->groupDocType==Entry::GROUPDOC_NORMAL && !additional) || @@ -478,8 +478,7 @@ static void organizeSubGroups(const Entry *root) static void buildFileList(const Entry *root) { - if (((root->section==Entry::FILEDOC_SEC) || - ((root->section & Entry::FILE_MASK) && Config_getBool(EXTRACT_ALL))) && + if ((root->section.isFileDoc() || (root->section.isFile() && Config_getBool(EXTRACT_ALL))) && !root->name.isEmpty() && !root->tagInfo() // skip any file coming from tag files ) { @@ -606,7 +605,7 @@ static void addIncludeFile(DefMutable *cd,FileDef *ifd,const Entry *root) } else if (includeFile.isEmpty() && ifd && // see if the file extension makes sense - guessSection(ifd->name())==Entry::HEADER_SEC) + guessSection(ifd->name()).isHeader()) { // implicit assumption fd=ifd; } @@ -861,9 +860,10 @@ std::unique_ptr getTemplateArgumentsFromName( } static -ClassDef::CompoundType convertToCompoundType(int section,TypeSpecifier specifier) +ClassDef::CompoundType convertToCompoundType(EntryType section,TypeSpecifier specifier) { ClassDef::CompoundType sec=ClassDef::Class; + if (specifier.isStruct()) sec=ClassDef::Struct; else if (specifier.isUnion()) @@ -881,39 +881,23 @@ ClassDef::CompoundType convertToCompoundType(int section,TypeSpecifier specifier else if (specifier.isSingleton()) sec=ClassDef::Singleton; - switch(section) - { - //case Entry::UNION_SEC: - case Entry::UNIONDOC_SEC: - sec=ClassDef::Union; - break; - //case Entry::STRUCT_SEC: - case Entry::STRUCTDOC_SEC: - sec=ClassDef::Struct; - break; - //case Entry::INTERFACE_SEC: - case Entry::INTERFACEDOC_SEC: - sec=ClassDef::Interface; - break; - //case Entry::PROTOCOL_SEC: - case Entry::PROTOCOLDOC_SEC: - sec=ClassDef::Protocol; - break; - //case Entry::CATEGORY_SEC: - case Entry::CATEGORYDOC_SEC: - sec=ClassDef::Category; - break; - //case Entry::EXCEPTION_SEC: - case Entry::EXCEPTIONDOC_SEC: - sec=ClassDef::Exception; - break; - case Entry::SERVICEDOC_SEC: - sec=ClassDef::Service; - break; - case Entry::SINGLETONDOC_SEC: - sec=ClassDef::Singleton; - break; - } + if (section.isUnionDoc()) + sec=ClassDef::Union; + else if (section.isStructDoc()) + sec=ClassDef::Struct; + else if (section.isInterfaceDoc()) + sec=ClassDef::Interface; + else if (section.isProtocolDoc()) + sec=ClassDef::Protocol; + else if (section.isCategoryDoc()) + sec=ClassDef::Category; + else if (section.isExceptionDoc()) + sec=ClassDef::Exception; + else if (section.isServiceDoc()) + sec=ClassDef::Service; + else if (section.isSingletonDoc()) + sec=ClassDef::Singleton; + return sec; } @@ -924,7 +908,7 @@ static void addClassToContext(const Entry *root) FileDef *fd = root->fileDef(); QCString scName; - if (root->parent()->section&Entry::SCOPE_MASK) + if (root->parent()->section.isScope()) { scName=root->parent()->name; } @@ -1081,7 +1065,7 @@ static void addClassToContext(const Entry *root) { addIncludeFile(cd,fd,root); } - if (fd && (root->section & Entry::COMPOUND_MASK)) + if (fd && root->section.isCompound()) { AUTO_TRACE_ADD("Inserting class {} in file {} (root->fileName='{}')", cd->name(), fd->name(), root->fileName); cd->setFileDef(fd); @@ -1099,10 +1083,7 @@ static void addClassToContext(const Entry *root) // and all classes that have a documentation block before their definition. static void buildClassList(const Entry *root) { - if ( - ((root->section & Entry::COMPOUND_MASK) || - root->section==Entry::OBJCIMPL_SEC) && !root->name.isEmpty() - ) + if ((root->section.isCompound() || root->section.isObjcImpl()) && !root->name.isEmpty()) { AUTO_TRACE(); addClassToContext(root); @@ -1112,9 +1093,7 @@ static void buildClassList(const Entry *root) static void buildClassDocList(const Entry *root) { - if ( - (root->section & Entry::COMPOUNDDOC_MASK) && !root->name.isEmpty() - ) + if ((root->section.isCompoundDoc()) && !root->name.isEmpty()) { AUTO_TRACE(); addClassToContext(root); @@ -1132,7 +1111,7 @@ static void addConceptToContext(const Entry *root) FileDef *fd = root->fileDef(); QCString scName; - if (root->parent()->section&Entry::SCOPE_MASK) + if (root->parent()->section.isScope()) { scName=root->parent()->name; } @@ -1243,7 +1222,7 @@ static void addConceptToContext(const Entry *root) static void findModuleDocumentation(const Entry *root) { - if (root->section==Entry::MODULEDOC_SEC) + if (root->section.isModuleDoc()) { AUTO_TRACE(); ModuleManager::instance().addDocs(root); @@ -1253,7 +1232,7 @@ static void findModuleDocumentation(const Entry *root) static void buildConceptList(const Entry *root) { - if (root->section & Entry::CONCEPT_SEC) + if (root->section.isConcept()) { AUTO_TRACE(); addConceptToContext(root); @@ -1263,7 +1242,7 @@ static void buildConceptList(const Entry *root) static void buildConceptDocList(const Entry *root) { - if (root->section & Entry::CONCEPTDOC_SEC) + if (root->section.isConceptDoc()) { AUTO_TRACE(); addConceptToContext(root); @@ -1648,9 +1627,9 @@ static void findTagLessClasses() static void buildNamespaceList(const Entry *root) { if ( - (root->section==Entry::NAMESPACE_SEC || - root->section==Entry::NAMESPACEDOC_SEC || - root->section==Entry::PACKAGEDOC_SEC + (root->section.isNamespace() || + root->section.isNamespaceDoc() || + root->section.isPackageDoc() ) && !root->name.isEmpty() ) @@ -1658,7 +1637,7 @@ static void buildNamespaceList(const Entry *root) AUTO_TRACE("name={}",root->name); QCString fName = root->name; - if (root->section==Entry::PACKAGEDOC_SEC) + if (root->section.isPackageDoc()) { fName=substitute(fName,".","::"); } @@ -1827,7 +1806,7 @@ static NamespaceDef *findUsedNamespace(const LinkedRefMap &unl, static void findUsingDirectives(const Entry *root) { - if (root->section==Entry::USINGDIR_SEC) + if (root->section.isUsingDir()) { AUTO_TRACE("Found using directive {} at line {} of {}",root->name,root->startLine,root->fileName); QCString name=substitute(root->name,".","::"); @@ -1844,7 +1823,7 @@ static void findUsingDirectives(const Entry *root) // see if the using statement was found inside a namespace or inside // the global file scope. - if (root->parent() && root->parent()->section==Entry::NAMESPACE_SEC && + if (root->parent() && root->parent()->section.isNamespace() && (fd==0 || fd->getLanguage()!=SrcLangExt_Java) // not a .java file ) { @@ -1969,8 +1948,8 @@ static void findUsingDirectives(const Entry *root) static void buildListOfUsingDecls(const Entry *root) { - if (root->section==Entry::USINGDECL_SEC && - !(root->parent()->section&Entry::COMPOUND_MASK) // not a class/struct member + if (root->section.isUsingDecl() && + !root->parent()->section.isCompound() // not a class/struct member ) { QCString name = substitute(root->name,".","::"); @@ -1982,12 +1961,12 @@ static void buildListOfUsingDecls(const Entry *root) static void findUsingDeclarations(const Entry *root,bool filterPythonPackages) { - if (root->section==Entry::USINGDECL_SEC && - !(root->parent()->section&Entry::COMPOUND_MASK) && // not a class/struct member + if (root->section.isUsingDecl() && + !root->parent()->section.isCompound() && // not a class/struct member (!filterPythonPackages || (root->lang==SrcLangExt_Python && root->fileName.endsWith("__init__.py"))) ) { - AUTO_TRACE("Found using declaration '{}' at line {} of {} inside section {:#10x}", + AUTO_TRACE("Found using declaration '{}' at line {} of {} inside section {}", root->name,root->startLine,root->fileName,root->parent()->section); if (!root->name.isEmpty()) { @@ -1998,7 +1977,7 @@ static void findUsingDeclarations(const Entry *root,bool filterPythonPackages) // see if the using statement was found inside a namespace or inside // the global file scope. - if (root->parent()->section == Entry::NAMESPACE_SEC) + if (root->parent()->section.isNamespace()) { scName=root->parent()->name; if (!scName.isEmpty()) @@ -2029,7 +2008,7 @@ static void findUsingDeclarations(const Entry *root,bool filterPythonPackages) if (usingCd==0) // definition not in the input => add an artificial class { - AUTO_TRACE_ADD("New using class '{}' (sec={:10x})! #tArgLists={}", + AUTO_TRACE_ADD("New using class '{}' (sec={})! #tArgLists={}", name,root->section,root->tArgLists.size()); usingCd = toClassDefMutable( Doxygen::hiddenClassLinkedMap->add(name, @@ -2063,8 +2042,8 @@ static void findUsingDeclarations(const Entry *root,bool filterPythonPackages) static void findUsingDeclImports(const Entry *root) { - if (root->section==Entry::USINGDECL_SEC && - (root->parent()->section&Entry::COMPOUND_MASK) // in a class/struct member + if (root->section.isUsingDecl() && + root->parent()->section.isCompound() // in a class/struct member ) { AUTO_TRACE("Found using declaration '{}' inside section {:#10x}", root->name, root->parent()->section); @@ -2630,7 +2609,7 @@ static bool isVarWithConstructor(const Entry *root) SymbolResolver resolver(fd); AUTO_TRACE("isVarWithConstructor({})",root->name); - if (root->parent()->section & Entry::COMPOUND_MASK) + if (root->parent()->section.isCompound()) { // inside a class result=FALSE; AUTO_TRACE_EXIT("inside class: result={}",result); @@ -2804,7 +2783,7 @@ static void addVariable(const Entry *root,int isFuncPtr=-1) // find the scope of this variable int index = computeQualifiedIndex(name); - if (index!=-1 && root->parent()->section==Entry::GROUPDOC_SEC && root->parent()->tagInfo()) + if (index!=-1 && root->parent()->section.isGroupDoc() && root->parent()->tagInfo()) // grouped members are stored with full scope { buildScopeFromQualifiedName(name.left(index+2),root->lang,root->tagInfo()); @@ -2814,7 +2793,7 @@ static void addVariable(const Entry *root,int isFuncPtr=-1) else { Entry *p = root->parent(); - while ((p->section & Entry::SCOPE_MASK)) + while (p->section.isScope()) { QCString scopeName = p->name; if (!scopeName.isEmpty()) @@ -2983,7 +2962,7 @@ static void buildTypedefList(const Entry *root) { //printf("buildVarList(%s)\n",qPrint(rootNav->name())); if (!root->name.isEmpty() && - root->section==Entry::VARIABLE_SEC && + root->section.isVariable() && root->type.find("typedef ")!=-1 // its a typedef ) { @@ -2991,7 +2970,7 @@ static void buildTypedefList(const Entry *root) addVariable(root); } for (const auto &e : root->children()) - if (e->section!=Entry::ENUM_SEC) + if (!e->section.isEnum()) buildTypedefList(e.get()); } @@ -3001,7 +2980,7 @@ static void buildTypedefList(const Entry *root) static void buildSequenceList(const Entry *root) { if (!root->name.isEmpty() && - root->section==Entry::VARIABLE_SEC && + root->section.isVariable() && root->type.find("sequence<")!=-1 // it's a sequence ) { @@ -3009,7 +2988,7 @@ static void buildSequenceList(const Entry *root) addVariable(root); } for (const auto &e : root->children()) - if (e->section!=Entry::ENUM_SEC) + if (!e->section.isEnum()) buildSequenceList(e.get()); } @@ -3019,7 +2998,7 @@ static void buildSequenceList(const Entry *root) static void buildDictionaryList(const Entry *root) { if (!root->name.isEmpty() && - root->section==Entry::VARIABLE_SEC && + root->section.isVariable() && root->type.find("dictionary<")!=-1 // it's a dictionary ) { @@ -3027,7 +3006,7 @@ static void buildDictionaryList(const Entry *root) addVariable(root); } for (const auto &e : root->children()) - if (e->section!=Entry::ENUM_SEC) + if (!e->section.isEnum()) buildDictionaryList(e.get()); } @@ -3042,12 +3021,12 @@ static void buildVarList(const Entry *root) if (!root->name.isEmpty() && (root->type.isEmpty() || g_compoundKeywords.find(root->type.str())==g_compoundKeywords.end()) && ( - (root->section==Entry::VARIABLE_SEC // it's a variable + (root->section.isVariable() // it's a variable ) || - (root->section==Entry::FUNCTION_SEC && // or maybe a function pointer variable + (root->section.isFunction() && // or maybe a function pointer variable (isFuncPtr=findFunctionPtr(root->type.str(),root->lang))!=-1 ) || - (root->section==Entry::FUNCTION_SEC && // class variable initialized by constructor + (root->section.isFunction() && // class variable initialized by constructor isVarWithConstructor(root) ) ) @@ -3057,7 +3036,7 @@ static void buildVarList(const Entry *root) addVariable(root,isFuncPtr); } for (const auto &e : root->children()) - if (e->section!=Entry::ENUM_SEC) + if (!e->section.isEnum()) buildVarList(e.get()); } @@ -3072,9 +3051,7 @@ static void addInterfaceOrServiceToServiceOrSingleton( QCString const& rname) { FileDef *fd = root->fileDef(); - enum MemberType type = (root->section==Entry::EXPORTED_INTERFACE_SEC) - ? MemberType_Interface - : MemberType_Service; + enum MemberType type = root->section.isExportedInterface() ? MemberType_Interface : MemberType_Service; QCString fileName = root->fileName; if (fileName.isEmpty() && root->tagInfo()) { @@ -3136,8 +3113,7 @@ static void addInterfaceOrServiceToServiceOrSingleton( static void buildInterfaceAndServiceList(const Entry *root) { - if (root->section==Entry::EXPORTED_INTERFACE_SEC || - root->section==Entry::INCLUDED_SERVICE_SEC) + if (root->section.isExportedInterface() || root->section.isIncludedService()) { AUTO_TRACE("Exported interface/included service: type='{}' scope='{}' name='{}' args='{}'" " relates='{}' relatesType='{}' file='{}' line={} bodyLine={} #tArgLists={}" @@ -3365,7 +3341,7 @@ static void addGlobalFunction(const Entry *root,const QCString &rname,const QCSt NamespaceDefMutable *nd = 0; // see if the function is inside a namespace that was not part of // the name already (in that case nd should be non-zero already) - if (root->parent()->section == Entry::NAMESPACE_SEC ) + if (root->parent()->section.isNamespace()) { //QCString nscope=removeAnonymousScopes(root->parent()->name); QCString nscope=root->parent()->name; @@ -3374,7 +3350,7 @@ static void addGlobalFunction(const Entry *root,const QCString &rname,const QCSt nd = getResolvedNamespaceMutable(nscope); } } - else if (root->parent()->section==Entry::GROUPDOC_SEC && !scope.isEmpty()) + else if (root->parent()->section.isGroupDoc() && !scope.isEmpty()) { nd = getResolvedNamespaceMutable(sc); } @@ -3442,7 +3418,7 @@ static void addGlobalFunction(const Entry *root,const QCString &rname,const QCSt static void buildFunctionList(const Entry *root) { - if (root->section==Entry::FUNCTION_SEC) + if (root->section.isFunction()) { AUTO_TRACE("member function: type='{}' scope='{}' name='{}' args='{}' relates='{}' relatesType='{}'" " file='{}' line={} bodyLine={} #tArgLists={} mGrpId={}" @@ -3457,7 +3433,7 @@ static void buildFunctionList(const Entry *root) QCString scope; int index = computeQualifiedIndex(rname); - if (index!=-1 && root->parent()->section==Entry::GROUPDOC_SEC && root->parent()->tagInfo()) + if (index!=-1 && root->parent()->section.isGroupDoc() && root->parent()->tagInfo()) // grouped members are stored with full scope { buildScopeFromQualifiedName(rname.left(index+2),root->lang,root->tagInfo()); @@ -3511,18 +3487,13 @@ static void buildFunctionList(const Entry *root) } } - if (!root->parent()->name.isEmpty() && - (root->parent()->section & Entry::COMPOUND_MASK) && - cd - ) + if (!root->parent()->name.isEmpty() && root->parent()->section.isCompound() && cd) { AUTO_TRACE_ADD("member '{}' of class '{}'", rname,cd->name()); addMethodToClass(root,cd,root->type,rname,root->args,isFriend, root->protection,root->isStatic,root->virt,root->spec,root->relates); } - else if (!((root->parent()->section & Entry::COMPOUND_MASK) - || root->parent()->section==Entry::OBJCIMPL_SEC - ) && + else if (!root->parent()->section.isCompound() && !root->parent()->section.isObjcImpl() && !isMember && (root->relates.isEmpty() || root->relatesType==RelatesType::Duplicate) && !root->type.startsWith("extern ") && !root->type.startsWith("typedef ") @@ -4514,8 +4485,9 @@ static bool findClassRelation( // sadly isRecursiveBaseClass always true for UNO IDL ifc/svc members // (i.e. this is needed for addInterfaceOrServiceToServiceOrSingleton) || (root->lang==SrcLangExt_IDL && - (root->section==Entry::EXPORTED_INTERFACE_SEC || - root->section==Entry::INCLUDED_SERVICE_SEC))) + (root->section.isExportedInterface() || + root->section.isIncludedService())) + ) { AUTO_TRACE_ADD("class relation '{}' inherited/used by '{}' found prot={} virt={} templSpec='{}'", baseClassName, root->name, bi->prot, bi->virt, templSpec); @@ -4788,12 +4760,12 @@ static bool isClassSection(const Entry *root) { if ( !root->name.isEmpty() ) { - if (root->section & Entry::COMPOUND_MASK) + if (root->section.isCompound()) // is it a compound (class, struct, union, interface ...) { return TRUE; } - else if (root->section & Entry::COMPOUNDDOC_MASK) + else if (root->section.isCompoundDoc()) // is it a documentation block with inheritance info. { bool hasExtends = !root->extends.empty(); @@ -4891,7 +4863,7 @@ static void computeClassRelations() !bName.endsWith("::")) { if (!root->name.isEmpty() && root->name.find('@')==-1 && // normal name - (guessSection(root->fileName)==Entry::HEADER_SEC || + (guessSection(root->fileName).isHeader() || Config_getBool(EXTRACT_LOCAL_CLASSES)) && // not defined in source file protectionLevelVisible(root->protection) && // hidden by protection !Config_getBool(HIDE_UNDOC_CLASSES) // undocumented class are visible @@ -5453,7 +5425,7 @@ static bool findGlobalMember(const Entry *root, } } } - if (!found && root->relatesType!=RelatesType::Duplicate && root->section==Entry::FUNCTION_SEC) // no match + if (!found && root->relatesType!=RelatesType::Duplicate && root->section.isFunction()) // no match { QCString fullFuncDecl=decl; if (!root->argList.empty()) fullFuncDecl+=argListToString(root->argList,TRUE); @@ -5829,7 +5801,7 @@ static void addMemberFunction(const Entry *root, cd,fd,&root->argList, TRUE,root->lang); - if (md->getLanguage()==SrcLangExt_ObjC && md->isVariable() && (root->section&Entry::FUNCTION_SEC)) + if (md->getLanguage()==SrcLangExt_ObjC && md->isVariable() && root->section.isFunction()) { matching = FALSE; // don't match methods and attributes with the same name } @@ -5858,7 +5830,7 @@ static void addMemberFunction(const Entry *root, substDone = false; matching = false; } - bool rootIsUserDoc = (root->section&Entry::MEMBERDOC_SEC)!=0; + bool rootIsUserDoc = root->section.isMemberDoc(); bool classIsTemplate = scopeIsTemplate(md->getClassDef()); bool mdIsTemplate = md->templateArguments().hasParameters(); bool classOrMdIsTemplate = mdIsTemplate || classIsTemplate; @@ -5914,8 +5886,7 @@ static void addMemberFunction(const Entry *root, if (memFound) break; } - if (count==0 && root->parent() && - root->parent()->section==Entry::OBJCIMPL_SEC) + if (count==0 && root->parent() && root->parent()->section.isObjcImpl()) { addLocalObjCMethod(root,scopeName,funcType,funcName,funcArgs,exceptions,funcDecl,spec); return; @@ -6310,11 +6281,9 @@ static void findMember(const Entry *root, } if (relates.isEmpty() && root->parent() && - ((root->parent()->section&Entry::SCOPE_MASK) || - (root->parent()->section==Entry::OBJCIMPL_SEC) - ) && + (root->parent()->section.isScope() || root->parent()->section.isObjcImpl()) && !root->parent()->name.isEmpty()) // see if we can combine scopeName - // with the scope in which it was found + // with the scope in which it was found { QCString joinedName = root->parent()->name+"::"+scopeName; if (!scopeName.isEmpty() && @@ -6781,7 +6750,7 @@ static void findMember(const Entry *root, ); } } - else if (root->parent() && root->parent()->section==Entry::OBJCIMPL_SEC) + else if (root->parent() && root->parent()->section.isObjcImpl()) { addLocalObjCMethod(root,scopeName,funcType,funcName,funcArgs,exceptions,funcDecl,spec); } @@ -6844,7 +6813,7 @@ static void filterMemberDocumentation(const Entry *root,const QCString &relates) } //printf("Member %s isFunc=%d\n",qPrint(root->name),isFunc); - if (root->section==Entry::MEMBERDOC_SEC) + if (root->section.isMemberDoc()) { //printf("Documentation for inline member '%s' found args='%s'\n", // qPrint(root->name),qPrint(args)); @@ -6870,7 +6839,7 @@ static void filterMemberDocumentation(const Entry *root,const QCString &relates) isFunc); } } - else if (root->section==Entry::OVERLOADDOC_SEC) + else if (root->section.isOverloadDoc()) { //printf("Overloaded member %s found\n",qPrint(root->name)); findMember(root, @@ -6882,9 +6851,9 @@ static void filterMemberDocumentation(const Entry *root,const QCString &relates) isFunc); } else if - ((root->section==Entry::FUNCTION_SEC // function + ((root->section.isFunction() // function || - (root->section==Entry::VARIABLE_SEC && // variable + (root->section.isVariable() && // variable !type.isEmpty() && // with a type g_compoundKeywords.find(type.str())==g_compoundKeywords.end() // that is not a keyword // (to skip forward declaration of class etc.) @@ -6926,7 +6895,7 @@ static void filterMemberDocumentation(const Entry *root,const QCString &relates) FALSE,isFunc); } } - else if (root->section==Entry::DEFINE_SEC && !relates.isEmpty()) + else if (root->section.isDefine() && !relates.isEmpty()) { findMember(root, relates, @@ -6936,7 +6905,7 @@ static void filterMemberDocumentation(const Entry *root,const QCString &relates) FALSE, !args.isEmpty()); } - else if (root->section==Entry::VARIABLEDOC_SEC) + else if (root->section.isVariableDoc()) { //printf("Documentation for variable %s found\n",qPrint(root->name)); //if (!relates.isEmpty()) printf(" Relates %s\n",qPrint(relates)); @@ -6948,8 +6917,8 @@ static void filterMemberDocumentation(const Entry *root,const QCString &relates) FALSE, FALSE); } - else if (root->section==Entry::EXPORTED_INTERFACE_SEC || - root->section==Entry::INCLUDED_SERVICE_SEC) + else if (root->section.isExportedInterface() || + root->section.isIncludedService()) { findMember(root, relates, @@ -6968,14 +6937,14 @@ static void filterMemberDocumentation(const Entry *root,const QCString &relates) static void findMemberDocumentation(const Entry *root) { - if (root->section==Entry::MEMBERDOC_SEC || - root->section==Entry::OVERLOADDOC_SEC || - root->section==Entry::FUNCTION_SEC || - root->section==Entry::VARIABLE_SEC || - root->section==Entry::VARIABLEDOC_SEC || - root->section==Entry::DEFINE_SEC || - root->section==Entry::INCLUDED_SERVICE_SEC || - root->section==Entry::EXPORTED_INTERFACE_SEC + if (root->section.isMemberDoc() || + root->section.isOverloadDoc() || + root->section.isFunction() || + root->section.isVariable() || + root->section.isVariableDoc() || + root->section.isDefine() || + root->section.isIncludedService() || + root->section.isExportedInterface() ) { AUTO_TRACE(); @@ -6987,7 +6956,7 @@ static void findMemberDocumentation(const Entry *root) } for (const auto &e : root->children()) { - if (e->section!=Entry::ENUM_SEC) + if (!e->section.isEnum()) { findMemberDocumentation(e.get()); } @@ -7001,11 +6970,11 @@ static void findObjCMethodDefinitions(const Entry *root) AUTO_TRACE(); for (const auto &objCImpl : root->children()) { - if (objCImpl->section==Entry::OBJCIMPL_SEC) + if (objCImpl->section.isObjcImpl()) { for (const auto &objCMethod : objCImpl->children()) { - if (objCMethod->section==Entry::FUNCTION_SEC) + if (objCMethod->section.isFunction()) { //Printf(" Found ObjC method definition %s\n",qPrint(objCMethod->name)); findMember(objCMethod.get(), @@ -7014,7 +6983,7 @@ static void findObjCMethodDefinitions(const Entry *root) objCMethod->args, objCMethod->type+" "+objCImpl->name+"::"+objCMethod->name+" "+objCMethod->args, FALSE,TRUE); - objCMethod->section=Entry::EMPTY_SEC; + objCMethod->section=EntryType::makeEmpty(); } } } @@ -7026,7 +6995,7 @@ static void findObjCMethodDefinitions(const Entry *root) static void findEnums(const Entry *root) { - if (root->section==Entry::ENUM_SEC) + if (root->section.isEnum()) { ClassDefMutable *cd=0; FileDef *fd=0; @@ -7052,9 +7021,7 @@ static void findEnums(const Entry *root) } else // no scope, check the scope in which the docs where found { - if (( root->parent()->section & Entry::SCOPE_MASK ) - && !root->parent()->name.isEmpty() - ) // found enum docs inside a compound + if (root->parent()->section.isScope() && !root->parent()->name.isEmpty()) // found enum docs inside a compound { scope=root->parent()->name; if ((cd=getClassMutable(scope))==0) nd=getResolvedNamespaceMutable(scope); @@ -7201,7 +7168,7 @@ static void findEnums(const Entry *root) static void addEnumValuesToEnums(const Entry *root) { - if (root->section==Entry::ENUM_SEC) + if (root->section.isEnum()) // non anonymous enumeration { ClassDefMutable *cd=0; @@ -7227,9 +7194,7 @@ static void addEnumValuesToEnums(const Entry *root) } else // no scope, check the scope in which the docs where found { - if (( root->parent()->section & Entry::SCOPE_MASK ) - && !root->parent()->name.isEmpty() - ) // found enum docs inside a compound + if (root->parent()->section.isScope() && !root->parent()->name.isEmpty()) // found enum docs inside a compound { scope=root->parent()->name; if ((cd=getClassMutable(scope))==0) nd=getResolvedNamespaceMutable(scope); @@ -7501,9 +7466,9 @@ static bool tryAddEnumDocsToGroupMember(const Entry *root,const QCString &name) static void findEnumDocumentation(const Entry *root) { - if (root->section==Entry::ENUMDOC_SEC - && !root->name.isEmpty() - && root->name.at(0)!='@' // skip anonymous enums + if (root->section.isEnumDoc() && + !root->name.isEmpty() && + root->name.at(0)!='@' // skip anonymous enums ) { int i; @@ -7519,9 +7484,7 @@ static void findEnumDocumentation(const Entry *root) { name=root->name; } - if (( root->parent()->section & Entry::SCOPE_MASK ) - && !root->parent()->name.isEmpty() - ) // found enum docs inside a compound + if (root->parent()->section.isScope() && !root->parent()->name.isEmpty()) // found enum docs inside a compound { if (!scope.isEmpty()) scope.prepend("::"); scope.prepend(root->parent()->name); @@ -9006,9 +8969,7 @@ static void addDefineDoc(const Entry *root, MemberDefMutable *md) static void findDefineDocumentation(Entry *root) { - if ((root->section==Entry::DEFINEDOC_SEC || - root->section==Entry::DEFINE_SEC) && !root->name.isEmpty() - ) + if ((root->section.isDefineDoc() || root->section.isDefine()) && !root->name.isEmpty()) { //printf("found define '%s' '%s' brief='%s' doc='%s'\n", // qPrint(root->name),qPrint(root->args),qPrint(root->brief),qPrint(root->doc)); @@ -9101,7 +9062,7 @@ static void findDefineDocumentation(Entry *root) static void findDirDocumentation(const Entry *root) { - if (root->section == Entry::DIRDOC_SEC) + if (root->section.isDirDoc()) { QCString normalizedName = root->name; normalizedName = substitute(normalizedName,"\\","/"); @@ -9164,14 +9125,14 @@ static void findDirDocumentation(const Entry *root) static void buildPageList(Entry *root) { - if (root->section == Entry::PAGEDOC_SEC) + if (root->section.isPageDoc()) { if (!root->name.isEmpty()) { addRelatedPage(root); } } - else if (root->section == Entry::MAINPAGEDOC_SEC) + else if (root->section.isMainpageDoc()) { QCString title=root->args.stripWhiteSpace(); if (title.isEmpty()) title=theTranslator->trMainPage(); @@ -9191,7 +9152,7 @@ static void buildPageList(Entry *root) // search for the main page defined in this project static void findMainPage(Entry *root) { - if (root->section == Entry::MAINPAGEDOC_SEC) + if (root->section.isMainpageDoc()) { if (Doxygen::mainPage==0 && root->tagInfo()==0) { @@ -9261,7 +9222,7 @@ static void findMainPage(Entry *root) // search for the main page imported via tag files and add only the section labels static void findMainPageTagFiles(Entry *root) { - if (root->section == Entry::MAINPAGEDOC_SEC) + if (root->section.isMainpageDoc()) { if (Doxygen::mainPage && root->tagInfo()) { @@ -9273,13 +9234,9 @@ static void findMainPageTagFiles(Entry *root) static void computePageRelations(Entry *root) { - if ((root->section==Entry::PAGEDOC_SEC || - root->section==Entry::MAINPAGEDOC_SEC - ) - && !root->name.isEmpty() - ) + if ((root->section.isPageDoc() || root->section.isMainpageDoc()) && !root->name.isEmpty()) { - PageDef *pd = root->section==Entry::PAGEDOC_SEC ? + PageDef *pd = root->section.isPageDoc() ? Doxygen::pageLinkedMap->find(root->name) : Doxygen::mainPage.get(); if (pd) @@ -9412,7 +9369,7 @@ static void generatePageDocs() static void buildExampleList(Entry *root) { - if ((root->section==Entry::EXAMPLE_SEC || root->section==Entry::EXAMPLE_LINENO_SEC) && !root->name.isEmpty()) + if ((root->section.isExample() || root->section.isExampleLineno()) && !root->name.isEmpty()) { if (Doxygen::exampleLinkedMap->find(root->name)) { @@ -9431,7 +9388,7 @@ static void buildExampleList(Entry *root) pd->setFileName(convertNameToFile(pd->name()+"-example",FALSE,TRUE)); pd->addSectionsToDefinition(root->anchors); pd->setLanguage(root->lang); - pd->setShowLineNo(root->section==Entry::EXAMPLE_LINENO_SEC); + pd->setShowLineNo(root->section.isExampleLineno()); //we don't add example to groups //addExampleToGroups(root,pd); @@ -9449,12 +9406,12 @@ void printNavTree(Entry *root,int indent) { QCString indentStr; indentStr.fill(' ',indent); - Debug::print(Debug::Entries,0,"%s%s at %s:%d (sec=0x%x, spec=%" PRIx64 ")\n", + Debug::print(Debug::Entries,0,"%s%s at %s:%d (sec=%s, spec=%s)\n", indentStr.isEmpty()?"":qPrint(indentStr), root->name.isEmpty()?"":qPrint(root->name), qPrint(root->fileName),root->startLine, - root->section, - root->spec); + root->section.to_string().c_str(), + root->spec.to_string().c_str()); for (const auto &e : root->children()) { printNavTree(e.get(),indent+2); diff --git a/src/entry.cpp b/src/entry.cpp index fcfd185d9ab..59cafa24124 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -30,12 +30,11 @@ static AtomicInt g_num; -Entry::Entry() : program(static_cast(0)), initializer(static_cast(0)) +Entry::Entry() : section(EntryType::makeEmpty()), program(static_cast(0)), initializer(static_cast(0)) { //printf("Entry::Entry(%p)\n",this); g_num++; m_parent=0; - section = EMPTY_SEC; //printf("Entry::Entry() tArgList=0\n"); mGrpId = -1; hasTagInfo = false; @@ -45,11 +44,10 @@ Entry::Entry() : program(static_cast(0)), initializer(static_cast(this))->section = Entry::EMPTY_SEC; } + void markAsProcessed() const { (const_cast(this))->section = EntryType::makeEmpty(); } void setFileDef(FileDef *fd); FileDef *fileDef() const { return m_fileDef; } // identification - int section; //!< entry type (see Sections); + EntryType section; //!< entry type (see Sections); QCString type; //!< member type QCString name; //!< member name bool hasTagInfo; //!< is tag info valid @@ -258,7 +260,7 @@ class Entry } Grouping::GroupPri_t groupingPri() const { - if( section != GROUPDOC_SEC ) + if( !section.isGroupDoc() ) { return Grouping::GROUPING_LOWEST; } diff --git a/src/filedef.cpp b/src/filedef.cpp index 8272f709886..281af44e2d7 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -281,7 +281,7 @@ FileDefImpl::FileDefImpl(const QCString &p,const QCString &nm, m_fileName=nm; setReference(lref); setDiskNameLocal(!dn.isEmpty() ? dn : nm); - m_isSource = guessSection(nm)==Entry::SOURCE_SEC; + m_isSource = guessSection(nm).isSource(); m_docname = nm; m_dir = 0; if (Config_getBool(FULL_PATH_NAMES)) @@ -1496,7 +1496,7 @@ bool FileDefImpl::generateSourceFile() const bool verbatimHeaders = Config_getBool(VERBATIM_HEADERS); return !isReference() && (sourceBrowser || - (verbatimHeaders && (guessSection(name())==Entry::HEADER_SEC || !m_includedByMap.empty())) + (verbatimHeaders && (guessSection(name()).isHeader() || !m_includedByMap.empty())) ) && !isDocumentationFile(); } diff --git a/src/fortranscanner.l b/src/fortranscanner.l index 742cd9ff4a2..bdada9583f1 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -321,10 +321,10 @@ SCOPENAME ({ID}{BS}"::"{BS})* %x ModuleBody %x ModuleBodyContains %x AttributeList -%x Variable +%x FVariable %x Initialization %x ArrayInitializer -%x Enum +%x FEnum %x Typedef %x TypedefBody %x TypedefBodyContains @@ -482,7 +482,7 @@ SCOPENAME ({ID}{BS}"::"{BS})* yyextra->current->name=yytext; yyextra->current->name=yyextra->current->name.lower(); yyextra->current->fileName = yyextra->fileName; - yyextra->current->section=Entry::USINGDIR_SEC; + yyextra->current->section=EntryType::makeUsingDir(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); yyextra->current->lang = SrcLangExt_Fortran; pop_state(yyscanner); @@ -498,7 +498,7 @@ SCOPENAME ({ID}{BS}"::"{BS})* yyextra->current->name= yyextra->useModuleName+"::"+yytext; yyextra->current->name=yyextra->current->name.lower(); yyextra->current->fileName = yyextra->fileName; - yyextra->current->section=Entry::USINGDECL_SEC; + yyextra->current->section=EntryType::makeUsingDecl(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); yyextra->current->lang = SrcLangExt_Fortran; } @@ -558,7 +558,7 @@ SCOPENAME ({ID}{BS}"::"{BS})* startScope(yyscanner,yyextra->last_entry.get()); } - yyextra->current->section = Entry::FUNCTION_SEC ; + yyextra->current->section = EntryType::makeFunction(); yyextra->current->name = name; yyextra->moduleProcedures.push_back(yyextra->current); addCurrentEntry(yyscanner,true); @@ -686,7 +686,7 @@ private { /* ignored for now */ } {ID} { /* type name found */ - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->spec.setStruct(true); yyextra->current->name = yytext; yyextra->current->fileName = yyextra->fileName; @@ -695,8 +695,8 @@ private { /* if type is part of a module, mod name is necessary for output */ if (yyextra->current_root && - (yyextra->current_root->section == Entry::CLASS_SEC || - yyextra->current_root->section == Entry::NAMESPACE_SEC)) + (yyextra->current_root->section.isClass() || + yyextra->current_root->section.isNamespace())) { yyextra->current->name = yyextra->current_root->name + "::" + yyextra->current->name; } @@ -742,7 +742,7 @@ private { {ID} { QCString name = yytext; yyextra->modifiers[yyextra->current_root][name.lower().str()] |= yyextra->currentModifiers; - yyextra->current->section = Entry::FUNCTION_SEC; + yyextra->current->section = EntryType::makeFunction(); yyextra->current->name = name; // check for procedure(name) if (yyextra->current->type.find('(') != -1) @@ -776,7 +776,7 @@ private { { copyEntry(yyextra->current, yyextra->last_entry); yyextra->current->name = yyextra->last_entry->name; - yyextra->current->section = Entry::FUNCTION_SEC; + yyextra->current->section = EntryType::makeFunction(); yyextra->last_entry->args = tmp.left(i).stripWhiteSpace(); //printf("Found %s.\n", last_entry->args.data()); addCurrentEntry(yyscanner,true); @@ -844,10 +844,10 @@ private { {ID} { } } -{ +{ ^{BS}{TYPE_SPEC}/{SEPARATE} { yyextra->last_enum.reset(); - if (YY_START == Enum) + if (YY_START == FEnum) { yyextra->argType = "@"; // enum marker } @@ -935,18 +935,18 @@ private { } } "::" { /* end attribute list */ - BEGIN( Variable ); + BEGIN( FVariable ); } . { /* unknown attribute, consider variable name */ //cout<<"start variables, unput "<<*yytext<colNr -= 1; unput(*yytext); - BEGIN( Variable ); + BEGIN( FVariable ); } } -{BS} {} -{OPERATOR_ID} { /* parse operator access statements "public :: operator(==)" */ +{BS} {} +{OPERATOR_ID} { /* parse operator access statements "public :: operator(==)" */ QCString name = QCString(yytext).stripWhiteSpace().lower(); /* if variable/type/etc is part of a module, mod name is necessary for output */ // get surrounding state @@ -956,9 +956,9 @@ private { yy_push_state(currentState,yyscanner); if( outerState == Start || outerState == ModuleBody ) { - if ((yyextra->current_root) && - (yyextra->current_root->section == Entry::CLASS_SEC - || yyextra->current_root->section == Entry::NAMESPACE_SEC)) + if ((yyextra->current_root) && + (yyextra->current_root->section.isClass() || + yyextra->current_root->section.isNamespace())) { name = yyextra->current_root->name + "::" + name; } @@ -966,13 +966,13 @@ private { /* remember attributes for the symbol */ yyextra->modifiers[yyextra->current_root][name.str()] |= yyextra->currentModifiers; } -{ID} { /* parse variable declaration */ +{ID} { /* parse variable declaration */ //cout << "5=========> got variable: " << yyextra->argType << "::" << yytext << endl; /* work around for bug in QCString.replace (QCString works) */ QCString name=yytext; name = name.lower(); /* if variable/type/etc is part of a module, mod name is necessary for output */ - if ((yyextra->current_root) && yyextra->current_root->section == Entry::NAMESPACE_SEC) + if ((yyextra->current_root) && yyextra->current_root->section.isNamespace()) { name = yyextra->current_root->name + "::" + name; } @@ -981,10 +981,10 @@ private { yyextra->argName= name; yyextra->vtype= V_IGNORE; - if (!yyextra->argType.isEmpty() && yyextra->current_root->section!=Entry::FUNCTION_SEC) + if (!yyextra->argType.isEmpty() && !yyextra->current_root->section.isFunction()) { // new variable entry yyextra->vtype = V_VARIABLE; - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); yyextra->current->name = yyextra->argName; yyextra->current->type = yyextra->argType; yyextra->current->fileName = yyextra->fileName; @@ -1075,28 +1075,28 @@ private { yyextra->current->brief.resize(0); } } -{ARGS} { /* dimension of the previous entry. */ +{ARGS} { /* dimension of the previous entry. */ QCString name(yyextra->argName); QCString attr("dimension"); attr += yytext; yyextra->modifiers[yyextra->current_root][name.lower().str()] |= attr; } -{COMMA} { //printf("COMMA: %d<=..<=%d\n", yyextra->colNr-(int)yyleng, yyextra->colNr); +{COMMA} { //printf("COMMA: %d<=..<=%d\n", yyextra->colNr-(int)yyleng, yyextra->colNr); // locate !< comment updateVariablePrepassComment(yyscanner,yyextra->colNr-(int)yyleng, yyextra->colNr); } -{BS}"=" { +{BS}"=" { yy_push_state(YY_START,yyscanner); yyextra->initializer="="; yyextra->initializerScope = yyextra->initializerArrayScope = 0; BEGIN(Initialization); } -"\n" { yyextra->currentModifiers = SymbolModifiers(); +"\n" { yyextra->currentModifiers = SymbolModifiers(); pop_state(yyscanner); // end variable declaration list newLine(yyscanner); yyextra->docBlock.resize(0); } -";".*"\n" { yyextra->currentModifiers = SymbolModifiers(); +";".*"\n" { yyextra->currentModifiers = SymbolModifiers(); pop_state(yyscanner); // end variable declaration list yyextra->docBlock.resize(0); yyextra->inputStringSemi = " \n"+QCString(yytext+1); @@ -1104,7 +1104,7 @@ private { pushBuffer(yyscanner,yyextra->inputStringSemi); } <*>";".*"\n" { - if (YY_START == Variable) REJECT; // Just be on the safe side + if (YY_START == FVariable) REJECT; // Just be on the safe side if (YY_START == String) REJECT; // ";" ignored in strings if (YY_START == StrIgnore) REJECT; // ";" ignored in regular yyextra->comments yyextra->inputStringSemi = " \n"+QCString(yytext+1); @@ -1173,7 +1173,7 @@ private { yy_push_state(ModuleBody,yyscanner); //anon program } - yy_push_state(Enum,yyscanner); + yy_push_state(FEnum,yyscanner); yyextra->current->protection = yyextra->defaultProtection; yyextra->typeProtection = yyextra->defaultProtection; yyextra->typeMode = true; @@ -1183,22 +1183,22 @@ private { yyextra->current->args.resize(0); yyextra->current->name.sprintf("@%d",yyextra->anonCount++); - yyextra->current->section = Entry::ENUM_SEC; + yyextra->current->section = EntryType::makeEnum(); yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->lineNr; yyextra->current->bodyLine = yyextra->lineNr; if ((yyextra->current_root) && - (yyextra->current_root->section == Entry::CLASS_SEC || - yyextra->current_root->section == Entry::NAMESPACE_SEC)) + (yyextra->current_root->section.isClass() || + yyextra->current_root->section.isNamespace())) { yyextra->current->name = yyextra->current_root->name + "::" + yyextra->current->name; } addCurrentEntry(yyscanner,true); startScope(yyscanner,yyextra->last_entry.get()); - BEGIN( Enum ) ; + BEGIN( FEnum ) ; } -"end"{BS}"enum" { +"end"{BS}"enum" { yyextra->last_entry->parent()->endBodyLine = yyextra->lineNr; if (!endScope(yyscanner,yyextra->current_root)) { @@ -1254,9 +1254,9 @@ private { //cout << "1a==========> got " << yyextra->current->type << " " << yytext << " " << yyextra->lineNr << endl; QCString returnName = yyextra->current->name.lower(); /* if type is part of a module, mod name is necessary for output */ - if ((yyextra->current_root) && - (yyextra->current_root->section == Entry::CLASS_SEC || - yyextra->current_root->section == Entry::NAMESPACE_SEC)) + if ((yyextra->current_root) && + (yyextra->current_root->section.isClass() || + yyextra->current_root->section.isNamespace())) { yyextra->current->name= yyextra->current_root->name + "::" + yyextra->current->name; } @@ -1318,7 +1318,7 @@ private { /*---- documentation yyextra->comments --------------------------------------------------------------------*/ -"!<" { /* backward docu comment */ +"!<" { /* backward docu comment */ if (yyextra->vtype != V_IGNORE) { yyextra->current->docLine = yyextra->lineNr; @@ -1385,7 +1385,7 @@ private { yyextra->docBlock.resize(0); } -"!>" { +"!>" { yy_push_state(YY_START,yyscanner); yyextra->current->docLine = yyextra->lineNr; yyextra->docBlockJavaStyle = FALSE; @@ -1938,7 +1938,7 @@ void resolveModuleProcedures(yyscan_t yyscanner,Entry *current_root) { for (const auto& cf: current_root->children()) { - if (cf->section != Entry::FUNCTION_SEC) + if (!cf->section.isFunction()) continue; // remove scope from name @@ -2360,7 +2360,7 @@ static bool endScope(yyscan_t yyscanner,Entry *scope, bool isGlobalRoot) // update variables or subprogram arguments with yyextra->modifiers std::map& mdfsMap = yyextra->modifiers[scope]; - if (scope->section == Entry::FUNCTION_SEC) + if (scope->section.isFunction()) { // iterate all symbol yyextra->modifiers of the scope for (const auto &kv : mdfsMap) @@ -2384,16 +2384,16 @@ static bool endScope(yyscan_t yyscanner,Entry *scope, bool isGlobalRoot) } } - if (scope->section==Entry::CLASS_SEC && scope->spec.isInterface()) + if (scope->section.isClass() && scope->spec.isInterface()) { // was INTERFACE_SEC - if (scope->parent() && scope->parent()->section == Entry::FUNCTION_SEC) + if (scope->parent() && scope->parent()->section.isFunction()) { // interface within function // iterate functions of interface and // try to find types for dummy(ie. argument) procedures. //cout<<"Search in "<name<children()) { - if (ce->section != Entry::FUNCTION_SEC) + if (!ce->section.isFunction()) continue; // remove prefix @@ -2426,12 +2426,12 @@ static bool endScope(yyscan_t yyscanner,Entry *scope, bool isGlobalRoot) return TRUE; } } - if (scope->section!=Entry::FUNCTION_SEC) + if (!scope->section.isFunction()) { // not function section // iterate variables: get and apply yyextra->modifiers for (const auto &ce : scope->children()) { - if (ce->section != Entry::VARIABLE_SEC && ce->section != Entry::FUNCTION_SEC && ce->section != Entry::CLASS_SEC) + if (!ce->section.isVariable() && !ce->section.isFunction() && !ce->section.isClass()) continue; //cout<name<<", "<name.lower())<name.lower().str()]); // remove prefix for variable names - if (ce->section == Entry::VARIABLE_SEC || ce->section == Entry::FUNCTION_SEC) + if (ce->section.isVariable() || ce->section.isFunction()) { int end = ce->name.findRev(":"); if (end != -1) @@ -2473,14 +2473,14 @@ static void resolveTypeBoundProcedures(Entry *scope) // iterate over all types for (const auto &ce: scope->children()) { - if (ce->section!=Entry::CLASS_SEC) + if (!ce->section.isClass()) continue; // handle non-"generic" non-"deferred" methods, copying the arguments from the implementation std::unordered_map> methodMap; for (auto &ct: ce->children()) { - if (ct->section!=Entry::FUNCTION_SEC) + if (!ct->section.isFunction()) continue; if (ct->type=="generic") @@ -2494,7 +2494,7 @@ static void resolveTypeBoundProcedures(Entry *scope) { for (const auto &cf: scope->children()) { - if (cf->section == Entry::FUNCTION_SEC) + if (cf->section.isFunction()) { procMap.insert(std::make_pair(cf->name.str(), cf)); } @@ -2528,7 +2528,7 @@ static void resolveTypeBoundProcedures(Entry *scope) // handle "deferred" methods (pure virtual functions), duplicating with arguments from the target abstract interface for (auto &ct: ce->children()) { - if (ct->section != Entry::FUNCTION_SEC) + if (!ct->section.isFunction()) continue; if (ct->virt != Specifier::Pure) @@ -2539,7 +2539,7 @@ static void resolveTypeBoundProcedures(Entry *scope) { for(const auto &cf: scope->children()) { - if (cf->section==Entry::CLASS_SEC && cf->spec.isInterface() && cf->type=="abstract") + if (cf->section.isClass() && cf->spec.isInterface() && cf->type=="abstract") { std::shared_ptr ci = cf->children().front(); interfMap.insert(std::make_pair(ci->name.str(), ci)); @@ -2576,7 +2576,7 @@ static void resolveTypeBoundProcedures(Entry *scope) { for (auto &ct: ce->children()) { - if (ct->section != Entry::FUNCTION_SEC) + if (!ct->section.isFunction()) continue; if (ct->type!="generic") @@ -2632,11 +2632,11 @@ static void initEntry(yyscan_t yyscanner) { yyextra->current->protection = yyextra->typeProtection; } - else if (yyextra->current_root && yyextra->current_root->section == Entry::CLASS_SEC && yyextra->current_root->spec.isInterface()) + else if (yyextra->current_root && yyextra->current_root->section.isClass() && yyextra->current_root->spec.isInterface()) { yyextra->current->protection = Protection::Public; } - else if (yyextra->current_root && yyextra->current_root->section == Entry::FUNCTION_SEC) + else if (yyextra->current_root && yyextra->current_root->section.isFunction()) { yyextra->current->protection = Protection::Private; } @@ -2670,9 +2670,9 @@ static void addModule(yyscan_t yyscanner,const QCString &name, bool isModule) DBG_CTX((stderr, "0=========> got module %s\n", qPrint(name))); if (isModule) - yyextra->current->section = Entry::NAMESPACE_SEC; + yyextra->current->section = EntryType::makeNamespace(); else - yyextra->current->section = Entry::FUNCTION_SEC; + yyextra->current->section = EntryType::makeFunction(); if (!name.isEmpty()) { @@ -2703,7 +2703,7 @@ static void addSubprogram(yyscan_t yyscanner,const QCString &text) struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; DBG_CTX((stderr,"1=========> got subprog, type: %s\n",qPrint(text))); yyextra->subrCurrent.push_back(yyextra->current); - yyextra->current->section = Entry::FUNCTION_SEC ; + yyextra->current->section = EntryType::makeFunction(); QCString subtype = text; subtype=subtype.lower().stripWhiteSpace(); yyextra->functionLine = (subtype.find("function") != -1); yyextra->current->type += " " + subtype; @@ -2733,7 +2733,7 @@ static void addInterface(yyscan_t yyscanner,QCString name, InterfaceType type) yy_push_state(ModuleBody,yyscanner); //anon program } - yyextra->current->section = Entry::CLASS_SEC; // was Entry::INTERFACE_SEC; + yyextra->current->section = EntryType::makeClass(); // was EntryType::Interface; yyextra->current->spec = TypeSpecifier().setInterface(true); yyextra->current->name = name; @@ -2755,8 +2755,8 @@ static void addInterface(yyscan_t yyscanner,QCString name, InterfaceType type) /* if type is part of a module, mod name is necessary for output */ if ((yyextra->current_root) && - (yyextra->current_root->section == Entry::CLASS_SEC || - yyextra->current_root->section == Entry::NAMESPACE_SEC)) + (yyextra->current_root->section.isClass() || + yyextra->current_root->section.isNamespace())) { yyextra->current->name= yyextra->current_root->name + "::" + yyextra->current->name; } @@ -3044,7 +3044,7 @@ static void parseMain(yyscan_t yyscanner, const QCString &fileName,const char *f yyextra->current = std::make_shared(); yyextra->current->lang = SrcLangExt_Fortran; yyextra->current->name = yyextra->fileName; - yyextra->current->section = Entry::SOURCE_SEC; + yyextra->current->section = EntryType::makeSource(); yyextra->file_root = yyextra->current; yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); yyextra->current->lang = SrcLangExt_Fortran; diff --git a/src/lexscanner.l b/src/lexscanner.l index f0ae72d9b27..2b60898188f 100644 --- a/src/lexscanner.l +++ b/src/lexscanner.l @@ -966,11 +966,11 @@ static void parseMain(yyscan_t yyscanner, yyextra->current_root = rt; yyextra->current = std::make_shared(); - int sec=guessSection(yyextra->fileName); - if (sec) + EntryType sec=guessSection(yyextra->fileName); + if (!sec.isEmpty()) { yyextra->current->name = yyextra->fileName; - yyextra->current->section = sec; + yyextra->current->section = EntryType(sec); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); } yyextra->current->reset(); diff --git a/src/pre.l b/src/pre.l index c85f0482661..336205bd519 100644 --- a/src/pre.l +++ b/src/pre.l @@ -1941,8 +1941,8 @@ static void setFileName(yyscan_t yyscanner,const QCString &name) state->insideIDL = getLanguageFromFileName(state->fileName)==SrcLangExt_IDL; state->insideCS = getLanguageFromFileName(state->fileName)==SrcLangExt_CSharp; state->insideFtn = getLanguageFromFileName(state->fileName)==SrcLangExt_Fortran; - int isSource = guessSection(state->fileName); - state->isSource = isSource==Entry::HEADER_SEC || isSource==Entry::SOURCE_SEC; + EntryType section = guessSection(state->fileName); + state->isSource = section.isHeader() || section.isSource(); } static void incrLevel(yyscan_t yyscanner) @@ -3761,7 +3761,7 @@ void Preprocessor::processFile(const QCString &fileName,BufStr &input,BufStr &ou BEGIN( Start ); - state->expectGuard = guessSection(fileName)==Entry::HEADER_SEC; + state->expectGuard = guessSection(fileName).isHeader(); state->guardName.resize(0); state->lastGuardName.resize(0); state->guardExpr.resize(0); diff --git a/src/pyscanner.l b/src/pyscanner.l index f3c7fa2c51b..42dc5f70539 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -311,7 +311,7 @@ STARTDOCSYMS "##" BEGIN( Import ); } ^{B}{IDENTIFIER}/{B}"="{B}"property" { // property - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); yyextra->current->mtype = MethodTypes::Property; yyextra->current->name = QCString(yytext).stripWhiteSpace(); yyextra->current->fileName = yyextra->fileName; @@ -323,7 +323,7 @@ STARTDOCSYMS "##" ^{B}{IDENTIFIER}/{B}"="[^=] { // variable if (yyextra->searchCount>0) REJECT; yyextra->indent=computeIndent(yytext); - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); yyextra->current->name = QCString(yytext).stripWhiteSpace(); yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; @@ -336,7 +336,7 @@ STARTDOCSYMS "##" QCString id = QCString(yytext).stripWhiteSpace(); if (id =="try" || id == "else" || id == "except" || id == "finally") REJECT; yyextra->indent=computeIndent(yytext); - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); yyextra->current->name = id; yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; @@ -350,7 +350,7 @@ STARTDOCSYMS "##" // is caught in the rule: [(], the ")" will be handled in [)] if (yyextra->searchCount>1) REJECT; yyextra->indent=computeIndent(yytext); - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); yyextra->current->name = QCString(yytext).stripWhiteSpace(); yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; @@ -509,7 +509,7 @@ STARTDOCSYMS "##" yyextra->current->name=removeRedundantWhiteSpace(substitute(yytext,".","::")); yyextra->current->fileName = yyextra->fileName; //printf("Adding using declaration: found:%s:%d name=%s\n",qPrint(yyextra->fileName),yyextra->yyLineNr,qPrint(yyextra->current->name)); - yyextra->current->section=Entry::USINGDECL_SEC; + yyextra->current->section=EntryType::makeUsingDecl(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); BEGIN(Search); @@ -1048,13 +1048,13 @@ STARTDOCSYMS "##" yyextra->current->type = "class"; } - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->name = yytext; // we need to set the protectiion based on the "local" class name setProtection(yyscanner); // prepend scope in case of nested classes - if (yyextra->current_root->section&Entry::SCOPE_MASK) + if (yyextra->current_root->section.isScope()) { //printf("*** Prepending scope %s to class %s\n",qPrint(yyextra->current_root->name),qPrint(yyextra->current->name)); yyextra->current->name.prepend(yyextra->current_root->name+"::"); @@ -1694,7 +1694,7 @@ static void docVariable(yyscan_t yyscanner,const char *name) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; yyextra->current->name = name; - yyextra->current->section=Entry::VARIABLE_SEC; + yyextra->current->section=EntryType::makeVariable(); yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; yyextra->current->bodyLine = yyextra->yyLineNr; @@ -1706,7 +1706,7 @@ static void newVariable(yyscan_t yyscanner) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; setProtection(yyscanner); - if (yyextra->current_root->section&Entry::COMPOUND_MASK) // mark as class variable + if (yyextra->current_root->section.isCompound()) // mark as class variable { yyextra->current->isStatic = TRUE; } @@ -1717,7 +1717,7 @@ static void addVariable(yyscan_t yyscanner) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; setProtection(yyscanner); - if (yyextra->current_root->section&Entry::COMPOUND_MASK) // mark as class variable + if (yyextra->current_root->section.isCompound()) // mark as class variable { yyextra->current->isStatic = TRUE; } @@ -1795,7 +1795,7 @@ static void addFrom(yyscan_t yyscanner,bool all) yyextra->current->name=removeRedundantWhiteSpace(substitute(item,".","::")); yyextra->current->fileName = yyextra->fileName; //printf("Adding using declaration: found:%s:%d name=%s\n",qPrint(yyextra->fileName),yyextra->yyLineNr,qPrint(yyextra->current->name)); - yyextra->current->section=all ? Entry::USINGDIR_SEC : Entry::USINGDECL_SEC; + yyextra->current->section=all ? EntryType::makeUsingDir() : EntryType::makeUsingDecl(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); } @@ -1955,7 +1955,7 @@ static void searchFoundDef(yyscan_t yyscanner) yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; yyextra->current->bodyLine = yyextra->yyLineNr; - yyextra->current->section = Entry::FUNCTION_SEC; + yyextra->current->section = EntryType::makeFunction(); yyextra->current->lang = SrcLangExt_Python; yyextra->current->virt = Specifier::Normal; yyextra->current->isStatic = yyextra->isStatic; @@ -1972,7 +1972,7 @@ static void searchFoundDef(yyscan_t yyscanner) static void searchFoundClass(yyscan_t yyscanner) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->argList.clear(); yyextra->current->type += "class" ; yyextra->current->fileName = yyextra->fileName; @@ -1999,7 +1999,7 @@ static void parseCompounds(yyscan_t yyscanner,std::shared_ptr rt) yyextra->inputString = yyextra->programStr.data(); yyextra->inputPosition = 0; pyscannerYYrestart( 0, yyscanner ); - if (ce->section&Entry::COMPOUND_MASK) + if (ce->section.isCompound()) { yyextra->specialBlock = false; yyextra->current_root = ce; @@ -2082,7 +2082,7 @@ static void parseMain(yyscan_t yyscanner, const QCString &fileName,const char *f yyextra->current = std::make_shared(); initEntry(yyscanner); yyextra->current->name = scope.left(pos); - yyextra->current->section = Entry::NAMESPACE_SEC; + yyextra->current->section = EntryType::makeNamespace(); yyextra->current->type = "namespace"; yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; @@ -2146,8 +2146,10 @@ static void parsePrototype(yyscan_t yyscanner,const QCString &text) yyextra->lexInit=TRUE; yyextra->current->name = yyextra->current->name.stripWhiteSpace(); - if (yyextra->current->section == Entry::MEMBERDOC_SEC && yyextra->current->args.isEmpty()) - yyextra->current->section = Entry::VARIABLEDOC_SEC; + if (yyextra->current->section.isMemberDoc() && yyextra->current->args.isEmpty()) + { + yyextra->current->section = EntryType::makeVariableDoc(); + } // restore original scanner state diff --git a/src/scanner.l b/src/scanner.l index 75bbf81134e..54df30eed9d 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -311,7 +311,7 @@ NONLopt [^\n]* %x AlignAs %x AlignAsEnd -%x Define +%x SDefine %x DefineEnd %x CompoundName %x ClassVar @@ -332,7 +332,7 @@ NONLopt [^\n]* %x FindMembersPHP %x FindMemberName %x FindFields -%x Function +%x SFunction %x FuncRound %x ExcpRound %x ExcpList @@ -783,7 +783,7 @@ NONLopt [^\n]* yyextra->current->startColumn = yyextra->yyColNr; yyextra->current->bodyLine = yyextra->yyLineNr; yyextra->current->bodyColumn = yyextra->yyColNr; - yyextra->current->section = Entry::FUNCTION_SEC; + yyextra->current->section = EntryType::makeFunction(); yyextra->language = yyextra->current->lang = SrcLangExt_ObjC; yyextra->insideObjC = TRUE; yyextra->current->virt = Specifier::Virtual; @@ -891,7 +891,7 @@ NONLopt [^\n]* yyextra->current->args = argListToString(yyextra->current->argList); //printf("argList=%s\n",qPrint(yyextra->current->args)); unput(';'); - BEGIN( Function ); + BEGIN( SFunction ); } (";"{BN}+)?"{" { // start of a method body lineCount(yyscanner); @@ -908,7 +908,7 @@ NONLopt [^\n]* } yyextra->current->args = argListToString(yyextra->current->argList); unput('{'); - BEGIN( Function ); + BEGIN( SFunction ); } {B}*"sequence"{BN}*"<"{BN}* { if (yyextra->insideSlice) @@ -920,7 +920,7 @@ NONLopt [^\n]* yyextra->current->startLine = yyextra->yyLineNr ; yyextra->current->startColumn = yyextra->yyColNr; yyextra->current->args.resize(0); - yyextra->current->section = Entry::TYPEDEF_SEC ; + yyextra->current->section = EntryType::makeTypedef(); yyextra->isTypedef = TRUE; BEGIN( SliceSequence ); } @@ -937,7 +937,7 @@ NONLopt [^\n]* yyextra->current->startLine = yyextra->yyLineNr ; yyextra->current->startColumn = yyextra->yyColNr; yyextra->current->args.resize(0); - yyextra->current->section = Entry::TYPEDEF_SEC ; + yyextra->current->section = EntryType::makeTypedef() ; yyextra->isTypedef = TRUE; BEGIN( SliceDictionary ); } @@ -1050,7 +1050,7 @@ NONLopt [^\n]* yyextra->current->name = yytext; yyextra->current->name = substitute(yyextra->current->name,".","::"); yyextra->current->name = substitute(yyextra->current->name,"\\","::"); - yyextra->current->section = Entry::NAMESPACE_SEC; + yyextra->current->section = EntryType::makeNamespace(); yyextra->current->type = "namespace" ; yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; @@ -1110,7 +1110,7 @@ NONLopt [^\n]* yyextra->current->exported, name, partition); - yyextra->current->section = Entry::MODULEDOC_SEC; + yyextra->current->section = EntryType::makeModuleDoc(); yyextra->isTypedef=FALSE; addType(yyscanner); yyextra->current->type += " module"; @@ -1128,7 +1128,7 @@ NONLopt [^\n]* yyextra->yyColNr, yyextra->current->exported, yytext); - yyextra->current->section = Entry::MODULEDOC_SEC; + yyextra->current->section = EntryType::makeModuleDoc(); yyextra->isTypedef=FALSE; addType(yyscanner); yyextra->current->type += " module"; @@ -1304,7 +1304,7 @@ NONLopt [^\n]* {B}*"typename"{BN}+ { lineCount(yyscanner); } {B}*"namespace"{BNopt}/[^a-z_A-Z0-9] { if (yyextra->insideJava) REJECT; yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::NAMESPACE_SEC; + yyextra->current->section = EntryType::makeNamespace(); yyextra->current->type = "namespace" ; yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; @@ -1326,7 +1326,7 @@ NONLopt [^\n]* if (yyextra->insideIDL || yyextra->insideSlice) { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::NAMESPACE_SEC; + yyextra->current->section = EntryType::makeNamespace(); yyextra->current->type = "module" ; yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; @@ -1351,7 +1351,7 @@ NONLopt [^\n]* if (yyextra->insideIDL) { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::NAMESPACE_SEC; + yyextra->current->section = EntryType::makeNamespace(); yyextra->current->type = "library" ; yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; @@ -1371,7 +1371,7 @@ NONLopt [^\n]* if (yyextra->insideIDL) { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::NAMESPACE_SEC; + yyextra->current->section = EntryType::makeNamespace(); yyextra->current->type = "constants"; yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; @@ -1391,7 +1391,7 @@ NONLopt [^\n]* if (yyextra->insideIDL) { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); TypeSpecifier spec = yyextra->current->spec; yyextra->current->spec = TypeSpecifier().setService(true). // preserve UNO IDL [optional] or published @@ -1415,7 +1415,7 @@ NONLopt [^\n]* if (yyextra->insideIDL) { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); TypeSpecifier spec = yyextra->current->spec; yyextra->current->spec = TypeSpecifier().setSingleton(true). setPublished(spec.isPublished()); // preserve @@ -1438,7 +1438,7 @@ NONLopt [^\n]* if (yyextra->insideIDL || yyextra->insideJava || yyextra->insideCS || yyextra->insideD || yyextra->insidePHP || yyextra->insideSlice) { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); TypeSpecifier spec = yyextra->current->spec; yyextra->current->spec = TypeSpecifier().setInterface(true). // preserve UNO IDL [optional], published, Slice local @@ -1463,7 +1463,7 @@ NONLopt [^\n]* {B}*"@implementation"{BN}+ { // Objective-C class implementation lineCount(yyscanner); yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::OBJCIMPL_SEC; + yyextra->current->section = EntryType::makeObjcImpl(); yyextra->language = yyextra->current->lang = SrcLangExt_ObjC; yyextra->insideObjC = TRUE; yyextra->current->protection = yyextra->protection = Protection::Public ; @@ -1478,7 +1478,7 @@ NONLopt [^\n]* {B}*"@interface"{BN}+ { // Objective-C class interface, or Java attribute lineCount(yyscanner); yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->spec = TypeSpecifier().setInterface(true); if (!yyextra->insideJava) { @@ -1498,7 +1498,7 @@ NONLopt [^\n]* {B}*"@protocol"{BN}+ { // Objective-C protocol definition lineCount(yyscanner); yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->spec = TypeSpecifier().setProtocol(true); yyextra->language = yyextra->current->lang = SrcLangExt_ObjC; yyextra->insideObjC = TRUE; @@ -1515,7 +1515,7 @@ NONLopt [^\n]* {B}*"exception"{BN}+ { // Corba IDL/Slice exception if (yyextra->insideJava || yyextra->insideCpp) REJECT; yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); TypeSpecifier spec = yyextra->current->spec; // preserve UNO IDL, Slice local yyextra->current->spec = TypeSpecifier().setException(true). @@ -1537,7 +1537,7 @@ NONLopt [^\n]* yyextra->isTypedef=decl.find("typedef")!=-1; bool isConst=decl.find("const")!=-1; bool isVolatile=decl.find("volatile")!=-1; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); addType(yyscanner); if (yyextra->insidePHP && yyextra->current->spec.isAbstract()) { @@ -1574,7 +1574,7 @@ NONLopt [^\n]* {B}*"value class{" | // C++/CLI extension {B}*"value class"{BN}+ { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->spec = TypeSpecifier().setValue(true); addType(yyscanner); yyextra->current->type += " value class" ; @@ -1590,7 +1590,7 @@ NONLopt [^\n]* {B}*"ref class{" | // C++/CLI extension {B}*"ref class"{BN}+ { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->spec = TypeSpecifier().setRef(true); addType(yyscanner); yyextra->current->type += " ref class" ; @@ -1606,7 +1606,7 @@ NONLopt [^\n]* {B}*"interface class{" | // C++/CLI extension {B}*"interface class"{BN}+ { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->spec = TypeSpecifier().setInterface(true); addType(yyscanner); yyextra->current->type += " interface class" ; @@ -1623,7 +1623,7 @@ NONLopt [^\n]* if (yyextra->insideIDL) { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); addType(yyscanner); yyextra->current->type += " coclass" ; yyextra->current->fileName = yyextra->fileName; @@ -1649,7 +1649,7 @@ NONLopt [^\n]* yyextra->isTypedef=decl.find("typedef")!=-1; bool isConst=decl.find("const")!=-1; bool isVolatile=decl.find("volatile")!=-1; - yyextra->current->section = Entry::CLASS_SEC ; + yyextra->current->section = EntryType::makeClass() ; TypeSpecifier spec = yyextra->current->spec; yyextra->current->spec = TypeSpecifier().setStruct(true). // preserve UNO IDL & Inline attributes, Slice local @@ -1680,7 +1680,7 @@ NONLopt [^\n]* {B}*"value struct{" | // C++/CLI extension {B}*"value struct"{BN}+ { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->spec = TypeSpecifier().setStruct(true).setValue(true); addType(yyscanner); yyextra->current->type += " value struct" ; @@ -1696,7 +1696,7 @@ NONLopt [^\n]* {B}*"ref struct{" | // C++/CLI extension {B}*"ref struct"{BN}+ { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->spec = TypeSpecifier().setStruct(true).setRef(true); addType(yyscanner); yyextra->current->type += " ref struct" ; @@ -1712,7 +1712,7 @@ NONLopt [^\n]* {B}*"interface struct{" | // C++/CLI extension {B}*"interface struct"{BN}+ { yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->spec = TypeSpecifier().setStruct(true).setInterface(true); addType(yyscanner); yyextra->current->type += " interface struct"; @@ -1732,7 +1732,7 @@ NONLopt [^\n]* yyextra->isTypedef=decl.find("typedef")!=-1; bool isConst=decl.find("const")!=-1; bool isVolatile=decl.find("volatile")!=-1; - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->spec = TypeSpecifier().setUnion(true); // bug 582676: can be a struct nested in an interface so keep yyextra->insideObjC state //yyextra->current->objc = yyextra->insideObjC = FALSE; @@ -1763,12 +1763,12 @@ NONLopt [^\n]* bool isEnumSytruct = text.find("struct")!=-1; if (yyextra->insideJava) { - yyextra->current->section = Entry::CLASS_SEC; + yyextra->current->section = EntryType::makeClass(); yyextra->current->spec = TypeSpecifier().setEnum(true); } else { - yyextra->current->section = Entry::ENUM_SEC ; + yyextra->current->section = EntryType::makeEnum() ; } addType(yyscanner); yyextra->current->type += " enum"; @@ -1792,7 +1792,7 @@ NONLopt [^\n]* {B}*"concept"{BN}+ { // C++20 concept if (yyextra->insideJava) REJECT; yyextra->isTypedef=FALSE; - yyextra->current->section = Entry::CONCEPT_SEC; + yyextra->current->section = EntryType::makeConcept(); addType(yyscanner); yyextra->current->type += " concept"; yyextra->current->fileName = yyextra->fileName; @@ -1873,10 +1873,10 @@ NONLopt [^\n]* //printf("PHP: adding use relation: %s\n",qPrint(yyextra->current->name)); yyextra->current->fileName = yyextra->fileName; // add a using declaration - yyextra->current->section=Entry::USINGDECL_SEC; + yyextra->current->section = EntryType::makeUsingDecl(); yyextra->current_root->copyToSubEntry(yyextra->current); // also add it as a using directive - yyextra->current->section=Entry::USINGDIR_SEC; + yyextra->current->section = EntryType::makeUsingDir(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); yyextra->aliasName.resize(0); @@ -1911,7 +1911,7 @@ NONLopt [^\n]* QCString scope=yytext; yyextra->current->name=removeRedundantWhiteSpace(substitute(scope.left(scope.length()-1),".","::")); yyextra->current->fileName = yyextra->fileName; - yyextra->current->section=Entry::USINGDIR_SEC; + yyextra->current->section = EntryType::makeUsingDir(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); BEGIN(Using); @@ -1923,12 +1923,12 @@ NONLopt [^\n]* yyextra->current->fileName = yyextra->fileName; if (yyextra->insideD) { - yyextra->current->section=Entry::USINGDIR_SEC; + yyextra->current->section = EntryType::makeUsingDir(); } else { //printf("import name = %s -> %s\n",yytext,qPrint(yyextra->current->name)); - yyextra->current->section=Entry::USINGDECL_SEC; + yyextra->current->section = EntryType::makeUsingDecl(); } yyextra->previous = yyextra->current; yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); @@ -1947,7 +1947,7 @@ NONLopt [^\n]* lineCount(yyscanner); yyextra->current->name=yytext; yyextra->current->fileName = yyextra->fileName; - yyextra->current->section=Entry::USINGDECL_SEC; + yyextra->current->section = EntryType::makeUsingDecl(); yyextra->current->startLine = yyextra->yyLineNr; yyextra->previous = yyextra->current; yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); @@ -1961,7 +1961,7 @@ NONLopt [^\n]* yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyLineNr; yyextra->current->startColumn = yyextra->yyColNr; - yyextra->current->section=Entry::USINGDIR_SEC; + yyextra->current->section = EntryType::makeUsingDir(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); } @@ -1971,7 +1971,7 @@ NONLopt [^\n]* BEGIN(UsingAlias); } ";" { - yyextra->previous->section=Entry::VARIABLE_SEC; + yyextra->previous->section = EntryType::makeVariable(); yyextra->previous->args = yyextra->previous->args.stripWhiteSpace(); yyextra->previous->args.stripPrefix("class "); yyextra->previous->args.stripPrefix("struct "); @@ -2026,7 +2026,7 @@ NONLopt [^\n]* } {SCOPENAME} { yyextra->current->name=removeRedundantWhiteSpace(yytext); yyextra->current->fileName = yyextra->fileName; - yyextra->current->section=Entry::USINGDIR_SEC; + yyextra->current->section = EntryType::makeUsingDir(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); BEGIN(Using); @@ -2643,9 +2643,9 @@ NONLopt [^\n]* yyextra->current->type.resize(0); yyextra->current->args = yyextra->current->args.simplifyWhiteSpace(); yyextra->current->name = yyextra->current->name.stripWhiteSpace(); - yyextra->current->section = Entry::DEFINE_SEC; + yyextra->current->section = EntryType::makeDefine(); yyextra->lastDefineContext = YY_START; - BEGIN( Define ); + BEGIN( SDefine ); } {B}*"#"{B}+[0-9]+{B}+/"\"" { /* line control directive */ yyextra->yyLineNr = atoi(&yytext[1]); @@ -2691,7 +2691,7 @@ NONLopt [^\n]* [\r]*\n[\r]* { lineCount(yyscanner); BEGIN( yyextra->lastCPPContext) ; } -{ID}{B}*"(" { +{ID}{B}*"(" { yyextra->current->name = yytext; yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace(); yyextra->current->args = "("; @@ -2712,7 +2712,7 @@ NONLopt [^\n]* yyextra->current->args += *yytext; } */ -{ID} { +{ID} { //printf("Define '%s' without args\n",yytext); if (yyextra->clangParser && (yyextra->insideCpp || yyextra->insideObjC)) { @@ -2743,7 +2743,7 @@ NONLopt [^\n]* init = init.left(init.length()-1); yyextra->current->initializer.str(init.str()); yyextra->current->name = yyextra->current->name.stripWhiteSpace(); - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); BEGIN(FindMembers); @@ -2793,7 +2793,7 @@ NONLopt [^\n]* yyextra->current->name += yytext ; addType(yyscanner); } -";"{BN}*{DCOMM}"<" { +";"{BN}*{DCOMM}"<" { if (yyextra->current->bodyLine==-1) { yyextra->current->bodyLine=yyextra->yyLineNr; @@ -2811,11 +2811,11 @@ NONLopt [^\n]* lineCount(yyscanner); yyextra->docBlockTerm = ';'; - if (YY_START==EnumBaseType && yyextra->current->section==Entry::ENUM_SEC) + if (YY_START==EnumBaseType && yyextra->current->section.isEnum()) { yyextra->current->bitfields = ":"+yyextra->current->args; yyextra->current->args.resize(0); - yyextra->current->section=Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); } if (yytext[yyleng-3]=='/') { @@ -2840,11 +2840,11 @@ NONLopt [^\n]* lineCount(yyscanner); yyextra->docBlockTerm = ','; - if (YY_START==EnumBaseType && yyextra->current->section==Entry::ENUM_SEC) + if (YY_START==EnumBaseType && yyextra->current->section.isEnum()) { yyextra->current->bitfields = ":"+yyextra->current->args; yyextra->current->args.resize(0); - yyextra->current->section=Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); } if (yytext[yyleng-3]=='/') { @@ -2887,7 +2887,7 @@ NONLopt [^\n]* ({CPPC}([!/]){B}*{CMD}"{")|({CCS}([!*]){B}*{CMD}"{") { //handleGroupStartCommand(yyextra->current->name); - if (yyextra->previous && yyextra->previous->section==Entry::GROUPDOC_SEC) + if (yyextra->previous && yyextra->previous->section.isGroupDoc()) { // link open command to the group defined in the yyextra->previous entry yyextra->commentScanner.open(yyextra->previous.get(),yyextra->fileName,yyextra->yyLineNr); @@ -3002,7 +3002,7 @@ NONLopt [^\n]* yyextra->current->startColumn = yyextra->yyColNr; yyextra->current->args = yyextra->current->args.simplifyWhiteSpace(); yyextra->current->name = yyextra->current->name.stripWhiteSpace(); - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); BEGIN(FindMembers); @@ -3580,7 +3580,7 @@ NONLopt [^\n]* if (yyextra->current->type.isEmpty() && yyextra->current->name=="enum") // see bug 69041, C++11 style anon enum: 'enum : unsigned int {...}' { - yyextra->current->section=Entry::ENUM_SEC; + yyextra->current->section = EntryType::makeEnum(); yyextra->current->name.resize(0); yyextra->current->args.resize(0); BEGIN(EnumBaseType); @@ -3623,8 +3623,8 @@ NONLopt [^\n]* } bool isStatic = yyextra->current->isStatic; Protection prot = yyextra->current->protection; - bool isConcept = yyextra->current->section==Entry::CONCEPT_SEC; - bool isModule = yyextra->current->section==Entry::MODULEDOC_SEC; + bool isConcept = yyextra->current->section.isConcept(); + bool isModule = yyextra->current->section.isModuleDoc(); if (isConcept) // C++20 concept { yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ; @@ -3635,16 +3635,16 @@ NONLopt [^\n]* yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ; initEntry(yyscanner); } - else if (!yyextra->current->name.isEmpty() && yyextra->current->section!=Entry::ENUM_SEC) + else if (!yyextra->current->name.isEmpty() && !yyextra->current->section.isEnum()) { yyextra->current->type=yyextra->current->type.simplifyWhiteSpace(); yyextra->current->args=removeRedundantWhiteSpace(yyextra->current->args); yyextra->current->name=yyextra->current->name.stripWhiteSpace(); - if (yyextra->current->section==Entry::CLASS_SEC) // remove spec for "struct Bla bla;" + if (yyextra->current->section.isClass()) // remove spec for "struct Bla bla;" { yyextra->current->spec = TypeSpecifier(); } - yyextra->current->section = Entry::VARIABLE_SEC ; + yyextra->current->section = EntryType::makeVariable() ; yyextra->current->fileName = yyextra->fileName; yyextra->current->startLine = yyextra->yyBegLineNr; yyextra->current->startColumn = yyextra->yyBegColNr; @@ -3885,7 +3885,7 @@ NONLopt [^\n]* if (!yyextra->current->args.isEmpty()) yyextra->current->args += ")"; yyextra->current->name = yyextra->current->name.stripWhiteSpace(); - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); BEGIN( FindMembers ); @@ -3899,7 +3899,7 @@ NONLopt [^\n]* } "]" { yyextra->current->args += *yytext ; if (--yyextra->squareCount<=0) - BEGIN( Function ) ; + BEGIN( SFunction ) ; } "[" { yyextra->current->args += *yytext ; yyextra->squareCount++; @@ -3968,7 +3968,7 @@ NONLopt [^\n]* } yyextra->current->args = yyextra->current->args.simplifyWhiteSpace(); yyextra->current->name = yyextra->current->name.stripWhiteSpace(); - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); } @@ -3995,7 +3995,7 @@ NONLopt [^\n]* } yyextra->current->args = yyextra->current->args.simplifyWhiteSpace(); yyextra->current->name = yyextra->current->name.stripWhiteSpace(); - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); // add to the scope of the enum if (!yyextra->insideCS && !yyextra->insideJava && !yyextra->current_root->spec.isStrong()) @@ -4136,7 +4136,7 @@ NONLopt [^\n]* { yyextra->current->endBodyLine = yyextra->yyLineNr; std::shared_ptr original_root = yyextra->current_root; // save root this namespace is in - if (yyextra->current->section == Entry::NAMESPACE_SEC && yyextra->current->type == "namespace") + if (yyextra->current->section.isNamespace() && yyextra->current->type == "namespace") { int split_point; // save documentation values @@ -4187,7 +4187,7 @@ NONLopt [^\n]* } else { - if (yyextra->current->section==Entry::ENUM_SEC || yyextra->current->spec.isEnum()) + if (yyextra->current->section.isEnum() || yyextra->current->spec.isEnum()) { yyextra->current->program << ','; // add field terminator } @@ -4208,7 +4208,7 @@ NONLopt [^\n]* yyextra->memspecEntry = yyextra->current; yyextra->current_root->moveToSubEntryAndKeep( yyextra->current ) ; yyextra->current = std::make_shared(*yyextra->current); - if (yyextra->current->section==Entry::NAMESPACE_SEC || + if (yyextra->current->section.isNamespace() || yyextra->current->spec.isInterface() || yyextra->insideJava || yyextra->insidePHP || yyextra->insideCS || yyextra->insideD || yyextra->insideJS || yyextra->insideSlice @@ -4261,7 +4261,7 @@ NONLopt [^\n]* yyextra->current->type.prepend(yytext); } {ID} { - if (yyextra->current->section==Entry::ENUM_SEC || yyextra->current->spec.isEnum()) + if (yyextra->current->section.isEnum() || yyextra->current->spec.isEnum()) { yyextra->current->program << ","; // add field terminator } @@ -4281,7 +4281,7 @@ NONLopt [^\n]* } ";" { /* typedef of anonymous type */ yyextra->current->name.sprintf("@%d",anonCount++); - if (yyextra->current->section==Entry::ENUM_SEC || yyextra->current->spec.isEnum()) + if (yyextra->current->section.isEnum() || yyextra->current->spec.isEnum()) { yyextra->current->program << ','; // add field terminator } @@ -4318,7 +4318,7 @@ NONLopt [^\n]* { yyextra->msType.prepend("union "+yyextra->firstTypedefEntry->name); } - else if (yyextra->firstTypedefEntry->section==Entry::ENUM_SEC) + else if (yyextra->firstTypedefEntry->section.isEnum()) { yyextra->msType.prepend("enum "+yyextra->firstTypedefEntry->name); } @@ -4346,7 +4346,7 @@ NONLopt [^\n]* while (p) { // only look for class scopes, not namespace scopes - if ((p->section & Entry::COMPOUND_MASK) && !p->name.isEmpty()) + if (p->section.isCompound() && !p->name.isEmpty()) { //printf("Trying scope '%s'\n",qPrint(p->name)); int i=p->name.findRev("::"); @@ -4372,8 +4372,7 @@ NONLopt [^\n]* // -> omit typedef and use S_t as the struct name if (typedefHidesStruct && yyextra->isTypedef && - ((yyextra->current->spec.isStruct() || yyextra->current->spec.isUnion()) || - yyextra->current->section==Entry::ENUM_SEC) && + ((yyextra->current->spec.isStruct() || yyextra->current->spec.isUnion()) || yyextra->current->section.isEnum()) && yyextra->msType.stripWhiteSpace().isEmpty() && yyextra->memspecEntry) { @@ -4387,7 +4386,7 @@ NONLopt [^\n]* varEntry->mtype = yyextra->current->mtype; varEntry->virt = yyextra->current->virt; varEntry->isStatic = yyextra->current->isStatic; - varEntry->section = Entry::VARIABLE_SEC; + varEntry->section = EntryType::makeVariable(); varEntry->name = yyextra->msName.stripWhiteSpace(); varEntry->type = yyextra->current->type.simplifyWhiteSpace()+" "; varEntry->args = yyextra->msArgs; @@ -4426,7 +4425,7 @@ NONLopt [^\n]* } if (*yytext==';') // end of a struct/class ... { - if (!yyextra->isTypedef && yyextra->msName.isEmpty() && yyextra->memspecEntry && (yyextra->current->section&Entry::COMPOUND_MASK)) + if (!yyextra->isTypedef && yyextra->msName.isEmpty() && yyextra->memspecEntry && yyextra->current->section.isCompound()) { // case where a class/struct has a doc block after it if (!yyextra->current->doc.isEmpty()) { @@ -4597,7 +4596,7 @@ NONLopt [^\n]* ")"{BNopt}/[;{] { lineCount(yyscanner); yyextra->current->type+=yyextra->funcPtrType.mid(1); - BEGIN(Function); + BEGIN(SFunction); } ")"{BNopt}/"[" { // function returning a pointer to an array lineCount(yyscanner); @@ -4617,7 +4616,7 @@ NONLopt [^\n]* if (yyextra->roundCount) --yyextra->roundCount; else - BEGIN(Function); + BEGIN(SFunction); } {BN}*","{BN}* { lineCount(yyscanner) ; yyextra->current->type += ", " ; } {BN}+ { lineCount(yyscanner) ; yyextra->current->type += ' ' ; } @@ -5036,7 +5035,7 @@ NONLopt [^\n]* } else { - unput(*yytext); BEGIN( Function ); + unput(*yytext); BEGIN( SFunction ); } } {BN}*"abstract"{BN}* { // pure virtual member function @@ -5177,15 +5176,13 @@ NONLopt [^\n]* lineCount(yyscanner) ; yyextra->current->args += ' ' ; } -"#" { if (yyextra->insidePHP) +"#" { if (yyextra->insidePHP) REJECT; yyextra->lastCPPContext = YY_START; BEGIN(SkipCPP); } "=" { - if (yyextra->insideCli && - (yyextra->current_root->section&Entry::COMPOUND_MASK) - ) + if (yyextra->insideCli && yyextra->current_root->section.isCompound()) { BEGIN(CliOverride); } @@ -5285,7 +5282,7 @@ NONLopt [^\n]* if (yytext[yyleng-1]==':') { unput(':'); - BEGIN( Function ); + BEGIN( SFunction ); } } {BN}*"throw"{BN}*"(" { // C++ style throw clause @@ -5330,16 +5327,16 @@ NONLopt [^\n]* . { yyextra->current->exception += *yytext; } -"(" { yyextra->current->type += yyextra->current->name ; +"(" { yyextra->current->type += yyextra->current->name ; yyextra->current->name = yyextra->current->args ; yyextra->current->args = yytext ; yyextra->roundCount=0; BEGIN( FuncRound ) ; } -":" { +":" { if (!yyextra->insidePHP) BEGIN(SkipInits); } -[;{,] { +[;{,] { yyextra->current->name=removeRedundantWhiteSpace(yyextra->current->name); yyextra->current->type=removeRedundantWhiteSpace(yyextra->current->type); yyextra->current->args=removeRedundantWhiteSpace(yyextra->current->args); @@ -5367,7 +5364,7 @@ NONLopt [^\n]* //printf("type=%s ts=%d te=%d ti=%d isFunction=%d\n", // qPrint(yyextra->current->type),ts,te,ti,isFunction); - if (*yytext!=';' || (yyextra->current_root->section&Entry::COMPOUND_MASK) ) + if (*yytext!=';' || yyextra->current_root->section.isCompound()) { if (isVariable) { @@ -5376,12 +5373,12 @@ NONLopt [^\n]* { yyextra->current->type.prepend("typedef "); } - yyextra->current->section = Entry::VARIABLE_SEC ; + yyextra->current->section = EntryType::makeVariable() ; } else { //printf("Scanner.l: found in class function: '%s' '%s' '%s'\n", qPrint(yyextra->current->type),qPrint(yyextra->current->name),qPrint(yyextra->current->args)); - yyextra->current->section = Entry::FUNCTION_SEC ; + yyextra->current->section = EntryType::makeFunction() ; yyextra->current->proto = *yytext==';'; } } @@ -5395,12 +5392,12 @@ NONLopt [^\n]* yyextra->current->type.prepend("typedef "); } //printf("Scanner.l: found function variable!\n"); - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); } else { //printf("Scanner.l: found prototype\n"); - yyextra->current->section = Entry::FUNCTION_SEC; + yyextra->current->section = EntryType::makeFunction(); yyextra->current->proto = TRUE; } } @@ -5451,7 +5448,7 @@ NONLopt [^\n]* } if ( *yytext == '{' ) { - if ( !yyextra->insidePHP && (yyextra->current_root->section & Entry::COMPOUND_MASK) ) + if ( !yyextra->insidePHP && yyextra->current_root->section.isCompound() ) { yyextra->previous->spec.setInline(true); } @@ -5461,7 +5458,7 @@ NONLopt [^\n]* } else { - if (yyextra->previous->section!=Entry::VARIABLE_SEC) + if (!yyextra->previous->section.isVariable()) yyextra->previous->bodyLine=-1; // a function/member declaration BEGIN( FindMembers ) ; } @@ -5491,7 +5488,7 @@ NONLopt [^\n]* } "{" { // C++11 style initializer unput('{'); - BEGIN( Function ); + BEGIN( SFunction ); } "{" { //addToBody(yytext); @@ -5695,7 +5692,7 @@ NONLopt [^\n]* BEGIN(ClassVar); } ";" { - yyextra->current->section = Entry::EMPTY_SEC ; + yyextra->current->section = EntryType::makeEmpty() ; yyextra->current->type.resize(0) ; yyextra->current->name.resize(0) ; yyextra->current->args.resize(0) ; @@ -5724,7 +5721,7 @@ NONLopt [^\n]* } else { - yyextra->current->section = Entry::EMPTY_SEC ; + yyextra->current->section = EntryType::makeEmpty() ; yyextra->current->type.resize(0) ; yyextra->current->name.resize(0) ; yyextra->current->args.resize(0) ; @@ -5839,9 +5836,9 @@ NONLopt [^\n]* // so do not throw it away... yyextra->current->name = yytext; yyextra->current->name=yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace(); - yyextra->current->section = yyextra->current->spec.isInterface() ? Entry::EXPORTED_INTERFACE_SEC - : Entry::INCLUDED_SERVICE_SEC; -// yyextra->current->section = Entry::MEMBERDOC_SEC; + yyextra->current->section = yyextra->current->spec.isInterface() ? EntryType::makeExportedInterface() + : EntryType::makeIncludedService(); +// yyextra->current->section = EntryType::makeMemberDoc(); yyextra->current->spec.setInterface(false).setService(false); // FIXME: horrible: Interface == Gettable, so need to clear it - actually we're mixing values from // different enums in this case... @@ -5923,7 +5920,7 @@ NONLopt [^\n]* { yyextra->current->name += "-p"; } - if (yyextra->current->spec.isProtocol() || yyextra->current->section == Entry::OBJCIMPL_SEC) + if (yyextra->current->spec.isProtocol() || yyextra->current->section.isObjcImpl()) { unput('{'); // fake start of body } @@ -6022,9 +6019,9 @@ NONLopt [^\n]* } else { - if (yyextra->current->section == Entry::ENUM_SEC) + if (yyextra->current->section.isEnum()) { // found "enum a b" -> variable - yyextra->current->section = Entry::VARIABLE_SEC ; + yyextra->current->section = EntryType::makeVariable() ; } yyextra->current->type += ' ' ; yyextra->current->type += yyextra->current->name ; @@ -6120,8 +6117,7 @@ NONLopt [^\n]* } ")" { yyextra->current->name+=')'; - if ((yyextra->current->spec.isProtocol()) || - yyextra->current->section == Entry::OBJCIMPL_SEC) + if (yyextra->current->spec.isProtocol() || yyextra->current->section.isObjcImpl()) { unput('{'); // fake start of body } @@ -6133,13 +6129,13 @@ NONLopt [^\n]* BEGIN( ClassVar ); } ":" { - if (yyextra->current->section==Entry::VARIABLE_SEC) // enum A B:2, see bug 748208 + if (yyextra->current->section.isVariable()) // enum A B:2, see bug 748208 { yyextra->current->bitfields+=":"; yyextra->current->args.resize(0); BEGIN(BitFields); } - else if (yyextra->current->section==Entry::ENUM_SEC) // enum E:2, see bug 313527, + else if (yyextra->current->section.isEnum()) // enum E:2, see bug 313527, // or C++11 style enum: 'E : unsigned int {...}' { yyextra->current->args.resize(0); @@ -6171,12 +6167,11 @@ NONLopt [^\n]* { yyextra->current->type.prepend("typedef"); } - if ((yytext[0]=='*' || yytext[0]=='&') && - yyextra->current->section == Entry::ENUM_SEC) + if ((yytext[0]=='*' || yytext[0]=='&') && yyextra->current->section.isEnum()) { // found "enum a *b" -> variable - yyextra->current->section = Entry::VARIABLE_SEC ; + yyextra->current->section = EntryType::makeVariable() ; } - if (yytext[0]==';' && yyextra->current->section == Entry::ENUM_SEC) + if (yytext[0]==';' && yyextra->current->section.isEnum()) { yyextra->current->reset(); initEntry(yyscanner); @@ -6230,7 +6225,7 @@ NONLopt [^\n]* yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name); if (yyextra->current->name.isEmpty() && !yyextra->isTypedef) // anonymous compound { - if (yyextra->current->section==Entry::NAMESPACE_SEC) // allow reopening of anonymous namespaces + if (yyextra->current->section.isNamespace()) // allow reopening of anonymous namespaces { if (Config_getBool(EXTRACT_ANON_NSPACES)) // use visible name { @@ -6252,14 +6247,14 @@ NONLopt [^\n]* (yyextra->current->spec.isInterface() || yyextra->current->spec.isProtocol() || yyextra->current->spec.isCategory() || - yyextra->current->section==Entry::OBJCIMPL_SEC + yyextra->current->section.isObjcImpl() ) && yyextra->insideObjC ) { // ObjC body that ends with @end BEGIN( ReadBodyIntf ); } - else if (yyextra->current->section==Entry::NAMESPACE_SEC) + else if (yyextra->current->section.isNamespace()) { // namespace body BEGIN( ReadNSBody ); } @@ -6544,7 +6539,7 @@ NONLopt [^\n]* } yyextra->lastDocContext = YY_START; - if (yyextra->current_root->section & Entry::SCOPE_MASK) + if (yyextra->current_root->section.isScope()) { yyextra->current->inside = yyextra->current_root->name+"::"; } @@ -6573,7 +6568,7 @@ NONLopt [^\n]* yyextra->lastDocContext = YY_START; //printf("Found comment banner at %s:%d\n",yyextra->fileName,yyextra->yyLineNr); - if (yyextra->current_root->section & Entry::SCOPE_MASK) + if (yyextra->current_root->section.isScope()) { yyextra->current->inside = yyextra->current_root->name+"::"; } @@ -6608,7 +6603,7 @@ NONLopt [^\n]* yyextra->lastDocContext = YY_START; //printf("Found comment block at %s:%d\n",yyextra->fileName,yyextra->yyLineNr); - if (yyextra->current_root->section & Entry::SCOPE_MASK) + if (yyextra->current_root->section.isScope()) { yyextra->current->inside = yyextra->current_root->name+"::"; } @@ -6633,7 +6628,7 @@ NONLopt [^\n]* } {CPPC}"!" { yyextra->lastDocContext = YY_START; - if (yyextra->current_root->section & Entry::SCOPE_MASK) + if (yyextra->current_root->section.isScope()) { yyextra->current->inside = yyextra->current_root->name+"::"; } @@ -6650,7 +6645,7 @@ NONLopt [^\n]* } {CPPC}"/"/[^/] { yyextra->lastDocContext = YY_START; - if (yyextra->current_root->section & Entry::SCOPE_MASK) + if (yyextra->current_root->section.isScope()) { yyextra->current->inside = yyextra->current_root->name+"::"; } @@ -6714,7 +6709,7 @@ NONLopt [^\n]* yyextra->current->name="[instance initializer]"; } unput(*yytext); - BEGIN( Function ); + BEGIN( SFunction ); } else { @@ -6803,7 +6798,7 @@ NONLopt [^\n]* } ";" { - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); BEGIN(FindMembers); @@ -6833,7 +6828,7 @@ NONLopt [^\n]* } ";" { - yyextra->current->section = Entry::VARIABLE_SEC; + yyextra->current->section = EntryType::makeVariable(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); BEGIN(FindMembers); @@ -7499,7 +7494,7 @@ static void setContext(yyscan_t yyscanner) static void prependScope(yyscan_t yyscanner) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - if (yyextra->current_root->section & Entry::SCOPE_MASK) + if (yyextra->current_root->section.isScope()) { //printf("--- prependScope %s to %s\n",qPrint(yyextra->current_root->name),qPrint(yyextra->current->name)); yyextra->current->name.prepend(yyextra->current_root->name+"::"); @@ -7837,7 +7832,7 @@ static void parseCompounds(yyscan_t yyscanner,const std::shared_ptr &rt) yyextra->programStr = ce->program.str(); yyextra->inputString = yyextra->programStr.data(); yyextra->inputPosition = 0; - if (ce->section==Entry::ENUM_SEC || ce->spec.isEnum()) + if (ce->section.isEnum() || ce->spec.isEnum()) BEGIN( FindFields ) ; else BEGIN( FindMembers ) ; @@ -7854,14 +7849,14 @@ static void parseCompounds(yyscan_t yyscanner,const std::shared_ptr &rt) // deep copy group list from parent (see bug 727732) bool autoGroupNested = Config_getBool(GROUP_NESTED_COMPOUNDS); - if (autoGroupNested && !rt->groups.empty() && ce->section!=Entry::ENUM_SEC && !ce->spec.isEnum()) + if (autoGroupNested && !rt->groups.empty() && !ce->section.isEnum() && !ce->spec.isEnum()) { ce->groups = rt->groups; } int ni=ce->name.findRev("::"); if (ni==-1) ni=0; else ni+=2; // set default protection based on the compound type - if( ce->section==Entry::CLASS_SEC ) // class + if ( ce->section.isClass() ) // class { if (yyextra->insidePHP || yyextra->insideD || yyextra->insideJS || yyextra->insideIDL || yyextra->insideSlice) { @@ -7887,20 +7882,20 @@ static void parseCompounds(yyscan_t yyscanner,const std::shared_ptr &rt) yyextra->current->protection = yyextra->protection = Protection::Private ; } } - else if (ce->section == Entry::ENUM_SEC ) // enum + else if (ce->section.isEnum() ) // enum { yyextra->current->protection = yyextra->protection = ce->protection; } else if (!ce->name.isEmpty() && ce->name.at(ni)=='@') // unnamed union or namespace { - if (ce->section == Entry::NAMESPACE_SEC ) // unnamed namespace + if (ce->section.isNamespace() ) // unnamed namespace { yyextra->current->isStatic = yyextra->isStatic = TRUE; } yyextra->current->protection = yyextra->protection = ce->protection; yyextra->current->exported = yyextra->exported = false; } - else if (ce->section==Entry::NAMESPACE_SEC ) + else if (ce->section.isNamespace() ) { yyextra->current->exported = yyextra->exported = ce->exported; } @@ -7976,8 +7971,8 @@ static void parseMain(yyscan_t yyscanner, yyextra->commentScanner.enterFile(yyextra->fileName,yyextra->yyLineNr); yyextra->current = std::make_shared(); //printf("yyextra->current=%p yyextra->current_root=%p\n",yyextra->current,yyextra->current_root); - int sec=guessSection(yyextra->fileName); - if (sec) + EntryType sec=guessSection(yyextra->fileName); + if (!sec.isEmpty()) { yyextra->current->name = yyextra->fileName; yyextra->current->section = sec; @@ -7993,7 +7988,7 @@ static void parseMain(yyscan_t yyscanner, { yyextra->current->name="java::lang"; // '::' is used in doxygen's internal representation as a scope separator yyextra->current->fileName = yyextra->fileName; - yyextra->current->section=Entry::USINGDIR_SEC; + yyextra->current->section = EntryType::makeUsingDir(); yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); initEntry(yyscanner); BEGIN( FindMembers ); @@ -8067,8 +8062,10 @@ static void parsePrototype(yyscan_t yyscanner,const QCString &text) yyextra->lexInit=TRUE; yyextra->current->name = yyextra->current->name.stripWhiteSpace(); - if (yyextra->current->section == Entry::MEMBERDOC_SEC && yyextra->current->args.isEmpty()) - yyextra->current->section = Entry::VARIABLEDOC_SEC; + if (yyextra->current->section.isMemberDoc() && yyextra->current->args.isEmpty()) + { + yyextra->current->section = EntryType::makeVariableDoc(); + } // restore original scanner state yy_delete_buffer(YY_CURRENT_BUFFER, yyscanner); diff --git a/src/stlsupport.cpp b/src/stlsupport.cpp index 7d03754f6d3..b46aaf5e7a0 100644 --- a/src/stlsupport.cpp +++ b/src/stlsupport.cpp @@ -142,7 +142,7 @@ static void addSTLMember(const std::shared_ptr &root,const char *type,con memEntry->name = name; memEntry->type = type; memEntry->protection = Protection::Public; - memEntry->section = Entry::VARIABLE_SEC; + memEntry->section = EntryType::makeVariable(); memEntry->brief = "STL member"; memEntry->hidden = FALSE; memEntry->artificial = TRUE; @@ -155,7 +155,7 @@ static void addSTLIterator(const std::shared_ptr &classEntry,const QCStri iteratorClassEntry->fileName = "[STL]"; iteratorClassEntry->startLine = 1; iteratorClassEntry->name = name; - iteratorClassEntry->section = Entry::CLASS_SEC; + iteratorClassEntry->section = EntryType::makeClass(); iteratorClassEntry->brief = "STL iterator class"; iteratorClassEntry->hidden = FALSE; iteratorClassEntry->artificial= TRUE; @@ -173,7 +173,7 @@ static void addSTLClass(const std::shared_ptr &root,const STLInfo *info) classEntry->fileName = "[STL]"; classEntry->startLine = 1; classEntry->name = fullName; - classEntry->section = Entry::CLASS_SEC; + classEntry->section = EntryType::makeClass(); classEntry->brief = "STL class"; classEntry->hidden = FALSE; classEntry->artificial= TRUE; @@ -214,7 +214,7 @@ static void addSTLClass(const std::shared_ptr &root,const STLInfo *info) memEntry->args = "()"; memEntry->type = "T*"; memEntry->protection = Protection::Public; - memEntry->section = Entry::FUNCTION_SEC; + memEntry->section = EntryType::makeFunction(); memEntry->brief = "STL member"; memEntry->hidden = FALSE; memEntry->artificial = FALSE; @@ -247,7 +247,7 @@ static void addSTLClasses(const std::shared_ptr &root) namespaceEntry->fileName = "[STL]"; namespaceEntry->startLine = 1; namespaceEntry->name = "std"; - namespaceEntry->section = Entry::NAMESPACE_SEC; + namespaceEntry->section = EntryType::makeNamespace(); namespaceEntry->brief = "STL namespace"; namespaceEntry->hidden = FALSE; namespaceEntry->artificial= TRUE; diff --git a/src/tagreader.cpp b/src/tagreader.cpp index 76e2f6e440b..bdef18c9440 100644 --- a/src/tagreader.cpp +++ b/src/tagreader.cpp @@ -1395,7 +1395,7 @@ void TagFileParser::buildMemberList(const std::shared_ptr &ce,const std:: ev->type = "@"; ev->name = evi.name; ev->id = evi.clangid; - ev->section = Entry::VARIABLE_SEC; + ev->section = EntryType::makeVariable(); ev->tagInfoData.tagName = m_tagName; ev->tagInfoData.anchor = evi.anchor; ev->tagInfoData.fileName = evi.file; @@ -1409,7 +1409,7 @@ void TagFileParser::buildMemberList(const std::shared_ptr &ce,const std:: me->fileName = ce->fileName; me->id = tmi.clangId; me->startLine = tmi.lineNr; - if (ce->section == Entry::GROUPDOC_SEC) + if (ce->section.isGroupDoc()) { me->groups.push_back(Grouping(ce->name,Grouping::GROUPING_INGROUP)); } @@ -1421,68 +1421,68 @@ void TagFileParser::buildMemberList(const std::shared_ptr &ce,const std:: if (tmi.kind=="define") { me->type="#define"; - me->section = Entry::DEFINE_SEC; + me->section = EntryType::makeDefine(); } else if (tmi.kind=="enumvalue") { - me->section = Entry::VARIABLE_SEC; + me->section = EntryType::makeVariable(); me->mtype = MethodTypes::Method; } else if (tmi.kind=="property") { - me->section = Entry::VARIABLE_SEC; + me->section = EntryType::makeVariable(); me->mtype = MethodTypes::Property; } else if (tmi.kind=="event") { - me->section = Entry::VARIABLE_SEC; + me->section = EntryType::makeVariable(); me->mtype = MethodTypes::Event; } else if (tmi.kind=="variable") { - me->section = Entry::VARIABLE_SEC; + me->section = EntryType::makeVariable(); me->mtype = MethodTypes::Method; } else if (tmi.kind=="typedef") { - me->section = Entry::VARIABLE_SEC; //Entry::TYPEDEF_SEC; + me->section = EntryType::makeVariable(); me->type.prepend("typedef "); me->mtype = MethodTypes::Method; } else if (tmi.kind=="enumeration") { - me->section = Entry::ENUM_SEC; + me->section = EntryType::makeEnum(); me->mtype = MethodTypes::Method; } else if (tmi.kind=="function") { - me->section = Entry::FUNCTION_SEC; + me->section = EntryType::makeFunction(); me->mtype = MethodTypes::Method; } else if (tmi.kind=="signal") { - me->section = Entry::FUNCTION_SEC; + me->section = EntryType::makeFunction(); me->mtype = MethodTypes::Signal; } else if (tmi.kind=="prototype") { - me->section = Entry::FUNCTION_SEC; + me->section = EntryType::makeFunction(); me->mtype = MethodTypes::Method; } else if (tmi.kind=="friend") { - me->section = Entry::FUNCTION_SEC; + me->section = EntryType::makeFunction(); me->type.prepend("friend "); me->mtype = MethodTypes::Method; } else if (tmi.kind=="dcop") { - me->section = Entry::FUNCTION_SEC; + me->section = EntryType::makeFunction(); me->mtype = MethodTypes::DCOP; } else if (tmi.kind=="slot") { - me->section = Entry::FUNCTION_SEC; + me->section = EntryType::makeFunction(); me->mtype = MethodTypes::Slot; } ce->moveToSubEntryAndKeep(me); @@ -1502,7 +1502,7 @@ void TagFileParser::buildLists(const std::shared_ptr &root) if (tci) { std::shared_ptr ce = std::make_shared(); - ce->section = Entry::CLASS_SEC; + ce->section = EntryType::makeClass(); switch (tci->kind) { case TagClassInfo::Kind::Class: break; @@ -1594,7 +1594,7 @@ void TagFileParser::buildLists(const std::shared_ptr &root) if (tci) { std::shared_ptr ce = std::make_shared(); - ce->section = Entry::CONCEPT_SEC; + ce->section = EntryType::makeConcept(); ce->name = tci->name; addDocAnchors(ce,tci->docAnchors); ce->tagInfoData.tagName = m_tagName; @@ -1650,7 +1650,7 @@ void TagFileParser::buildLists(const std::shared_ptr &root) if (tni) { std::shared_ptr ne = std::make_shared(); - ne->section = Entry::NAMESPACE_SEC; + ne->section = EntryType::makeNamespace(); ne->name = tni->name; addDocAnchors(ne,tni->docAnchors); ne->tagInfoData.tagName = m_tagName; @@ -1671,7 +1671,7 @@ void TagFileParser::buildLists(const std::shared_ptr &root) if (tpgi) { std::shared_ptr pe = std::make_shared(); - pe->section = Entry::PACKAGE_SEC; + pe->section = EntryType::makePackage(); pe->name = tpgi->name; addDocAnchors(pe,tpgi->docAnchors); pe->tagInfoData.tagName = m_tagName; @@ -1691,7 +1691,7 @@ void TagFileParser::buildLists(const std::shared_ptr &root) if (tgi) { std::shared_ptr ge = std::make_shared(); - ge->section = Entry::GROUPDOC_SEC; + ge->section = EntryType::makeGroupDoc(); ge->name = tgi->name; ge->type = tgi->title; addDocAnchors(ge,tgi->docAnchors); @@ -1732,7 +1732,7 @@ void TagFileParser::buildLists(const std::shared_ptr &root) { std::shared_ptr pe = std::make_shared(); bool isIndex = (stripExtensionGeneral(tpi->filename,getFileNameExtension(tpi->filename))=="index"); - pe->section = isIndex ? Entry::MAINPAGEDOC_SEC : Entry::PAGEDOC_SEC; + pe->section = isIndex ? EntryType::makeMainpageDoc() : EntryType::makePageDoc(); pe->name = tpi->name; pe->args = tpi->title; for (const auto &subpage : tpi->subpages) diff --git a/src/trace.h b/src/trace.h index ab4959c1410..c804c2e37a4 100644 --- a/src/trace.h +++ b/src/trace.h @@ -303,4 +303,13 @@ template<> struct fmt::formatter : formatter } }; +//! adds support for formatting EntryType +template<> struct fmt::formatter : formatter +{ + auto format(EntryType type, format_context& ctx) { + return formatter::format(type.to_string(),ctx); + } +}; + + #endif // TRACE_H diff --git a/src/types.h b/src/types.h index ec929e60326..74eee62b798 100644 --- a/src/types.h +++ b/src/types.h @@ -467,5 +467,116 @@ enum class VhdlSpecifier }; +// Type Categories (or'ed) +#define ENTRY_TYPES \ + ETYPE(Empty, None) \ + ETYPE(Class, Compound|Scope) \ + ETYPE(Namespace, Scope) \ + ETYPE(Concept, None) \ + ETYPE(ClassDoc, CompoundDoc|Doc) \ + ETYPE(StructDoc, CompoundDoc|Doc) \ + ETYPE(UnionDoc, CompoundDoc|Doc) \ + ETYPE(ExceptionDoc, CompoundDoc|Doc) \ + ETYPE(InterfaceDoc, CompoundDoc|Doc) \ + ETYPE(ProtocolDoc, CompoundDoc|Doc) \ + ETYPE(CategoryDoc, CompoundDoc|Doc) \ + ETYPE(ServiceDoc, CompoundDoc|Doc) \ + ETYPE(SingletonDoc, CompoundDoc|Doc) \ + ETYPE(Source, File) \ + ETYPE(Header, File) \ + ETYPE(ModuleDoc, Doc) \ + ETYPE(ConceptDoc, Doc) \ + ETYPE(NamespaceDoc, Doc) \ + ETYPE(EnumDoc, Doc) \ + ETYPE(PageDoc, Doc) \ + ETYPE(MemberDoc, Doc) \ + ETYPE(OverloadDoc, Doc) \ + ETYPE(Example, Doc) \ + ETYPE(VariableDoc, Doc) \ + ETYPE(FileDoc, Doc) \ + ETYPE(DefineDoc, Doc) \ + ETYPE(GroupDoc, Doc) \ + ETYPE(MainpageDoc, Doc) \ + ETYPE(MemberGrp, Doc) \ + ETYPE(PackageDoc, Doc) \ + ETYPE(DirDoc, Doc) \ + ETYPE(Variable, None) \ + ETYPE(Function, None) \ + ETYPE(Typedef, None) \ + ETYPE(Include, None) \ + ETYPE(Enum, None) \ + ETYPE(Define, None) \ + ETYPE(UsingDir, None) \ + ETYPE(UsingDecl, None) \ + ETYPE(Package, None) \ + ETYPE(ObjcImpl, None) \ + ETYPE(ExportedInterface, None) \ + ETYPE(IncludedService, None) \ + ETYPE(ExampleLineno, None) \ + +/** Wrapper class for the Entry type. Can be set only during construction. + * Packs the type together with category flags. + */ +class EntryType +{ + public: +#define ETYPE(x,bits) \ + static EntryType make##x() { return EntryType(x|bits); } \ + bool is##x() const { return (m_type&TypeMask)==x; } + ENTRY_TYPES +#undef ETYPE + bool isCompound() const { return (m_type & Compound)!=0; } + bool isScope() const { return (m_type & Scope)!=0; } + bool isFile() const { return (m_type & File)!=0; } + bool isCompoundDoc() const { return (m_type & CompoundDoc)!=0; } + bool isDoc() const { return (m_type & Doc)!=0; } + std::string to_string() const + { + switch (type()) + { +#define ETYPE(x,bits) \ + case x : return "["+std::string(#x)+bits_to_string()+"]"; + ENTRY_TYPES +#undef ETYPE + } + return "[unknown]"; + } + friend inline bool operator==(const EntryType &t1,const EntryType &t2) { return t1.m_type==t2.m_type; } + friend inline bool operator!=(const EntryType &t1,const EntryType &t2) { return !(operator==(t1,t2)); } + + private: + enum TypeName + { +#define ETYPE(x,bits) \ + x, + ENTRY_TYPES +#undef ETYPE + }; + + enum CategoryBits + { + None = 0, + Compound = (1<<16), + Scope = (1<<17), + File = (1<<18), + CompoundDoc = (1<<19), + Doc = (1<<20), + TypeMask = 0x0000FFFF, + CategoryMask = 0xFFFF0000 + }; + explicit EntryType(int t) : m_type(t) {} + std::string bits_to_string() const + { + std::string result; + if (m_type&Compound) result+=",Compound"; + if (m_type&Scope) result+=",Scope"; + if (m_type&File) result+=",File"; + if (m_type&CompoundDoc) result+=",CompoundDoc"; + return result; + } + TypeName type() const { return static_cast(m_type & TypeMask); } + unsigned int m_type = Empty; +}; + #endif diff --git a/src/util.cpp b/src/util.cpp index 090882319b0..6b9c94d09da 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -331,7 +331,7 @@ QCString stripFromIncludePath(const QCString &path) * at the extension. A number of variations is allowed in both upper and * lower case) If anyone knows or uses another extension please let me know :-) */ -int guessSection(const QCString &name) +EntryType guessSection(const QCString &name) { QCString n=name.lower(); static const std::unordered_set sourceExt = { @@ -352,18 +352,18 @@ int guessSection(const QCString &name) QCString extension = n.mid(lastDot+1); // part after the last dot if (sourceExt.find(extension.str())!=sourceExt.end()) { - return Entry::SOURCE_SEC; + return EntryType::makeSource(); } if (headerExt.find(extension.str())!=headerExt.end()) { - return Entry::HEADER_SEC; + return EntryType::makeHeader(); } } else { - if (getLanguageFromFileName(name,SrcLangExt_Unknown) == SrcLangExt_Cpp) return Entry::HEADER_SEC; + if (getLanguageFromFileName(name,SrcLangExt_Unknown) == SrcLangExt_Cpp) return EntryType::makeHeader(); } - return 0; + return EntryType::makeEmpty(); } QCString resolveTypeDef(const Definition *context,const QCString &qualifiedName, diff --git a/src/util.h b/src/util.h index 6224290aef3..e4f17ca85b4 100644 --- a/src/util.h +++ b/src/util.h @@ -196,7 +196,7 @@ FileDef *findFileDef(const FileNameLinkedMap *fnMap,const QCString &n, QCString showFileDefMatches(const FileNameLinkedMap *fnMap,const QCString &n); -int guessSection(const QCString &name); +EntryType guessSection(const QCString &name); inline bool isId(int c) { diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index dc5a1ab7afb..e333fb49d26 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -2373,7 +2373,7 @@ static void initUCF(Entry* root,const QCString &type,QCString &qcs, std::shared_ptr current = std::make_shared(); current->vhdlSpec=VhdlSpecifier::UCF_CONST; - current->section=Entry::VARIABLE_SEC; + current->section=EntryType::makeVariable(); current->bodyLine=line; current->fileName=fileName; current->type="ucf_const"; diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp index dcaa7081864..3c2ce714574 100644 --- a/src/vhdljjparser.cpp +++ b/src/vhdljjparser.cpp @@ -358,7 +358,7 @@ int VHDLOutlineParser::checkInlineCode(QCString &doc) gBlock.doc = code; gBlock.inbodyDocs = code; gBlock.brief = co; - gBlock.section = Entry::VARIABLE_SEC; + gBlock.section = EntryType::makeVariable(); gBlock.vhdlSpec = VhdlSpecifier::MISCELLANEOUS; gBlock.fileName = p->yyFileName; gBlock.endBodyLine = p->yyLineNr + val +iLine; @@ -459,7 +459,7 @@ void VHDLOutlineParser::handleCommentBlock(const QCString &doc1, bool brief) { p->varr = FALSE; s->current->name = p->varName; - s->current->section = Entry::VARIABLEDOC_SEC; + s->current->section = EntryType::makeVariableDoc(); p->varName = ""; } newEntry(); @@ -478,7 +478,7 @@ void VHDLOutlineParser::addCompInst(const char *n, const char* instName, const c { VhdlParser::SharedState *s = &p->shared; s->current->vhdlSpec=VhdlSpecifier::INSTANTIATION; - s->current->section=Entry::VARIABLE_SEC; + s->current->section=EntryType::makeVariable(); s->current->startLine=iLine; s->current->bodyLine=iLine; s->current->type=instName; // foo:instname e.g proto or work. proto(ttt) @@ -516,7 +516,7 @@ void VHDLOutlineParser::addCompInst(const char *n, const char* instName, const c } } -void VHDLOutlineParser::addVhdlType(const char *n,int startLine,int section, +void VHDLOutlineParser::addVhdlType(const char *n,int startLine,EntryType section, VhdlSpecifier spec,const char* args,const char* type,Protection prot) { VhdlParser::SharedState *s = &p->shared; @@ -545,7 +545,7 @@ void VHDLOutlineParser::addVhdlType(const char *n,int startLine,int section, s->current->type=type; s->current->protection=prot; - if (!s->lastCompound && (section==Entry::VARIABLE_SEC) && (spec == VhdlSpecifier::USE || spec == VhdlSpecifier::LIBRARY) ) + if (!s->lastCompound && section.isVariable() && (spec == VhdlSpecifier::USE || spec == VhdlSpecifier::LIBRARY) ) { p->libUse.emplace_back(std::make_shared(*s->current)); s->current->reset(); @@ -558,7 +558,7 @@ void VHDLOutlineParser::createFunction(const QCString &impure,VhdlSpecifier spec { VhdlParser::SharedState *s = &p->shared; s->current->vhdlSpec=spec; - s->current->section=Entry::FUNCTION_SEC; + s->current->section=EntryType::makeFunction(); if (impure=="impure" || impure=="pure") { @@ -568,7 +568,7 @@ void VHDLOutlineParser::createFunction(const QCString &impure,VhdlSpecifier spec if (s->parse_sec==GEN_SEC) { s->current->vhdlSpec=VhdlSpecifier::GENERIC; - s->current->section=Entry::FUNCTION_SEC; + s->current->section=EntryType::makeFunction(); } if (s->currP==VhdlSpecifier::PROCEDURE) diff --git a/src/vhdljjparser.h b/src/vhdljjparser.h index af269a03033..1e96ec2d3a6 100644 --- a/src/vhdljjparser.h +++ b/src/vhdljjparser.h @@ -47,7 +47,7 @@ class VHDLOutlineParser : public OutlineParserInterface void lineCount(); void addProto(const char *s1,const char *s2,const char *s3,const char *s4,const char *s5,const char *s6); void createFunction(const QCString &impure,VhdlSpecifier spec,const QCString &fname); - void addVhdlType(const char *n,int startLine,int section, VhdlSpecifier spec,const char* args,const char* type,Protection prot); + void addVhdlType(const char *n,int startLine,EntryType section, VhdlSpecifier spec,const char* args,const char* type,Protection prot); void addCompInst(const char *n, const char* instName, const char* comp,int iLine); void handleCommentBlock(const QCString &doc,bool brief); void handleFlowComment(const QCString &); diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc index 01eb66b61d1..702b24ae507 100644 --- a/vhdlparser/VhdlParser.cc +++ b/vhdlparser/VhdlParser.cc @@ -381,7 +381,8 @@ s+=s1; if (!hasError) { jj_consume_token(SEMI_T); } -outlineParser()->addVhdlType(s2.data(),outlineParser()->getLine(ALIAS_T),Entry::VARIABLE_SEC,VhdlSpecifier::ALIAS,0,s.data(),Protection::Public); +outlineParser()->addVhdlType(s2.data(),outlineParser()->getLine(ALIAS_T), + EntryType::makeVariable(),VhdlSpecifier::ALIAS,0,s.data(),Protection::Public); return s2+" "+s+";"; assert(false); @@ -476,7 +477,8 @@ QCString t=s1+"::"+s; m_sharedState->genLabels.resize(0); outlineParser()->pushLabel(m_sharedState->genLabels,s1); m_sharedState->lastCompound=m_sharedState->current; - outlineParser()->addVhdlType(t.data(),outlineParser()->getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlSpecifier::ARCHITECTURE,0,0,Protection::Private); + outlineParser()->addVhdlType(t.data(),outlineParser()->getLine(ARCHITECTURE_T), + EntryType::makeClass(),VhdlSpecifier::ARCHITECTURE,0,0,Protection::Private); } if (!hasError) { try { @@ -962,7 +964,8 @@ QCString VhdlParser::attribute_declaration() {QCString s,s1; if (!hasError) { jj_consume_token(SEMI_T); } -outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlSpecifier::ATTRIBUTE,0,s1.data(),Protection::Public); +outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ATTRIBUTE_T), + EntryType::makeVariable(),VhdlSpecifier::ATTRIBUTE,0,s1.data(),Protection::Public); return " attribute "+s+":"+s1+";"; assert(false); } @@ -1081,7 +1084,8 @@ QCString VhdlParser::attribute_specification() {QCString s,s1,s2; jj_consume_token(SEMI_T); } QCString t= s1+" is "+s2; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlSpecifier::ATTRIBUTE,0,t.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ATTRIBUTE_T), + EntryType::makeVariable(),VhdlSpecifier::ATTRIBUTE,0,t.data(),Protection::Public); return " attribute "+s+" of "+s1+ " is "+s2+";"; assert(false); } @@ -2053,7 +2057,8 @@ m_sharedState->currP=VhdlSpecifier::COMPONENT; } } if (!hasError) { -outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(COMPONENT_T),Entry::VARIABLE_SEC,VhdlSpecifier::COMPONENT,0,0,Protection::Public); +outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(COMPONENT_T), + EntryType::makeVariable(),VhdlSpecifier::COMPONENT,0,0,Protection::Public); m_sharedState->currP=VhdlSpecifier::UNKNOWN; } if (!hasError) { @@ -2972,7 +2977,8 @@ void VhdlParser::configuration_declaration() {QCString s,s1; } if (!hasError) { m_sharedState->confName=s+"::"+s1; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(CONFIGURATION_T),Entry::VARIABLE_SEC,VhdlSpecifier::CONFIG,"configuration",s1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(CONFIGURATION_T), + EntryType::makeVariable(),VhdlSpecifier::CONFIG,"configuration",s1.data(),Protection::Public); } if (!hasError) { configuration_declarative_part(); @@ -3143,7 +3149,8 @@ QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0; if(t) s2.prepend(":="); QCString it=s1+s2; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(CONSTANT_T),Entry::VARIABLE_SEC,VhdlSpecifier::CONSTANT,0,it.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(CONSTANT_T), + EntryType::makeVariable(),VhdlSpecifier::CONSTANT,0,it.data(),Protection::Public); it.prepend("constant "); return it; assert(false); @@ -3324,7 +3331,8 @@ m_sharedState->parse_sec=CONTEXT_SEC; jj_consume_token(SEMI_T); } m_sharedState->parse_sec=0; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(LIBRARY_T),Entry::VARIABLE_SEC,VhdlSpecifier::LIBRARY,"context",s1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(LIBRARY_T), + EntryType::makeVariable(),VhdlSpecifier::LIBRARY,"context",s1.data(),Protection::Public); } @@ -3672,7 +3680,7 @@ auto ql = split(rec_name.str(),","); name+=outlineParser()->getNameID().data(); outlineParser()->addVhdlType( name.c_str(),outlineParser()->getLine(), - Entry::VARIABLE_SEC, + EntryType::makeVariable(), VhdlSpecifier::RECORD,0, s1.data(), Protection::Public); @@ -4086,7 +4094,8 @@ void VhdlParser::entity_declaration() {QCString s; if (!hasError) { m_sharedState->lastEntity=m_sharedState->current; m_sharedState->lastCompound=0; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ENTITY_T),Entry::CLASS_SEC,VhdlSpecifier::ENTITY,0,0,Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ENTITY_T), + EntryType::makeClass(),VhdlSpecifier::ENTITY,0,0,Protection::Public); } if (!hasError) { entity_header(); @@ -5099,7 +5108,8 @@ QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3; jj_consume_token(SEMI_T); } QCString t1=s2+" "+s3; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::VFILE,0,t1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::VFILE,0,t1.data(),Protection::Public); return " file "+s+":"+s2+" "+s3+";"; assert(false); } @@ -5312,7 +5322,8 @@ QCString VhdlParser::full_type_declaration() {std::shared_ptr tmpEntry;QC } if (!hasError) { tmpEntry=m_sharedState->current; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::RECORD,0,0,Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::RECORD,0,0,Protection::Public); } if (!hasError) { s2 = type_definition(); @@ -6583,7 +6594,8 @@ return s; } if (!hasError) { if (m_sharedState->parse_sec==GEN_SEC) - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,m_sharedState->currP,s1.data(),0,Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),m_sharedState->currP,s1.data(),0,Protection::Public); return s; } break; @@ -6703,7 +6715,8 @@ QCString VhdlParser::interface_file_declaration() {QCString s,s1; if (!hasError) { s1 = subtype_indication(); } -outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::VFILE,0,s1.data(),Protection::Public); +outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::VFILE,0,s1.data(),Protection::Public); return QCString(" file "+s+":"+s1); assert(false); } @@ -7073,7 +7086,8 @@ QCString q; int b=outlineParser()->getLine(PROCEDURE_T); if (a>b) b=a; - outlineParser()->addVhdlType(m_sharedState->current->name.data(),b,Entry::VARIABLE_SEC,VhdlSpecifier::GENERIC,ss.data(),0,Protection::Public); + outlineParser()->addVhdlType(m_sharedState->current->name.data(),b,EntryType::makeVariable(), + VhdlSpecifier::GENERIC,ss.data(),0,Protection::Public); } m_sharedState->currP=VhdlSpecifier::UNKNOWN;return QCString(); assert(false); @@ -7303,7 +7317,7 @@ if (m_sharedState->currP!=VhdlSpecifier::COMPONENT && m_sharedState->interf_sec= } else if(m_sharedState->parse_sec==GEN_SEC) { - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::GENERIC,s1.data(),"",Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),EntryType::makeVariable(),VhdlSpecifier::GENERIC,s1.data(),"",Protection::Public); } return s+" "+s1; @@ -7483,7 +7497,8 @@ if(tok) else { QCString i=s2+s3+s4; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,m_sharedState->currP,i.data(),s1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),m_sharedState->currP,i.data(),s1.data(),Protection::Public); } } // if component return it; @@ -7555,7 +7570,8 @@ QCString VhdlParser::library_clause() {QCString s; } if ( m_sharedState->parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) ) { - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::LIBRARY,s.data(),"_library_",Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::LIBRARY,s.data(),"_library_",Protection::Public); } QCString s1="library "+s; return s1; @@ -8585,7 +8601,8 @@ void VhdlParser::package_body() {QCString s; if (!hasError) { m_sharedState->lastCompound=m_sharedState->current; s.prepend("_"); - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::CLASS_SEC,VhdlSpecifier::PACKAGE_BODY,0,0,Protection::Protected); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeClass(),VhdlSpecifier::PACKAGE_BODY,0,0,Protection::Protected); } if (!hasError) { package_body_declarative_part(); @@ -8817,14 +8834,15 @@ void VhdlParser::package_declaration() {QCString s; if (!hasError) { m_sharedState->lastCompound=m_sharedState->current; std::shared_ptr clone=std::make_shared(*m_sharedState->current); - clone->section=Entry::NAMESPACE_SEC; + clone->section=EntryType::makeNamespace(); clone->vhdlSpec=VhdlSpecifier::PACKAGE; clone->name=s; clone->startLine=outlineParser()->getLine(PACKAGE_T); clone->bodyLine=outlineParser()->getLine(PACKAGE_T); clone->protection=Protection::Package; m_sharedState->current_root->moveToSubEntryAndKeep(clone); - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlSpecifier::PACKAGE,0,0,Protection::Package); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(PACKAGE_T), + EntryType::makeClass(),VhdlSpecifier::PACKAGE,0,0,Protection::Package); } if (!hasError) { package_header(); @@ -9091,7 +9109,8 @@ void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2; jj_consume_token(SEMI_T); } QCString q=" is new "+s1+s2; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(PACKAGE_T),Entry::VARIABLE_SEC,VhdlSpecifier::INSTANTIATION,"package",q.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(PACKAGE_T), + EntryType::makeVariable(),VhdlSpecifier::INSTANTIATION,"package",q.data(),Protection::Public); } @@ -9218,7 +9237,8 @@ QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;Token *t=0; jj_consume_token(SEMI_T); } if (!hasError) { -outlineParser()->addVhdlType(s.data(),t->beginLine,Entry::VARIABLE_SEC,VhdlSpecifier::UNITS,0,0,Protection::Public); +outlineParser()->addVhdlType(s.data(),t->beginLine, + EntryType::makeVariable(),VhdlSpecifier::UNITS,0,0,Protection::Public); } if (!hasError) { while (!hasError) { @@ -11132,7 +11152,8 @@ QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;Token *t1=0; if (!hasError) { jj_consume_token(SEMI_T); } -outlineParser()->addVhdlType(s.data(),t1->beginLine,Entry::VARIABLE_SEC,VhdlSpecifier::UNITS,0,s1.data(),Protection::Public); +outlineParser()->addVhdlType(s.data(),t1->beginLine, + EntryType::makeVariable(),VhdlSpecifier::UNITS,0,s1.data(),Protection::Public); return s+"="+s1; assert(false); } @@ -12287,7 +12308,8 @@ void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4; if(tok) s3.prepend(":="); s4=s1+s2+s3; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::SIGNAL,0,s4.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::SIGNAL,0,s4.data(),Protection::Public); } @@ -13224,7 +13246,8 @@ QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2; jj_consume_token(SEMI_T); } QCString q= " is new "+s1+s2; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(FUNCTION_T),Entry::VARIABLE_SEC,VhdlSpecifier::INSTANTIATION,"function ",q.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(FUNCTION_T), + EntryType::makeVariable(),VhdlSpecifier::INSTANTIATION,"function ",q.data(),Protection::Public); return q; assert(false); } @@ -13246,7 +13269,8 @@ QCString VhdlParser::subtype_declaration() {QCString s,s1; if (!hasError) { jj_consume_token(SEMI_T); } -outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::SUBTYPE,0,s1.data(),Protection::Public); +outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::SUBTYPE,0,s1.data(),Protection::Public); return " subtype "+s+" is "+s1+";"; assert(false); } @@ -13668,7 +13692,7 @@ auto ql1=split(s.str(),","); { outlineParser()->addVhdlType(it.c_str(), outlineParser()->getLine(), - Entry::VARIABLE_SEC, + EntryType::makeVariable(), VhdlSpecifier::USE, it.c_str(), "_use_",Protection::Public); @@ -13812,7 +13836,8 @@ if(t1) it+=":="; it+=s2; } - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,spec,0,it.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),spec,0,it.data(),Protection::Public); return val; assert(false); } diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h index f783a759669..e5e34e63c06 100644 --- a/vhdlparser/VhdlParser.h +++ b/vhdlparser/VhdlParser.h @@ -1712,532 +1712,462 @@ void parseInline(); { jj_save(167, xla); } } - inline bool jj_3R_signal_declaration_2999_68_518() - { - if (jj_done) return true; - if (jj_3R_signal_kind_3009_3_638()) return true; - return false; - } - - inline bool jj_3R_subprogram_body_3061_1_664() - { - if (jj_done) return true; - if (jj_scan_token(IS_T)) return true; - if (jj_3R_subprogram_declarative_part_3120_3_740()) return true; - if (jj_scan_token(BEGIN_T)) return true; - if (jj_3R_subprogram_statement_part_3173_3_741()) return true; - if (jj_scan_token(END_T)) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_subprogram_body_3074_11_742()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_subprogram_body_3074_33_743()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; - return false; - } - - inline bool jj_3R_function_call_1523_1_136() - { - if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_actual_parameter_part_371_4_297()) return true; - if (jj_scan_token(RPAREN_T)) return true; - return false; - } - - inline bool jj_3R_string_literal_3054_1_452() - { - if (jj_done) return true; - if (jj_scan_token(STRINGLITERAL)) return true; - return false; - } - - inline bool jj_3R_sequential_bock_statement_2929_124_165() - { - if (jj_done) return true; - if (jj_3R_label_2007_2_84()) return true; - return false; - } - - inline bool jj_3R_signature_3031_15_674() + inline bool jj_3R_signature_3053_15_674() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_simple_expression_3039_3_199() + inline bool jj_3R_simple_expression_3061_3_199() { if (jj_done) return true; - if (jj_3R_sign_2973_2_378()) return true; + if (jj_3R_sign_2994_2_378()) return true; return false; } - inline bool jj_3R_simple_expression_3039_1_85() + inline bool jj_3R_simple_expression_3061_1_85() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_simple_expression_3039_3_199()) jj_scanpos = xsp; - if (jj_3R_simpleTerm_3220_2_169()) return true; + if (jj_3R_simple_expression_3061_3_199()) jj_scanpos = xsp; + if (jj_3R_simpleTerm_3244_2_169()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_simple_expression_3039_41_200()) { jj_scanpos = xsp; break; } + if (jj_3R_simple_expression_3061_41_200()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_signature_3032_4_568() + inline bool jj_3R_signature_3054_4_568() { if (jj_done) return true; if (jj_scan_token(RETURN_T)) return true; - if (jj_3R_name_2126_2_73()) return true; - return false; - } - - inline bool jj_3R_file_declaration_1434_67_522() - { - if (jj_done) return true; - if (jj_3R_file_open_information_1449_2_639()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_signature_3031_4_567() + inline bool jj_3R_signature_3053_4_567() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_signature_3031_15_674()) { jj_scanpos = xsp; break; } + if (jj_3R_signature_3053_15_674()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_formal_part_1486_11_191() - { - if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_formal_designator_1474_5_374()) return true; - if (jj_scan_token(RPAREN_T)) return true; - return false; - } - - inline bool jj_3R_signature_3030_1_472() + inline bool jj_3R_signature_3052_1_472() { if (jj_done) return true; if (jj_scan_token(LBRACKET_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_signature_3031_4_567()) jj_scanpos = xsp; + if (jj_3R_signature_3053_4_567()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_signature_3032_4_568()) jj_scanpos = xsp; + if (jj_3R_signature_3054_4_568()) jj_scanpos = xsp; if (jj_scan_token(RBRACKET_T)) return true; return false; } - inline bool jj_3R_full_type_declaration_1491_3_176() - { - if (jj_done) return true; - if (jj_scan_token(TYPE_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(IS_T)) return true; - if (jj_3R_type_definition_3245_1_691()) return true; - if (jj_scan_token(SEMI_T)) return true; - return false; - } - - inline bool jj_3R_signal_list_3015_12_783() + inline bool jj_3R_signal_list_3037_12_783() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_name_2126_2_73()) return true; - return false; - } - - inline bool jj_3R_file_open_information_1449_39_697() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_scan_token(53)) { - jj_scanpos = xsp; - if (jj_scan_token(75)) return true; - } + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_formal_part_1486_1_76() + inline bool jj_3R_file_declaration_1443_67_522() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_formal_part_1486_11_191()) jj_scanpos = xsp; + if (jj_3R_file_open_information_1459_2_639()) return true; return false; } - inline bool jj_3R_signal_list_3017_3_723() + inline bool jj_3R_signal_list_3039_3_723() { if (jj_done) return true; if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_signal_list_3016_3_722() + inline bool jj_3R_formal_part_1496_11_191() { if (jj_done) return true; - if (jj_scan_token(OTHER_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_formal_designator_1484_5_374()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_formal_parameter_list_1481_2_739() + inline bool jj_3R_signal_list_3038_3_722() { if (jj_done) return true; - if (jj_3R_interface_list_1823_3_377()) return true; + if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_signal_list_3015_2_721() + inline bool jj_3R_signal_list_3037_2_721() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_signal_list_3015_12_783()) { jj_scanpos = xsp; break; } + if (jj_3R_signal_list_3037_12_783()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_signal_list_3015_2_644() + inline bool jj_3R_signal_list_3037_2_644() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_signal_list_3015_2_721()) { + if (jj_3R_signal_list_3037_2_721()) { jj_scanpos = xsp; - if (jj_3R_signal_list_3016_3_722()) { + if (jj_3R_signal_list_3038_3_722()) { jj_scanpos = xsp; - if (jj_3R_signal_list_3017_3_723()) return true; + if (jj_3R_signal_list_3039_3_723()) return true; } } return false; } - inline bool jj_3R_formal_designator_1475_6_485() + inline bool jj_3R_full_type_declaration_1501_3_176() { if (jj_done) return true; - if (jj_scan_token(INTEGER)) return true; + if (jj_scan_token(TYPE_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(IS_T)) return true; + if (jj_3R_type_definition_3269_1_691()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_signal_kind_3010_5_695() + inline bool jj_3R_signal_kind_3032_5_695() { if (jj_done) return true; if (jj_scan_token(BUS_T)) return true; return false; } - inline bool jj_3R_formal_designator_1474_5_484() + inline bool jj_3R_signal_kind_3031_3_694() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_scan_token(REGISTER_T)) return true; return false; } - inline bool jj_3R_formal_designator_1474_5_374() + inline bool jj_3R_signal_kind_3031_3_638() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_formal_designator_1474_5_484()) { + if (jj_3R_signal_kind_3031_3_694()) { jj_scanpos = xsp; - if (jj_3R_formal_designator_1475_6_485()) return true; + if (jj_3R_signal_kind_3032_5_695()) return true; } return false; } - inline bool jj_3R_signal_kind_3009_3_694() + inline bool jj_3R_file_open_information_1459_39_697() { if (jj_done) return true; - if (jj_scan_token(REGISTER_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_scan_token(53)) { + jj_scanpos = xsp; + if (jj_scan_token(75)) return true; + } return false; } - inline bool jj_3R_signal_kind_3009_3_638() + inline bool jj_3R_formal_part_1496_1_76() { if (jj_done) return true; + if (jj_3R_name_2142_2_73()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_signal_kind_3009_3_694()) { - jj_scanpos = xsp; - if (jj_3R_signal_kind_3010_5_695()) return true; - } + if (jj_3R_formal_part_1496_11_191()) jj_scanpos = xsp; return false; } - inline bool jj_3R_floating_incomplete_type_definition_1464_4_114() + inline bool jj_3R_formal_parameter_list_1491_2_739() { if (jj_done) return true; - if (jj_scan_token(RANGE_T)) return true; - if (jj_scan_token(BOX_T)) return true; - if (jj_scan_token(DOT_T)) return true; - if (jj_scan_token(BOX_T)) return true; + if (jj_3R_interface_list_1836_3_377()) return true; return false; } - inline bool jj_3R_signal_declaration_2999_1_419() + inline bool jj_3R_formal_designator_1485_6_485() + { + if (jj_done) return true; + if (jj_scan_token(INTEGER)) return true; + return false; + } + + inline bool jj_3R_formal_designator_1484_5_484() + { + if (jj_done) return true; + if (jj_3R_name_2142_2_73()) return true; + return false; + } + + inline bool jj_3R_formal_designator_1484_5_374() { if (jj_done) return true; - if (jj_scan_token(SIGNAL_T)) return true; - if (jj_3R_identifier_list_1652_4_258()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_signal_declaration_2999_68_518()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_signal_declaration_2999_89_519()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_formal_designator_1484_5_484()) { + jj_scanpos = xsp; + if (jj_3R_formal_designator_1485_6_485()) return true; + } return false; } - inline bool jj_3R_file_incomplete_type_definition_1459_2_790() + inline bool jj_3R_signal_declaration_3020_1_419() { if (jj_done) return true; - if (jj_scan_token(FILE_T)) return true; - if (jj_scan_token(OF_T)) return true; - if (jj_3R_type_mark_3265_3_195()) return true; + if (jj_scan_token(SIGNAL_T)) return true; + if (jj_3R_identifier_list_1663_4_258()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_signal_declaration_3020_68_518()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_signal_declaration_3020_89_519()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } inline bool jj_3_153() { if (jj_done) return true; - if (jj_3R_selected_signal_assignment_wave_2826_3_167()) return true; + if (jj_3R_selected_signal_assignment_wave_2847_3_167()) return true; return false; } inline bool jj_3_152() { if (jj_done) return true; - if (jj_3R_conditional_signal_assignment_wave_921_3_166()) return true; + if (jj_3R_conditional_signal_assignment_wave_926_3_166()) return true; return false; } - inline bool jj_3R_file_type_definition_1454_2_801() + inline bool jj_3R_floating_incomplete_type_definition_1474_4_114() { if (jj_done) return true; - if (jj_scan_token(FILE_T)) return true; - if (jj_scan_token(OF_T)) return true; - if (jj_3R_type_mark_3265_3_195()) return true; + if (jj_scan_token(RANGE_T)) return true; + if (jj_scan_token(BOX_T)) return true; + if (jj_scan_token(DOT_T)) return true; + if (jj_scan_token(BOX_T)) return true; return false; } - inline bool jj_3R_signal_assignment_statement_2988_3_665() + inline bool jj_3R_signal_assignment_statement_3009_3_665() { if (jj_done) return true; - if (jj_3R_delay_mechanism_1084_1_381()) return true; + if (jj_3R_delay_mechanism_1092_1_381()) return true; return false; } inline bool jj_3_151() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_signal_assignment_statement_2986_3_553() + inline bool jj_3R_signal_assignment_statement_3007_3_553() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_151()) jj_scanpos = xsp; - if (jj_3R_target_3213_2_150()) return true; + if (jj_3R_target_3237_2_150()) return true; if (jj_scan_token(LESSTHAN_T)) return true; xsp = jj_scanpos; - if (jj_3R_signal_assignment_statement_2988_3_665()) jj_scanpos = xsp; - if (jj_3R_waveform_3350_1_382()) return true; + if (jj_3R_signal_assignment_statement_3009_3_665()) jj_scanpos = xsp; + if (jj_3R_waveform_3375_1_382()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_file_open_information_1449_4_696() - { - if (jj_done) return true; - if (jj_scan_token(OPEN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - return false; - } - - inline bool jj_3R_file_open_information_1449_2_639() + inline bool jj_3R_signal_assignment_statement_3004_3_552() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_file_open_information_1449_4_696()) jj_scanpos = xsp; - if (jj_scan_token(IS_T)) return true; - xsp = jj_scanpos; - if (jj_3R_file_open_information_1449_39_697()) jj_scanpos = xsp; - if (jj_3R_file_logical_name_1444_2_698()) return true; + if (jj_3R_selected_signal_assignment_wave_2847_3_167()) return true; return false; } - inline bool jj_3R_signal_assignment_statement_2983_3_552() + inline bool jj_3R_file_incomplete_type_definition_1469_2_790() { if (jj_done) return true; - if (jj_3R_selected_signal_assignment_wave_2826_3_167()) return true; + if (jj_scan_token(FILE_T)) return true; + if (jj_scan_token(OF_T)) return true; + if (jj_3R_type_mark_3289_3_195()) return true; return false; } - inline bool jj_3R_shift_expression_2959_26_474() + inline bool jj_3R_shift_expression_2980_26_474() { if (jj_done) return true; - if (jj_3R_shift_operator_2963_3_577()) return true; - if (jj_3R_simple_expression_3039_1_85()) return true; + if (jj_3R_shift_operator_2984_3_577()) return true; + if (jj_3R_simple_expression_3061_1_85()) return true; return false; } - inline bool jj_3R_signal_assignment_statement_2980_3_551() + inline bool jj_3R_signal_assignment_statement_3001_3_551() { if (jj_done) return true; - if (jj_3R_conditional_signal_assignment_wave_921_3_166()) return true; + if (jj_3R_conditional_signal_assignment_wave_926_3_166()) return true; return false; } - inline bool jj_3R_signal_assignment_statement_2980_3_460() + inline bool jj_3R_signal_assignment_statement_3001_3_460() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_signal_assignment_statement_2980_3_551()) { + if (jj_3R_signal_assignment_statement_3001_3_551()) { jj_scanpos = xsp; - if (jj_3R_signal_assignment_statement_2983_3_552()) { + if (jj_3R_signal_assignment_statement_3004_3_552()) { jj_scanpos = xsp; - if (jj_3R_signal_assignment_statement_2986_3_553()) return true; + if (jj_3R_signal_assignment_statement_3007_3_553()) return true; } } return false; } - inline bool jj_3R_file_logical_name_1444_2_698() + inline bool jj_3R_file_type_definition_1464_2_801() { if (jj_done) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_scan_token(FILE_T)) return true; + if (jj_scan_token(OF_T)) return true; + if (jj_3R_type_mark_3289_3_195()) return true; return false; } - inline bool jj_3R_sign_2974_4_489() + inline bool jj_3R_sign_2995_4_489() { if (jj_done) return true; if (jj_scan_token(MINUS_T)) return true; return false; } - inline bool jj_3R_sign_2973_2_488() + inline bool jj_3R_file_open_information_1459_4_696() { if (jj_done) return true; - if (jj_scan_token(PLUS_T)) return true; + if (jj_scan_token(OPEN_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_sign_2973_2_378() + inline bool jj_3R_file_open_information_1459_2_639() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_sign_2973_2_488()) { - jj_scanpos = xsp; - if (jj_3R_sign_2974_4_489()) return true; - } + if (jj_3R_file_open_information_1459_4_696()) jj_scanpos = xsp; + if (jj_scan_token(IS_T)) return true; + xsp = jj_scanpos; + if (jj_3R_file_open_information_1459_39_697()) jj_scanpos = xsp; + if (jj_3R_file_logical_name_1454_2_698()) return true; return false; } - inline bool jj_3R_shift_operator_2968_5_680() + inline bool jj_3R_sign_2994_2_488() { if (jj_done) return true; - if (jj_scan_token(ROR_T)) return true; + if (jj_scan_token(PLUS_T)) return true; return false; } - inline bool jj_3R_factor_1424_14_566() + inline bool jj_3R_sign_2994_2_378() { if (jj_done) return true; - if (jj_scan_token(DOUBLEMULT_T)) return true; - if (jj_3R_primary_2408_1_473()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_sign_2994_2_488()) { + jj_scanpos = xsp; + if (jj_3R_sign_2995_4_489()) return true; + } + return false; + } + + inline bool jj_3R_shift_operator_2989_5_680() + { + if (jj_done) return true; + if (jj_scan_token(ROR_T)) return true; return false; } - inline bool jj_3R_shift_operator_2967_5_679() + inline bool jj_3R_shift_operator_2988_5_679() { if (jj_done) return true; if (jj_scan_token(ROL_T)) return true; return false; } - inline bool jj_3R_shift_operator_2966_5_678() + inline bool jj_3R_shift_operator_2987_5_678() { if (jj_done) return true; if (jj_scan_token(SRA_T)) return true; return false; } - inline bool jj_3R_file_declaration_1434_2_421() + inline bool jj_3R_file_logical_name_1454_2_698() { if (jj_done) return true; - if (jj_scan_token(FILE_T)) return true; - if (jj_3R_identifier_list_1652_4_258()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_file_declaration_1434_67_522()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_shift_operator_2965_5_677() + inline bool jj_3R_shift_operator_2986_5_677() { if (jj_done) return true; if (jj_scan_token(SLA_T)) return true; return false; } - inline bool jj_3R_shift_operator_2964_5_676() + inline bool jj_3R_shift_operator_2985_5_676() { if (jj_done) return true; if (jj_scan_token(SRL_T)) return true; return false; } - inline bool jj_3R_shift_operator_2963_3_675() + inline bool jj_3R_shift_operator_2984_3_675() { if (jj_done) return true; if (jj_scan_token(SLL_T)) return true; return false; } - inline bool jj_3R_shift_operator_2963_3_577() + inline bool jj_3R_shift_operator_2984_3_577() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_shift_operator_2963_3_675()) { + if (jj_3R_shift_operator_2984_3_675()) { jj_scanpos = xsp; - if (jj_3R_shift_operator_2964_5_676()) { + if (jj_3R_shift_operator_2985_5_676()) { jj_scanpos = xsp; - if (jj_3R_shift_operator_2965_5_677()) { + if (jj_3R_shift_operator_2986_5_677()) { jj_scanpos = xsp; - if (jj_3R_shift_operator_2966_5_678()) { + if (jj_3R_shift_operator_2987_5_678()) { jj_scanpos = xsp; - if (jj_3R_shift_operator_2967_5_679()) { + if (jj_3R_shift_operator_2988_5_679()) { jj_scanpos = xsp; - if (jj_3R_shift_operator_2968_5_680()) return true; + if (jj_3R_shift_operator_2989_5_680()) return true; } } } @@ -2246,62 +2176,120 @@ void parseInline(); return false; } - inline bool jj_3R_factor_1428_3_364() + inline bool jj_3R_factor_1433_14_566() + { + if (jj_done) return true; + if (jj_scan_token(DOUBLEMULT_T)) return true; + if (jj_3R_primary_2428_1_473()) return true; + return false; + } + + inline bool jj_3R_shift_expression_2980_2_365() + { + if (jj_done) return true; + if (jj_3R_simple_expression_3061_1_85()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_shift_expression_2980_26_474()) jj_scanpos = xsp; + return false; + } + + inline bool jj_3R_file_declaration_1443_2_421() + { + if (jj_done) return true; + if (jj_scan_token(FILE_T)) return true; + if (jj_3R_identifier_list_1663_4_258()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_file_declaration_1443_67_522()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; + return false; + } + + inline bool jj_3R_sequential_statement_declarative_part_2972_3_854() + { + if (jj_done) return true; + if (jj_3R_process_declarative_item_2506_1_513()) return true; + return false; + } + + inline bool jj_3R_factor_1437_3_364() + { + if (jj_done) return true; + if (jj_3R_logop_1418_3_367()) return true; + if (jj_3R_primary_2428_1_473()) return true; + return false; + } + + inline bool jj_3R_sequential_statement_declarative_part_2972_2_843() { if (jj_done) return true; - if (jj_3R_logop_1409_3_367()) return true; - if (jj_3R_primary_2408_1_473()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_sequential_statement_declarative_part_2972_3_854()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_factor_1427_3_363() + inline bool jj_3R_factor_1436_3_363() { if (jj_done) return true; if (jj_scan_token(QQ_T)) return true; - if (jj_3R_primary_2408_1_473()) return true; + if (jj_3R_primary_2428_1_473()) return true; return false; } - inline bool jj_3R_factor_1426_3_362() + inline bool jj_3R_factor_1435_3_362() { if (jj_done) return true; if (jj_scan_token(NOT_T)) return true; - if (jj_3R_primary_2408_1_473()) return true; + if (jj_3R_primary_2428_1_473()) return true; return false; } - inline bool jj_3R_factor_1425_3_361() + inline bool jj_3R_factor_1434_3_361() { if (jj_done) return true; if (jj_scan_token(ABS_T)) return true; - if (jj_3R_primary_2408_1_473()) return true; + if (jj_3R_primary_2428_1_473()) return true; + return false; + } + + inline bool jj_3R_sequential_statement_body_2967_3_811() + { + if (jj_done) return true; + if (jj_3R_sequential_statement_declarative_part_2972_2_843()) return true; + if (jj_scan_token(BEGIN_T)) return true; return false; } - inline bool jj_3R_shift_expression_2959_2_365() + inline bool jj_3R_sequential_statement_body_2967_2_797() { if (jj_done) return true; - if (jj_3R_simple_expression_3039_1_85()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_shift_expression_2959_26_474()) jj_scanpos = xsp; + if (jj_3R_sequential_statement_body_2967_3_811()) jj_scanpos = xsp; + if (jj_3R_sequence_of_statements_2900_2_334()) return true; return false; } - inline bool jj_3R_factor_1424_1_175() + inline bool jj_3R_factor_1433_1_175() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_factor_1424_1_360()) { + if (jj_3R_factor_1433_1_360()) { jj_scanpos = xsp; - if (jj_3R_factor_1425_3_361()) { + if (jj_3R_factor_1434_3_361()) { jj_scanpos = xsp; - if (jj_3R_factor_1426_3_362()) { + if (jj_3R_factor_1435_3_362()) { jj_scanpos = xsp; - if (jj_3R_factor_1427_3_363()) { + if (jj_3R_factor_1436_3_363()) { jj_scanpos = xsp; - if (jj_3R_factor_1428_3_364()) return true; + if (jj_3R_factor_1437_3_364()) return true; } } } @@ -2309,110 +2297,107 @@ void parseInline(); return false; } - inline bool jj_3R_factor_1424_1_360() + inline bool jj_3R_factor_1433_1_360() { if (jj_done) return true; - if (jj_3R_primary_2408_1_473()) return true; + if (jj_3R_primary_2428_1_473()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_factor_1424_14_566()) jj_scanpos = xsp; + if (jj_3R_factor_1433_14_566()) jj_scanpos = xsp; + return false; + } + + inline bool jj_3R_sequential_bock_statement_2950_16_163() + { + if (jj_done) return true; + if (jj_3R_label_2022_2_84()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_sequential_statement_declarative_part_2951_3_854() + inline bool jj_3R_sequential_block_statement_part_2962_3_344() { if (jj_done) return true; - if (jj_3R_process_declarative_item_2486_1_513()) return true; + if (jj_3R_sequential_statement_2905_5_148()) return true; return false; } - inline bool jj_3R_sequential_statement_declarative_part_2951_2_843() + inline bool jj_3R_sequential_block_statement_part_2962_2_164() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_sequential_statement_declarative_part_2951_3_854()) { jj_scanpos = xsp; break; } + if (jj_3R_sequential_block_statement_part_2962_3_344()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_logop_1414_4_481() + inline bool jj_3R_logop_1423_4_481() { if (jj_done) return true; if (jj_scan_token(OR_T)) return true; return false; } - inline bool jj_3R_logop_1413_4_480() + inline bool jj_3R_logop_1422_4_480() { if (jj_done) return true; if (jj_scan_token(XOR_T)) return true; return false; } - inline bool jj_3R_logop_1412_4_479() + inline bool jj_3R_logop_1421_4_479() { if (jj_done) return true; if (jj_scan_token(XNOR_T)) return true; return false; } - inline bool jj_3R_logop_1411_4_478() + inline bool jj_3R_logop_1420_4_478() { if (jj_done) return true; if (jj_scan_token(NOR_T)) return true; return false; } - inline bool jj_3R_sequential_statement_body_2946_3_811() + inline bool jj_3R_sequential_block_declarative_part_2957_2_469() { if (jj_done) return true; - if (jj_3R_sequential_statement_declarative_part_2951_2_843()) return true; - if (jj_scan_token(BEGIN_T)) return true; + if (jj_3R_process_declarative_part_2531_2_236()) return true; return false; } - inline bool jj_3R_logop_1410_4_477() + inline bool jj_3R_logop_1419_4_477() { if (jj_done) return true; if (jj_scan_token(NAND_T)) return true; return false; } - inline bool jj_3R_sequential_statement_body_2946_2_797() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_sequential_statement_body_2946_3_811()) jj_scanpos = xsp; - if (jj_3R_sequence_of_statements_2879_2_334()) return true; - return false; - } - - inline bool jj_3R_logop_1409_3_476() + inline bool jj_3R_logop_1418_3_476() { if (jj_done) return true; if (jj_scan_token(AND_T)) return true; return false; } - inline bool jj_3R_logop_1409_3_367() + inline bool jj_3R_logop_1418_3_367() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_logop_1409_3_476()) { + if (jj_3R_logop_1418_3_476()) { jj_scanpos = xsp; - if (jj_3R_logop_1410_4_477()) { + if (jj_3R_logop_1419_4_477()) { jj_scanpos = xsp; - if (jj_3R_logop_1411_4_478()) { + if (jj_3R_logop_1420_4_478()) { jj_scanpos = xsp; - if (jj_3R_logop_1412_4_479()) { + if (jj_3R_logop_1421_4_479()) { jj_scanpos = xsp; - if (jj_3R_logop_1413_4_480()) { + if (jj_3R_logop_1422_4_480()) { jj_scanpos = xsp; - if (jj_3R_logop_1414_4_481()) return true; + if (jj_3R_logop_1423_4_481()) return true; } } } @@ -2421,359 +2406,326 @@ void parseInline(); return false; } - inline bool jj_3R_sequential_bock_statement_2929_16_163() + inline bool jj_3R_sequential_bock_statement_2952_4_468() { if (jj_done) return true; - if (jj_3R_label_2007_2_84()) return true; + if (jj_3R_label_2022_2_84()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_sequential_block_statement_part_2941_3_344() + inline bool jj_3R_sequential_bock_statement_2952_2_343() { if (jj_done) return true; - if (jj_3R_sequential_statement_2884_5_148()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_sequential_bock_statement_2952_4_468()) jj_scanpos = xsp; + if (jj_scan_token(BLOCK_T)) return true; + xsp = jj_scanpos; + if (jj_scan_token(56)) jj_scanpos = xsp; + if (jj_3R_sequential_block_declarative_part_2957_2_469()) return true; + if (jj_scan_token(BEGIN_T)) return true; + if (jj_3R_sequential_block_statement_part_2962_2_164()) return true; + if (jj_scan_token(END_T)) return true; + xsp = jj_scanpos; + if (jj_scan_token(24)) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_sequential_bock_statement_2952_159_795()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_sig_stat_1403_5_592() + inline bool jj_3R_sig_stat_1412_5_592() { if (jj_done) return true; if (jj_scan_token(VARIABLE_T)) return true; return false; } - inline bool jj_3R_sequential_block_statement_part_2941_2_164() + inline bool jj_3R_sig_stat_1411_5_591() + { + if (jj_done) return true; + if (jj_scan_token(SIGNAL_T)) return true; + return false; + } + + inline bool jj_3R_sequential_bock_statement_2950_1_162() { if (jj_done) return true; Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_sequential_block_statement_part_2941_3_344()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3_150()) { + jj_scanpos = xsp; + if (jj_3R_sequential_bock_statement_2952_2_343()) return true; } return false; } - inline bool jj_3R_sig_stat_1402_5_591() + inline bool jj_3_150() { if (jj_done) return true; - if (jj_scan_token(SIGNAL_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_sequential_bock_statement_2950_16_163()) jj_scanpos = xsp; + if (jj_scan_token(BLOCK_T)) return true; + xsp = jj_scanpos; + if (jj_scan_token(56)) jj_scanpos = xsp; + if (jj_scan_token(BEGIN_T)) return true; + if (jj_3R_sequential_block_statement_part_2962_2_164()) return true; + if (jj_scan_token(END_T)) return true; + xsp = jj_scanpos; + if (jj_scan_token(24)) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_sequential_bock_statement_2950_124_165()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_expression_1371_35_180() + inline bool jj_3R_expression_1380_35_180() { if (jj_done) return true; - if (jj_3R_logop_1409_3_367()) return true; - if (jj_3R_relation_2702_3_179()) return true; + if (jj_3R_logop_1418_3_367()) return true; + if (jj_3R_relation_2722_3_179()) return true; return false; } - inline bool jj_3R_sig_stat_1401_3_590() + inline bool jj_3_135() { if (jj_done) return true; - if (jj_scan_token(CONSTANT_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; + if (jj_scan_token(WHEN_T)) return true; return false; } - inline bool jj_3R_sig_stat_1401_3_482() + inline bool jj_3R_sequential_statement_2944_5_321() { if (jj_done) return true; - Token * xsp; + if (jj_3R_null_statement_2209_1_462()) return true; + return false; + } + + inline bool jj_3R_sig_stat_1410_3_590() + { + if (jj_done) return true; + if (jj_scan_token(CONSTANT_T)) return true; + return false; + } + + inline bool jj_3R_sig_stat_1410_3_482() + { + if (jj_done) return true; + Token * xsp; xsp = jj_scanpos; - if (jj_3R_sig_stat_1401_3_590()) { + if (jj_3R_sig_stat_1410_3_590()) { jj_scanpos = xsp; - if (jj_3R_sig_stat_1402_5_591()) { + if (jj_3R_sig_stat_1411_5_591()) { jj_scanpos = xsp; - if (jj_3R_sig_stat_1403_5_592()) return true; + if (jj_3R_sig_stat_1412_5_592()) return true; } } return false; } - inline bool jj_3R_sequential_block_declarative_part_2936_2_469() + inline bool jj_3_149() { if (jj_done) return true; - if (jj_3R_process_declarative_part_2511_2_236()) return true; + if (jj_3R_sequential_bock_statement_2950_1_162()) return true; return false; } - inline bool jj_3R_exit_statement_1357_43_339() + inline bool jj_3R_exit_statement_1366_43_339() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_sequential_bock_statement_2931_4_468() + inline bool jj_3_148() { if (jj_done) return true; - if (jj_3R_label_2007_2_84()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_return_statement_2775_5_161()) return true; return false; } - inline bool jj_3R_sequential_bock_statement_2931_2_343() + inline bool jj_3_147() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_sequential_bock_statement_2931_4_468()) jj_scanpos = xsp; - if (jj_scan_token(BLOCK_T)) return true; - xsp = jj_scanpos; - if (jj_scan_token(56)) jj_scanpos = xsp; - if (jj_3R_sequential_block_declarative_part_2936_2_469()) return true; - if (jj_scan_token(BEGIN_T)) return true; - if (jj_3R_sequential_block_statement_part_2941_2_164()) return true; - if (jj_scan_token(END_T)) return true; - xsp = jj_scanpos; - if (jj_scan_token(24)) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_sequential_bock_statement_2931_159_795()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_exit_statement_1366_1_160()) return true; return false; } - inline bool jj_3R_sequential_bock_statement_2929_1_162() + inline bool jj_3R_sel_var_list_2881_58_459() { if (jj_done) return true; + if (jj_3R_expression_1380_20_70()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_choices_775_3_106()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_150()) { + if (jj_scan_token(136)) { jj_scanpos = xsp; - if (jj_3R_sequential_bock_statement_2931_2_343()) return true; + if (jj_scan_token(139)) return true; } return false; } - inline bool jj_3_150() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_sequential_bock_statement_2929_16_163()) jj_scanpos = xsp; - if (jj_scan_token(BLOCK_T)) return true; - xsp = jj_scanpos; - if (jj_scan_token(56)) jj_scanpos = xsp; - if (jj_scan_token(BEGIN_T)) return true; - if (jj_3R_sequential_block_statement_part_2941_2_164()) return true; - if (jj_scan_token(END_T)) return true; - xsp = jj_scanpos; - if (jj_scan_token(24)) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_sequential_bock_statement_2929_124_165()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; - return false; - } - - inline bool jj_3R_external_name_1391_2_371() + inline bool jj_3R_external_name_1400_2_371() { if (jj_done) return true; if (jj_scan_token(SLSL_T)) return true; - if (jj_3R_sig_stat_1401_3_482()) return true; - if (jj_3R_external_pathname_1384_4_483()) return true; + if (jj_3R_sig_stat_1410_3_482()) return true; + if (jj_3R_external_pathname_1393_4_483()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; if (jj_scan_token(RSRS_T)) return true; return false; } - inline bool jj_3_135() + inline bool jj_3_146() { if (jj_done) return true; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_next_statement_2196_1_159()) return true; return false; } - inline bool jj_3R_sequential_statement_2923_5_321() + inline bool jj_3R_null_2917_19_154() { if (jj_done) return true; - if (jj_3R_null_statement_2193_1_462()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_expression_1371_20_70() + inline bool jj_3R_expression_1380_20_70() { if (jj_done) return true; - if (jj_3R_relation_2702_3_179()) return true; + if (jj_3R_relation_2722_3_179()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_expression_1371_35_180()) { jj_scanpos = xsp; break; } + if (jj_3R_expression_1380_35_180()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_external_pathname_1386_4_595() - { - if (jj_done) return true; - if (jj_3R_package_path_name_2365_3_683()) return true; - return false; - } - - inline bool jj_3_149() - { - if (jj_done) return true; - if (jj_3R_sequential_bock_statement_2929_1_162()) return true; - return false; - } - - inline bool jj_3R_external_pathname_1385_4_594() - { - if (jj_done) return true; - if (jj_3R_relative_pathname_2707_3_682()) return true; - return false; - } - - inline bool jj_3R_enumeration_type_definition_1351_38_316() + inline bool jj_3R_external_pathname_1395_4_595() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_enumeration_literal_1345_2_126()) return true; + if (jj_3R_package_path_name_2384_3_683()) return true; return false; } - inline bool jj_3R_external_pathname_1384_4_593() + inline bool jj_3_145() { if (jj_done) return true; - if (jj_3R_absolute_pathname_329_2_681()) return true; + if (jj_3R_loop_statement_2072_1_158()) return true; return false; } - inline bool jj_3R_external_pathname_1384_4_483() + inline bool jj_3_141() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_external_pathname_1384_4_593()) { - jj_scanpos = xsp; - if (jj_3R_external_pathname_1385_4_594()) { - jj_scanpos = xsp; - if (jj_3R_external_pathname_1386_4_595()) return true; - } - } + if (jj_3R_null_2917_19_154()) jj_scanpos = xsp; + if (jj_3R_target_3237_2_150()) return true; + if (jj_scan_token(VARASSIGN_T)) return true; return false; } - inline bool jj_3_148() + inline bool jj_3R_external_pathname_1394_4_594() { if (jj_done) return true; - if (jj_3R_return_statement_2755_5_161()) return true; + if (jj_3R_relative_pathname_2727_3_682()) return true; return false; } - inline bool jj_3R_expression_or_unaffected_1379_6_745() + inline bool jj_3R_enumeration_type_definition_1360_38_316() { if (jj_done) return true; - if (jj_scan_token(UNAFFECTED_T)) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_enumeration_literal_1354_2_126()) return true; return false; } - inline bool jj_3_147() + inline bool jj_3R_external_pathname_1393_4_593() { if (jj_done) return true; - if (jj_3R_exit_statement_1357_1_160()) return true; + if (jj_3R_absolute_pathname_329_2_681()) return true; return false; } - inline bool jj_3R_sel_var_list_2860_58_459() + inline bool jj_3R_external_pathname_1393_4_483() { if (jj_done) return true; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_choices_771_3_106()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_scan_token(136)) { + if (jj_3R_external_pathname_1393_4_593()) { jj_scanpos = xsp; - if (jj_scan_token(139)) return true; + if (jj_3R_external_pathname_1394_4_594()) { + jj_scanpos = xsp; + if (jj_3R_external_pathname_1395_4_595()) return true; + } } return false; } - inline bool jj_3R_expression_or_unaffected_1378_4_744() - { - if (jj_done) return true; - if (jj_3R_expression_1371_20_70()) return true; - return false; - } - - inline bool jj_3R_expression_or_unaffected_1378_4_668() + inline bool jj_3_144() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_expression_or_unaffected_1378_4_744()) { - jj_scanpos = xsp; - if (jj_3R_expression_or_unaffected_1379_6_745()) return true; - } + if (jj_3R_case_statement_712_1_157()) return true; return false; } - inline bool jj_3_146() + inline bool jj_3R_sel_wave_list_2887_43_673() { if (jj_done) return true; - if (jj_3R_next_statement_2180_1_159()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_sel_wave_list_2887_4_565()) return true; return false; } - inline bool jj_3R_null_2896_19_154() + inline bool jj_3R_expression_or_unaffected_1388_6_745() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_scan_token(UNAFFECTED_T)) return true; return false; } - inline bool jj_3_145() + inline bool jj_3_143() { if (jj_done) return true; - if (jj_3R_loop_statement_2056_1_158()) return true; + if (jj_3R_if_statement_1668_3_156()) return true; return false; } - inline bool jj_3_141() + inline bool jj_3R_selected_force_assignment_2876_53_317() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_null_2896_19_154()) jj_scanpos = xsp; - if (jj_3R_target_3213_2_150()) return true; - if (jj_scan_token(VARASSIGN_T)) return true; - return false; - } - - inline bool jj_3_144() - { - if (jj_done) return true; - if (jj_3R_case_statement_708_1_157()) return true; - return false; - } - - inline bool jj_3R_sel_wave_list_2866_43_673() - { - if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_sel_wave_list_2866_4_565()) return true; + if (jj_scan_token(53)) { + jj_scanpos = xsp; + if (jj_scan_token(75)) return true; + } return false; } - inline bool jj_3_143() + inline bool jj_3R_expression_or_unaffected_1387_4_744() { if (jj_done) return true; - if (jj_3R_if_statement_1657_3_156()) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_selected_force_assignment_2855_53_317() + inline bool jj_3R_expression_or_unaffected_1387_4_668() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_scan_token(53)) { + if (jj_3R_expression_or_unaffected_1387_4_744()) { jj_scanpos = xsp; - if (jj_scan_token(75)) return true; + if (jj_3R_expression_or_unaffected_1388_6_745()) return true; } return false; } @@ -2781,22 +2733,22 @@ void parseInline(); inline bool jj_3_142() { if (jj_done) return true; - if (jj_3R_procedure_call_statement_2472_1_155()) return true; + if (jj_3R_procedure_call_statement_2492_1_155()) return true; return false; } - inline bool jj_3R_null_2884_18_149() + inline bool jj_3R_null_2905_18_149() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_sequential_statement_2896_5_320() + inline bool jj_3R_sequential_statement_2917_5_320() { if (jj_done) return true; - if (jj_3R_variable_assignment_statement_3303_1_461()) return true; + if (jj_3R_variable_assignment_statement_3327_1_461()) return true; return false; } @@ -2805,8 +2757,8 @@ void parseInline(); if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_null_2884_18_149()) jj_scanpos = xsp; - if (jj_3R_target_3213_2_150()) return true; + if (jj_3R_null_2905_18_149()) jj_scanpos = xsp; + if (jj_3R_target_3237_2_150()) return true; if (jj_scan_token(LESSTHAN_T)) return true; return false; } @@ -2814,75 +2766,30 @@ void parseInline(); inline bool jj_3_140() { if (jj_done) return true; - if (jj_3R_wait_statement_3341_1_153()) return true; - return false; - } - - inline bool jj_3R_exit_statement_1358_3_340() - { - if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_condition_901_3_100()) return true; + if (jj_3R_wait_statement_3366_1_153()) return true; return false; } inline bool jj_3_139() { if (jj_done) return true; - if (jj_3R_report_statement_2735_1_152()) return true; - return false; - } - - inline bool jj_3R_exit_statement_1357_3_338() - { - if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; - return false; - } - - inline bool jj_3R_exit_statement_1357_1_160() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_exit_statement_1357_3_338()) jj_scanpos = xsp; - if (jj_scan_token(EXIT_T)) return true; - xsp = jj_scanpos; - if (jj_3R_exit_statement_1357_43_339()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_exit_statement_1358_3_340()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_report_statement_2755_1_152()) return true; return false; } inline bool jj_3_138() { if (jj_done) return true; - if (jj_3R_assertion_statement_537_3_151()) return true; - return false; - } - - inline bool jj_3R_enumeration_type_definition_1351_3_146() - { - if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_enumeration_literal_1345_2_126()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_enumeration_type_definition_1351_38_316()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_assertion_statement_539_3_151()) return true; return false; } - inline bool jj_3R_sequential_statement_2884_5_148() + inline bool jj_3R_sequential_statement_2905_5_148() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_sequential_statement_2884_5_319()) { + if (jj_3R_sequential_statement_2905_5_319()) { jj_scanpos = xsp; if (jj_3_138()) { jj_scanpos = xsp; @@ -2890,7 +2797,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3_140()) { jj_scanpos = xsp; - if (jj_3R_sequential_statement_2896_5_320()) { + if (jj_3R_sequential_statement_2917_5_320()) { jj_scanpos = xsp; if (jj_3_142()) { jj_scanpos = xsp; @@ -2908,7 +2815,7 @@ void parseInline(); jj_scanpos = xsp; if (jj_3_149()) { jj_scanpos = xsp; - if (jj_3R_sequential_statement_2923_5_321()) return true; + if (jj_3R_sequential_statement_2944_5_321()) return true; } } } @@ -2925,55 +2832,60 @@ void parseInline(); return false; } - inline bool jj_3R_sequential_statement_2884_5_319() + inline bool jj_3R_sequential_statement_2905_5_319() { if (jj_done) return true; - if (jj_3R_signal_assignment_statement_2980_3_460()) return true; + if (jj_3R_signal_assignment_statement_3001_3_460()) return true; return false; } - inline bool jj_3R_sensitivity_list_2874_12_622() + inline bool jj_3R_sensitivity_list_2895_12_622() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_enumeration_literal_1346_4_280() + inline bool jj_3R_exit_statement_1367_3_340() { if (jj_done) return true; - if (jj_3R_character_literal_750_3_445()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_condition_906_3_100()) return true; return false; } - inline bool jj_3_136() + inline bool jj_3R_exit_statement_1366_3_338() { if (jj_done) return true; - if (jj_3R_sequential_statement_2884_5_148()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_enumeration_literal_1345_2_126() + inline bool jj_3_136() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_enumeration_literal_1345_2_279()) { - jj_scanpos = xsp; - if (jj_3R_enumeration_literal_1346_4_280()) return true; - } + if (jj_3R_sequential_statement_2905_5_148()) return true; return false; } - inline bool jj_3R_enumeration_literal_1345_2_279() + inline bool jj_3R_exit_statement_1366_1_160() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_exit_statement_1366_3_338()) jj_scanpos = xsp; + if (jj_scan_token(EXIT_T)) return true; + xsp = jj_scanpos; + if (jj_3R_exit_statement_1366_43_339()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_exit_statement_1367_3_340()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_sequence_of_statements_2879_2_334() + inline bool jj_3R_sequence_of_statements_2900_2_334() { if (jj_done) return true; Token * xsp; @@ -2984,113 +2896,131 @@ void parseInline(); return false; } - inline bool jj_3R_entity_tag_1340_3_824() + inline bool jj_3R_enumeration_type_definition_1360_3_146() { if (jj_done) return true; - if (jj_3R_character_literal_750_3_445()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_enumeration_literal_1354_2_126()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_enumeration_type_definition_1360_38_316()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_sensitivity_list_2874_2_512() + inline bool jj_3R_sensitivity_list_2895_2_512() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_sensitivity_list_2874_12_622()) { jj_scanpos = xsp; break; } + if (jj_3R_sensitivity_list_2895_12_622()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_entity_tag_1339_1_823() + inline bool jj_3R_sensitivity_list_2893_3_511() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_entity_tag_1339_1_805() + inline bool jj_3R_sensitivity_list_2893_3_412() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_entity_tag_1339_1_823()) { + if (jj_3R_sensitivity_list_2893_3_511()) { jj_scanpos = xsp; - if (jj_3R_entity_tag_1340_3_824()) return true; + if (jj_3R_sensitivity_list_2895_2_512()) return true; } return false; } - inline bool jj_3R_sensitivity_list_2872_3_511() + inline bool jj_3R_enumeration_literal_1355_4_280() { if (jj_done) return true; - if (jj_scan_token(ALL_T)) return true; + if (jj_3R_character_literal_754_3_445()) return true; + return false; + } + + inline bool jj_3R_sel_wave_list_2887_4_565() + { + if (jj_done) return true; + if (jj_3R_waveform_element_3383_2_562()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_choices_775_3_106()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_sel_wave_list_2887_43_673()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_sensitivity_list_2872_3_412() + inline bool jj_3R_enumeration_literal_1354_2_126() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_sensitivity_list_2872_3_511()) { + if (jj_3R_enumeration_literal_1354_2_279()) { jj_scanpos = xsp; - if (jj_3R_sensitivity_list_2874_2_512()) return true; + if (jj_3R_enumeration_literal_1355_4_280()) return true; } return false; } - inline bool jj_3R_entity_name_list_1308_28_782() + inline bool jj_3R_enumeration_literal_1354_2_279() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_entity_designator_1297_1_781()) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3_57() + inline bool jj_3R_entity_tag_1349_3_824() { if (jj_done) return true; - if (jj_3R_process_statement_2516_1_112()) return true; + if (jj_3R_character_literal_754_3_445()) return true; return false; } - inline bool jj_3R_sel_wave_list_2866_4_565() + inline bool jj_3R_selected_waveform_assignment_2870_17_564() { if (jj_done) return true; - if (jj_3R_waveform_element_3358_2_562()) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_choices_771_3_106()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_sel_wave_list_2866_43_673()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_delay_mechanism_1092_1_381()) return true; return false; } - inline bool jj_3_56() + inline bool jj_3R_entity_tag_1348_1_823() { if (jj_done) return true; - if (jj_3R_concurrent_assertion_statement_826_1_111()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_selected_waveform_assignment_2849_17_564() + inline bool jj_3R_entity_tag_1348_1_805() { if (jj_done) return true; - if (jj_3R_delay_mechanism_1084_1_381()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_entity_tag_1348_1_823()) { + jj_scanpos = xsp; + if (jj_3R_entity_tag_1349_3_824()) return true; + } return false; } - inline bool jj_3R_sel_var_list_2860_3_318() + inline bool jj_3R_sel_var_list_2881_3_318() { if (jj_done) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_expression_1380_20_70()) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_choices_771_3_106()) return true; + if (jj_3R_choices_775_3_106()) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(136)) { @@ -3099,35 +3029,48 @@ void parseInline(); } while (true) { xsp = jj_scanpos; - if (jj_3R_sel_var_list_2860_58_459()) { jj_scanpos = xsp; break; } + if (jj_3R_sel_var_list_2881_58_459()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_selected_force_assignment_2854_3_147() + inline bool jj_3R_entity_name_list_1317_28_782() + { + if (jj_done) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_entity_designator_1306_1_781()) return true; + return false; + } + + inline bool jj_3_57() + { + if (jj_done) return true; + if (jj_3R_process_statement_2536_1_112()) return true; + return false; + } + + inline bool jj_3R_selected_force_assignment_2875_3_147() { if (jj_done) return true; if (jj_scan_token(WITH_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_expression_1380_20_70()) return true; if (jj_scan_token(SELECT_T)) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(158)) jj_scanpos = xsp; - if (jj_3R_target_3213_2_150()) return true; + if (jj_3R_target_3237_2_150()) return true; if (jj_scan_token(LESSTHAN_T)) return true; if (jj_scan_token(FORCE_T)) return true; xsp = jj_scanpos; - if (jj_3R_selected_force_assignment_2855_53_317()) jj_scanpos = xsp; - if (jj_3R_sel_var_list_2860_3_318()) return true; + if (jj_3R_selected_force_assignment_2876_53_317()) jj_scanpos = xsp; + if (jj_3R_sel_var_list_2881_3_318()) return true; return false; } - inline bool jj_3R_entity_specification_1317_1_530() + inline bool jj_3_56() { if (jj_done) return true; - if (jj_3R_entity_name_list_1308_1_642()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_entity_class_1211_1_643()) return true; + if (jj_3R_concurrent_assertion_statement_831_1_111()) return true; return false; } @@ -3138,620 +3081,651 @@ void parseInline(); return false; } - inline bool jj_3R_entity_designator_1297_18_806() - { - if (jj_done) return true; - if (jj_3R_signature_3030_1_472()) return true; - return false; - } - - inline bool jj_3R_selected_waveform_assignment_2847_3_471() + inline bool jj_3R_selected_waveform_assignment_2868_3_471() { if (jj_done) return true; if (jj_scan_token(WITH_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_expression_1380_20_70()) return true; if (jj_scan_token(SELECT_T)) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(158)) jj_scanpos = xsp; - if (jj_3R_target_3213_2_150()) return true; + if (jj_3R_target_3237_2_150()) return true; if (jj_scan_token(LESSTHAN_T)) return true; xsp = jj_scanpos; - if (jj_3R_selected_waveform_assignment_2849_17_564()) jj_scanpos = xsp; - if (jj_3R_sel_wave_list_2866_4_565()) return true; - return false; - } - - inline bool jj_3R_entity_name_list_1310_3_703() - { - if (jj_done) return true; - if (jj_scan_token(ALL_T)) return true; + if (jj_3R_selected_waveform_assignment_2870_17_564()) jj_scanpos = xsp; + if (jj_3R_sel_wave_list_2887_4_565()) return true; return false; } - inline bool jj_3R_entity_name_list_1309_3_702() + inline bool jj_3R_select_name_2863_3_842() { if (jj_done) return true; - if (jj_scan_token(OTHER_T)) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_select_name_2842_3_842() + inline bool jj_3R_selected_waveforms_2833_32_385() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_waveform_3375_1_382()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_choices_775_3_106()) return true; return false; } - inline bool jj_3R_entity_name_list_1308_1_701() + inline bool jj_3R_select_name_2861_3_841() { if (jj_done) return true; - if (jj_3R_entity_designator_1297_1_781()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_entity_name_list_1308_28_782()) { jj_scanpos = xsp; break; } - } + if (jj_3R_aggregate_400_3_141()) return true; return false; } - inline bool jj_3R_entity_name_list_1308_1_642() + inline bool jj_3R_select_name_2861_3_810() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_entity_name_list_1308_1_701()) { - jj_scanpos = xsp; - if (jj_3R_entity_name_list_1309_3_702()) { + if (jj_3R_select_name_2861_3_841()) { jj_scanpos = xsp; - if (jj_3R_entity_name_list_1310_3_703()) return true; - } + if (jj_3R_select_name_2863_3_842()) return true; } return false; } - inline bool jj_3R_selected_waveforms_2812_32_385() + inline bool jj_3R_entity_specification_1326_1_530() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_waveform_3350_1_382()) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_choices_771_3_106()) return true; + if (jj_3R_entity_name_list_1317_1_642()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_entity_class_1219_1_643()) return true; return false; } - inline bool jj_3R_select_name_2840_3_841() + inline bool jj_3_133() { if (jj_done) return true; - if (jj_3R_aggregate_400_3_141()) return true; + if (jj_3R_selected_force_assignment_2875_3_147()) return true; return false; } - inline bool jj_3R_select_name_2840_3_810() + inline bool jj_3R_entity_designator_1306_18_806() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_select_name_2840_3_841()) { - jj_scanpos = xsp; - if (jj_3R_select_name_2842_3_842()) return true; - } + if (jj_3R_signature_3052_1_472()) return true; return false; } - inline bool jj_3_133() + inline bool jj_3R_entity_name_list_1319_3_703() { if (jj_done) return true; - if (jj_3R_selected_force_assignment_2854_3_147()) return true; + if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_selected_variable_assignment_2833_3_666() + inline bool jj_3R_selected_variable_assignment_2854_3_666() { if (jj_done) return true; if (jj_scan_token(WITH_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_expression_1380_20_70()) return true; if (jj_scan_token(SELECT_T)) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(158)) jj_scanpos = xsp; - if (jj_3R_select_name_2840_3_810()) return true; + if (jj_3R_select_name_2861_3_810()) return true; if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_sel_var_list_2860_3_318()) return true; + if (jj_3R_sel_var_list_2881_3_318()) return true; return false; } - inline bool jj_3R_entity_designator_1297_1_781() + inline bool jj_3R_entity_name_list_1318_3_702() { if (jj_done) return true; - if (jj_3R_entity_tag_1339_1_805()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_entity_designator_1297_18_806()) jj_scanpos = xsp; + if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_selected_signal_assignment_wave_2828_3_348() + inline bool jj_3R_entity_name_list_1317_1_701() { if (jj_done) return true; - if (jj_3R_selected_waveform_assignment_2847_3_471()) return true; - return false; - } - - inline bool jj_3R_selected_signal_assignment_wave_2826_3_167() + if (jj_3R_entity_designator_1306_1_781()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_entity_name_list_1317_28_782()) { jj_scanpos = xsp; break; } + } + return false; + } + + inline bool jj_3R_entity_name_list_1317_1_642() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_selected_signal_assignment_wave_2826_3_347()) { + if (jj_3R_entity_name_list_1317_1_701()) { + jj_scanpos = xsp; + if (jj_3R_entity_name_list_1318_3_702()) { jj_scanpos = xsp; - if (jj_3R_selected_signal_assignment_wave_2828_3_348()) return true; + if (jj_3R_entity_name_list_1319_3_703()) return true; + } } return false; } - inline bool jj_3R_selected_signal_assignment_wave_2826_3_347() + inline bool jj_3R_selected_signal_assignment_wave_2849_3_348() { if (jj_done) return true; - if (jj_3R_selected_force_assignment_2854_3_147()) return true; + if (jj_3R_selected_waveform_assignment_2868_3_471()) return true; return false; } - inline bool jj_3_55() + inline bool jj_3R_selected_signal_assignment_wave_2847_3_167() { if (jj_done) return true; - if (jj_3R_package_instantiation_declaration_2332_2_110()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_selected_signal_assignment_wave_2847_3_347()) { + jj_scanpos = xsp; + if (jj_3R_selected_signal_assignment_wave_2849_3_348()) return true; + } return false; } - inline bool jj_3_53() + inline bool jj_3R_selected_signal_assignment_wave_2847_3_347() { if (jj_done) return true; - if (jj_3R_attribute_declaration_556_2_79()) return true; + if (jj_3R_selected_force_assignment_2875_3_147()) return true; return false; } - inline bool jj_3R_sensitivity_clause_2817_2_463() + inline bool jj_3R_entity_designator_1306_1_781() { if (jj_done) return true; - if (jj_scan_token(ON_T)) return true; - if (jj_3R_sensitivity_list_2872_3_412()) return true; + if (jj_3R_entity_tag_1348_1_805()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_entity_designator_1306_18_806()) jj_scanpos = xsp; return false; } - inline bool jj_3_54() + inline bool jj_3R_sensitivity_clause_2838_2_463() { if (jj_done) return true; - if (jj_3R_group_template_declaration_1633_2_80()) return true; + if (jj_scan_token(ON_T)) return true; + if (jj_3R_sensitivity_list_2893_3_412()) return true; return false; } - inline bool jj_3R_selected_waveforms_2812_2_209() + inline bool jj_3R_selected_waveforms_2833_2_209() { if (jj_done) return true; - if (jj_3R_waveform_3350_1_382()) return true; + if (jj_3R_waveform_3375_1_382()) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_choices_771_3_106()) return true; + if (jj_3R_choices_775_3_106()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_selected_waveforms_2812_32_385()) { jj_scanpos = xsp; break; } + if (jj_3R_selected_waveforms_2833_32_385()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_entity_class_entry_list_1237_39_646() + inline bool jj_3_55() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_entity_class_entry_1232_2_645()) return true; + if (jj_3R_package_instantiation_declaration_2350_2_110()) return true; return false; } - inline bool jj_3_52() + inline bool jj_3_53() { if (jj_done) return true; - if (jj_3R_package_declaration_2272_2_78()) return true; + if (jj_3R_attribute_declaration_558_2_79()) return true; return false; } - inline bool jj_3_51() + inline bool jj_3_54() { if (jj_done) return true; - if (jj_3R_package_body_2226_1_77()) return true; + if (jj_3R_group_template_declaration_1644_2_80()) return true; return false; } - inline bool jj_3_50() + inline bool jj_3R_selected_name_2821_2_508() { if (jj_done) return true; - if (jj_3R_package_instantiation_declaration_2332_2_110()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(DOT_T)) return true; + if (jj_3R_suffix_3228_1_130()) return true; return false; } - inline bool jj_3R_plain_return_statement_2761_42_315() + inline bool jj_3R_plain_return_statement_2781_42_315() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_condition_901_3_100()) return true; + if (jj_3R_condition_906_3_100()) return true; return false; } - inline bool jj_3R_selected_name_2800_2_508() + inline bool jj_3R_scalar_type_definition_2795_26_844() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(DOT_T)) return true; - if (jj_3R_suffix_3204_1_130()) return true; + if (jj_3R_physical_type_definition_2394_9_855()) return true; + return false; + } + + inline bool jj_3R_entity_class_entry_list_1245_39_646() + { + if (jj_done) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_entity_class_entry_1240_2_645()) return true; + return false; + } + + inline bool jj_3_52() + { + if (jj_done) return true; + if (jj_3R_package_declaration_2289_2_78()) return true; return false; } - inline bool jj_3R_scalar_type_definition_2775_26_844() + inline bool jj_3_51() { if (jj_done) return true; - if (jj_3R_physical_type_definition_2375_9_855()) return true; + if (jj_3R_package_body_2242_1_77()) return true; return false; } - inline bool jj_3R_secondary_unit_declaration_2792_1_888() + inline bool jj_3R_secondary_unit_declaration_2812_1_888() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(EQU_T)) return true; - if (jj_3R_physical_literal_2370_2_133()) return true; + if (jj_3R_physical_literal_2389_2_133()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_entity_class_entry_1232_21_724() + inline bool jj_3_50() { if (jj_done) return true; - if (jj_scan_token(BOX_T)) return true; + if (jj_3R_package_instantiation_declaration_2350_2_110()) return true; return false; } inline bool jj_3_132() { if (jj_done) return true; - if (jj_3R_enumeration_type_definition_1351_3_146()) return true; + if (jj_3R_enumeration_type_definition_1360_3_146()) return true; return false; } - inline bool jj_3R_entity_declaration_1243_5_442() + inline bool jj_3R_scalar_type_definition_2795_3_813() { if (jj_done) return true; - if (jj_scan_token(ENTITY_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_range_constraint_2677_1_103()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_scalar_type_definition_2795_26_844()) jj_scanpos = xsp; return false; } - inline bool jj_3R_scalar_type_definition_2775_3_813() + inline bool jj_3R_entity_class_entry_1240_21_724() { if (jj_done) return true; - if (jj_3R_range_constraint_2657_1_103()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_scalar_type_definition_2775_26_844()) jj_scanpos = xsp; + if (jj_scan_token(BOX_T)) return true; return false; } - inline bool jj_3R_scalar_type_definition_2773_1_812() + inline bool jj_3R_scalar_type_definition_2793_1_812() { if (jj_done) return true; - if (jj_3R_enumeration_type_definition_1351_3_146()) return true; + if (jj_3R_enumeration_type_definition_1360_3_146()) return true; return false; } - inline bool jj_3R_scalar_type_definition_2773_1_798() + inline bool jj_3R_scalar_type_definition_2793_1_798() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_scalar_type_definition_2773_1_812()) { + if (jj_3R_scalar_type_definition_2793_1_812()) { jj_scanpos = xsp; - if (jj_3R_scalar_type_definition_2775_3_813()) return true; + if (jj_3R_scalar_type_definition_2795_3_813()) return true; } return false; } - inline bool jj_3R_entity_class_entry_list_1237_2_533() + inline bool jj_3R_entity_declaration_1251_5_442() { if (jj_done) return true; - if (jj_3R_entity_class_entry_1232_2_645()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_entity_class_entry_list_1237_39_646()) { jj_scanpos = xsp; break; } - } + if (jj_scan_token(ENTITY_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } inline bool jj_3_131() { if (jj_done) return true; - if (jj_3R_plain_return_statement_2761_1_145()) return true; + if (jj_3R_plain_return_statement_2781_1_145()) return true; + return false; + } + + inline bool jj_3R_value_return_statement_2786_3_559() + { + if (jj_done) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_entity_class_entry_1232_2_645() + inline bool jj_3R_value_return_statement_2786_1_467() { if (jj_done) return true; - if (jj_3R_entity_class_1211_1_643()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_entity_class_entry_1232_21_724()) jj_scanpos = xsp; + if (jj_3R_value_return_statement_2786_3_559()) jj_scanpos = xsp; + if (jj_scan_token(RETURN_T)) return true; + if (jj_3R_conditional_or_unaffected_expression_965_2_560()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_value_return_statement_2766_3_559() + inline bool jj_3R_plain_return_statement_2781_3_314() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_value_return_statement_2766_1_467() + inline bool jj_3R_return_statement_2776_7_342() + { + if (jj_done) return true; + if (jj_3R_value_return_statement_2786_1_467()) return true; + return false; + } + + inline bool jj_3R_entity_class_entry_list_1245_2_533() + { + if (jj_done) return true; + if (jj_3R_entity_class_entry_1240_2_645()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_entity_class_entry_list_1245_39_646()) { jj_scanpos = xsp; break; } + } + return false; + } + + inline bool jj_3R_plain_return_statement_2781_1_145() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_value_return_statement_2766_3_559()) jj_scanpos = xsp; + if (jj_3R_plain_return_statement_2781_3_314()) jj_scanpos = xsp; if (jj_scan_token(RETURN_T)) return true; - if (jj_3R_conditional_or_unaffected_expression_960_2_560()) return true; + xsp = jj_scanpos; + if (jj_3R_plain_return_statement_2781_42_315()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_entity_aspect_1204_27_755() + inline bool jj_3R_return_statement_2775_5_161() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(RPAREN_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_return_statement_2775_5_341()) { + jj_scanpos = xsp; + if (jj_3R_return_statement_2776_7_342()) return true; + } return false; } - inline bool jj_3R_entity_class_1227_3_720() + inline bool jj_3R_return_statement_2775_5_341() { if (jj_done) return true; - if (jj_scan_token(FILE_T)) return true; + if (jj_3R_plain_return_statement_2781_1_145()) return true; return false; } - inline bool jj_3R_entity_class_1226_3_719() + inline bool jj_3R_entity_class_entry_1240_2_645() { if (jj_done) return true; - if (jj_scan_token(GROUP_T)) return true; + if (jj_3R_entity_class_1219_1_643()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_entity_class_entry_1240_21_724()) jj_scanpos = xsp; return false; } - inline bool jj_3R_plain_return_statement_2761_3_314() + inline bool jj_3R_entity_aspect_1212_27_755() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_entity_class_1225_3_718() + inline bool jj_3R_resolution_indication_2769_5_409() { if (jj_done) return true; - if (jj_scan_token(UNITS_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_return_statement_2756_7_342() + inline bool jj_3R_entity_class_1235_3_720() { if (jj_done) return true; - if (jj_3R_value_return_statement_2766_1_467()) return true; + if (jj_scan_token(FILE_T)) return true; return false; } - inline bool jj_3R_entity_class_1224_3_717() + inline bool jj_3R_entity_class_1234_3_719() { if (jj_done) return true; - if (jj_scan_token(LITERAL_T)) return true; + if (jj_scan_token(GROUP_T)) return true; return false; } - inline bool jj_3R_plain_return_statement_2761_1_145() + inline bool jj_3R_resolution_indication_2768_4_232() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_plain_return_statement_2761_3_314()) jj_scanpos = xsp; - if (jj_scan_token(RETURN_T)) return true; - xsp = jj_scanpos; - if (jj_3R_plain_return_statement_2761_42_315()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_resolution_indication_2768_4_408()) { + jj_scanpos = xsp; + if (jj_3R_resolution_indication_2769_5_409()) return true; + } return false; } - inline bool jj_3R_entity_class_1223_3_716() + inline bool jj_3R_resolution_indication_2768_4_408() { if (jj_done) return true; - if (jj_scan_token(LABEL_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_entity_class_1222_3_715() + inline bool jj_3R_entity_class_1233_3_718() { if (jj_done) return true; - if (jj_scan_token(COMPONENT_T)) return true; + if (jj_scan_token(UNITS_T)) return true; return false; } - inline bool jj_3R_return_statement_2755_5_161() + inline bool jj_3R_entity_class_1232_3_717() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_return_statement_2755_5_341()) { - jj_scanpos = xsp; - if (jj_3R_return_statement_2756_7_342()) return true; - } + if (jj_scan_token(LITERAL_T)) return true; return false; } - inline bool jj_3R_return_statement_2755_5_341() + inline bool jj_3R_entity_class_1231_3_716() { if (jj_done) return true; - if (jj_3R_plain_return_statement_2761_1_145()) return true; + if (jj_scan_token(LABEL_T)) return true; return false; } - inline bool jj_3R_entity_class_1221_3_714() + inline bool jj_3R_entity_class_1230_3_715() { if (jj_done) return true; - if (jj_scan_token(VARIABLE_T)) return true; + if (jj_scan_token(COMPONENT_T)) return true; return false; } - inline bool jj_3R_entity_class_1220_3_713() + inline bool jj_3R_report_statement_2757_11_326() { if (jj_done) return true; - if (jj_scan_token(SIGNAL_T)) return true; + if (jj_scan_token(SEVERITY_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_entity_class_1219_3_712() + inline bool jj_3R_entity_class_1229_3_714() { if (jj_done) return true; - if (jj_scan_token(CONSTANT_T)) return true; + if (jj_scan_token(VARIABLE_T)) return true; return false; } - inline bool jj_3R_entity_class_1218_3_711() + inline bool jj_3R_entity_class_1228_3_713() { if (jj_done) return true; - if (jj_scan_token(SUBTYPE_T)) return true; + if (jj_scan_token(SIGNAL_T)) return true; return false; } - inline bool jj_3R_entity_class_1217_3_710() + inline bool jj_3R_entity_class_1227_3_712() { if (jj_done) return true; - if (jj_scan_token(TYPE_T)) return true; + if (jj_scan_token(CONSTANT_T)) return true; return false; } - inline bool jj_3R_entity_class_1216_3_709() + inline bool jj_3R_entity_class_1226_3_711() { if (jj_done) return true; - if (jj_scan_token(PACKAGE_T)) return true; + if (jj_scan_token(SUBTYPE_T)) return true; return false; } - inline bool jj_3R_resolution_indication_2749_5_409() + inline bool jj_3R_entity_class_1225_3_710() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_scan_token(TYPE_T)) return true; return false; } - inline bool jj_3R_entity_class_1215_3_708() + inline bool jj_3R_entity_class_1224_3_709() { if (jj_done) return true; - if (jj_scan_token(FUNCTION_T)) return true; + if (jj_scan_token(PACKAGE_T)) return true; return false; } - inline bool jj_3R_entity_class_1214_3_707() + inline bool jj_3R_entity_class_1223_3_708() { if (jj_done) return true; - if (jj_scan_token(PROCEDURE_T)) return true; + if (jj_scan_token(FUNCTION_T)) return true; return false; } - inline bool jj_3R_resolution_indication_2748_4_232() + inline bool jj_3R_entity_class_1222_3_707() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_resolution_indication_2748_4_408()) { - jj_scanpos = xsp; - if (jj_3R_resolution_indication_2749_5_409()) return true; - } + if (jj_scan_token(PROCEDURE_T)) return true; return false; } - inline bool jj_3R_resolution_indication_2748_4_408() + inline bool jj_3R_entity_class_1221_3_706() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_scan_token(CONFIGURATION_T)) return true; return false; } - inline bool jj_3R_entity_class_1213_3_706() + inline bool jj_3R_entity_class_1220_3_705() { if (jj_done) return true; - if (jj_scan_token(CONFIGURATION_T)) return true; + if (jj_scan_token(ARCHITECTURE_T)) return true; return false; } - inline bool jj_3R_entity_class_1212_3_705() + inline bool jj_3R_report_statement_2755_3_325() { if (jj_done) return true; - if (jj_scan_token(ARCHITECTURE_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_report_statement_2737_11_326() + inline bool jj_3R_report_statement_2755_1_152() { if (jj_done) return true; - if (jj_scan_token(SEVERITY_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_report_statement_2755_3_325()) jj_scanpos = xsp; + if (jj_scan_token(REPORT_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; + xsp = jj_scanpos; + if (jj_3R_report_statement_2757_11_326()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_entity_class_1211_1_704() + inline bool jj_3R_entity_class_1219_1_704() { if (jj_done) return true; if (jj_scan_token(ENTITY_T)) return true; return false; } - inline bool jj_3R_entity_class_1211_1_643() + inline bool jj_3R_entity_class_1219_1_643() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_entity_class_1211_1_704()) { + if (jj_3R_entity_class_1219_1_704()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1212_3_705()) { + if (jj_3R_entity_class_1220_3_705()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1213_3_706()) { + if (jj_3R_entity_class_1221_3_706()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1214_3_707()) { + if (jj_3R_entity_class_1222_3_707()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1215_3_708()) { + if (jj_3R_entity_class_1223_3_708()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1216_3_709()) { + if (jj_3R_entity_class_1224_3_709()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1217_3_710()) { + if (jj_3R_entity_class_1225_3_710()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1218_3_711()) { + if (jj_3R_entity_class_1226_3_711()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1219_3_712()) { + if (jj_3R_entity_class_1227_3_712()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1220_3_713()) { + if (jj_3R_entity_class_1228_3_713()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1221_3_714()) { + if (jj_3R_entity_class_1229_3_714()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1222_3_715()) { + if (jj_3R_entity_class_1230_3_715()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1223_3_716()) { + if (jj_3R_entity_class_1231_3_716()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1224_3_717()) { + if (jj_3R_entity_class_1232_3_717()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1225_3_718()) { + if (jj_3R_entity_class_1233_3_718()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1226_3_719()) { + if (jj_3R_entity_class_1234_3_719()) { jj_scanpos = xsp; - if (jj_3R_entity_class_1227_3_720()) return true; + if (jj_3R_entity_class_1235_3_720()) return true; } } } @@ -3771,270 +3745,196 @@ void parseInline(); return false; } - inline bool jj_3R_entity_aspect_1206_3_686() - { - if (jj_done) return true; - if (jj_scan_token(OPEN_T)) return true; - return false; - } - - inline bool jj_3R_entity_aspect_1205_3_685() - { - if (jj_done) return true; - if (jj_scan_token(CONFIGURATION_T)) return true; - if (jj_3R_name_2126_2_73()) return true; - return false; - } - - inline bool jj_3R_entity_aspect_1204_1_684() - { - if (jj_done) return true; - if (jj_scan_token(ENTITY_T)) return true; - if (jj_3R_name_2126_2_73()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_entity_aspect_1204_27_755()) jj_scanpos = xsp; - return false; - } - - inline bool jj_3R_entity_aspect_1204_1_618() + inline bool jj_3_130() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_entity_aspect_1204_1_684()) { - jj_scanpos = xsp; - if (jj_3R_entity_aspect_1205_3_685()) { - jj_scanpos = xsp; - if (jj_3R_entity_aspect_1206_3_686()) return true; - } - } + if (jj_3R_pathname_element_list_2378_3_69()) return true; return false; } - inline bool jj_3R_report_statement_2735_3_325() + inline bool jj_3R_entity_aspect_1214_3_686() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_scan_token(OPEN_T)) return true; return false; } - inline bool jj_3R_report_statement_2735_1_152() + inline bool jj_3R_entity_aspect_1213_3_685() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_report_statement_2735_3_325()) jj_scanpos = xsp; - if (jj_scan_token(REPORT_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - xsp = jj_scanpos; - if (jj_3R_report_statement_2737_11_326()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_scan_token(CONFIGURATION_T)) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_element_record_mode_view_indication_1198_2_109() + inline bool jj_3R_relation_operator_2748_3_589() { if (jj_done) return true; - if (jj_scan_token(VIEW_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_scan_token(QNEQU_T)) return true; return false; } - inline bool jj_3_130() + inline bool jj_3R_relation_operator_2747_3_588() { if (jj_done) return true; - if (jj_3R_pathname_element_list_2359_3_69()) return true; + if (jj_scan_token(QEQU_T)) return true; return false; } - inline bool jj_3R_element_mode_view_indication_1193_5_822() + inline bool jj_3R_relation_operator_2746_3_587() { if (jj_done) return true; - if (jj_3R_element_array_mode_view_indication_1137_2_850()) return true; + if (jj_scan_token(QL_T)) return true; return false; } - inline bool jj_3R_relation_operator_2728_3_589() + inline bool jj_3R_entity_aspect_1212_1_684() { if (jj_done) return true; - if (jj_scan_token(QNEQU_T)) return true; + if (jj_scan_token(ENTITY_T)) return true; + if (jj_3R_name_2142_2_73()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_entity_aspect_1212_27_755()) jj_scanpos = xsp; return false; } - inline bool jj_3R_element_mode_view_indication_1192_3_804() + inline bool jj_3R_entity_aspect_1212_1_618() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_49()) { + if (jj_3R_entity_aspect_1212_1_684()) { + jj_scanpos = xsp; + if (jj_3R_entity_aspect_1213_3_685()) { jj_scanpos = xsp; - if (jj_3R_element_mode_view_indication_1193_5_822()) return true; + if (jj_3R_entity_aspect_1214_3_686()) return true; + } } return false; } - inline bool jj_3R_relation_operator_2727_3_588() - { - if (jj_done) return true; - if (jj_scan_token(QEQU_T)) return true; - return false; - } - - inline bool jj_3_49() - { - if (jj_done) return true; - if (jj_3R_element_record_mode_view_indication_1198_2_109()) return true; - return false; - } - - inline bool jj_3R_relation_operator_2726_3_587() - { - if (jj_done) return true; - if (jj_scan_token(QL_T)) return true; - return false; - } - - inline bool jj_3R_relation_operator_2725_3_586() + inline bool jj_3R_relation_operator_2745_3_586() { if (jj_done) return true; if (jj_scan_token(QG_T)) return true; return false; } - inline bool jj_3_48() - { - if (jj_done) return true; - if (jj_3R_array_element_resolution_485_3_108()) return true; - return false; - } - - inline bool jj_3R_element_mode_indication_1187_5_769() - { - if (jj_done) return true; - if (jj_3R_element_mode_view_indication_1192_3_804()) return true; - return false; - } - - inline bool jj_3R_relation_operator_2724_3_585() + inline bool jj_3R_relation_operator_2744_3_585() { if (jj_done) return true; if (jj_scan_token(QLT_T)) return true; return false; } - inline bool jj_3R_relation_2702_25_366() + inline bool jj_3R_relation_2722_25_366() { if (jj_done) return true; - if (jj_3R_relation_operator_2717_2_475()) return true; - if (jj_3R_shift_expression_2959_2_365()) return true; + if (jj_3R_relation_operator_2737_2_475()) return true; + if (jj_3R_shift_expression_2980_2_365()) return true; return false; } - inline bool jj_3R_relation_operator_2723_3_584() + inline bool jj_3R_relation_operator_2743_3_584() { if (jj_done) return true; if (jj_scan_token(QGT_T)) return true; return false; } - inline bool jj_3R_relation_operator_2722_3_583() + inline bool jj_3R_relation_operator_2742_3_583() { if (jj_done) return true; if (jj_scan_token(NOTEQU_T)) return true; return false; } - inline bool jj_3R_element_mode_indication_1186_3_768() + inline bool jj_3R_relative_pathname_2727_17_754() { if (jj_done) return true; - if (jj_3R_mode_2085_1_428()) return true; + if (jj_3R_pathname_element_list_2378_3_69()) return true; return false; } - inline bool jj_3R_relative_pathname_2707_17_754() + inline bool jj_3R_relation_operator_2741_3_582() { if (jj_done) return true; - if (jj_3R_pathname_element_list_2359_3_69()) return true; + if (jj_scan_token(LESSTHAN_T)) return true; return false; } - inline bool jj_3R_element_mode_indication_1186_3_693() + inline bool jj_3R_relation_operator_2740_3_581() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_element_mode_indication_1186_3_768()) { - jj_scanpos = xsp; - if (jj_3R_element_mode_indication_1187_5_769()) return true; - } + if (jj_scan_token(GREATERTHAN_T)) return true; return false; } - inline bool jj_3R_relation_operator_2721_3_582() + inline bool jj_3R_element_record_mode_view_indication_1206_2_109() { if (jj_done) return true; - if (jj_scan_token(LESSTHAN_T)) return true; + if (jj_scan_token(VIEW_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_relation_operator_2720_3_581() + inline bool jj_3R_relation_operator_2739_3_580() { if (jj_done) return true; - if (jj_scan_token(GREATERTHAN_T)) return true; + if (jj_scan_token(EQU_T)) return true; return false; } - inline bool jj_3R_relation_operator_2719_3_580() + inline bool jj_3R_element_mode_view_indication_1201_5_822() { if (jj_done) return true; - if (jj_scan_token(EQU_T)) return true; + if (jj_3R_element_array_mode_view_indication_1145_2_850()) return true; return false; } - inline bool jj_3R_relation_operator_2718_3_579() + inline bool jj_3R_relation_operator_2738_3_579() { if (jj_done) return true; if (jj_scan_token(GT_T)) return true; return false; } - inline bool jj_3R_relation_operator_2717_2_578() + inline bool jj_3R_relation_operator_2737_2_578() { if (jj_done) return true; if (jj_scan_token(LT_T)) return true; return false; } - inline bool jj_3R_relation_operator_2717_2_475() + inline bool jj_3R_relation_operator_2737_2_475() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_relation_operator_2717_2_578()) { + if (jj_3R_relation_operator_2737_2_578()) { jj_scanpos = xsp; - if (jj_3R_relation_operator_2718_3_579()) { + if (jj_3R_relation_operator_2738_3_579()) { jj_scanpos = xsp; - if (jj_3R_relation_operator_2719_3_580()) { + if (jj_3R_relation_operator_2739_3_580()) { jj_scanpos = xsp; - if (jj_3R_relation_operator_2720_3_581()) { + if (jj_3R_relation_operator_2740_3_581()) { jj_scanpos = xsp; - if (jj_3R_relation_operator_2721_3_582()) { + if (jj_3R_relation_operator_2741_3_582()) { jj_scanpos = xsp; - if (jj_3R_relation_operator_2722_3_583()) { + if (jj_3R_relation_operator_2742_3_583()) { jj_scanpos = xsp; - if (jj_3R_relation_operator_2723_3_584()) { + if (jj_3R_relation_operator_2743_3_584()) { jj_scanpos = xsp; - if (jj_3R_relation_operator_2724_3_585()) { + if (jj_3R_relation_operator_2744_3_585()) { jj_scanpos = xsp; - if (jj_3R_relation_operator_2725_3_586()) { + if (jj_3R_relation_operator_2745_3_586()) { jj_scanpos = xsp; - if (jj_3R_relation_operator_2726_3_587()) { + if (jj_3R_relation_operator_2746_3_587()) { jj_scanpos = xsp; - if (jj_3R_relation_operator_2727_3_588()) { + if (jj_3R_relation_operator_2747_3_588()) { jj_scanpos = xsp; - if (jj_3R_relation_operator_2728_3_589()) return true; + if (jj_3R_relation_operator_2748_3_589()) return true; } } } @@ -4049,417 +3949,427 @@ void parseInline(); return false; } - inline bool jj_3R_record_mode_view_indication_2696_21_791() + inline bool jj_3R_element_mode_view_indication_1200_3_804() { if (jj_done) return true; - if (jj_scan_token(OF_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3_49()) { + jj_scanpos = xsp; + if (jj_3R_element_mode_view_indication_1201_5_822()) return true; + } return false; } - inline bool jj_3R_neg_list_2712_3_796() + inline bool jj_3_49() { if (jj_done) return true; - if (jj_scan_token(NEG_T)) return true; - if (jj_scan_token(DOT_T)) return true; + if (jj_3R_element_record_mode_view_indication_1206_2_109()) return true; return false; } - inline bool jj_3R_neg_list_2712_2_753() + inline bool jj_3R_record_mode_view_indication_2716_21_791() { if (jj_done) return true; - Token * xsp; - if (jj_3R_neg_list_2712_3_796()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3R_neg_list_2712_3_796()) { jj_scanpos = xsp; break; } - } + if (jj_scan_token(OF_T)) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; return false; } - inline bool jj_3R_relative_pathname_2707_3_682() + inline bool jj_3_48() { if (jj_done) return true; - if (jj_3R_neg_list_2712_2_753()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_relative_pathname_2707_17_754()) jj_scanpos = xsp; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_array_element_resolution_487_3_108()) return true; return false; } - inline bool jj_3R_relation_2702_3_179() + inline bool jj_3R_neg_list_2732_3_796() { if (jj_done) return true; - if (jj_3R_shift_expression_2959_2_365()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_relation_2702_25_366()) jj_scanpos = xsp; + if (jj_scan_token(NEG_T)) return true; + if (jj_scan_token(DOT_T)) return true; return false; } - inline bool jj_3R_record_element_list_2681_20_767() + inline bool jj_3R_element_mode_indication_1195_5_769() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_element_mode_view_indication_1200_3_804()) return true; return false; } - inline bool jj_3R_record_mode_view_indication_2696_4_735() + inline bool jj_3R_neg_list_2732_2_753() { if (jj_done) return true; - if (jj_scan_token(VIEW_T)) return true; - if (jj_3R_name_2126_2_73()) return true; Token * xsp; - xsp = jj_scanpos; - if (jj_3R_record_mode_view_indication_2696_21_791()) jj_scanpos = xsp; + if (jj_3R_neg_list_2732_3_796()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_neg_list_2732_3_796()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_element_declaration_1159_3_868() + inline bool jj_3R_element_mode_indication_1194_3_768() { if (jj_done) return true; - if (jj_3R_identifier_list_1652_4_258()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_mode_2101_1_428()) return true; return false; } - inline bool jj_3R_element_constraint_1154_4_510() + inline bool jj_3R_element_mode_indication_1194_3_693() { if (jj_done) return true; - if (jj_3R_array_constraint_474_3_621()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_element_mode_indication_1194_3_768()) { + jj_scanpos = xsp; + if (jj_3R_element_mode_indication_1195_5_769()) return true; + } return false; } - inline bool jj_3_47() + inline bool jj_3R_relative_pathname_2727_3_682() { if (jj_done) return true; - if (jj_3R_record_constraint_2670_6_107()) return true; + if (jj_3R_neg_list_2732_2_753()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_relative_pathname_2727_17_754()) jj_scanpos = xsp; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_element_constraint_1153_3_407() + inline bool jj_3R_relation_2722_3_179() { if (jj_done) return true; + if (jj_3R_shift_expression_2980_2_365()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_47()) { - jj_scanpos = xsp; - if (jj_3R_element_constraint_1154_4_510()) return true; - } + if (jj_3R_relation_2722_25_366()) jj_scanpos = xsp; return false; } - inline bool jj_3_46() + inline bool jj_3R_record_element_list_2701_20_767() { if (jj_done) return true; - if (jj_3R_choices_771_3_106()) return true; - if (jj_scan_token(ARROW_T)) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + return false; + } + + inline bool jj_3R_record_mode_view_indication_2716_4_735() + { + if (jj_done) return true; + if (jj_scan_token(VIEW_T)) return true; + if (jj_3R_name_2142_2_73()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_record_mode_view_indication_2716_21_791()) jj_scanpos = xsp; return false; } - inline bool jj_3R_record_type_definition_2665_21_859() + inline bool jj_3R_record_type_definition_2685_21_859() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_record_element_list_2681_5_692() + inline bool jj_3R_record_element_list_2701_5_692() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_record_element_list_2681_20_767()) { jj_scanpos = xsp; break; } + if (jj_3R_record_element_list_2701_20_767()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_record_element_constraint_2676_5_231() + inline bool jj_3R_element_declaration_1167_3_868() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_3R_element_constraint_1153_3_407()) return true; + if (jj_3R_identifier_list_1663_4_258()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_element_association_1143_2_453() + inline bool jj_3R_element_constraint_1162_4_510() { if (jj_done) return true; - if (jj_3R_choices_771_3_106()) return true; - if (jj_scan_token(ARROW_T)) return true; + if (jj_3R_array_constraint_476_3_621()) return true; return false; } - inline bool jj_3_45() + inline bool jj_3R_record_element_constraint_2696_5_231() { if (jj_done) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_3R_element_constraint_1161_3_407()) return true; return false; } - inline bool jj_3R_element_association_1143_1_305() + inline bool jj_3_47() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_element_association_1143_2_453()) jj_scanpos = xsp; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_record_constraint_2690_6_107()) return true; return false; } - inline bool jj_3_44() + inline bool jj_3R_element_constraint_1161_3_407() { if (jj_done) return true; - if (jj_3R_range_2648_4_105()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3_47()) { + jj_scanpos = xsp; + if (jj_3R_element_constraint_1162_4_510()) return true; + } return false; } - inline bool jj_3R_record_constraint_2670_6_107() + inline bool jj_3_46() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_record_element_constraint_2676_5_231()) return true; + if (jj_3R_choices_775_3_106()) return true; + if (jj_scan_token(ARROW_T)) return true; return false; } - inline bool jj_3R_element_array_mode_view_indication_1137_2_850() + inline bool jj_3R_record_constraint_2690_6_107() { if (jj_done) return true; - if (jj_scan_token(VIEW_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_record_element_constraint_2696_5_231()) return true; return false; } - inline bool jj_3R_record_type_definition_2663_9_858() + inline bool jj_3R_record_type_definition_2683_9_858() { if (jj_done) return true; - if (jj_3R_element_declaration_1159_3_868()) return true; + if (jj_3R_element_declaration_1167_3_868()) return true; return false; } - inline bool jj_3R_record_type_definition_2662_8_846() + inline bool jj_3R_record_type_definition_2682_8_846() { if (jj_done) return true; if (jj_scan_token(RECORD_T)) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_record_type_definition_2663_9_858()) { jj_scanpos = xsp; break; } + if (jj_3R_record_type_definition_2683_9_858()) { jj_scanpos = xsp; break; } } if (jj_scan_token(END_T)) return true; if (jj_scan_token(RECORD_T)) return true; xsp = jj_scanpos; - if (jj_3R_record_type_definition_2665_21_859()) jj_scanpos = xsp; + if (jj_3R_record_type_definition_2685_21_859()) jj_scanpos = xsp; return false; } - inline bool jj_3R_discrete_range_1131_3_204() + inline bool jj_3R_element_association_1151_2_453() { if (jj_done) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_choices_775_3_106()) return true; + if (jj_scan_token(ARROW_T)) return true; return false; } - inline bool jj_3R_discrete_range_1128_3_87() + inline bool jj_3_45() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_discrete_range_1128_3_203()) { - jj_scanpos = xsp; - if (jj_3R_discrete_range_1131_3_204()) return true; - } + if (jj_3R_subtype_indication_3222_3_71()) return true; return false; } - inline bool jj_3R_discrete_range_1128_3_203() + inline bool jj_3R_element_association_1151_1_305() { if (jj_done) return true; - if (jj_3R_range_2648_4_105()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_element_association_1151_2_453()) jj_scanpos = xsp; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3_128() + inline bool jj_3_44() { if (jj_done) return true; - if (jj_3R_simple_expression_3039_1_85()) return true; - if (jj_3R_direction_1107_1_86()) return true; - if (jj_3R_simple_expression_3039_1_85()) return true; + if (jj_3R_range_2668_4_105()) return true; return false; } - inline bool jj_3_129() + inline bool jj_3_128() { if (jj_done) return true; - if (jj_3R_attribute_name_572_3_144()) return true; + if (jj_3R_simple_expression_3061_1_85()) return true; + if (jj_3R_direction_1115_1_86()) return true; + if (jj_3R_simple_expression_3061_1_85()) return true; return false; } - inline bool jj_3R_guarded_signal_specificatio_1123_2_531() + inline bool jj_3_129() { if (jj_done) return true; - if (jj_3R_signal_list_3015_2_644()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_attribute_name_575_3_144()) return true; return false; } - inline bool jj_3R_range_constraint_2657_1_103() + inline bool jj_3R_element_array_mode_view_indication_1145_2_850() { if (jj_done) return true; - if (jj_scan_token(RANGE_T)) return true; - if (jj_3R_range_2648_4_105()) return true; + if (jj_scan_token(VIEW_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_disconnection_specification_1118_1_425() + inline bool jj_3R_range_constraint_2677_1_103() { if (jj_done) return true; - if (jj_scan_token(DISCONNECT_T)) return true; - if (jj_3R_guarded_signal_specificatio_1123_2_531()) return true; - if (jj_scan_token(AFTER_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_scan_token(RANGE_T)) return true; + if (jj_3R_range_2668_4_105()) return true; return false; } - inline bool jj_3_126() + inline bool jj_3R_discrete_range_1139_3_204() { if (jj_done) return true; - if (jj_3R_aggregate_400_3_141()) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; return false; } - inline bool jj_3R_range_2651_2_228() + inline bool jj_3R_discrete_range_1136_3_87() { if (jj_done) return true; - if (jj_3R_attribute_name_572_3_144()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_discrete_range_1136_3_203()) { + jj_scanpos = xsp; + if (jj_3R_discrete_range_1139_3_204()) return true; + } return false; } - inline bool jj_3R_range_2648_4_105() + inline bool jj_3R_discrete_range_1136_3_203() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_range_2648_4_227()) { - jj_scanpos = xsp; - if (jj_3R_range_2651_2_228()) return true; - } + if (jj_3R_range_2668_4_105()) return true; return false; } - inline bool jj_3R_range_2648_4_227() + inline bool jj_3_126() { if (jj_done) return true; - if (jj_3R_simple_expression_3039_1_85()) return true; - if (jj_3R_direction_1107_1_86()) return true; - if (jj_3R_simple_expression_3039_1_85()) return true; + if (jj_3R_aggregate_400_3_141()) return true; return false; } - inline bool jj_3R_discrete_incomplete_type_definition_1113_2_785() + inline bool jj_3R_range_2671_2_228() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_scan_token(BOX_T)) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_attribute_name_575_3_144()) return true; return false; } - inline bool jj_3R_qualified_expression_2641_7_451() + inline bool jj_3R_range_2668_4_105() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_scan_token(RPAREN_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_range_2668_4_227()) { + jj_scanpos = xsp; + if (jj_3R_range_2671_2_228()) return true; + } return false; } - inline bool jj_3R_direction_1108_3_202() + inline bool jj_3R_range_2668_4_227() { if (jj_done) return true; - if (jj_scan_token(DOWNTO_T)) return true; + if (jj_3R_simple_expression_3061_1_85()) return true; + if (jj_3R_direction_1115_1_86()) return true; + if (jj_3R_simple_expression_3061_1_85()) return true; return false; } - inline bool jj_3R_qualified_expression_2639_5_450() + inline bool jj_3R_guarded_signal_specificatio_1131_2_531() { if (jj_done) return true; - if (jj_3R_aggregate_400_3_141()) return true; + if (jj_3R_signal_list_3037_2_644()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_direction_1107_1_86() + inline bool jj_3R_qualified_expression_2661_7_451() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_direction_1107_1_201()) { - jj_scanpos = xsp; - if (jj_3R_direction_1108_3_202()) return true; - } + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_direction_1107_1_201() + inline bool jj_3R_qualified_expression_2659_5_450() { if (jj_done) return true; - if (jj_scan_token(TO_T)) return true; + if (jj_3R_aggregate_400_3_141()) return true; return false; } - inline bool jj_3R_designator_1102_4_737() + inline bool jj_3R_disconnection_specification_1126_1_425() { if (jj_done) return true; - if (jj_3R_operator_symbol_2216_1_369()) return true; + if (jj_scan_token(DISCONNECT_T)) return true; + if (jj_3R_guarded_signal_specificatio_1131_2_531()) return true; + if (jj_scan_token(AFTER_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_qualified_expression_2638_3_189() + inline bool jj_3R_qualified_expression_2658_3_189() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(APOSTROPHE_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_qualified_expression_2639_5_450()) { + if (jj_3R_qualified_expression_2659_5_450()) { jj_scanpos = xsp; - if (jj_3R_qualified_expression_2641_7_451()) return true; + if (jj_3R_qualified_expression_2661_7_451()) return true; } return false; } - inline bool jj_3R_protected_type_header_2613_26_861() + inline bool jj_3R_protected_type_header_2633_26_861() { if (jj_done) return true; - if (jj_3R_generic_map_aspect_1609_6_88()) return true; + if (jj_3R_generic_map_aspect_1620_6_88()) return true; return false; } - inline bool jj_3R_protected_type_declaration_2608_31_821() + inline bool jj_3R_protected_type_declaration_2628_31_821() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_qualified_expression_2636_3_74() + inline bool jj_3R_qualified_expression_2656_3_74() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_127()) { jj_scanpos = xsp; - if (jj_3R_qualified_expression_2638_3_189()) return true; + if (jj_3R_qualified_expression_2658_3_189()) return true; } return false; } @@ -4467,7 +4377,7 @@ void parseInline(); inline bool jj_3_127() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(CHARACTER_LITERAL)) return true; if (jj_scan_token(LETTER_OR_DIGIT)) return true; if (jj_scan_token(APOSTROPHE_T)) return true; @@ -4475,105 +4385,117 @@ void parseInline(); return false; } - inline bool jj_3R_designator_1101_2_736() + inline bool jj_3R_discrete_incomplete_type_definition_1121_2_785() + { + if (jj_done) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_scan_token(BOX_T)) return true; + if (jj_scan_token(RPAREN_T)) return true; + return false; + } + + inline bool jj_3R_protected_type_declarative_part_2649_6_849() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_protected_type_declarative_item_2638_5_862()) return true; return false; } - inline bool jj_3R_designator_1101_2_659() + inline bool jj_3R_protected_type_declarative_part_2649_5_820() { if (jj_done) return true; Token * xsp; - xsp = jj_scanpos; - if (jj_3R_designator_1101_2_736()) { - jj_scanpos = xsp; - if (jj_3R_designator_1102_4_737()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_protected_type_declarative_part_2649_6_849()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_protected_type_declarative_part_2629_6_849() + inline bool jj_3R_direction_1116_3_202() { if (jj_done) return true; - if (jj_3R_protected_type_declarative_item_2618_5_862()) return true; + if (jj_scan_token(DOWNTO_T)) return true; return false; } - inline bool jj_3_43() + inline bool jj_3_124() { if (jj_done) return true; - if (jj_3R_context_clause_1039_3_104()) return true; + if (jj_3R_subprogram_declaration_3106_1_142()) return true; return false; } - inline bool jj_3R_protected_type_declarative_part_2629_5_820() + inline bool jj_3R_direction_1115_1_86() { if (jj_done) return true; Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_protected_type_declarative_part_2629_6_849()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_direction_1115_1_201()) { + jj_scanpos = xsp; + if (jj_3R_direction_1116_3_202()) return true; } return false; } - inline bool jj_3_124() + inline bool jj_3R_direction_1115_1_201() { if (jj_done) return true; - if (jj_3R_subprogram_declaration_3084_1_142()) return true; + if (jj_scan_token(TO_T)) return true; return false; } - inline bool jj_3R_protected_type_declarative_item_2623_7_887() + inline bool jj_3R_protected_type_declarative_item_2643_7_887() { if (jj_done) return true; - if (jj_3R_use_clause_3276_2_400()) return true; + if (jj_3R_use_clause_3300_2_400()) return true; return false; } - inline bool jj_3R_protected_type_declarative_item_2622_7_886() + inline bool jj_3R_protected_type_declarative_item_2642_7_886() { if (jj_done) return true; - if (jj_3R_private_variable_declaration_2450_3_890()) return true; + if (jj_3R_private_variable_declaration_2470_3_890()) return true; return false; } - inline bool jj_3R_constant_declaration_1020_74_517() + inline bool jj_3R_designator_1110_4_737() { if (jj_done) return true; - if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_conditional_expression_955_3_137()) return true; + if (jj_3R_operator_symbol_2232_1_369()) return true; return false; } - inline bool jj_3R_protected_type_declarative_item_2621_7_885() + inline bool jj_3R_protected_type_declarative_item_2641_7_885() { if (jj_done) return true; - if (jj_3R_attribute_specification_577_3_423()) return true; + if (jj_3R_attribute_specification_580_3_423()) return true; return false; } - inline bool jj_3R_conditional_or_unaffected_expression_960_133_670() + inline bool jj_3R_protected_type_declarative_item_2640_7_884() { if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_condition_901_3_100()) return true; + if (jj_3R_subprogram_instantiation_declaration_3200_2_170()) return true; return false; } - inline bool jj_3R_protected_type_declarative_item_2620_7_884() + inline bool jj_3R_designator_1109_2_736() { if (jj_done) return true; - if (jj_3R_subprogram_instantiation_declaration_3178_2_170()) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_context_ref_1061_31_509() + inline bool jj_3R_designator_1109_2_659() { if (jj_done) return true; - if (jj_scan_token(DOT_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_designator_1109_2_736()) { + jj_scanpos = xsp; + if (jj_3R_designator_1110_4_737()) return true; + } return false; } @@ -4584,37 +4506,29 @@ void parseInline(); return false; } - inline bool jj_3R_delay_mechanism_1085_5_615() - { - if (jj_done) return true; - if (jj_scan_token(REJECT_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - return false; - } - - inline bool jj_3R_protected_type_declarative_item_2618_5_883() + inline bool jj_3R_protected_type_declarative_item_2638_5_883() { if (jj_done) return true; - if (jj_3R_subprogram_declaration_3084_1_142()) return true; + if (jj_3R_subprogram_declaration_3106_1_142()) return true; return false; } - inline bool jj_3R_protected_type_declarative_item_2618_5_862() + inline bool jj_3R_protected_type_declarative_item_2638_5_862() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_protected_type_declarative_item_2618_5_883()) { + if (jj_3R_protected_type_declarative_item_2638_5_883()) { jj_scanpos = xsp; if (jj_3_125()) { jj_scanpos = xsp; - if (jj_3R_protected_type_declarative_item_2620_7_884()) { + if (jj_3R_protected_type_declarative_item_2640_7_884()) { jj_scanpos = xsp; - if (jj_3R_protected_type_declarative_item_2621_7_885()) { + if (jj_3R_protected_type_declarative_item_2641_7_885()) { jj_scanpos = xsp; - if (jj_3R_protected_type_declarative_item_2622_7_886()) { + if (jj_3R_protected_type_declarative_item_2642_7_886()) { jj_scanpos = xsp; - if (jj_3R_protected_type_declarative_item_2623_7_887()) return true; + if (jj_3R_protected_type_declarative_item_2643_7_887()) return true; } } } @@ -4623,360 +4537,343 @@ void parseInline(); return false; } - inline bool jj_3R_delay_mechanism_1085_3_493() + inline bool jj_3_43() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_delay_mechanism_1085_5_615()) jj_scanpos = xsp; - if (jj_scan_token(INERTIAL_T)) return true; + if (jj_3R_context_clause_1046_3_104()) return true; return false; } - inline bool jj_3R_protected_type_header_2613_7_848() + inline bool jj_3R_protected_type_header_2633_7_848() { if (jj_done) return true; - if (jj_3R_generic_clause_1599_2_81()) return true; + if (jj_3R_generic_clause_1610_2_81()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_protected_type_header_2613_26_861()) jj_scanpos = xsp; - return false; - } - - inline bool jj_3R_delay_mechanism_1084_1_492() - { - if (jj_done) return true; - if (jj_scan_token(TRANSPORT_T)) return true; + if (jj_3R_protected_type_header_2633_26_861()) jj_scanpos = xsp; return false; } - inline bool jj_3R_delay_mechanism_1084_1_381() + inline bool jj_3R_protected_type_header_2633_5_819() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_delay_mechanism_1084_1_492()) { - jj_scanpos = xsp; - if (jj_3R_delay_mechanism_1085_3_493()) return true; - } + if (jj_3R_protected_type_header_2633_7_848()) jj_scanpos = xsp; return false; } - inline bool jj_3R_protected_type_header_2613_5_819() + inline bool jj_3R_constant_declaration_1026_74_517() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_protected_type_header_2613_7_848()) jj_scanpos = xsp; + if (jj_scan_token(VARASSIGN_T)) return true; + if (jj_3R_conditional_expression_960_3_137()) return true; return false; } - inline bool jj_3R_protected_type_declaration_2603_4_803() + inline bool jj_3R_context_ref_1068_31_509() { if (jj_done) return true; - if (jj_scan_token(PROTECTED_T)) return true; - if (jj_3R_protected_type_header_2613_5_819()) return true; - if (jj_3R_protected_type_declarative_part_2629_5_820()) return true; - if (jj_scan_token(END_T)) return true; - if (jj_scan_token(PROTECTED_T)) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_protected_type_declaration_2608_31_821()) jj_scanpos = xsp; + if (jj_scan_token(DOT_T)) return true; return false; } - inline bool jj_3R_context_declaration_1069_2_444() + inline bool jj_3R_conditional_or_unaffected_expression_965_133_670() { if (jj_done) return true; - if (jj_scan_token(CONTEXT_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_condition_906_3_100()) return true; return false; } - inline bool jj_3R_protected_type_body_2567_38_818() + inline bool jj_3R_delay_mechanism_1093_5_615() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_scan_token(REJECT_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_part_2597_7_847() + inline bool jj_3R_delay_mechanism_1093_3_493() { if (jj_done) return true; - if (jj_3R_protected_type_body_declarative_item_2572_5_860()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_delay_mechanism_1093_5_615()) jj_scanpos = xsp; + if (jj_scan_token(INERTIAL_T)) return true; return false; } - inline bool jj_3_122() + inline bool jj_3R_delay_mechanism_1092_1_492() { if (jj_done) return true; - if (jj_3R_attribute_declaration_556_2_79()) return true; + if (jj_scan_token(TRANSPORT_T)) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_part_2597_5_817() + inline bool jj_3R_delay_mechanism_1092_1_381() { if (jj_done) return true; Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_protected_type_body_declarative_part_2597_7_847()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_delay_mechanism_1092_1_492()) { + jj_scanpos = xsp; + if (jj_3R_delay_mechanism_1093_3_493()) return true; } return false; } - inline bool jj_3R_protected_type_body_declarative_item_2591_7_882() + inline bool jj_3R_protected_type_declaration_2623_4_803() { if (jj_done) return true; - if (jj_3R_group_declaration_1625_3_426()) return true; + if (jj_scan_token(PROTECTED_T)) return true; + if (jj_3R_protected_type_header_2633_5_819()) return true; + if (jj_3R_protected_type_declarative_part_2649_5_820()) return true; + if (jj_scan_token(END_T)) return true; + if (jj_scan_token(PROTECTED_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_protected_type_declaration_2628_31_821()) jj_scanpos = xsp; return false; } - inline bool jj_3R_context_ref_1061_2_401() + inline bool jj_3R_protected_type_body_2587_38_818() { if (jj_done) return true; - if (jj_scan_token(CONTEXT_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_context_ref_1061_31_509()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3_42() + inline bool jj_3R_protected_type_body_declarative_part_2617_7_847() { if (jj_done) return true; - if (jj_3R_index_constraint_1724_3_75()) return true; + if (jj_3R_protected_type_body_declarative_item_2592_5_860()) return true; return false; } - inline bool jj_3_123() + inline bool jj_3_122() { if (jj_done) return true; - if (jj_3R_group_template_declaration_1633_2_80()) return true; + if (jj_3R_attribute_declaration_558_2_79()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2588_7_881() + inline bool jj_3R_protected_type_body_declarative_part_2617_5_817() { if (jj_done) return true; - if (jj_3R_use_clause_3276_2_400()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_protected_type_body_declarative_part_2617_7_847()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_protected_type_body_declarative_item_2587_7_880() + inline bool jj_3R_protected_type_body_declarative_item_2611_7_882() { if (jj_done) return true; - if (jj_3R_attribute_specification_577_3_423()) return true; + if (jj_3R_group_declaration_1636_3_426()) return true; return false; } - inline bool jj_3_41() + inline bool jj_3_123() { if (jj_done) return true; - if (jj_3R_range_constraint_2657_1_103()) return true; + if (jj_3R_group_template_declaration_1644_2_80()) return true; return false; } - inline bool jj_3R_context_item_1056_3_226() + inline bool jj_3R_protected_type_body_declarative_item_2608_7_881() { if (jj_done) return true; - if (jj_3R_context_ref_1061_2_401()) return true; + if (jj_3R_use_clause_3300_2_400()) return true; return false; } - inline bool jj_3_121() + inline bool jj_3R_protected_type_body_declarative_item_2607_7_880() { if (jj_done) return true; - if (jj_3R_package_declaration_2272_2_78()) return true; + if (jj_3R_attribute_specification_580_3_423()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2585_7_879() + inline bool jj_3R_context_declaration_1076_2_444() { if (jj_done) return true; - if (jj_3R_attribute_declaration_556_2_79()) return true; + if (jj_scan_token(CONTEXT_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_context_item_1054_3_225() + inline bool jj_3_121() { if (jj_done) return true; - if (jj_3R_use_clause_3276_2_400()) return true; + if (jj_3R_package_declaration_2289_2_78()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2583_7_878() + inline bool jj_3R_protected_type_body_declarative_item_2605_7_879() { if (jj_done) return true; - if (jj_3R_alias_declaration_405_2_143()) return true; + if (jj_3R_attribute_declaration_558_2_79()) return true; return false; } - inline bool jj_3R_context_item_1053_2_102() + inline bool jj_3R_protected_type_body_declarative_item_2603_7_878() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_context_item_1053_2_224()) { - jj_scanpos = xsp; - if (jj_3R_context_item_1054_3_225()) { - jj_scanpos = xsp; - if (jj_3R_context_item_1056_3_226()) return true; - } - } + if (jj_3R_alias_declaration_405_2_143()) return true; return false; } - inline bool jj_3R_context_item_1053_2_224() + inline bool jj_3R_protected_type_body_declarative_item_2602_7_877() { if (jj_done) return true; - if (jj_3R_library_clause_2012_2_399()) return true; + if (jj_3R_file_declaration_1443_2_421()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2582_7_877() + inline bool jj_3R_protected_type_body_declarative_item_2601_7_876() { if (jj_done) return true; - if (jj_3R_file_declaration_1434_2_421()) return true; + if (jj_3R_variable_declaration_3336_1_420()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2581_7_876() + inline bool jj_3R_protected_type_body_declarative_item_2600_7_875() { if (jj_done) return true; - if (jj_3R_variable_declaration_3312_1_420()) return true; + if (jj_3R_constant_declaration_1026_4_418()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2580_7_875() + inline bool jj_3R_protected_type_body_declarative_item_2599_7_874() { if (jj_done) return true; - if (jj_3R_constant_declaration_1020_4_418()) return true; + if (jj_3R_subtype_declaration_3211_1_416()) return true; return false; } - inline bool jj_3R_constraint_1047_5_355() + inline bool jj_3R_protected_type_body_declarative_item_2598_7_873() { if (jj_done) return true; - if (jj_3R_index_constraint_1724_3_75()) return true; + if (jj_3R_type_declaration_3262_1_415()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2579_7_874() + inline bool jj_3R_context_ref_1068_2_401() { if (jj_done) return true; - if (jj_3R_subtype_declaration_3188_1_416()) return true; + if (jj_scan_token(CONTEXT_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_context_ref_1068_31_509()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2578_7_873() + inline bool jj_3R_protected_type_body_declarative_item_2597_7_872() { if (jj_done) return true; - if (jj_3R_type_declaration_3238_1_415()) return true; + if (jj_3R_package_instantiation_declaration_2350_2_110()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2577_7_872() + inline bool jj_3_42() { if (jj_done) return true; - if (jj_3R_package_instantiation_declaration_2332_2_110()) return true; + if (jj_3R_index_constraint_1735_3_75()) return true; return false; } - inline bool jj_3R_constraint_1044_5_173() + inline bool jj_3R_protected_type_body_declarative_item_2596_7_871() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_constraint_1044_5_354()) { - jj_scanpos = xsp; - if (jj_3R_constraint_1047_5_355()) return true; - } + if (jj_3R_package_declaration_2289_2_78()) return true; return false; } - inline bool jj_3R_constraint_1044_5_354() + inline bool jj_3_120() { if (jj_done) return true; - if (jj_3R_range_constraint_2657_1_103()) return true; + if (jj_3R_package_body_2242_1_77()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2576_7_871() + inline bool jj_3_41() { if (jj_done) return true; - if (jj_3R_package_declaration_2272_2_78()) return true; + if (jj_3R_range_constraint_2677_1_103()) return true; return false; } - inline bool jj_3_120() + inline bool jj_3R_context_item_1063_3_226() { if (jj_done) return true; - if (jj_3R_package_body_2226_1_77()) return true; + if (jj_3R_context_ref_1068_2_401()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2573_7_870() + inline bool jj_3R_protected_type_body_declarative_item_2593_7_870() { if (jj_done) return true; - if (jj_3R_subprogram_body_3061_1_664()) return true; + if (jj_3R_subprogram_body_3083_1_664()) return true; return false; } - inline bool jj_3_40() + inline bool jj_3R_context_item_1061_3_225() { if (jj_done) return true; - if (jj_3R_context_item_1053_2_102()) return true; + if (jj_3R_use_clause_3300_2_400()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2572_5_869() + inline bool jj_3R_protected_type_body_declarative_item_2592_5_869() { if (jj_done) return true; - if (jj_3R_subprogram_declaration_3084_1_142()) return true; + if (jj_3R_subprogram_declaration_3106_1_142()) return true; return false; } - inline bool jj_3R_protected_type_body_declarative_item_2572_5_860() + inline bool jj_3R_protected_type_body_declarative_item_2592_5_860() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_protected_type_body_declarative_item_2572_5_869()) { + if (jj_3R_protected_type_body_declarative_item_2592_5_869()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2573_7_870()) { + if (jj_3R_protected_type_body_declarative_item_2593_7_870()) { jj_scanpos = xsp; if (jj_3_120()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2576_7_871()) { + if (jj_3R_protected_type_body_declarative_item_2596_7_871()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2577_7_872()) { + if (jj_3R_protected_type_body_declarative_item_2597_7_872()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2578_7_873()) { + if (jj_3R_protected_type_body_declarative_item_2598_7_873()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2579_7_874()) { + if (jj_3R_protected_type_body_declarative_item_2599_7_874()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2580_7_875()) { + if (jj_3R_protected_type_body_declarative_item_2600_7_875()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2581_7_876()) { + if (jj_3R_protected_type_body_declarative_item_2601_7_876()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2582_7_877()) { + if (jj_3R_protected_type_body_declarative_item_2602_7_877()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2583_7_878()) { + if (jj_3R_protected_type_body_declarative_item_2603_7_878()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2585_7_879()) { + if (jj_3R_protected_type_body_declarative_item_2605_7_879()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2587_7_880()) { + if (jj_3R_protected_type_body_declarative_item_2607_7_880()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2588_7_881()) { + if (jj_3R_protected_type_body_declarative_item_2608_7_881()) { jj_scanpos = xsp; if (jj_3_123()) { jj_scanpos = xsp; - if (jj_3R_protected_type_body_declarative_item_2591_7_882()) return true; + if (jj_3R_protected_type_body_declarative_item_2611_7_882()) return true; } } } @@ -4995,317 +4892,330 @@ void parseInline(); return false; } - inline bool jj_3R_context_clause_1039_3_104() + inline bool jj_3R_context_item_1060_2_102() { if (jj_done) return true; Token * xsp; - if (jj_3_40()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3_40()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_context_item_1060_2_224()) { + jj_scanpos = xsp; + if (jj_3R_context_item_1061_3_225()) { + jj_scanpos = xsp; + if (jj_3R_context_item_1063_3_226()) return true; + } } return false; } - inline bool jj_3R_constraint_array_definition_1033_1_866() + inline bool jj_3R_context_item_1060_2_224() { if (jj_done) return true; - if (jj_scan_token(ARRAY_T)) return true; - if (jj_3R_index_constraint_1724_3_75()) return true; - if (jj_scan_token(OF_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_library_clause_2027_2_399()) return true; return false; } - inline bool jj_3R_protected_type_body_2563_4_177() + inline bool jj_3R_constraint_1054_5_355() + { + if (jj_done) return true; + if (jj_3R_index_constraint_1735_3_75()) return true; + return false; + } + + inline bool jj_3R_constraint_1051_5_173() { if (jj_done) return true; - if (jj_scan_token(PROTECTED_T)) return true; - if (jj_scan_token(BODY_T)) return true; - if (jj_3R_protected_type_body_declarative_part_2597_5_817()) return true; - if (jj_scan_token(END_T)) return true; - if (jj_scan_token(PROTECTED_T)) return true; - if (jj_scan_token(BODY_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_protected_type_body_2567_38_818()) jj_scanpos = xsp; + if (jj_3R_constraint_1051_5_354()) { + jj_scanpos = xsp; + if (jj_3R_constraint_1054_5_355()) return true; + } return false; } - inline bool jj_3R_process_statement_part_2556_4_414() + inline bool jj_3R_constraint_1051_5_354() { if (jj_done) return true; - if (jj_3R_sequential_statement_2884_5_148()) return true; + if (jj_3R_range_constraint_2677_1_103()) return true; return false; } - inline bool jj_3R_constant_declaration_1020_4_418() + inline bool jj_3R_protected_type_body_2583_4_177() { if (jj_done) return true; - if (jj_scan_token(CONSTANT_T)) return true; - if (jj_3R_identifier_list_1652_4_258()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_scan_token(PROTECTED_T)) return true; + if (jj_scan_token(BODY_T)) return true; + if (jj_3R_protected_type_body_declarative_part_2617_5_817()) return true; + if (jj_scan_token(END_T)) return true; + if (jj_scan_token(PROTECTED_T)) return true; + if (jj_scan_token(BODY_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_constant_declaration_1020_74_517()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_protected_type_body_2587_38_818()) jj_scanpos = xsp; + return false; + } + + inline bool jj_3_40() + { + if (jj_done) return true; + if (jj_3R_context_item_1060_2_102()) return true; return false; } - inline bool jj_3R_process_statement_part_2556_3_237() + inline bool jj_3R_context_clause_1046_3_104() { if (jj_done) return true; Token * xsp; + if (jj_3_40()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_process_statement_part_2556_4_414()) { jj_scanpos = xsp; break; } + if (jj_3_40()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_process_statement_2534_24_238() + inline bool jj_3R_process_statement_part_2576_4_414() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_sequential_statement_2905_5_148()) return true; return false; } - inline bool jj_3_39() + inline bool jj_3R_process_statement_part_2576_3_237() { if (jj_done) return true; - if (jj_3R_component_configuration_776_5_101()) return true; - return false; - } + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_process_statement_part_2576_4_414()) { jj_scanpos = xsp; break; } + } + return false; + } - inline bool jj_3R_configuration_specification_1015_1_424() + inline bool jj_3R_process_statement_2554_24_238() { if (jj_done) return true; - if (jj_scan_token(FOR_T)) return true; - if (jj_3R_component_specification_815_1_221()) return true; - if (jj_3R_binding_indication_618_2_397()) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_configuration_item_1009_4_689() + inline bool jj_3R_constraint_array_definition_1040_1_866() { if (jj_done) return true; - if (jj_3R_block_configuration_636_5_398()) return true; + if (jj_scan_token(ARRAY_T)) return true; + if (jj_3R_index_constraint_1735_3_75()) return true; + if (jj_scan_token(OF_T)) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; return false; } - inline bool jj_3R_configuration_item_1007_2_688() + inline bool jj_3R_constant_declaration_1026_4_418() { if (jj_done) return true; - if (jj_3R_component_configuration_776_5_101()) return true; + if (jj_scan_token(CONSTANT_T)) return true; + if (jj_3R_identifier_list_1663_4_258()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_constant_declaration_1026_74_517()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_configuration_item_1007_2_620() + inline bool jj_3_39() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_configuration_item_1007_2_688()) { - jj_scanpos = xsp; - if (jj_3R_configuration_item_1009_4_689()) return true; - } + if (jj_3R_component_configuration_780_5_101()) return true; return false; } - inline bool jj_3_37() + inline bool jj_3R_configuration_specification_1021_1_424() { if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_condition_901_3_100()) return true; - if (jj_scan_token(ELSE_T)) return true; + if (jj_scan_token(FOR_T)) return true; + if (jj_3R_component_specification_820_1_221()) return true; + if (jj_3R_binding_indication_622_2_397()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_process_statement_2524_4_235() + inline bool jj_3R_configuration_item_1015_4_689() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_sensitivity_list_2872_3_412()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_block_configuration_640_5_398()) return true; return false; } - inline bool jj_3R_conditional_or_unaffected_expression_960_32_669() + inline bool jj_3R_configuration_item_1013_2_688() { if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_condition_901_3_100()) return true; - if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_expression_or_unaffected_1378_4_668()) return true; + if (jj_3R_component_configuration_780_5_101()) return true; return false; } - inline bool jj_3_38() + inline bool jj_3R_configuration_item_1013_2_620() { if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_condition_901_3_100()) return true; - if (jj_scan_token(ELSE_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_configuration_item_1013_2_688()) { + jj_scanpos = xsp; + if (jj_3R_configuration_item_1015_4_689()) return true; + } return false; } - inline bool jj_3R_process_statement_2516_3_234() + inline bool jj_3R_process_statement_2544_4_235() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_sensitivity_list_2893_3_412()) return true; + if (jj_scan_token(RPAREN_T)) return true; + return false; + } + + inline bool jj_3_37() + { + if (jj_done) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_condition_906_3_100()) return true; + if (jj_scan_token(ELSE_T)) return true; return false; } - inline bool jj_3R_configuration_declaration_981_2_443() + inline bool jj_3R_process_statement_2536_3_234() { if (jj_done) return true; - if (jj_scan_token(CONFIGURATION_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_process_statement_2516_1_112() + inline bool jj_3R_process_statement_2536_1_112() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_process_statement_2516_3_234()) jj_scanpos = xsp; + if (jj_3R_process_statement_2536_3_234()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(79)) jj_scanpos = xsp; if (jj_scan_token(PROCESS_T)) return true; xsp = jj_scanpos; - if (jj_3R_process_statement_2524_4_235()) jj_scanpos = xsp; + if (jj_3R_process_statement_2544_4_235()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_scan_token(56)) jj_scanpos = xsp; - if (jj_3R_process_declarative_part_2511_2_236()) return true; + if (jj_3R_process_declarative_part_2531_2_236()) return true; if (jj_scan_token(BEGIN_T)) return true; - if (jj_3R_process_statement_part_2556_3_237()) return true; + if (jj_3R_process_statement_part_2576_3_237()) return true; if (jj_scan_token(END_T)) return true; xsp = jj_scanpos; if (jj_scan_token(79)) jj_scanpos = xsp; if (jj_scan_token(PROCESS_T)) return true; xsp = jj_scanpos; - if (jj_3R_process_statement_2534_24_238()) jj_scanpos = xsp; + if (jj_3R_process_statement_2554_24_238()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_conditional_waveforms_974_7_384() + inline bool jj_3R_process_declarative_part_2531_4_413() { if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_condition_901_3_100()) return true; + if (jj_3R_process_declarative_item_2506_1_513()) return true; return false; } - inline bool jj_3R_process_declarative_part_2511_4_413() + inline bool jj_3R_process_declarative_part_2531_2_236() { if (jj_done) return true; - if (jj_3R_process_declarative_item_2486_1_513()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_process_declarative_part_2531_4_413()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_conditional_waveforms_972_7_383() + inline bool jj_3R_conditional_or_unaffected_expression_965_32_669() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_condition_901_3_100()) return true; + if (jj_3R_condition_906_3_100()) return true; if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_waveform_3350_1_382()) return true; - return false; - } - - inline bool jj_3R_else_stat_950_28_617() - { - if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_expression_or_unaffected_1387_4_668()) return true; return false; } - inline bool jj_3R_process_declarative_part_2511_2_236() + inline bool jj_3R_process_declarative_item_2526_3_635() { if (jj_done) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_process_declarative_part_2511_4_413()) { jj_scanpos = xsp; break; } - } + if (jj_3R_group_declaration_1636_3_426()) return true; return false; } - inline bool jj_3R_conditional_expression_955_20_298() + inline bool jj_3_38() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_condition_901_3_100()) return true; + if (jj_3R_condition_906_3_100()) return true; if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; return false; } - inline bool jj_3R_process_declarative_item_2506_3_635() + inline bool jj_3R_process_declarative_item_2522_3_634() { if (jj_done) return true; - if (jj_3R_group_declaration_1625_3_426()) return true; + if (jj_3R_use_clause_3300_2_400()) return true; return false; } - inline bool jj_3R_conditional_waveforms_971_1_207() + inline bool jj_3_119() { if (jj_done) return true; - if (jj_3R_waveform_3350_1_382()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_conditional_waveforms_972_7_383()) { jj_scanpos = xsp; break; } - } - xsp = jj_scanpos; - if (jj_3R_conditional_waveforms_974_7_384()) jj_scanpos = xsp; + if (jj_3R_group_template_declaration_1644_2_80()) return true; return false; } - inline bool jj_3R_process_declarative_item_2502_3_634() + inline bool jj_3R_procedure_call_2487_38_394() { if (jj_done) return true; - if (jj_3R_use_clause_3276_2_400()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_actual_parameter_part_371_4_297()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3_119() + inline bool jj_3R_process_declarative_item_2521_3_633() { if (jj_done) return true; - if (jj_3R_group_template_declaration_1633_2_80()) return true; + if (jj_3R_attribute_specification_580_3_423()) return true; return false; } - inline bool jj_3R_procedure_call_2467_38_394() + inline bool jj_3R_configuration_declaration_986_2_443() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_actual_parameter_part_371_4_297()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_scan_token(CONFIGURATION_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_process_declarative_item_2501_3_633() + inline bool jj_3_117() { if (jj_done) return true; - if (jj_3R_attribute_specification_577_3_423()) return true; + if (jj_3R_package_declaration_2289_2_78()) return true; return false; } - inline bool jj_3_117() + inline bool jj_3R_conditional_waveforms_979_7_384() { if (jj_done) return true; - if (jj_3R_package_declaration_2272_2_78()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_condition_906_3_100()) return true; return false; } - inline bool jj_3R_process_declarative_item_2497_3_632() + inline bool jj_3R_process_declarative_item_2517_3_632() { if (jj_done) return true; if (jj_3R_alias_declaration_405_2_143()) return true; @@ -5315,200 +5225,158 @@ void parseInline(); inline bool jj_3_118() { if (jj_done) return true; - if (jj_3R_attribute_declaration_556_2_79()) return true; + if (jj_3R_attribute_declaration_558_2_79()) return true; return false; } - inline bool jj_3R_process_declarative_item_2496_3_631() + inline bool jj_3R_process_declarative_item_2516_3_631() { if (jj_done) return true; - if (jj_3R_file_declaration_1434_2_421()) return true; + if (jj_3R_file_declaration_1443_2_421()) return true; return false; } - inline bool jj_3R_else_wave_list_936_27_750() + inline bool jj_3R_conditional_waveforms_977_7_383() { if (jj_done) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_condition_906_3_100()) return true; + if (jj_scan_token(ELSE_T)) return true; + if (jj_3R_waveform_3375_1_382()) return true; return false; } - inline bool jj_3R_process_declarative_item_2495_3_630() + inline bool jj_3R_process_declarative_item_2515_3_630() { if (jj_done) return true; - if (jj_3R_variable_declaration_3312_1_420()) return true; + if (jj_3R_variable_declaration_3336_1_420()) return true; return false; } - inline bool jj_3R_process_declarative_item_2494_3_629() + inline bool jj_3R_else_stat_955_28_617() { if (jj_done) return true; - if (jj_3R_constant_declaration_1020_4_418()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_conditional_or_unaffected_expression_960_2_560() + inline bool jj_3R_process_declarative_item_2514_3_629() { if (jj_done) return true; - if (jj_3R_expression_or_unaffected_1378_4_668()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_conditional_or_unaffected_expression_960_32_669()) { jj_scanpos = xsp; break; } - } - xsp = jj_scanpos; - if (jj_3R_conditional_or_unaffected_expression_960_133_670()) jj_scanpos = xsp; + if (jj_3R_constant_declaration_1026_4_418()) return true; return false; } - inline bool jj_3R_process_declarative_item_2493_3_628() + inline bool jj_3R_process_declarative_item_2513_3_628() { if (jj_done) return true; - if (jj_3R_type_declaration_3238_1_415()) return true; + if (jj_3R_type_declaration_3262_1_415()) return true; return false; } - inline bool jj_3R_process_declarative_item_2492_3_627() + inline bool jj_3R_process_declarative_item_2512_3_627() { if (jj_done) return true; - if (jj_3R_subtype_declaration_3188_1_416()) return true; + if (jj_3R_subtype_declaration_3211_1_416()) return true; return false; } - inline bool jj_3R_process_declarative_item_2491_3_626() + inline bool jj_3R_conditional_expression_960_20_298() { if (jj_done) return true; - if (jj_3R_package_instantiation_declaration_2332_2_110()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_condition_906_3_100()) return true; + if (jj_scan_token(ELSE_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_conditional_force_assignment_943_16_219() + inline bool jj_3R_process_declarative_item_2511_3_626() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_scan_token(53)) { - jj_scanpos = xsp; - if (jj_scan_token(75)) return true; - } + if (jj_3R_package_instantiation_declaration_2350_2_110()) return true; return false; } - inline bool jj_3R_process_declarative_item_2490_3_625() + inline bool jj_3R_process_declarative_item_2510_3_625() { if (jj_done) return true; - if (jj_3R_package_declaration_2272_2_78()) return true; + if (jj_3R_package_declaration_2289_2_78()) return true; return false; } - inline bool jj_3R_conditional_expression_955_3_137() + inline bool jj_3R_conditional_waveforms_976_1_207() { if (jj_done) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_waveform_3375_1_382()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_conditional_expression_955_20_298()) { jj_scanpos = xsp; break; } + if (jj_3R_conditional_waveforms_977_7_383()) { jj_scanpos = xsp; break; } } - return false; - } - - inline bool jj_3R_conditional_force_assignment_944_13_220() - { - if (jj_done) return true; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_3R_else_stat_950_4_395()) return true; + xsp = jj_scanpos; + if (jj_3R_conditional_waveforms_979_7_384()) jj_scanpos = xsp; return false; } inline bool jj_3_116() { if (jj_done) return true; - if (jj_3R_package_body_2226_1_77()) return true; - return false; - } - - inline bool jj_3R_conditional_waveform_assignment_930_26_563() - { - if (jj_done) return true; - if (jj_3R_else_wave_list_936_3_672()) return true; - return false; - } - - inline bool jj_3R_process_declarative_item_2487_3_624() - { - if (jj_done) return true; - if (jj_3R_subprogram_body_3061_1_664()) return true; - return false; - } - - inline bool jj_3R_else_stat_950_5_498() - { - if (jj_done) return true; - if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_else_stat_950_28_617()) jj_scanpos = xsp; + if (jj_3R_package_body_2242_1_77()) return true; return false; } - inline bool jj_3R_else_stat_950_4_395() + inline bool jj_3R_process_declarative_item_2507_3_624() { if (jj_done) return true; - Token * xsp; - if (jj_3R_else_stat_950_5_498()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3R_else_stat_950_5_498()) { jj_scanpos = xsp; break; } - } + if (jj_3R_subprogram_body_3083_1_664()) return true; return false; } - inline bool jj_3R_process_declarative_item_2486_1_623() + inline bool jj_3R_process_declarative_item_2506_1_623() { if (jj_done) return true; - if (jj_3R_subprogram_declaration_3084_1_142()) return true; + if (jj_3R_subprogram_declaration_3106_1_142()) return true; return false; } - inline bool jj_3R_process_declarative_item_2486_1_513() + inline bool jj_3R_process_declarative_item_2506_1_513() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_process_declarative_item_2486_1_623()) { + if (jj_3R_process_declarative_item_2506_1_623()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2487_3_624()) { + if (jj_3R_process_declarative_item_2507_3_624()) { jj_scanpos = xsp; if (jj_3_116()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2490_3_625()) { + if (jj_3R_process_declarative_item_2510_3_625()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2491_3_626()) { + if (jj_3R_process_declarative_item_2511_3_626()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2492_3_627()) { + if (jj_3R_process_declarative_item_2512_3_627()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2493_3_628()) { + if (jj_3R_process_declarative_item_2513_3_628()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2494_3_629()) { + if (jj_3R_process_declarative_item_2514_3_629()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2495_3_630()) { + if (jj_3R_process_declarative_item_2515_3_630()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2496_3_631()) { + if (jj_3R_process_declarative_item_2516_3_631()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2497_3_632()) { + if (jj_3R_process_declarative_item_2517_3_632()) { jj_scanpos = xsp; if (jj_3_118()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2501_3_633()) { + if (jj_3R_process_declarative_item_2521_3_633()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2502_3_634()) { + if (jj_3R_process_declarative_item_2522_3_634()) { jj_scanpos = xsp; if (jj_3_119()) { jj_scanpos = xsp; - if (jj_3R_process_declarative_item_2506_3_635()) return true; + if (jj_3R_process_declarative_item_2526_3_635()) return true; } } } @@ -5527,31 +5395,41 @@ void parseInline(); return false; } - inline bool jj_3R_conditional_waveform_assignment_929_17_561() + inline bool jj_3R_else_wave_list_941_27_750() { if (jj_done) return true; - if (jj_3R_delay_mechanism_1084_1_381()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_conditional_force_assignment_941_3_99() + inline bool jj_3R_conditional_or_unaffected_expression_965_2_560() { if (jj_done) return true; - if (jj_3R_target_3213_2_150()) return true; - if (jj_scan_token(LESSTHAN_T)) return true; - if (jj_scan_token(FORCE_T)) return true; + if (jj_3R_expression_or_unaffected_1387_4_668()) return true; Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_conditional_or_unaffected_expression_965_32_669()) { jj_scanpos = xsp; break; } + } xsp = jj_scanpos; - if (jj_3R_conditional_force_assignment_943_16_219()) jj_scanpos = xsp; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_conditional_or_unaffected_expression_965_133_670()) jj_scanpos = xsp; + return false; + } + + inline bool jj_3R_conditional_force_assignment_948_16_219() + { + if (jj_done) return true; + Token * xsp; xsp = jj_scanpos; - if (jj_3R_conditional_force_assignment_944_13_220()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_scan_token(53)) { + jj_scanpos = xsp; + if (jj_scan_token(75)) return true; + } return false; } - inline bool jj_3R_procedure_call_2467_12_393() + inline bool jj_3R_procedure_call_2487_12_393() { if (jj_done) return true; if (jj_scan_token(PARAMETER_T)) return true; @@ -5559,198 +5437,250 @@ void parseInline(); return false; } - inline bool jj_3R_else_wave_list_936_3_672() + inline bool jj_3R_conditional_expression_960_3_137() + { + if (jj_done) return true; + if (jj_3R_expression_1380_20_70()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_conditional_expression_960_20_298()) { jj_scanpos = xsp; break; } + } + return false; + } + + inline bool jj_3R_conditional_force_assignment_949_13_220() + { + if (jj_done) return true; + if (jj_3R_expression_1380_20_70()) return true; + if (jj_3R_else_stat_955_4_395()) return true; + return false; + } + + inline bool jj_3R_conditional_waveform_assignment_935_26_563() + { + if (jj_done) return true; + if (jj_3R_else_wave_list_941_3_672()) return true; + return false; + } + + inline bool jj_3R_else_stat_955_5_498() { if (jj_done) return true; if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_expression_1380_20_70()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_else_wave_list_936_27_750()) jj_scanpos = xsp; + if (jj_3R_else_stat_955_28_617()) jj_scanpos = xsp; + return false; + } + + inline bool jj_3R_else_stat_955_4_395() + { + if (jj_done) return true; + Token * xsp; + if (jj_3R_else_stat_955_5_498()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_else_stat_955_5_498()) { jj_scanpos = xsp; break; } + } return false; } inline bool jj_3_115() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_procedure_call_statement_2472_1_155() + inline bool jj_3R_procedure_call_statement_2492_1_155() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_115()) jj_scanpos = xsp; - if (jj_3R_procedure_call_2467_3_218()) return true; + if (jj_3R_procedure_call_2487_3_218()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_concurrent_selected_signal_assignment_856_79_208() - { - if (jj_done) return true; - if (jj_3R_delay_mechanism_1084_1_381()) return true; - return false; - } - - inline bool jj_3R_procedure_call_2467_3_218() + inline bool jj_3R_procedure_call_2487_3_218() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_procedure_call_2467_12_393()) jj_scanpos = xsp; + if (jj_3R_procedure_call_2487_12_393()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_procedure_call_2467_38_394()) jj_scanpos = xsp; + if (jj_3R_procedure_call_2487_38_394()) jj_scanpos = xsp; return false; } - inline bool jj_3_36() + inline bool jj_3R_conditional_waveform_assignment_934_17_561() { if (jj_done) return true; - if (jj_3R_conditional_force_assignment_941_3_99()) return true; + if (jj_3R_delay_mechanism_1092_1_381()) return true; return false; } - inline bool jj_3R_conditional_waveform_assignment_928_3_470() + inline bool jj_3R_conditional_force_assignment_946_3_99() { if (jj_done) return true; - if (jj_3R_target_3213_2_150()) return true; + if (jj_3R_target_3237_2_150()) return true; if (jj_scan_token(LESSTHAN_T)) return true; + if (jj_scan_token(FORCE_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_conditional_waveform_assignment_929_17_561()) jj_scanpos = xsp; - if (jj_3R_waveform_element_3358_2_562()) return true; + if (jj_3R_conditional_force_assignment_948_16_219()) jj_scanpos = xsp; + if (jj_3R_expression_1380_20_70()) return true; if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; xsp = jj_scanpos; - if (jj_3R_conditional_waveform_assignment_930_26_563()) jj_scanpos = xsp; + if (jj_3R_conditional_force_assignment_949_13_220()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_conditional_signal_assignment_wave_923_3_346() + inline bool jj_3R_else_wave_list_941_3_672() { if (jj_done) return true; - if (jj_3R_conditional_waveform_assignment_928_3_470()) return true; + if (jj_scan_token(ELSE_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_else_wave_list_941_27_750()) jj_scanpos = xsp; return false; } - inline bool jj_3R_conditional_signal_assignment_wave_921_3_166() + inline bool jj_3R_private_incomplete_type_definition_2475_3_784() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_conditional_signal_assignment_wave_921_3_345()) { - jj_scanpos = xsp; - if (jj_3R_conditional_signal_assignment_wave_923_3_346()) return true; - } + if (jj_scan_token(PRIVATE_T)) return true; return false; } - inline bool jj_3R_conditional_signal_assignment_wave_921_3_345() + inline bool jj_3R_concurrent_selected_signal_assignment_861_79_208() { if (jj_done) return true; - if (jj_3R_conditional_force_assignment_941_3_99()) return true; + if (jj_3R_delay_mechanism_1092_1_381()) return true; return false; } - inline bool jj_3R_private_incomplete_type_definition_2455_3_784() + inline bool jj_3_36() { if (jj_done) return true; - if (jj_scan_token(PRIVATE_T)) return true; + if (jj_3R_conditional_force_assignment_946_3_99()) return true; return false; } - inline bool jj_3R_private_variable_declaration_2450_3_890() + inline bool jj_3R_private_variable_declaration_2470_3_890() { if (jj_done) return true; if (jj_scan_token(PRIVATE_T)) return true; - if (jj_3R_variable_declaration_3312_1_420()) return true; + if (jj_3R_variable_declaration_3336_1_420()) return true; + return false; + } + + inline bool jj_3R_conditional_waveform_assignment_933_3_470() + { + if (jj_done) return true; + if (jj_3R_target_3237_2_150()) return true; + if (jj_scan_token(LESSTHAN_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_conditional_waveform_assignment_934_17_561()) jj_scanpos = xsp; + if (jj_3R_waveform_element_3383_2_562()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; + xsp = jj_scanpos; + if (jj_3R_conditional_waveform_assignment_935_26_563()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } inline bool jj_3_114() { if (jj_done) return true; - if (jj_3R_package_instantiation_declaration_2332_2_110()) return true; + if (jj_3R_package_instantiation_declaration_2350_2_110()) return true; return false; } - inline bool jj_3R_condition_clause_912_3_464() + inline bool jj_3R_primary_unit_2464_4_276() { if (jj_done) return true; - if (jj_scan_token(UNTIL_T)) return true; - if (jj_3R_condition_901_3_100()) return true; + if (jj_3R_context_declaration_1076_2_444()) return true; return false; } - inline bool jj_3R_primary_unit_2444_4_276() + inline bool jj_3R_conditional_signal_assignment_wave_928_3_346() { if (jj_done) return true; - if (jj_3R_context_declaration_1069_2_444()) return true; + if (jj_3R_conditional_waveform_assignment_933_3_470()) return true; return false; } - inline bool jj_3R_primary_unit_2443_3_275() + inline bool jj_3R_primary_unit_2463_3_275() { if (jj_done) return true; - if (jj_3R_package_declaration_2272_2_78()) return true; + if (jj_3R_package_declaration_2289_2_78()) return true; return false; } - inline bool jj_3R_primary_unit_2438_3_273() + inline bool jj_3R_conditional_signal_assignment_wave_926_3_166() { if (jj_done) return true; - if (jj_3R_configuration_declaration_981_2_443()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_conditional_signal_assignment_wave_926_3_345()) { + jj_scanpos = xsp; + if (jj_3R_conditional_signal_assignment_wave_928_3_346()) return true; + } return false; } - inline bool jj_3R_primary_unit_2440_1_274() + inline bool jj_3R_conditional_signal_assignment_wave_926_3_345() { if (jj_done) return true; - if (jj_3R_package_instantiation_declaration_2332_2_110()) return true; + if (jj_3R_conditional_force_assignment_946_3_99()) return true; return false; } - inline bool jj_3_113() + inline bool jj_3R_primary_unit_2458_3_273() { if (jj_done) return true; - if (jj_3R_aggregate_400_3_141()) return true; + if (jj_3R_configuration_declaration_986_2_443()) return true; return false; } - inline bool jj_3R_condition_901_3_100() + inline bool jj_3R_primary_unit_2460_1_274() { if (jj_done) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_package_instantiation_declaration_2350_2_110()) return true; return false; } - inline bool jj_3_35() + inline bool jj_3_113() { if (jj_done) return true; - if (jj_3R_concurrent_procedure_call_statement_831_1_98()) return true; + if (jj_3R_aggregate_400_3_141()) return true; return false; } - inline bool jj_3R_primary_unit_2437_1_123() + inline bool jj_3R_primary_unit_2457_1_123() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_primary_unit_2437_1_272()) { + if (jj_3R_primary_unit_2457_1_272()) { jj_scanpos = xsp; - if (jj_3R_primary_unit_2438_3_273()) { + if (jj_3R_primary_unit_2458_3_273()) { jj_scanpos = xsp; - if (jj_3R_primary_unit_2440_1_274()) { + if (jj_3R_primary_unit_2460_1_274()) { jj_scanpos = xsp; - if (jj_3R_primary_unit_2443_3_275()) { + if (jj_3R_primary_unit_2463_3_275()) { jj_scanpos = xsp; - if (jj_3R_primary_unit_2444_4_276()) return true; + if (jj_3R_primary_unit_2464_4_276()) return true; } } } @@ -5758,257 +5688,227 @@ void parseInline(); return false; } - inline bool jj_3R_primary_unit_2437_1_272() + inline bool jj_3R_primary_unit_2457_1_272() { if (jj_done) return true; - if (jj_3R_entity_declaration_1243_5_442()) return true; + if (jj_3R_entity_declaration_1251_5_442()) return true; return false; } inline bool jj_3_112() { if (jj_done) return true; - if (jj_3R_allocator_425_3_140()) return true; - return false; - } - - inline bool jj_3_34() - { - if (jj_done) return true; - if (jj_3R_component_instantiation_statement_798_2_97()) return true; + if (jj_3R_allocator_426_3_140()) return true; return false; } - inline bool jj_3_33() + inline bool jj_3R_condition_clause_917_3_464() { if (jj_done) return true; - if (jj_3R_concurrent_signal_association_statement_861_2_96()) return true; + if (jj_scan_token(UNTIL_T)) return true; + if (jj_3R_condition_906_3_100()) return true; return false; } inline bool jj_3_111() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } inline bool jj_3_110() { if (jj_done) return true; - if (jj_3R_literal_2036_2_139()) return true; + if (jj_3R_literal_2052_2_139()) return true; return false; } - inline bool jj_3R_primary_2429_1_576() + inline bool jj_3R_primary_2449_1_576() { if (jj_done) return true; if (jj_3R_aggregate_400_3_141()) return true; return false; } - inline bool jj_3_32() + inline bool jj_3_109() { if (jj_done) return true; - if (jj_3R_concurrent_signal_assignment_statement_836_1_95()) return true; + if (jj_3R_type_conversion_3257_3_138()) return true; return false; } - inline bool jj_3R_null_881_12_94() + inline bool jj_3R_primary_2446_1_575() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_allocator_426_3_140()) return true; return false; } - inline bool jj_3_109() + inline bool jj_3_108() { if (jj_done) return true; - if (jj_3R_type_conversion_3233_3_138()) return true; + if (jj_3R_qualified_expression_2656_3_74()) return true; return false; } - inline bool jj_3R_primary_2426_1_575() + inline bool jj_3R_primary_2443_1_574() { if (jj_done) return true; - if (jj_3R_allocator_425_3_140()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3_31() + inline bool jj_3R_condition_906_3_100() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_null_881_12_94()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_scan_token(79)) jj_scanpos = xsp; - if (jj_scan_token(ASSERT_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_concurrent_simple_signal_assignment_851_39_496() + inline bool jj_3_35() { if (jj_done) return true; - if (jj_3R_delay_mechanism_1084_1_381()) return true; + if (jj_3R_concurrent_procedure_call_statement_836_1_98()) return true; return false; } - inline bool jj_3_108() + inline bool jj_3_107() { if (jj_done) return true; - if (jj_3R_qualified_expression_2636_3_74()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_conditional_expression_960_3_137()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_primary_2423_1_574() + inline bool jj_3R_primary_2440_1_573() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_literal_2052_2_139()) return true; return false; } - inline bool jj_3R_null_875_12_92() + inline bool jj_3_34() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_component_instantiation_statement_803_2_97()) return true; return false; } - inline bool jj_3_107() + inline bool jj_3_33() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_conditional_expression_955_3_137()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_concurrent_signal_association_statement_866_2_96()) return true; return false; } - inline bool jj_3R_primary_2420_1_573() + inline bool jj_3_106() { if (jj_done) return true; - if (jj_3R_literal_2036_2_139()) return true; + if (jj_3R_function_call_1534_1_136()) return true; return false; } - inline bool jj_3_29() + inline bool jj_3R_primary_2437_1_572() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_null_875_12_92()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_scan_token(79)) jj_scanpos = xsp; - if (jj_scan_token(PROCESS_T)) return true; + if (jj_3R_type_conversion_3257_3_138()) return true; return false; } - inline bool jj_3R_null_872_12_91() + inline bool jj_3R_primary_2434_1_571() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_qualified_expression_2656_3_74()) return true; return false; } - inline bool jj_3R_concurrent_conditional_signal_assignment_846_38_206() + inline bool jj_3_32() { if (jj_done) return true; - if (jj_3R_delay_mechanism_1084_1_381()) return true; + if (jj_3R_concurrent_signal_assignment_statement_841_1_95()) return true; return false; } - inline bool jj_3_106() + inline bool jj_3_104() { if (jj_done) return true; - if (jj_3R_function_call_1523_1_136()) return true; + if (jj_3R_pathname_element_2367_3_134()) return true; + if (jj_scan_token(DOT_T)) return true; return false; } - inline bool jj_3R_primary_2417_1_572() + inline bool jj_3R_physical_type_definition_2400_33_865() { if (jj_done) return true; - if (jj_3R_type_conversion_3233_3_138()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3_28() + inline bool jj_3R_null_886_12_94() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_null_872_12_91()) jj_scanpos = xsp; - if (jj_scan_token(BLOCK_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3_104() - { - if (jj_done) return true; - if (jj_3R_pathname_element_2348_3_134()) return true; - if (jj_scan_token(DOT_T)) return true; - return false; - } - - inline bool jj_3R_primary_2414_1_571() - { - if (jj_done) return true; - if (jj_3R_qualified_expression_2636_3_74()) return true; - return false; - } - - inline bool jj_3_30() + inline bool jj_3R_primary_2431_1_570() { if (jj_done) return true; - if (jj_3R_generate_statement_1581_1_93()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_conditional_expression_960_3_137()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_physical_type_definition_2380_33_865() + inline bool jj_3_31() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_null_886_12_94()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_scan_token(79)) jj_scanpos = xsp; + if (jj_scan_token(ASSERT_T)) return true; return false; } - inline bool jj_3R_primary_2411_1_570() + inline bool jj_3R_concurrent_simple_signal_assignment_856_39_496() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_conditional_expression_955_3_137()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_delay_mechanism_1092_1_381()) return true; return false; } - inline bool jj_3R_primary_2408_1_569() + inline bool jj_3R_primary_2428_1_569() { if (jj_done) return true; - if (jj_3R_function_call_1523_1_136()) return true; + if (jj_3R_function_call_1534_1_136()) return true; return false; } - inline bool jj_3R_primary_2408_1_473() + inline bool jj_3R_primary_2428_1_473() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_primary_2408_1_569()) { + if (jj_3R_primary_2428_1_569()) { jj_scanpos = xsp; - if (jj_3R_primary_2411_1_570()) { + if (jj_3R_primary_2431_1_570()) { jj_scanpos = xsp; - if (jj_3R_primary_2414_1_571()) { + if (jj_3R_primary_2434_1_571()) { jj_scanpos = xsp; - if (jj_3R_primary_2417_1_572()) { + if (jj_3R_primary_2437_1_572()) { jj_scanpos = xsp; - if (jj_3R_primary_2420_1_573()) { + if (jj_3R_primary_2440_1_573()) { jj_scanpos = xsp; - if (jj_3R_primary_2423_1_574()) { + if (jj_3R_primary_2443_1_574()) { jj_scanpos = xsp; - if (jj_3R_primary_2426_1_575()) { + if (jj_3R_primary_2446_1_575()) { jj_scanpos = xsp; - if (jj_3R_primary_2429_1_576()) return true; + if (jj_3R_primary_2449_1_576()) return true; } } } @@ -6019,794 +5919,791 @@ void parseInline(); return false; } - inline bool jj_3R_pathname_element_list_2359_47_178() + inline bool jj_3R_null_880_12_92() { if (jj_done) return true; - if (jj_3R_pathname_element_2348_3_134()) return true; - if (jj_scan_token(DOT_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_port_map_aspect_2403_2_392() + inline bool jj_3_29() { if (jj_done) return true; - if (jj_scan_token(PORT_T)) return true; - if (jj_scan_token(MAP_T)) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_association_list_551_1_205()) return true; - if (jj_scan_token(RPAREN_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_null_880_12_92()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_scan_token(79)) jj_scanpos = xsp; + if (jj_scan_token(PROCESS_T)) return true; return false; } - inline bool jj_3R_concurrent_simple_signal_association_866_2_214() + inline bool jj_3R_pathname_element_list_2378_47_178() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(LGT_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_pathname_element_2367_3_134()) return true; + if (jj_scan_token(DOT_T)) return true; return false; } - inline bool jj_3R_port_list_2398_3_700() + inline bool jj_3R_port_map_aspect_2423_2_392() { if (jj_done) return true; - if (jj_3R_interface_list_1823_3_377()) return true; + if (jj_scan_token(PORT_T)) return true; + if (jj_scan_token(MAP_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_association_list_553_1_205()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3_27() + inline bool jj_3R_null_877_12_91() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_concurrent_signal_association_statement_861_2_96() + inline bool jj_3R_concurrent_conditional_signal_assignment_851_38_206() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3_27()) jj_scanpos = xsp; - if (jj_3R_concurrent_simple_signal_association_866_2_214()) return true; + if (jj_3R_delay_mechanism_1092_1_381()) return true; return false; } - inline bool jj_3R_port_clause_2393_4_641() + inline bool jj_3_28() { if (jj_done) return true; - if (jj_scan_token(PORT_T)) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_port_list_2398_3_700()) return true; - if (jj_scan_token(RPAREN_T)) return true; - if (jj_scan_token(SEMI_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_null_877_12_91()) jj_scanpos = xsp; + if (jj_scan_token(BLOCK_T)) return true; return false; } - inline bool jj_3R_concurrent_selected_signal_assignment_856_6_90() + inline bool jj_3R_port_list_2418_3_700() { if (jj_done) return true; - if (jj_scan_token(WITH_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_scan_token(SELECT_T)) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_scan_token(158)) jj_scanpos = xsp; - if (jj_3R_target_3213_2_150()) return true; - if (jj_scan_token(LESSTHAN_T)) return true; - xsp = jj_scanpos; - if (jj_scan_token(50)) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_concurrent_selected_signal_assignment_856_79_208()) jj_scanpos = xsp; - if (jj_3R_selected_waveforms_2812_2_209()) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_interface_list_1836_3_377()) return true; return false; } - inline bool jj_3R_physical_incomplete_type_definition_2388_5_786() + inline bool jj_3_30() { if (jj_done) return true; - if (jj_scan_token(UNITS_T)) return true; - if (jj_scan_token(BOX_T)) return true; + if (jj_3R_generate_statement_1592_1_93()) return true; return false; } - inline bool jj_3R_concurrent_simple_signal_assignment_851_7_388() + inline bool jj_3R_port_clause_2413_4_641() { if (jj_done) return true; - if (jj_3R_target_3213_2_150()) return true; - if (jj_scan_token(LESSTHAN_T)) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_scan_token(50)) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_concurrent_simple_signal_assignment_851_39_496()) jj_scanpos = xsp; - if (jj_3R_waveform_3350_1_382()) return true; + if (jj_scan_token(PORT_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_port_list_2418_3_700()) return true; + if (jj_scan_token(RPAREN_T)) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_physical_type_definition_2378_14_864() + inline bool jj_3R_physical_incomplete_type_definition_2408_5_786() { if (jj_done) return true; - if (jj_3R_secondary_unit_declaration_2792_1_888()) return true; + if (jj_scan_token(UNITS_T)) return true; + if (jj_scan_token(BOX_T)) return true; return false; } - inline bool jj_3R_package_instantiation_declaration_2332_57_307() + inline bool jj_3R_physical_type_definition_2398_14_864() { if (jj_done) return true; - if (jj_3R_gen_assoc_list_1533_4_172()) return true; + if (jj_3R_secondary_unit_declaration_2812_1_888()) return true; return false; } - inline bool jj_3R_concurrent_conditional_signal_assignment_846_6_89() + inline bool jj_3R_concurrent_simple_signal_association_871_2_214() { if (jj_done) return true; - if (jj_3R_target_3213_2_150()) return true; - if (jj_scan_token(LESSTHAN_T)) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_scan_token(50)) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_concurrent_conditional_signal_assignment_846_38_206()) jj_scanpos = xsp; - if (jj_3R_conditional_waveforms_971_1_207()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(LGT_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3_26() + inline bool jj_3R_package_instantiation_declaration_2350_57_307() + { + if (jj_done) return true; + if (jj_3R_gen_assoc_list_1544_4_172()) return true; + return false; + } + + inline bool jj_3_27() { if (jj_done) return true; - if (jj_3R_concurrent_selected_signal_assignment_856_6_90()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_physical_type_definition_2375_9_855() + inline bool jj_3R_physical_type_definition_2394_9_855() { if (jj_done) return true; if (jj_scan_token(UNITS_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(SEMI_T)) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_physical_type_definition_2378_14_864()) { jj_scanpos = xsp; break; } + if (jj_3R_physical_type_definition_2398_14_864()) { jj_scanpos = xsp; break; } } if (jj_scan_token(END_T)) return true; if (jj_scan_token(UNITS_T)) return true; xsp = jj_scanpos; - if (jj_3R_physical_type_definition_2380_33_865()) jj_scanpos = xsp; + if (jj_3R_physical_type_definition_2400_33_865()) jj_scanpos = xsp; return false; } - inline bool jj_3_25() + inline bool jj_3R_concurrent_signal_association_statement_866_2_96() { if (jj_done) return true; - if (jj_3R_concurrent_conditional_signal_assignment_846_6_89()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3_27()) jj_scanpos = xsp; + if (jj_3R_concurrent_simple_signal_association_871_2_214()) return true; return false; } - inline bool jj_3_105() + inline bool jj_3R_concurrent_selected_signal_assignment_861_6_90() { if (jj_done) return true; - if (jj_3R_abstract_literal_338_4_135()) return true; + if (jj_scan_token(WITH_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; + if (jj_scan_token(SELECT_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_scan_token(158)) jj_scanpos = xsp; + if (jj_3R_target_3237_2_150()) return true; + if (jj_scan_token(LESSTHAN_T)) return true; + xsp = jj_scanpos; + if (jj_scan_token(50)) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_concurrent_selected_signal_assignment_861_79_208()) jj_scanpos = xsp; + if (jj_3R_selected_waveforms_2833_2_209()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_concurrent_signal_assignment_statement_840_3_213() + inline bool jj_3_105() { if (jj_done) return true; - if (jj_3R_concurrent_simple_signal_assignment_851_7_388()) return true; + if (jj_3R_abstract_literal_338_4_135()) return true; return false; } - inline bool jj_3R_concurrent_signal_assignment_statement_839_3_212() + inline bool jj_3R_concurrent_simple_signal_assignment_856_7_388() { if (jj_done) return true; - if (jj_3R_concurrent_selected_signal_assignment_856_6_90()) return true; + if (jj_3R_target_3237_2_150()) return true; + if (jj_scan_token(LESSTHAN_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_scan_token(50)) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_concurrent_simple_signal_assignment_856_39_496()) jj_scanpos = xsp; + if (jj_3R_waveform_3375_1_382()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3_24() + inline bool jj_3R_concurrent_conditional_signal_assignment_851_6_89() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_target_3237_2_150()) return true; + if (jj_scan_token(LESSTHAN_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_scan_token(50)) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_concurrent_conditional_signal_assignment_851_38_206()) jj_scanpos = xsp; + if (jj_3R_conditional_waveforms_976_1_207()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_concurrent_signal_assignment_statement_838_1_211() + inline bool jj_3_26() { if (jj_done) return true; - if (jj_3R_concurrent_conditional_signal_assignment_846_6_89()) return true; + if (jj_3R_concurrent_selected_signal_assignment_861_6_90()) return true; return false; } - inline bool jj_3R_physical_literal_2370_3_292() + inline bool jj_3R_physical_literal_2389_3_292() { if (jj_done) return true; if (jj_3R_abstract_literal_338_4_135()) return true; return false; } - inline bool jj_3R_concurrent_signal_assignment_statement_836_1_95() + inline bool jj_3R_physical_literal_2389_2_133() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3_24()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_scan_token(79)) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_concurrent_signal_assignment_statement_838_1_211()) { - jj_scanpos = xsp; - if (jj_3R_concurrent_signal_assignment_statement_839_3_212()) { - jj_scanpos = xsp; - if (jj_3R_concurrent_signal_assignment_statement_840_3_213()) return true; - } - } + if (jj_3R_physical_literal_2389_3_292()) jj_scanpos = xsp; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_physical_literal_2370_2_133() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_physical_literal_2370_3_292()) jj_scanpos = xsp; - if (jj_3R_name_2126_2_73()) return true; - return false; - } - - inline bool jj_3_23() + inline bool jj_3_25() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_concurrent_conditional_signal_assignment_851_6_89()) return true; return false; } - inline bool jj_3R_package_path_name_2365_3_683() + inline bool jj_3R_package_path_name_2384_3_683() { if (jj_done) return true; if (jj_scan_token(AT_T)) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_concurrent_procedure_call_statement_831_1_98() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3_23()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_scan_token(79)) jj_scanpos = xsp; - if (jj_3R_procedure_call_2467_3_218()) return true; - if (jj_scan_token(SEMI_T)) return true; - return false; - } - - inline bool jj_3R_pathname_element_2348_19_293() + inline bool jj_3R_pathname_element_2367_19_293() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_expression_1380_20_70()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3_21() - { - if (jj_done) return true; - if (jj_3R_generic_map_aspect_1609_6_88()) return true; - return false; - } - - inline bool jj_3_22() + inline bool jj_3R_concurrent_signal_assignment_statement_845_3_213() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_concurrent_simple_signal_assignment_856_7_388()) return true; return false; } - inline bool jj_3R_concurrent_assertion_statement_826_1_111() + inline bool jj_3R_concurrent_signal_assignment_statement_844_3_212() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3_22()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_scan_token(79)) jj_scanpos = xsp; - if (jj_3R_assertion_526_4_233()) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_concurrent_selected_signal_assignment_861_6_90()) return true; return false; } - inline bool jj_3R_pathname_element_list_2359_3_69() + inline bool jj_3R_pathname_element_list_2378_3_69() { if (jj_done) return true; - if (jj_3R_pathname_element_2348_3_134()) return true; + if (jj_3R_pathname_element_2367_3_134()) return true; if (jj_scan_token(DOT_T)) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_pathname_element_list_2359_47_178()) { jj_scanpos = xsp; break; } + if (jj_3R_pathname_element_list_2378_47_178()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_composite_type_definition_821_3_815() + inline bool jj_3_24() { if (jj_done) return true; - if (jj_3R_record_type_definition_2662_8_846()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_composite_type_definition_820_2_814() + inline bool jj_3R_concurrent_signal_assignment_statement_843_1_211() { if (jj_done) return true; - if (jj_3R_array_type_definition_517_2_845()) return true; + if (jj_3R_concurrent_conditional_signal_assignment_851_6_89()) return true; return false; } - inline bool jj_3R_composite_type_definition_820_2_799() + inline bool jj_3R_concurrent_signal_assignment_statement_841_1_95() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_composite_type_definition_820_2_814()) { + if (jj_3_24()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_scan_token(79)) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_concurrent_signal_assignment_statement_843_1_211()) { + jj_scanpos = xsp; + if (jj_3R_concurrent_signal_assignment_statement_844_3_212()) { jj_scanpos = xsp; - if (jj_3R_composite_type_definition_821_3_815()) return true; + if (jj_3R_concurrent_signal_assignment_statement_845_3_213()) return true; + } } return false; } - inline bool jj_3R_component_declaration_791_31_529() + inline bool jj_3_23() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_component_instantiation_statement_810_11_217() + inline bool jj_3R_concurrent_procedure_call_statement_836_1_98() { if (jj_done) return true; - if (jj_3R_port_map_aspect_2403_2_392()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3_23()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_scan_token(79)) jj_scanpos = xsp; + if (jj_3R_procedure_call_2487_3_218()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_component_instantiation_statement_809_11_216() + inline bool jj_3_21() { if (jj_done) return true; - if (jj_3R_generic_map_aspect_1609_6_88()) return true; + if (jj_3R_generic_map_aspect_1620_6_88()) return true; return false; } - inline bool jj_3R_component_specification_815_1_221() + inline bool jj_3_22() { if (jj_done) return true; - if (jj_3R_instantiation_list_1750_3_396()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_name_2126_2_73()) return true; return false; } - inline bool jj_3R_pathname_element_2348_3_134() + inline bool jj_3R_pathname_element_2367_3_134() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_pathname_element_2348_19_293()) jj_scanpos = xsp; - return false; - } - - inline bool jj_3R_parameter_specification_2341_1_667() - { - if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(IN_T)) return true; - if (jj_3R_discrete_range_1128_3_87()) return true; + if (jj_3R_pathname_element_2367_19_293()) jj_scanpos = xsp; return false; } - inline bool jj_3R_component_instantiation_statement_798_2_97() + inline bool jj_3R_concurrent_assertion_statement_831_1_111() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_instantiation_unit_1743_1_215()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_component_instantiation_statement_809_11_216()) jj_scanpos = xsp; + if (jj_3_22()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_component_instantiation_statement_810_11_217()) jj_scanpos = xsp; + if (jj_scan_token(79)) jj_scanpos = xsp; + if (jj_3R_assertion_528_4_233()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_case_scheme_726_73_83() + inline bool jj_3R_composite_type_definition_826_3_815() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_record_type_definition_2682_8_846()) return true; return false; } - inline bool jj_3R_package_instantiation_declaration_2332_2_110() + inline bool jj_3R_composite_type_definition_825_2_814() { if (jj_done) return true; - if (jj_scan_token(PACKAGE_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(IS_T)) return true; - if (jj_scan_token(NEW_T)) return true; - if (jj_3R_name_2126_2_73()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_package_instantiation_declaration_2332_57_307()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_array_type_definition_519_2_845()) return true; return false; } - inline bool jj_3R_package_declarative_part_2327_3_376() + inline bool jj_3R_composite_type_definition_825_2_799() { if (jj_done) return true; - if (jj_3R_package_declarative_item_2296_1_487()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_composite_type_definition_825_2_814()) { + jj_scanpos = xsp; + if (jj_3R_composite_type_definition_826_3_815()) return true; + } return false; } - inline bool jj_3R_package_declarative_part_2327_2_193() + inline bool jj_3R_component_declaration_796_31_529() { if (jj_done) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_package_declarative_part_2327_3_376()) { jj_scanpos = xsp; break; } - } + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_component_declaration_786_5_528() + inline bool jj_3R_parameter_specification_2360_1_667() { if (jj_done) return true; - if (jj_3R_port_clause_2393_4_641()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(IN_T)) return true; + if (jj_3R_discrete_range_1136_3_87()) return true; return false; } - inline bool jj_3R_component_declaration_785_5_527() + inline bool jj_3R_component_instantiation_statement_815_11_217() { if (jj_done) return true; - if (jj_3R_generic_clause_1599_2_81()) return true; + if (jj_3R_port_map_aspect_2423_2_392()) return true; return false; } - inline bool jj_3R_component_configuration_778_11_223() + inline bool jj_3R_component_instantiation_statement_814_11_216() { if (jj_done) return true; - if (jj_3R_block_configuration_636_5_398()) return true; + if (jj_3R_generic_map_aspect_1620_6_88()) return true; return false; } - inline bool jj_3R_package_declarative_item_2321_2_611() + inline bool jj_3R_component_specification_820_1_221() { if (jj_done) return true; - if (jj_3R_package_declaration_2272_2_78()) return true; + if (jj_3R_instantiation_list_1761_3_396()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_component_configuration_777_11_222() + inline bool jj_3R_package_instantiation_declaration_2350_2_110() { if (jj_done) return true; - if (jj_3R_binding_indication_618_2_397()) return true; + if (jj_scan_token(PACKAGE_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(IS_T)) return true; + if (jj_scan_token(NEW_T)) return true; + if (jj_3R_name_2142_2_73()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_package_instantiation_declaration_2350_57_307()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_choices_771_15_230() + inline bool jj_3R_package_declarative_part_2345_3_376() { if (jj_done) return true; - if (jj_scan_token(BAR_T)) return true; - if (jj_3R_choice_755_4_229()) return true; + if (jj_3R_package_declarative_item_2314_1_487()) return true; return false; } - inline bool jj_3_103() + inline bool jj_3R_package_declarative_part_2345_2_193() { if (jj_done) return true; - if (jj_3R_package_instantiation_declaration_2332_2_110()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_package_declarative_part_2345_3_376()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_package_declarative_item_2317_3_610() + inline bool jj_3R_package_declarative_item_2339_2_611() { if (jj_done) return true; - if (jj_3R_group_declaration_1625_3_426()) return true; + if (jj_3R_package_declaration_2289_2_78()) return true; return false; } - inline bool jj_3R_component_declaration_783_2_422() + inline bool jj_3R_component_instantiation_statement_803_2_97() { if (jj_done) return true; - if (jj_scan_token(COMPONENT_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_instantiation_unit_1754_1_215()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_scan_token(56)) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_component_declaration_785_5_527()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_component_declaration_786_5_528()) jj_scanpos = xsp; - if (jj_scan_token(END_T)) return true; + if (jj_3R_component_instantiation_statement_814_11_216()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_scan_token(28)) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_component_declaration_791_31_529()) jj_scanpos = xsp; + if (jj_3R_component_instantiation_statement_815_11_217()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3_101() + inline bool jj_3_103() { if (jj_done) return true; - if (jj_3R_attribute_declaration_556_2_79()) return true; + if (jj_3R_package_instantiation_declaration_2350_2_110()) return true; return false; } - inline bool jj_3R_package_declarative_item_2313_3_609() + inline bool jj_3R_package_declarative_item_2335_3_610() { if (jj_done) return true; - if (jj_3R_use_clause_3276_2_400()) return true; + if (jj_3R_group_declaration_1636_3_426()) return true; return false; } - inline bool jj_3R_component_configuration_776_5_101() + inline bool jj_3R_case_scheme_730_73_83() { if (jj_done) return true; - if (jj_scan_token(FOR_T)) return true; - if (jj_3R_component_specification_815_1_221()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_component_configuration_777_11_222()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_component_configuration_778_11_223()) jj_scanpos = xsp; - if (jj_scan_token(END_T)) return true; - if (jj_scan_token(FOR_T)) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3_102() + inline bool jj_3_101() { if (jj_done) return true; - if (jj_3R_group_template_declaration_1633_2_80()) return true; + if (jj_3R_attribute_declaration_558_2_79()) return true; return false; } - inline bool jj_3R_package_declarative_item_2312_3_608() + inline bool jj_3R_package_declarative_item_2331_3_609() { if (jj_done) return true; - if (jj_3R_disconnection_specification_1118_1_425()) return true; + if (jj_3R_use_clause_3300_2_400()) return true; return false; } - inline bool jj_3R_package_declarative_item_2311_3_607() + inline bool jj_3_102() { if (jj_done) return true; - if (jj_3R_attribute_specification_577_3_423()) return true; + if (jj_3R_group_template_declaration_1644_2_80()) return true; return false; } - inline bool jj_3R_package_declaration_2287_26_194() + inline bool jj_3R_package_declarative_item_2330_3_608() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_disconnection_specification_1126_1_425()) return true; return false; } - inline bool jj_3_16() + inline bool jj_3R_package_declarative_item_2329_3_607() { if (jj_done) return true; - if (jj_scan_token(END_T)) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_case_scheme_726_73_83()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_attribute_specification_580_3_423()) return true; return false; } - inline bool jj_3R_package_declarative_item_2309_1_606() + inline bool jj_3R_package_declaration_2305_26_194() { if (jj_done) return true; - if (jj_3R_attribute_declaration_556_2_79()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_package_declarative_item_2307_3_605() + inline bool jj_3R_component_declaration_790_5_528() { if (jj_done) return true; - if (jj_3R_mode_view_declaration_2100_3_417()) return true; + if (jj_3R_port_clause_2413_4_641()) return true; return false; } - inline bool jj_3_20() + inline bool jj_3R_component_declaration_789_5_527() { if (jj_done) return true; - if (jj_3R_discrete_range_1128_3_87()) return true; + if (jj_3R_generic_clause_1610_2_81()) return true; return false; } - inline bool jj_3R_package_declarative_item_2306_3_604() + inline bool jj_3R_package_declarative_item_2327_1_606() { if (jj_done) return true; - if (jj_3R_component_declaration_783_2_422()) return true; + if (jj_3R_attribute_declaration_558_2_79()) return true; return false; } - inline bool jj_3R_choices_771_3_106() + inline bool jj_3R_package_declarative_item_2325_3_605() { if (jj_done) return true; - if (jj_3R_choice_755_4_229()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_choices_771_15_230()) { jj_scanpos = xsp; break; } - } + if (jj_3R_mode_view_declaration_2116_3_417()) return true; return false; } - inline bool jj_3R_package_declarative_item_2305_3_603() + inline bool jj_3R_component_configuration_782_11_223() { if (jj_done) return true; - if (jj_3R_alias_declaration_405_2_143()) return true; + if (jj_3R_block_configuration_640_5_398()) return true; return false; } - inline bool jj_3R_package_declarative_item_2304_3_602() + inline bool jj_3R_package_declarative_item_2324_3_604() { if (jj_done) return true; - if (jj_3R_file_declaration_1434_2_421()) return true; + if (jj_3R_component_declaration_787_2_422()) return true; return false; } - inline bool jj_3_19() + inline bool jj_3R_component_configuration_781_11_222() { if (jj_done) return true; - if (jj_3R_simple_expression_3039_1_85()) return true; + if (jj_3R_binding_indication_622_2_397()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_package_declarative_item_2303_3_601() + inline bool jj_3R_package_declarative_item_2323_3_603() { if (jj_done) return true; - if (jj_3R_variable_declaration_3312_1_420()) return true; + if (jj_3R_alias_declaration_405_2_143()) return true; return false; } - inline bool jj_3R_package_declarative_item_2302_3_600() + inline bool jj_3R_package_declarative_item_2322_3_602() { if (jj_done) return true; - if (jj_3R_signal_declaration_2999_1_419()) return true; + if (jj_3R_file_declaration_1443_2_421()) return true; return false; } - inline bool jj_3R_choice_765_5_406() + inline bool jj_3R_choices_775_15_230() { if (jj_done) return true; - if (jj_scan_token(OTHER_T)) return true; + if (jj_scan_token(BAR_T)) return true; + if (jj_3R_choice_759_4_229()) return true; return false; } - inline bool jj_3R_package_declarative_item_2301_3_599() + inline bool jj_3R_package_declarative_item_2321_3_601() { if (jj_done) return true; - if (jj_3R_constant_declaration_1020_4_418()) return true; + if (jj_3R_variable_declaration_3336_1_420()) return true; return false; } - inline bool jj_3_18() + inline bool jj_3R_component_declaration_787_2_422() { if (jj_done) return true; - if (jj_3R_simple_expression_3039_1_85()) return true; - if (jj_3R_direction_1107_1_86()) return true; + if (jj_scan_token(COMPONENT_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_scan_token(56)) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_component_declaration_789_5_527()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_component_declaration_790_5_528()) jj_scanpos = xsp; + if (jj_scan_token(END_T)) return true; + xsp = jj_scanpos; + if (jj_scan_token(28)) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_component_declaration_796_31_529()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_choice_764_4_405() + inline bool jj_3R_package_declarative_item_2320_3_600() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_signal_declaration_3020_1_419()) return true; + return false; + } + + inline bool jj_3R_package_declarative_item_2319_3_599() + { + if (jj_done) return true; + if (jj_3R_constant_declaration_1026_4_418()) return true; return false; } inline bool jj_3_100() { if (jj_done) return true; - if (jj_3R_package_declaration_2272_2_78()) return true; + if (jj_3R_package_declaration_2289_2_78()) return true; + return false; + } + + inline bool jj_3R_component_configuration_780_5_101() + { + if (jj_done) return true; + if (jj_scan_token(FOR_T)) return true; + if (jj_3R_component_specification_820_1_221()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_component_configuration_781_11_222()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_component_configuration_782_11_223()) jj_scanpos = xsp; + if (jj_scan_token(END_T)) return true; + if (jj_scan_token(FOR_T)) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } inline bool jj_3_99() { if (jj_done) return true; - if (jj_3R_package_instantiation_declaration_2332_2_110()) return true; + if (jj_3R_package_instantiation_declaration_2350_2_110()) return true; return false; } - inline bool jj_3R_package_declarative_item_2298_3_598() + inline bool jj_3R_package_declarative_item_2316_3_598() { if (jj_done) return true; - if (jj_3R_subtype_declaration_3188_1_416()) return true; + if (jj_3R_subtype_declaration_3211_1_416()) return true; return false; } - inline bool jj_3R_package_declarative_item_2297_3_597() + inline bool jj_3R_package_declarative_item_2315_3_597() { if (jj_done) return true; - if (jj_3R_type_declaration_3238_1_415()) return true; + if (jj_3R_type_declaration_3262_1_415()) return true; return false; } - inline bool jj_3R_choice_761_4_404() + inline bool jj_3_16() { if (jj_done) return true; - if (jj_3R_discrete_range_1128_3_87()) return true; + if (jj_scan_token(END_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_case_scheme_730_73_83()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_package_declarative_item_2296_1_596() + inline bool jj_3R_package_declarative_item_2314_1_596() { if (jj_done) return true; - if (jj_3R_subprogram_declaration_3084_1_142()) return true; + if (jj_3R_subprogram_declaration_3106_1_142()) return true; return false; } - inline bool jj_3R_package_declarative_item_2296_1_487() + inline bool jj_3R_package_declarative_item_2314_1_487() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_package_declarative_item_2296_1_596()) { + if (jj_3R_package_declarative_item_2314_1_596()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2297_3_597()) { + if (jj_3R_package_declarative_item_2315_3_597()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2298_3_598()) { + if (jj_3R_package_declarative_item_2316_3_598()) { jj_scanpos = xsp; if (jj_3_99()) { jj_scanpos = xsp; if (jj_3_100()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2301_3_599()) { + if (jj_3R_package_declarative_item_2319_3_599()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2302_3_600()) { + if (jj_3R_package_declarative_item_2320_3_600()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2303_3_601()) { + if (jj_3R_package_declarative_item_2321_3_601()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2304_3_602()) { + if (jj_3R_package_declarative_item_2322_3_602()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2305_3_603()) { + if (jj_3R_package_declarative_item_2323_3_603()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2306_3_604()) { + if (jj_3R_package_declarative_item_2324_3_604()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2307_3_605()) { + if (jj_3R_package_declarative_item_2325_3_605()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2309_1_606()) { + if (jj_3R_package_declarative_item_2327_1_606()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2311_3_607()) { + if (jj_3R_package_declarative_item_2329_3_607()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2312_3_608()) { + if (jj_3R_package_declarative_item_2330_3_608()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2313_3_609()) { + if (jj_3R_package_declarative_item_2331_3_609()) { jj_scanpos = xsp; if (jj_3_102()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2317_3_610()) { + if (jj_3R_package_declarative_item_2335_3_610()) { jj_scanpos = xsp; if (jj_3_103()) { jj_scanpos = xsp; - if (jj_3R_package_declarative_item_2321_2_611()) return true; + if (jj_3R_package_declarative_item_2339_2_611()) return true; } } } @@ -6829,250 +6726,297 @@ void parseInline(); return false; } - inline bool jj_3R_choice_758_4_403() + inline bool jj_3_20() { if (jj_done) return true; - if (jj_3R_simple_expression_3039_1_85()) return true; + if (jj_3R_discrete_range_1136_3_87()) return true; return false; } - inline bool jj_3R_choice_755_4_229() + inline bool jj_3R_choices_775_3_106() { if (jj_done) return true; + if (jj_3R_choice_759_4_229()) return true; Token * xsp; - xsp = jj_scanpos; - if (jj_3R_choice_755_4_402()) { - jj_scanpos = xsp; - if (jj_3R_choice_758_4_403()) { - jj_scanpos = xsp; - if (jj_3R_choice_761_4_404()) { - jj_scanpos = xsp; - if (jj_3R_choice_764_4_405()) { - jj_scanpos = xsp; - if (jj_3R_choice_765_5_406()) return true; - } - } - } + while (true) { + xsp = jj_scanpos; + if (jj_3R_choices_775_15_230()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_choice_755_4_402() + inline bool jj_3_19() + { + if (jj_done) return true; + if (jj_3R_simple_expression_3061_1_85()) return true; + return false; + } + + inline bool jj_3R_choice_769_5_406() { if (jj_done) return true; - if (jj_3R_range_2648_4_105()) return true; + if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_case_statement_717_38_760() + inline bool jj_3_18() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_simple_expression_3061_1_85()) return true; + if (jj_3R_direction_1115_1_86()) return true; return false; } - inline bool jj_3R_package_header_2265_25_486() + inline bool jj_3R_package_header_2282_25_486() { if (jj_done) return true; - if (jj_3R_generic_map_aspect_1609_6_88()) return true; + if (jj_3R_generic_map_aspect_1620_6_88()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_character_literal_750_3_445() + inline bool jj_3R_choice_768_4_405() { if (jj_done) return true; - if (jj_scan_token(CHARACTER_LITERAL)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3_17() + inline bool jj_3R_choice_765_4_404() { if (jj_done) return true; - if (jj_3R_label_2007_2_84()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_discrete_range_1136_3_87()) return true; return false; } - inline bool jj_3R_case_statement_alternative_739_3_748() + inline bool jj_3R_choice_762_4_403() { if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_choices_771_3_106()) return true; - if (jj_scan_token(ARROW_T)) return true; - if (jj_3R_sequential_statement_body_2946_2_797()) return true; + if (jj_3R_simple_expression_3061_1_85()) return true; + return false; + } + + inline bool jj_3R_choice_759_4_229() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_choice_759_4_402()) { + jj_scanpos = xsp; + if (jj_3R_choice_762_4_403()) { + jj_scanpos = xsp; + if (jj_3R_choice_765_4_404()) { + jj_scanpos = xsp; + if (jj_3R_choice_768_4_405()) { + jj_scanpos = xsp; + if (jj_3R_choice_769_5_406()) return true; + } + } + } + } + return false; + } + + inline bool jj_3R_choice_759_4_402() + { + if (jj_done) return true; + if (jj_3R_range_2668_4_105()) return true; + return false; + } + + inline bool jj_3R_case_statement_721_38_760() + { + if (jj_done) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_package_declaration_2272_2_78() + inline bool jj_3R_character_literal_754_3_445() + { + if (jj_done) return true; + if (jj_scan_token(CHARACTER_LITERAL)) return true; + return false; + } + + inline bool jj_3R_package_declaration_2289_2_78() { if (jj_done) return true; if (jj_scan_token(PACKAGE_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(IS_T)) return true; - if (jj_3R_package_header_2265_4_192()) return true; - if (jj_3R_package_declarative_part_2327_2_193()) return true; + if (jj_3R_package_header_2282_4_192()) return true; + if (jj_3R_package_declarative_part_2345_2_193()) return true; if (jj_scan_token(END_T)) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(76)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_package_declaration_2287_26_194()) jj_scanpos = xsp; + if (jj_3R_package_declaration_2305_26_194()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_package_header_2265_6_375() + inline bool jj_3R_package_header_2282_6_375() { if (jj_done) return true; - if (jj_3R_generic_clause_1599_2_81()) return true; + if (jj_3R_generic_clause_1610_2_81()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_package_header_2265_25_486()) jj_scanpos = xsp; + if (jj_3R_package_header_2282_25_486()) jj_scanpos = xsp; + return false; + } + + inline bool jj_3R_package_body_2251_36_526() + { + if (jj_done) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_package_body_2234_36_526() + inline bool jj_3_17() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_label_2022_2_84()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_package_header_2265_4_192() + inline bool jj_3R_package_header_2282_4_192() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_package_header_2265_6_375()) jj_scanpos = xsp; + if (jj_3R_package_header_2282_6_375()) jj_scanpos = xsp; return false; } - inline bool jj_3R_case_statement_716_11_759() + inline bool jj_3R_case_statement_alternative_743_3_748() { if (jj_done) return true; - if (jj_3R_case_statement_alternative_739_3_748()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_choices_775_3_106()) return true; + if (jj_scan_token(ARROW_T)) return true; + if (jj_3R_sequential_statement_body_2967_2_797()) return true; return false; } - inline bool jj_3R_package_body_declarative_part_2260_2_640() + inline bool jj_3R_package_body_declarative_part_2277_2_640() { if (jj_done) return true; - if (jj_3R_package_body_declarative_item_2239_1_699()) return true; + if (jj_3R_package_body_declarative_item_2256_1_699()) return true; return false; } - inline bool jj_3R_package_body_declarative_part_2260_1_524() + inline bool jj_3R_package_body_declarative_part_2277_1_524() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_package_body_declarative_part_2260_2_640()) { jj_scanpos = xsp; break; } + if (jj_3R_package_body_declarative_part_2277_2_640()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_package_body_declarative_item_2255_3_780() + inline bool jj_3R_package_body_declarative_item_2272_3_780() { if (jj_done) return true; - if (jj_3R_group_declaration_1625_3_426()) return true; + if (jj_3R_group_declaration_1636_3_426()) return true; return false; } - inline bool jj_3R_package_body_declarative_item_2251_3_779() + inline bool jj_3R_package_body_declarative_item_2268_3_779() { if (jj_done) return true; - if (jj_3R_use_clause_3276_2_400()) return true; + if (jj_3R_use_clause_3300_2_400()) return true; return false; } inline bool jj_3_98() { if (jj_done) return true; - if (jj_3R_group_template_declaration_1633_2_80()) return true; + if (jj_3R_group_template_declaration_1644_2_80()) return true; return false; } - inline bool jj_3R_package_body_declarative_item_2250_3_778() + inline bool jj_3R_package_body_declarative_item_2267_3_778() { if (jj_done) return true; - if (jj_3R_mode_view_declaration_2100_3_417()) return true; + if (jj_3R_mode_view_declaration_2116_3_417()) return true; return false; } - inline bool jj_3R_package_body_declarative_item_2249_3_777() + inline bool jj_3R_package_body_declarative_item_2266_3_777() { if (jj_done) return true; if (jj_3R_alias_declaration_405_2_143()) return true; return false; } - inline bool jj_3R_package_body_declarative_item_2248_3_776() + inline bool jj_3R_package_body_declarative_item_2265_3_776() { if (jj_done) return true; - if (jj_3R_file_declaration_1434_2_421()) return true; + if (jj_3R_file_declaration_1443_2_421()) return true; return false; } - inline bool jj_3R_package_body_declarative_item_2247_4_775() + inline bool jj_3R_package_body_declarative_item_2264_4_775() { if (jj_done) return true; - if (jj_3R_package_declaration_2272_2_78()) return true; + if (jj_3R_package_declaration_2289_2_78()) return true; return false; } - inline bool jj_3_97() + inline bool jj_3R_case_statement_720_11_759() { if (jj_done) return true; - if (jj_3R_package_instantiation_declaration_2332_2_110()) return true; + if (jj_3R_case_statement_alternative_743_3_748()) return true; return false; } - inline bool jj_3_96() + inline bool jj_3_97() { if (jj_done) return true; - if (jj_3R_package_body_2226_1_77()) return true; + if (jj_3R_package_instantiation_declaration_2350_2_110()) return true; return false; } - inline bool jj_3R_package_body_declarative_item_2244_3_774() + inline bool jj_3_96() { if (jj_done) return true; - if (jj_3R_variable_declaration_3312_1_420()) return true; + if (jj_3R_package_body_2242_1_77()) return true; return false; } - inline bool jj_3R_package_body_declarative_item_2243_3_773() + inline bool jj_3R_package_body_declarative_item_2261_3_774() { if (jj_done) return true; - if (jj_3R_constant_declaration_1020_4_418()) return true; + if (jj_3R_variable_declaration_3336_1_420()) return true; return false; } - inline bool jj_3R_package_body_declarative_item_2242_3_772() + inline bool jj_3R_package_body_declarative_item_2260_3_773() { if (jj_done) return true; - if (jj_3R_subtype_declaration_3188_1_416()) return true; + if (jj_3R_constant_declaration_1026_4_418()) return true; return false; } - inline bool jj_3_15() + inline bool jj_3R_package_body_declarative_item_2259_3_772() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_subtype_declaration_3211_1_416()) return true; return false; } - inline bool jj_3R_package_body_declarative_item_2241_3_771() + inline bool jj_3R_package_body_declarative_item_2258_3_771() { if (jj_done) return true; - if (jj_3R_type_declaration_3238_1_415()) return true; + if (jj_3R_type_declaration_3262_1_415()) return true; return false; } - inline bool jj_3R_package_body_2234_10_525() + inline bool jj_3R_package_body_2251_10_525() { if (jj_done) return true; if (jj_scan_token(PACKAGE_T)) return true; @@ -7080,71 +7024,45 @@ void parseInline(); return false; } - inline bool jj_3R_case_statement_708_1_157() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3_15()) jj_scanpos = xsp; - if (jj_scan_token(CASE_T)) return true; - xsp = jj_scanpos; - if (jj_scan_token(158)) jj_scanpos = xsp; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_scan_token(IS_T)) return true; - if (jj_3R_case_statement_alternative_739_3_748()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3R_case_statement_716_11_759()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(END_T)) return true; - if (jj_scan_token(CASE_T)) return true; - xsp = jj_scanpos; - if (jj_scan_token(158)) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_case_statement_717_38_760()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; - return false; - } - - inline bool jj_3R_package_body_declarative_item_2239_1_770() + inline bool jj_3R_package_body_declarative_item_2256_1_770() { if (jj_done) return true; - if (jj_3R_subprogram_declaration_3084_1_142()) return true; + if (jj_3R_subprogram_declaration_3106_1_142()) return true; return false; } - inline bool jj_3R_package_body_declarative_item_2239_1_699() + inline bool jj_3R_package_body_declarative_item_2256_1_699() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_package_body_declarative_item_2239_1_770()) { + if (jj_3R_package_body_declarative_item_2256_1_770()) { jj_scanpos = xsp; - if (jj_3R_package_body_declarative_item_2241_3_771()) { + if (jj_3R_package_body_declarative_item_2258_3_771()) { jj_scanpos = xsp; - if (jj_3R_package_body_declarative_item_2242_3_772()) { + if (jj_3R_package_body_declarative_item_2259_3_772()) { jj_scanpos = xsp; - if (jj_3R_package_body_declarative_item_2243_3_773()) { + if (jj_3R_package_body_declarative_item_2260_3_773()) { jj_scanpos = xsp; - if (jj_3R_package_body_declarative_item_2244_3_774()) { + if (jj_3R_package_body_declarative_item_2261_3_774()) { jj_scanpos = xsp; if (jj_3_96()) { jj_scanpos = xsp; if (jj_3_97()) { jj_scanpos = xsp; - if (jj_3R_package_body_declarative_item_2247_4_775()) { + if (jj_3R_package_body_declarative_item_2264_4_775()) { jj_scanpos = xsp; - if (jj_3R_package_body_declarative_item_2248_3_776()) { + if (jj_3R_package_body_declarative_item_2265_3_776()) { jj_scanpos = xsp; - if (jj_3R_package_body_declarative_item_2249_3_777()) { + if (jj_3R_package_body_declarative_item_2266_3_777()) { jj_scanpos = xsp; - if (jj_3R_package_body_declarative_item_2250_3_778()) { + if (jj_3R_package_body_declarative_item_2267_3_778()) { jj_scanpos = xsp; - if (jj_3R_package_body_declarative_item_2251_3_779()) { + if (jj_3R_package_body_declarative_item_2268_3_779()) { jj_scanpos = xsp; if (jj_3_98()) { jj_scanpos = xsp; - if (jj_3R_package_body_declarative_item_2255_3_780()) return true; + if (jj_3R_package_body_declarative_item_2272_3_780()) return true; } } } @@ -7161,86 +7079,110 @@ void parseInline(); return false; } - inline bool jj_3R_block_specification_684_12_619() + inline bool jj_3_15() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_index_specification_1729_2_687()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; + return false; + } + + inline bool jj_3R_case_statement_712_1_157() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3_15()) jj_scanpos = xsp; + if (jj_scan_token(CASE_T)) return true; + xsp = jj_scanpos; + if (jj_scan_token(158)) jj_scanpos = xsp; + if (jj_3R_expression_1380_20_70()) return true; + if (jj_scan_token(IS_T)) return true; + if (jj_3R_case_statement_alternative_743_3_748()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_case_statement_720_11_759()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(END_T)) return true; + if (jj_scan_token(CASE_T)) return true; + xsp = jj_scanpos; + if (jj_scan_token(158)) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_case_statement_721_38_760()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_package_body_2226_1_77() + inline bool jj_3R_package_body_2242_1_77() { if (jj_done) return true; if (jj_scan_token(PACKAGE_T)) return true; if (jj_scan_token(BODY_T)) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; if (jj_scan_token(IS_T)) return true; - if (jj_3R_package_body_declarative_part_2260_1_524()) return true; + if (jj_3R_package_body_declarative_part_2277_1_524()) return true; if (jj_scan_token(END_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_package_body_2234_10_525()) jj_scanpos = xsp; + if (jj_3R_package_body_2251_10_525()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_package_body_2234_36_526()) jj_scanpos = xsp; + if (jj_3R_package_body_2251_36_526()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3_14() + inline bool jj_3R_next_statement_2196_43_336() { if (jj_done) return true; - if (jj_3R_generic_clause_1599_2_81()) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_next_statement_2180_43_336() + inline bool jj_3R_block_specification_688_12_619() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_index_specification_1740_2_687()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_block_specification_684_3_505() + inline bool jj_3R_operator_symbol_2232_1_369() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_block_specification_684_12_619()) jj_scanpos = xsp; + if (jj_scan_token(STRINGLITERAL)) return true; return false; } - inline bool jj_3R_operator_symbol_2216_1_369() + inline bool jj_3R_object_class_2227_2_658() { if (jj_done) return true; - if (jj_scan_token(STRINGLITERAL)) return true; + if (jj_scan_token(TYPE_T)) return true; return false; } - inline bool jj_3R_object_class_2211_2_658() + inline bool jj_3_14() { if (jj_done) return true; - if (jj_scan_token(TYPE_T)) return true; + if (jj_3R_generic_clause_1610_2_81()) return true; return false; } - inline bool jj_3R_object_class_2210_2_657() + inline bool jj_3R_object_class_2226_2_657() { if (jj_done) return true; if (jj_scan_token(FILE_T)) return true; return false; } - inline bool jj_3R_mode_view_declaration_2100_112_516() + inline bool jj_3R_mode_view_declaration_2116_112_516() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_object_class_2209_2_656() + inline bool jj_3R_object_class_2225_2_656() { if (jj_done) return true; if (jj_scan_token(SHARED_T)) return true; @@ -7251,47 +7193,57 @@ void parseInline(); inline bool jj_3_95() { if (jj_done) return true; - if (jj_3R_physical_literal_2370_2_133()) return true; + if (jj_3R_physical_literal_2389_2_133()) return true; return false; } - inline bool jj_3R_object_class_2208_2_655() + inline bool jj_3R_object_class_2224_2_655() { if (jj_done) return true; if (jj_scan_token(VARIABLE_T)) return true; return false; } - inline bool jj_3R_object_class_2207_2_654() + inline bool jj_3R_block_specification_688_3_505() + { + if (jj_done) return true; + if (jj_3R_name_2142_2_73()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_block_specification_688_12_619()) jj_scanpos = xsp; + return false; + } + + inline bool jj_3R_object_class_2223_2_654() { if (jj_done) return true; if (jj_scan_token(SIGNAL_T)) return true; return false; } - inline bool jj_3R_object_class_2206_1_653() + inline bool jj_3R_object_class_2222_1_653() { if (jj_done) return true; if (jj_scan_token(CONSTANT_T)) return true; return false; } - inline bool jj_3R_object_class_2206_1_545() + inline bool jj_3R_object_class_2222_1_545() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_object_class_2206_1_653()) { + if (jj_3R_object_class_2222_1_653()) { jj_scanpos = xsp; - if (jj_3R_object_class_2207_2_654()) { + if (jj_3R_object_class_2223_2_654()) { jj_scanpos = xsp; - if (jj_3R_object_class_2208_2_655()) { + if (jj_3R_object_class_2224_2_655()) { jj_scanpos = xsp; - if (jj_3R_object_class_2209_2_656()) { + if (jj_3R_object_class_2225_2_656()) { jj_scanpos = xsp; - if (jj_3R_object_class_2210_2_657()) { + if (jj_3R_object_class_2226_2_657()) { jj_scanpos = xsp; - if (jj_3R_object_class_2211_2_658()) return true; + if (jj_3R_object_class_2227_2_658()) return true; } } } @@ -7300,290 +7252,327 @@ void parseInline(); return false; } - inline bool jj_3R_block_declarative_item_667_3_256() + inline bool jj_3R_numeric_literal_2217_4_278() { if (jj_done) return true; - if (jj_3R_group_declaration_1625_3_426()) return true; + if (jj_3R_abstract_literal_338_4_135()) return true; return false; } - inline bool jj_3R_numeric_literal_2201_4_278() + inline bool jj_3R_name_ext_2173_47_446() { if (jj_done) return true; - if (jj_3R_abstract_literal_338_4_135()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3_12() + inline bool jj_3R_numeric_literal_2215_2_125() { if (jj_done) return true; - if (jj_3R_attribute_declaration_556_2_79()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_numeric_literal_2215_2_277()) { + jj_scanpos = xsp; + if (jj_3R_numeric_literal_2217_4_278()) return true; + } return false; } - inline bool jj_3R_name_ext_2157_47_446() + inline bool jj_3R_numeric_literal_2215_2_277() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_physical_literal_2389_2_133()) return true; + return false; + } + + inline bool jj_3R_null_statement_2209_3_556() + { + if (jj_done) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; + return false; + } + + inline bool jj_3R_null_statement_2209_1_462() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_null_statement_2209_3_556()) jj_scanpos = xsp; + if (jj_scan_token(NULL_T)) return true; + if (jj_scan_token(SEMI_T)) return true; + return false; + } + + inline bool jj_3R_block_declarative_item_671_3_256() + { + if (jj_done) return true; + if (jj_3R_group_declaration_1636_3_426()) return true; + return false; + } + + inline bool jj_3_12() + { + if (jj_done) return true; + if (jj_3R_attribute_declaration_558_2_79()) return true; return false; } inline bool jj_3_11() { if (jj_done) return true; - if (jj_3R_package_declaration_2272_2_78()) return true; + if (jj_3R_package_declaration_2289_2_78()) return true; return false; } inline bool jj_3_13() { if (jj_done) return true; - if (jj_3R_group_template_declaration_1633_2_80()) return true; + if (jj_3R_group_template_declaration_1644_2_80()) return true; return false; } - inline bool jj_3R_block_declarative_item_663_3_255() + inline bool jj_3R_block_declarative_item_667_3_255() { if (jj_done) return true; - if (jj_3R_use_clause_3276_2_400()) return true; + if (jj_3R_use_clause_3300_2_400()) return true; return false; } - inline bool jj_3R_numeric_literal_2199_2_125() + inline bool jj_3R_block_declarative_item_666_3_254() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_numeric_literal_2199_2_277()) { - jj_scanpos = xsp; - if (jj_3R_numeric_literal_2201_4_278()) return true; - } + if (jj_3R_disconnection_specification_1126_1_425()) return true; return false; } - inline bool jj_3R_numeric_literal_2199_2_277() + inline bool jj_3R_null_2172_32_132() { if (jj_done) return true; - if (jj_3R_physical_literal_2370_2_133()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_block_declarative_item_662_3_254() + inline bool jj_3R_block_declarative_item_665_3_253() { if (jj_done) return true; - if (jj_3R_disconnection_specification_1118_1_425()) return true; + if (jj_3R_configuration_specification_1021_1_424()) return true; return false; } - inline bool jj_3R_block_declarative_item_661_3_253() + inline bool jj_3R_block_declarative_item_664_3_252() { if (jj_done) return true; - if (jj_3R_configuration_specification_1015_1_424()) return true; + if (jj_3R_attribute_specification_580_3_423()) return true; return false; } - inline bool jj_3R_block_declarative_item_660_3_252() + inline bool jj_3R_next_statement_2197_3_337() { if (jj_done) return true; - if (jj_3R_attribute_specification_577_3_423()) return true; + if (jj_scan_token(WHEN_T)) return true; + if (jj_3R_condition_906_3_100()) return true; return false; } - inline bool jj_3R_null_statement_2193_3_556() + inline bool jj_3R_next_statement_2196_3_335() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_block_declarative_item_656_3_250() + inline bool jj_3R_block_declarative_item_660_3_250() { if (jj_done) return true; - if (jj_3R_component_declaration_783_2_422()) return true; + if (jj_3R_component_declaration_787_2_422()) return true; return false; } - inline bool jj_3R_block_declarative_item_658_1_251() + inline bool jj_3R_block_declarative_item_662_1_251() { if (jj_done) return true; - if (jj_3R_attribute_declaration_556_2_79()) return true; + if (jj_3R_attribute_declaration_558_2_79()) return true; return false; } - inline bool jj_3R_null_statement_2193_1_462() + inline bool jj_3_93() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_null_statement_2193_3_556()) jj_scanpos = xsp; - if (jj_scan_token(NULL_T)) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_scan_token(LBRACKET_T)) return true; return false; } - inline bool jj_3R_block_declarative_item_655_3_249() + inline bool jj_3R_block_declarative_item_659_3_249() { if (jj_done) return true; - if (jj_3R_package_instantiation_declaration_2332_2_110()) return true; + if (jj_3R_package_instantiation_declaration_2350_2_110()) return true; return false; } - inline bool jj_3R_block_declarative_item_654_3_248() + inline bool jj_3R_next_statement_2196_1_159() { if (jj_done) return true; - if (jj_3R_package_declaration_2272_2_78()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_next_statement_2196_3_335()) jj_scanpos = xsp; + if (jj_scan_token(NEXT_T)) return true; + xsp = jj_scanpos; + if (jj_3R_next_statement_2196_43_336()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_next_statement_2197_3_337()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3_10() + inline bool jj_3R_block_declarative_item_658_3_248() { if (jj_done) return true; - if (jj_3R_package_body_2226_1_77()) return true; + if (jj_3R_package_declaration_2289_2_78()) return true; return false; } - inline bool jj_3R_block_declarative_item_652_3_247() + inline bool jj_3_10() { if (jj_done) return true; - if (jj_3R_alias_declaration_405_2_143()) return true; + if (jj_3R_package_body_2242_1_77()) return true; return false; } - inline bool jj_3R_block_declarative_item_651_3_246() + inline bool jj_3R_block_declarative_item_656_3_247() { if (jj_done) return true; - if (jj_3R_file_declaration_1434_2_421()) return true; + if (jj_3R_alias_declaration_405_2_143()) return true; return false; } - inline bool jj_3R_block_declarative_item_650_3_245() + inline bool jj_3R_block_declarative_item_655_3_246() { if (jj_done) return true; - if (jj_3R_variable_declaration_3312_1_420()) return true; + if (jj_3R_file_declaration_1443_2_421()) return true; return false; } - inline bool jj_3R_null_2156_32_132() + inline bool jj_3R_block_declarative_item_654_3_245() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_variable_declaration_3336_1_420()) return true; return false; } - inline bool jj_3R_block_declarative_item_649_3_244() + inline bool jj_3R_block_declarative_item_653_3_244() { if (jj_done) return true; - if (jj_3R_signal_declaration_2999_1_419()) return true; + if (jj_3R_signal_declaration_3020_1_419()) return true; return false; } - inline bool jj_3R_block_declarative_item_648_3_243() + inline bool jj_3R_block_declarative_item_652_3_243() { if (jj_done) return true; - if (jj_3R_constant_declaration_1020_4_418()) return true; + if (jj_3R_constant_declaration_1026_4_418()) return true; return false; } - inline bool jj_3R_block_declarative_item_647_3_242() + inline bool jj_3R_block_declarative_item_651_3_242() { if (jj_done) return true; - if (jj_3R_mode_view_declaration_2100_3_417()) return true; + if (jj_3R_mode_view_declaration_2116_3_417()) return true; return false; } - inline bool jj_3R_block_configuration_638_11_507() + inline bool jj_3R_test_att_name_2185_4_449() { if (jj_done) return true; - if (jj_3R_configuration_item_1007_2_620()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_block_declarative_item_646_3_241() + inline bool jj_3R_block_configuration_642_11_507() { if (jj_done) return true; - if (jj_3R_subtype_declaration_3188_1_416()) return true; + if (jj_3R_configuration_item_1013_2_620()) return true; return false; } - inline bool jj_3R_next_statement_2181_3_337() + inline bool jj_3R_block_declarative_item_650_3_241() { if (jj_done) return true; - if (jj_scan_token(WHEN_T)) return true; - if (jj_3R_condition_901_3_100()) return true; + if (jj_3R_subtype_declaration_3211_1_416()) return true; return false; } - inline bool jj_3R_block_configuration_637_11_506() + inline bool jj_3R_test_att_name_2183_5_447() { if (jj_done) return true; - if (jj_3R_use_clause_3276_2_400()) return true; + if (jj_3R_signature_3052_1_472()) return true; return false; } - inline bool jj_3R_block_declarative_item_645_3_240() + inline bool jj_3R_block_configuration_641_11_506() { if (jj_done) return true; - if (jj_3R_type_declaration_3238_1_415()) return true; + if (jj_3R_use_clause_3300_2_400()) return true; return false; } - inline bool jj_3R_next_statement_2180_3_335() + inline bool jj_3R_block_declarative_item_649_3_240() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_type_declaration_3262_1_415()) return true; return false; } - inline bool jj_3R_block_declarative_item_644_3_113() + inline bool jj_3R_block_declarative_item_648_3_113() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_block_declarative_item_644_3_239()) { + if (jj_3R_block_declarative_item_648_3_239()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_645_3_240()) { + if (jj_3R_block_declarative_item_649_3_240()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_646_3_241()) { + if (jj_3R_block_declarative_item_650_3_241()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_647_3_242()) { + if (jj_3R_block_declarative_item_651_3_242()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_648_3_243()) { + if (jj_3R_block_declarative_item_652_3_243()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_649_3_244()) { + if (jj_3R_block_declarative_item_653_3_244()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_650_3_245()) { + if (jj_3R_block_declarative_item_654_3_245()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_651_3_246()) { + if (jj_3R_block_declarative_item_655_3_246()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_652_3_247()) { + if (jj_3R_block_declarative_item_656_3_247()) { jj_scanpos = xsp; if (jj_3_10()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_654_3_248()) { + if (jj_3R_block_declarative_item_658_3_248()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_655_3_249()) { + if (jj_3R_block_declarative_item_659_3_249()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_656_3_250()) { + if (jj_3R_block_declarative_item_660_3_250()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_658_1_251()) { + if (jj_3R_block_declarative_item_662_1_251()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_660_3_252()) { + if (jj_3R_block_declarative_item_664_3_252()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_661_3_253()) { + if (jj_3R_block_declarative_item_665_3_253()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_662_3_254()) { + if (jj_3R_block_declarative_item_666_3_254()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_663_3_255()) { + if (jj_3R_block_declarative_item_667_3_255()) { jj_scanpos = xsp; if (jj_3_13()) { jj_scanpos = xsp; - if (jj_3R_block_declarative_item_667_3_256()) return true; - } - } + if (jj_3R_block_declarative_item_671_3_256()) return true; + } } } } @@ -7601,80 +7590,14 @@ void parseInline(); } } } - return false; - } - - inline bool jj_3R_block_declarative_item_644_3_239() - { - if (jj_done) return true; - if (jj_3R_subprogram_declaration_3084_1_142()) return true; - return false; - } - - inline bool jj_3_93() - { - if (jj_done) return true; - if (jj_scan_token(LBRACKET_T)) return true; - return false; - } - - inline bool jj_3R_next_statement_2180_1_159() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_next_statement_2180_3_335()) jj_scanpos = xsp; - if (jj_scan_token(NEXT_T)) return true; - xsp = jj_scanpos; - if (jj_3R_next_statement_2180_43_336()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_next_statement_2181_3_337()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; - return false; - } - - inline bool jj_3R_block_configuration_636_5_398() - { - if (jj_done) return true; - if (jj_scan_token(FOR_T)) return true; - if (jj_3R_block_specification_684_3_505()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_block_configuration_637_11_506()) { jj_scanpos = xsp; break; } - } - while (true) { - xsp = jj_scanpos; - if (jj_3R_block_configuration_638_11_507()) { jj_scanpos = xsp; break; } } - if (jj_scan_token(END_T)) return true; - if (jj_scan_token(FOR_T)) return true; - if (jj_scan_token(SEMI_T)) return true; - return false; - } - - inline bool jj_3R_attribute_name_572_68_313() - { - if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_scan_token(RPAREN_T)) return true; - return false; - } - - inline bool jj_3R_test_att_name_2169_4_449() - { - if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_test_att_name_2167_5_447() + inline bool jj_3R_block_declarative_item_648_3_239() { if (jj_done) return true; - if (jj_3R_signature_3030_1_472()) return true; + if (jj_3R_subprogram_declaration_3106_1_142()) return true; return false; } @@ -7682,37 +7605,37 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_expression_1380_20_70()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_null_2156_32_132()) { jj_scanpos = xsp; break; } + if (jj_3R_null_2172_32_132()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_test_att_name_2167_3_291() + inline bool jj_3R_test_att_name_2183_3_291() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_test_att_name_2167_5_447()) jj_scanpos = xsp; + if (jj_3R_test_att_name_2183_5_447()) jj_scanpos = xsp; if (jj_scan_token(APOSTROPHE_T)) return true; - if (jj_3R_attribute_designator_565_3_448()) return true; + if (jj_3R_attribute_designator_568_3_448()) return true; xsp = jj_scanpos; - if (jj_3R_test_att_name_2169_4_449()) jj_scanpos = xsp; + if (jj_3R_test_att_name_2185_4_449()) jj_scanpos = xsp; return false; } - inline bool jj_3R_test_att_name_2165_4_131() + inline bool jj_3R_test_att_name_2181_4_131() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_94()) { jj_scanpos = xsp; - if (jj_3R_test_att_name_2167_3_291()) return true; + if (jj_3R_test_att_name_2183_3_291()) return true; } return false; } @@ -7731,7 +7654,7 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_discrete_range_1128_3_87()) return true; + if (jj_3R_discrete_range_1136_3_87()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } @@ -7739,56 +7662,71 @@ void parseInline(); inline bool jj_3_87() { if (jj_done) return true; - if (jj_3R_name_ext_2143_3_129()) return true; + if (jj_3R_name_ext_2159_3_129()) return true; return false; } - inline bool jj_3R_bit_string_literal_625_3_124() + inline bool jj_3R_block_configuration_640_5_398() { if (jj_done) return true; - if (jj_scan_token(BIT_STRING_LITERAL)) return true; + if (jj_scan_token(FOR_T)) return true; + if (jj_3R_block_specification_688_3_505()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_block_configuration_641_11_506()) { jj_scanpos = xsp; break; } + } + while (true) { + xsp = jj_scanpos; + if (jj_3R_block_configuration_642_11_507()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(END_T)) return true; + if (jj_scan_token(FOR_T)) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } inline bool jj_3_90() { if (jj_done) return true; - if (jj_3R_test_att_name_2165_4_131()) return true; + if (jj_3R_test_att_name_2181_4_131()) return true; return false; } - inline bool jj_3_84() + inline bool jj_3R_attribute_name_575_68_313() { if (jj_done) return true; - if (jj_3R_name_ext1_2137_4_128()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3_85() + inline bool jj_3_84() { if (jj_done) return true; - if (jj_3R_name_ext1_2137_4_128()) return true; + if (jj_3R_name_ext1_2153_4_128()) return true; return false; } - inline bool jj_3R_mode_view_declaration_2100_61_515() + inline bool jj_3_85() { if (jj_done) return true; - if (jj_3R_mode_view_element_definition_2105_3_637()) return true; + if (jj_3R_name_ext1_2153_4_128()) return true; return false; } - inline bool jj_3_86() + inline bool jj_3R_mode_view_declaration_2116_61_515() { if (jj_done) return true; - if (jj_3R_name_ext1_2137_4_128()) return true; + if (jj_3R_mode_view_element_definition_2121_3_637()) return true; return false; } - inline bool jj_3R_binding_indication_620_4_504() + inline bool jj_3_86() { if (jj_done) return true; - if (jj_3R_port_map_aspect_2403_2_392()) return true; + if (jj_3R_name_ext1_2153_4_128()) return true; return false; } @@ -7796,133 +7734,119 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; - if (jj_3R_suffix_3204_1_130()) return true; + if (jj_3R_suffix_3228_1_130()) return true; return false; } - inline bool jj_3R_name_ext_2156_3_286() + inline bool jj_3R_name_ext_2172_3_286() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_expression_1380_20_70()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_name_ext_2157_47_446()) { jj_scanpos = xsp; break; } + if (jj_3R_name_ext_2173_47_446()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_binding_indication_619_4_503() - { - if (jj_done) return true; - if (jj_3R_generic_map_aspect_1609_6_88()) return true; - return false; - } - - inline bool jj_3R_binding_indication_618_4_502() + inline bool jj_3_88() { if (jj_done) return true; - if (jj_scan_token(USE_T)) return true; - if (jj_3R_entity_aspect_1204_1_618()) return true; + if (jj_scan_token(APOSTROPHE_T)) return true; + if (jj_scan_token(SUBTYPE_T)) return true; return false; } - inline bool jj_3_88() + inline bool jj_3R_name_ext1_2153_18_281() { if (jj_done) return true; - if (jj_scan_token(APOSTROPHE_T)) return true; - if (jj_scan_token(SUBTYPE_T)) return true; + if (jj_3R_name_ext_2159_3_129()) return true; return false; } - inline bool jj_3R_binding_indication_618_2_397() + inline bool jj_3R_name_ext_2169_2_285() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_binding_indication_618_4_502()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_binding_indication_619_4_503()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_binding_indication_620_4_504()) jj_scanpos = xsp; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_discrete_range_1136_3_87()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_name_ext1_2137_18_281() + inline bool jj_3R_name_ext_2166_3_284() { if (jj_done) return true; - if (jj_3R_name_ext_2143_3_129()) return true; + if (jj_3R_test_att_name_2181_4_131()) return true; return false; } - inline bool jj_3R_name_ext_2153_2_285() + inline bool jj_3R_name_2143_25_370() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_discrete_range_1128_3_87()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_name_ext1_2153_4_128()) return true; return false; } - inline bool jj_3R_attribute_name_572_46_312() + inline bool jj_3R_name_2144_24_372() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_ext1_2153_4_128()) return true; return false; } - inline bool jj_3R_name_ext_2150_3_284() + inline bool jj_3R_bit_string_literal_629_3_124() { if (jj_done) return true; - if (jj_3R_test_att_name_2165_4_131()) return true; + if (jj_scan_token(BIT_STRING_LITERAL)) return true; return false; } - inline bool jj_3R_name_2127_25_370() + inline bool jj_3R_name_2145_22_373() { if (jj_done) return true; - if (jj_3R_name_ext1_2137_4_128()) return true; + if (jj_3R_name_ext1_2153_4_128()) return true; return false; } - inline bool jj_3R_name_2128_24_372() + inline bool jj_3R_name_ext_2163_2_283() { if (jj_done) return true; - if (jj_3R_name_ext1_2137_4_128()) return true; + if (jj_scan_token(DOT_T)) return true; + if (jj_3R_suffix_3228_1_130()) return true; return false; } - inline bool jj_3R_name_2129_22_373() + inline bool jj_3R_binding_indication_624_4_504() { if (jj_done) return true; - if (jj_3R_name_ext1_2137_4_128()) return true; + if (jj_3R_port_map_aspect_2423_2_392()) return true; return false; } - inline bool jj_3R_name_ext_2147_2_283() + inline bool jj_3R_binding_indication_623_4_503() { if (jj_done) return true; - if (jj_scan_token(DOT_T)) return true; - if (jj_3R_suffix_3204_1_130()) return true; + if (jj_3R_generic_map_aspect_1620_6_88()) return true; return false; } - inline bool jj_3R_name_ext_2143_3_129() + inline bool jj_3R_name_ext_2159_3_129() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_name_ext_2144_2_282()) { + if (jj_3R_name_ext_2160_2_282()) { jj_scanpos = xsp; - if (jj_3R_name_ext_2147_2_283()) { + if (jj_3R_name_ext_2163_2_283()) { jj_scanpos = xsp; - if (jj_3R_name_ext_2150_3_284()) { + if (jj_3R_name_ext_2166_3_284()) { jj_scanpos = xsp; - if (jj_3R_name_ext_2153_2_285()) { + if (jj_3R_name_ext_2169_2_285()) { jj_scanpos = xsp; - if (jj_3R_name_ext_2156_3_286()) return true; + if (jj_3R_name_ext_2172_3_286()) return true; } } } @@ -7930,7 +7854,7 @@ void parseInline(); return false; } - inline bool jj_3R_name_ext_2144_2_282() + inline bool jj_3R_name_ext_2160_2_282() { if (jj_done) return true; if (jj_scan_token(APOSTROPHE_T)) return true; @@ -7938,145 +7862,152 @@ void parseInline(); return false; } - inline bool jj_3R_name_ext1_2137_4_128() + inline bool jj_3R_binding_indication_622_4_502() + { + if (jj_done) return true; + if (jj_scan_token(USE_T)) return true; + if (jj_3R_entity_aspect_1212_1_618()) return true; + return false; + } + + inline bool jj_3R_binding_indication_622_2_397() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_binding_indication_622_4_502()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_binding_indication_623_4_503()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_binding_indication_624_4_504()) jj_scanpos = xsp; + return false; + } + + inline bool jj_3R_name_ext1_2153_4_128() { if (jj_done) return true; - if (jj_3R_name_ext_2143_3_129()) return true; + if (jj_3R_name_ext_2159_3_129()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_name_ext1_2137_18_281()) { jj_scanpos = xsp; break; } + if (jj_3R_name_ext1_2153_18_281()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_name_2129_6_188() + inline bool jj_3R_attribute_name_575_46_312() + { + if (jj_done) return true; + if (jj_3R_name_2142_2_73()) return true; + return false; + } + + inline bool jj_3R_name_2145_6_188() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_name_2129_22_373()) jj_scanpos = xsp; + if (jj_3R_name_2145_22_373()) jj_scanpos = xsp; return false; } - inline bool jj_3R_name_2128_5_187() + inline bool jj_3R_name_2144_5_187() { if (jj_done) return true; - if (jj_3R_external_name_1391_2_371()) return true; + if (jj_3R_external_name_1400_2_371()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_name_2128_24_372()) jj_scanpos = xsp; + if (jj_3R_name_2144_24_372()) jj_scanpos = xsp; return false; } - inline bool jj_3R_name_2127_4_186() + inline bool jj_3R_name_2143_4_186() { if (jj_done) return true; - if (jj_3R_operator_symbol_2216_1_369()) return true; + if (jj_3R_operator_symbol_2232_1_369()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_name_2127_25_370()) jj_scanpos = xsp; + if (jj_3R_name_2143_25_370()) jj_scanpos = xsp; return false; } - inline bool jj_3R_name_2126_2_73() + inline bool jj_3R_name_2142_2_73() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_name_2127_4_186()) { + if (jj_3R_name_2143_4_186()) { jj_scanpos = xsp; - if (jj_3R_name_2128_5_187()) { + if (jj_3R_name_2144_5_187()) { jj_scanpos = xsp; - if (jj_3R_name_2129_6_188()) return true; + if (jj_3R_name_2145_6_188()) return true; } } return false; } - inline bool jj_3R_assertion_526_63_411() - { - if (jj_done) return true; - if (jj_scan_token(SEVERITY_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - return false; - } - - inline bool jj_3R_multiplying_operation_2120_3_359() + inline bool jj_3R_multiplying_operation_2136_3_359() { if (jj_done) return true; if (jj_scan_token(REM_T)) return true; return false; } - inline bool jj_3R_multiplying_operation_2119_3_358() + inline bool jj_3R_multiplying_operation_2135_3_358() { if (jj_done) return true; if (jj_scan_token(MOD_T)) return true; return false; } - inline bool jj_3R_multiplying_operation_2118_3_357() + inline bool jj_3R_multiplying_operation_2134_3_357() { if (jj_done) return true; if (jj_scan_token(SLASH_T)) return true; return false; } - inline bool jj_3R_multiplying_operation_2117_1_174() + inline bool jj_3R_multiplying_operation_2133_1_174() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_multiplying_operation_2117_1_356()) { + if (jj_3R_multiplying_operation_2133_1_356()) { jj_scanpos = xsp; - if (jj_3R_multiplying_operation_2118_3_357()) { + if (jj_3R_multiplying_operation_2134_3_357()) { jj_scanpos = xsp; - if (jj_3R_multiplying_operation_2119_3_358()) { + if (jj_3R_multiplying_operation_2135_3_358()) { jj_scanpos = xsp; - if (jj_3R_multiplying_operation_2120_3_359()) return true; + if (jj_3R_multiplying_operation_2136_3_359()) return true; } } } return false; } - inline bool jj_3R_multiplying_operation_2117_1_356() + inline bool jj_3R_multiplying_operation_2133_1_356() { if (jj_done) return true; if (jj_scan_token(MULT_T)) return true; return false; } - inline bool jj_3R_mode_view_indication_2111_5_652() - { - if (jj_done) return true; - if (jj_3R_record_mode_view_indication_2696_4_735()) return true; - return false; - } - - inline bool jj_3R_attribute_specification_577_3_423() + inline bool jj_3R_mode_view_indication_2127_5_652() { if (jj_done) return true; - if (jj_scan_token(ATTRIBUTE_T)) return true; - if (jj_3R_attribute_designator_565_3_448()) return true; - if (jj_scan_token(OF_T)) return true; - if (jj_3R_entity_specification_1317_1_530()) return true; - if (jj_scan_token(IS_T)) return true; - if (jj_3R_conditional_expression_955_3_137()) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_record_mode_view_indication_2716_4_735()) return true; return false; } - inline bool jj_3R_mode_view_indication_2110_3_544() + inline bool jj_3R_mode_view_indication_2126_3_544() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_83()) { jj_scanpos = xsp; - if (jj_3R_mode_view_indication_2111_5_652()) return true; + if (jj_3R_mode_view_indication_2127_5_652()) return true; } return false; } @@ -8084,194 +8015,176 @@ void parseInline(); inline bool jj_3_83() { if (jj_done) return true; - if (jj_3R_array_mode_view_indication_510_1_127()) return true; - return false; - } - - inline bool jj_3R_association_list_551_26_380() - { - if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_association_element_545_2_379()) return true; + if (jj_3R_array_mode_view_indication_512_1_127()) return true; return false; } - inline bool jj_3R_attribute_name_572_3_144() + inline bool jj_3R_assertion_528_63_411() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(APOSTROPHE_T)) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_scan_token(86)) { - jj_scanpos = xsp; - if (jj_3R_attribute_name_572_46_312()) return true; - } - xsp = jj_scanpos; - if (jj_3R_attribute_name_572_68_313()) jj_scanpos = xsp; + if (jj_scan_token(SEVERITY_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_mode_view_element_definition_2105_3_637() + inline bool jj_3R_mode_view_element_definition_2121_3_637() { if (jj_done) return true; - if (jj_3R_record_element_list_2681_5_692()) return true; + if (jj_3R_record_element_list_2701_5_692()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_element_mode_indication_1186_3_693()) return true; + if (jj_3R_element_mode_indication_1194_3_693()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_attribute_designator_566_5_547() - { - if (jj_done) return true; - if (jj_scan_token(RANGE_T)) return true; - return false; - } - - inline bool jj_3R_attribute_designator_565_3_546() - { - if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - return false; - } - - inline bool jj_3R_attribute_designator_565_3_448() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_attribute_designator_565_3_546()) { - jj_scanpos = xsp; - if (jj_3R_attribute_designator_566_5_547()) return true; - } - return false; - } - - inline bool jj_3R_mode_view_declaration_2100_3_417() + inline bool jj_3R_mode_view_declaration_2116_3_417() { if (jj_done) return true; if (jj_scan_token(VIEW_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(OF_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; if (jj_scan_token(IS_T)) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_mode_view_declaration_2100_61_515()) { jj_scanpos = xsp; break; } + if (jj_3R_mode_view_declaration_2116_61_515()) { jj_scanpos = xsp; break; } } if (jj_scan_token(END_T)) return true; if (jj_scan_token(VIEW_T)) return true; xsp = jj_scanpos; - if (jj_3R_mode_view_declaration_2100_112_516()) jj_scanpos = xsp; + if (jj_3R_mode_view_declaration_2116_112_516()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_attribute_declaration_556_2_79() + inline bool jj_3R_attribute_specification_580_3_423() { if (jj_done) return true; if (jj_scan_token(ATTRIBUTE_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_type_mark_3265_3_195()) return true; + if (jj_3R_attribute_designator_568_3_448()) return true; + if (jj_scan_token(OF_T)) return true; + if (jj_3R_entity_specification_1326_1_530()) return true; + if (jj_scan_token(IS_T)) return true; + if (jj_3R_conditional_expression_960_3_137()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3_9() + inline bool jj_3R_association_list_553_26_380() { if (jj_done) return true; - if (jj_3R_formal_part_1486_1_76()) return true; - if (jj_scan_token(ARROW_T)) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_association_element_547_2_379()) return true; return false; } - inline bool jj_3R_loop_statement_2064_28_749() + inline bool jj_3R_attribute_name_575_3_144() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(APOSTROPHE_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_scan_token(86)) { + jj_scanpos = xsp; + if (jj_3R_attribute_name_575_46_312()) return true; + } + xsp = jj_scanpos; + if (jj_3R_attribute_name_575_68_313()) jj_scanpos = xsp; return false; } - inline bool jj_3R_mode_2089_3_539() + inline bool jj_3R_attribute_designator_569_5_547() { if (jj_done) return true; - if (jj_scan_token(LINKAGE_T)) return true; + if (jj_scan_token(RANGE_T)) return true; return false; } - inline bool jj_3R_assertion_526_31_410() + inline bool jj_3R_loop_statement_2080_28_749() { if (jj_done) return true; - if (jj_scan_token(REPORT_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + return false; + } + + inline bool jj_3R_mode_2105_3_539() + { + if (jj_done) return true; + if (jj_scan_token(LINKAGE_T)) return true; return false; } - inline bool jj_3R_mode_2088_3_538() + inline bool jj_3R_mode_2104_3_538() { if (jj_done) return true; if (jj_scan_token(BUFFER_T)) return true; return false; } - inline bool jj_3_78() + inline bool jj_3R_attribute_designator_568_3_546() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(OF_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_mode_2087_3_537() + inline bool jj_3R_mode_2103_3_537() { if (jj_done) return true; if (jj_scan_token(INOUT_T)) return true; return false; } - inline bool jj_3R_mode_2086_3_536() + inline bool jj_3R_attribute_designator_568_3_448() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_attribute_designator_568_3_546()) { + jj_scanpos = xsp; + if (jj_3R_attribute_designator_569_5_547()) return true; + } + return false; + } + + inline bool jj_3R_mode_2102_3_536() { if (jj_done) return true; if (jj_scan_token(OUT_T)) return true; return false; } - inline bool jj_3R_association_list_551_1_205() + inline bool jj_3_78() { if (jj_done) return true; - if (jj_3R_association_element_545_2_379()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_association_list_551_26_380()) { jj_scanpos = xsp; break; } - } + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(OF_T)) return true; return false; } - inline bool jj_3R_mode_2085_1_535() + inline bool jj_3R_mode_2101_1_535() { if (jj_done) return true; if (jj_scan_token(IN_T)) return true; return false; } - inline bool jj_3R_mode_2085_1_428() + inline bool jj_3R_mode_2101_1_428() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_mode_2085_1_535()) { + if (jj_3R_mode_2101_1_535()) { jj_scanpos = xsp; - if (jj_3R_mode_2086_3_536()) { + if (jj_3R_mode_2102_3_536()) { jj_scanpos = xsp; - if (jj_3R_mode_2087_3_537()) { + if (jj_3R_mode_2103_3_537()) { jj_scanpos = xsp; - if (jj_3R_mode_2088_3_538()) { + if (jj_3R_mode_2104_3_538()) { jj_scanpos = xsp; - if (jj_3R_mode_2089_3_539()) return true; + if (jj_3R_mode_2105_3_539()) return true; } } } @@ -8279,147 +8192,160 @@ void parseInline(); return false; } - inline bool jj_3R_association_element_545_3_490() + inline bool jj_3R_attribute_declaration_558_2_79() { if (jj_done) return true; - if (jj_3R_formal_part_1486_1_76()) return true; - if (jj_scan_token(ARROW_T)) return true; + if (jj_scan_token(ATTRIBUTE_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_type_mark_3289_3_195()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_association_element_545_2_379() + inline bool jj_3_9() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_association_element_545_3_490()) jj_scanpos = xsp; - if (jj_3R_actual_part_380_2_491()) return true; + if (jj_3R_formal_part_1496_1_76()) return true; + if (jj_scan_token(ARROW_T)) return true; return false; } - inline bool jj_3R_assertion_statement_537_5_324() + inline bool jj_3R_assertion_528_31_410() { if (jj_done) return true; - if (jj_3R_label_2007_2_84()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_scan_token(REPORT_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_assertion_statement_537_3_151() + inline bool jj_3R_association_list_553_1_205() { if (jj_done) return true; + if (jj_3R_association_element_547_2_379()) return true; Token * xsp; - xsp = jj_scanpos; - if (jj_3R_assertion_statement_537_5_324()) jj_scanpos = xsp; - if (jj_3R_assertion_526_4_233()) return true; - if (jj_scan_token(SEMI_T)) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_association_list_553_26_380()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_array_index_incomplete_type_list_503_33_826() + inline bool jj_3R_association_element_547_3_490() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_array_index_incomplete_type_495_2_825()) return true; + if (jj_3R_formal_part_1496_1_76()) return true; + if (jj_scan_token(ARROW_T)) return true; return false; } - inline bool jj_3R_assertion_526_4_233() + inline bool jj_3R_association_element_547_2_379() { if (jj_done) return true; - if (jj_scan_token(ASSERT_T)) return true; - if (jj_3R_condition_901_3_100()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_assertion_526_31_410()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_assertion_526_63_411()) jj_scanpos = xsp; + if (jj_3R_association_element_547_3_490()) jj_scanpos = xsp; + if (jj_3R_actual_part_380_2_491()) return true; return false; } - inline bool jj_3_8() + inline bool jj_3R_loop_statement_2073_7_333() { if (jj_done) return true; - if (jj_scan_token(ARRAY_T)) return true; - if (jj_3R_index_constraint_1724_3_75()) return true; - if (jj_scan_token(OF_T)) return true; + if (jj_3R_iteration_scheme_2004_1_466()) return true; return false; } - inline bool jj_3R_loop_statement_2057_7_333() + inline bool jj_3R_assertion_statement_539_5_324() { if (jj_done) return true; - if (jj_3R_iteration_scheme_1989_1_466()) return true; + if (jj_3R_label_2022_2_84()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_array_type_definition_520_4_857() + inline bool jj_3R_assertion_statement_539_3_151() { if (jj_done) return true; - if (jj_3R_unconstraint_array_definition_3270_1_867()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_assertion_statement_539_5_324()) jj_scanpos = xsp; + if (jj_3R_assertion_528_4_233()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_loop_statement_2056_3_332() + inline bool jj_3R_loop_statement_2072_3_332() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_loop_statement_2056_1_158() + inline bool jj_3R_array_index_incomplete_type_list_505_33_826() + { + if (jj_done) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_array_index_incomplete_type_497_2_825()) return true; + return false; + } + + inline bool jj_3R_loop_statement_2072_1_158() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_loop_statement_2056_3_332()) jj_scanpos = xsp; + if (jj_3R_loop_statement_2072_3_332()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_loop_statement_2057_7_333()) jj_scanpos = xsp; + if (jj_3R_loop_statement_2073_7_333()) jj_scanpos = xsp; if (jj_scan_token(LOOP_T)) return true; - if (jj_3R_sequence_of_statements_2879_2_334()) return true; + if (jj_3R_sequence_of_statements_2900_2_334()) return true; if (jj_scan_token(END_T)) return true; if (jj_scan_token(LOOP_T)) return true; xsp = jj_scanpos; - if (jj_3R_loop_statement_2064_28_749()) jj_scanpos = xsp; + if (jj_3R_loop_statement_2080_28_749()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_array_type_definition_517_2_856() + inline bool jj_3_82() { if (jj_done) return true; - if (jj_3R_constraint_array_definition_1033_1_866()) return true; + if (jj_3R_enumeration_literal_1354_2_126()) return true; return false; } - inline bool jj_3R_array_type_definition_517_2_845() + inline bool jj_3R_assertion_528_4_233() { if (jj_done) return true; + if (jj_scan_token(ASSERT_T)) return true; + if (jj_3R_condition_906_3_100()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_array_type_definition_517_2_856()) { - jj_scanpos = xsp; - if (jj_3R_array_type_definition_520_4_857()) return true; - } + if (jj_3R_assertion_528_31_410()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_assertion_528_63_411()) jj_scanpos = xsp; return false; } - inline bool jj_3_82() + inline bool jj_3_81() { if (jj_done) return true; - if (jj_3R_enumeration_literal_1345_2_126()) return true; + if (jj_3R_numeric_literal_2215_2_125()) return true; return false; } - inline bool jj_3_81() + inline bool jj_3_8() { if (jj_done) return true; - if (jj_3R_numeric_literal_2199_2_125()) return true; + if (jj_scan_token(ARRAY_T)) return true; + if (jj_3R_index_constraint_1735_3_75()) return true; + if (jj_scan_token(OF_T)) return true; return false; } - inline bool jj_3R_literal_2046_3_303() + inline bool jj_3R_literal_2062_3_303() { if (jj_done) return true; if (jj_scan_token(NULL_T)) return true; @@ -8429,69 +8355,71 @@ void parseInline(); inline bool jj_3_80() { if (jj_done) return true; - if (jj_3R_bit_string_literal_625_3_124()) return true; + if (jj_3R_bit_string_literal_629_3_124()) return true; return false; } - inline bool jj_3R_literal_2045_3_302() + inline bool jj_3R_literal_2061_3_302() { if (jj_done) return true; - if (jj_3R_string_literal_3054_1_452()) return true; + if (jj_3R_string_literal_3076_1_452()) return true; return false; } - inline bool jj_3R_array_mode_view_indication_510_1_127() + inline bool jj_3R_array_type_definition_522_4_857() { if (jj_done) return true; - if (jj_scan_token(VIEW_T)) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(RPAREN_T)) return true; - if (jj_scan_token(OF_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_unconstraint_array_definition_3294_1_867()) return true; + return false; + } + + inline bool jj_3R_literal_2059_1_301() + { + if (jj_done) return true; + if (jj_3R_enumeration_literal_1354_2_126()) return true; return false; } - inline bool jj_3R_literal_2043_1_301() + inline bool jj_3R_literal_2055_2_300() { if (jj_done) return true; - if (jj_3R_enumeration_literal_1345_2_126()) return true; + if (jj_3R_numeric_literal_2215_2_125()) return true; return false; } - inline bool jj_3R_literal_2039_2_300() + inline bool jj_3R_array_type_definition_519_2_856() { if (jj_done) return true; - if (jj_3R_numeric_literal_2199_2_125()) return true; + if (jj_3R_constraint_array_definition_1040_1_866()) return true; return false; } - inline bool jj_3R_array_index_incomplete_type_list_503_2_807() + inline bool jj_3R_array_type_definition_519_2_845() { if (jj_done) return true; - if (jj_3R_array_index_incomplete_type_495_2_825()) return true; Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_array_index_incomplete_type_list_503_33_826()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_array_type_definition_519_2_856()) { + jj_scanpos = xsp; + if (jj_3R_array_type_definition_522_4_857()) return true; } return false; } - inline bool jj_3R_literal_2036_2_139() + inline bool jj_3R_literal_2052_2_139() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_literal_2036_2_299()) { + if (jj_3R_literal_2052_2_299()) { jj_scanpos = xsp; - if (jj_3R_literal_2039_2_300()) { + if (jj_3R_literal_2055_2_300()) { jj_scanpos = xsp; - if (jj_3R_literal_2043_1_301()) { + if (jj_3R_literal_2059_1_301()) { jj_scanpos = xsp; - if (jj_3R_literal_2045_3_302()) { + if (jj_3R_literal_2061_3_302()) { jj_scanpos = xsp; - if (jj_3R_literal_2046_3_303()) return true; + if (jj_3R_literal_2062_3_303()) return true; } } } @@ -8499,222 +8427,218 @@ void parseInline(); return false; } - inline bool jj_3R_literal_2036_2_299() + inline bool jj_3R_literal_2052_2_299() { if (jj_done) return true; - if (jj_3R_bit_string_literal_625_3_124()) return true; + if (jj_3R_bit_string_literal_629_3_124()) return true; return false; } - inline bool jj_3R_array_index_incomplete_type_497_4_853() + inline bool jj_3R_array_mode_view_indication_512_1_127() { if (jj_done) return true; - if (jj_3R_anonymous_type_indication_457_2_543()) return true; + if (jj_scan_token(VIEW_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(RPAREN_T)) return true; + if (jj_scan_token(OF_T)) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; return false; } - inline bool jj_3R_array_index_incomplete_type_496_4_852() + inline bool jj_3_79() { if (jj_done) return true; - if (jj_3R_index_subtype_definition_1738_2_863()) return true; + if (jj_3R_primary_unit_2457_1_123()) return true; return false; } - inline bool jj_3R_array_index_incomplete_type_495_2_851() + inline bool jj_3R_array_index_incomplete_type_list_505_2_807() { if (jj_done) return true; - if (jj_3R_index_constraint_1724_3_75()) return true; + if (jj_3R_array_index_incomplete_type_497_2_825()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_array_index_incomplete_type_list_505_33_826()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_array_index_incomplete_type_495_2_825() + inline bool jj_3R_array_index_incomplete_type_499_4_853() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_array_index_incomplete_type_495_2_851()) { - jj_scanpos = xsp; - if (jj_3R_array_index_incomplete_type_496_4_852()) { - jj_scanpos = xsp; - if (jj_3R_array_index_incomplete_type_497_4_853()) return true; - } - } + if (jj_3R_anonymous_type_indication_459_2_543()) return true; return false; } - inline bool jj_3R_array_incomplete_type_definition_490_3_788() + inline bool jj_3R_array_index_incomplete_type_498_4_852() { if (jj_done) return true; - if (jj_scan_token(ARRAY_T)) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_array_index_incomplete_type_list_503_2_807()) return true; - if (jj_scan_token(RPAREN_T)) return true; - if (jj_scan_token(OF_T)) return true; - if (jj_3R_incomplete_subtype_indication_1685_3_808()) return true; + if (jj_3R_index_subtype_definition_1749_2_863()) return true; return false; } - inline bool jj_3_79() + inline bool jj_3R_array_index_incomplete_type_497_2_851() { if (jj_done) return true; - if (jj_3R_primary_unit_2437_1_123()) return true; + if (jj_3R_index_constraint_1735_3_75()) return true; return false; } - inline bool jj_3R_array_element_resolution_485_3_108() + inline bool jj_3R_array_index_incomplete_type_497_2_825() { if (jj_done) return true; - if (jj_3R_resolution_indication_2748_4_232()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_array_index_incomplete_type_497_2_851()) { + jj_scanpos = xsp; + if (jj_3R_array_index_incomplete_type_498_4_852()) { + jj_scanpos = xsp; + if (jj_3R_array_index_incomplete_type_499_4_853()) return true; + } + } return false; } - inline bool jj_3R_array_constraint_475_5_690() + inline bool jj_3R_array_incomplete_type_definition_492_3_788() { if (jj_done) return true; - if (jj_3R_index_constraint_1724_3_75()) return true; + if (jj_scan_token(ARRAY_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_array_index_incomplete_type_list_505_2_807()) return true; + if (jj_scan_token(RPAREN_T)) return true; + if (jj_scan_token(OF_T)) return true; + if (jj_3R_incomplete_subtype_indication_1696_3_808()) return true; return false; } - inline bool jj_3R_library_clause_2012_2_399() + inline bool jj_3R_library_clause_2027_2_399() { if (jj_done) return true; if (jj_scan_token(LIBRARY_T)) return true; - if (jj_3R_identifier_list_1652_4_258()) return true; + if (jj_3R_identifier_list_1663_4_258()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_array_constraint_474_3_621() + inline bool jj_3R_array_element_resolution_487_3_108() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3_7()) { - jj_scanpos = xsp; - if (jj_3R_array_constraint_475_5_690()) return true; - } + if (jj_3R_resolution_indication_2768_4_232()) return true; return false; } - inline bool jj_3_7() + inline bool jj_3R_label_2022_2_84() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_scan_token(OPEN_T)) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_label_2007_2_84() + inline bool jj_3R_interface_variable_declaration_1973_49_260() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_scan_token(VARASSIGN_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_interface_variable_declaration_1959_49_260() + inline bool jj_3R_array_constraint_477_5_690() { if (jj_done) return true; - if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_index_constraint_1735_3_75()) return true; + return false; + } + + inline bool jj_3R_array_constraint_476_3_621() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3_7()) { + jj_scanpos = xsp; + if (jj_3R_array_constraint_477_5_690()) return true; + } return false; } - inline bool jj_3R_iteration_scheme_1996_3_558() + inline bool jj_3R_iteration_scheme_2011_3_558() { if (jj_done) return true; if (jj_scan_token(FOR_T)) return true; - if (jj_3R_parameter_specification_2341_1_667()) return true; + if (jj_3R_parameter_specification_2360_1_667()) return true; return false; } - inline bool jj_3R_interface_variable_declaration_1958_37_259() + inline bool jj_3_7() { if (jj_done) return true; - if (jj_3R_mode_2085_1_428()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_scan_token(OPEN_T)) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_anonymous_type_indication_457_2_543() + inline bool jj_3R_interface_variable_declaration_1972_37_259() { if (jj_done) return true; - if (jj_scan_token(TYPE_T)) return true; - if (jj_scan_token(IS_T)) return true; - if (jj_3R_incomplete_type_definition_1691_2_651()) return true; + if (jj_3R_mode_2101_1_428()) return true; return false; } - inline bool jj_3R_iteration_scheme_1989_1_557() + inline bool jj_3R_iteration_scheme_2004_1_557() { if (jj_done) return true; if (jj_scan_token(WHILE_T)) return true; - if (jj_3R_condition_901_3_100()) return true; + if (jj_3R_condition_906_3_100()) return true; return false; } - inline bool jj_3R_iteration_scheme_1989_1_466() + inline bool jj_3R_iteration_scheme_2004_1_466() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_iteration_scheme_1989_1_557()) { + if (jj_3R_iteration_scheme_2004_1_557()) { jj_scanpos = xsp; - if (jj_3R_iteration_scheme_1996_3_558()) return true; + if (jj_3R_iteration_scheme_2011_3_558()) return true; } return false; } - inline bool jj_3R_alias_declaration_407_44_523() - { - if (jj_done) return true; - if (jj_3R_signature_3030_1_472()) return true; - return false; - } - - inline bool jj_3R_aggregate_400_39_306() - { - if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_element_association_1143_1_305()) return true; - return false; - } - - inline bool jj_3R_allocator_427_6_304() + inline bool jj_3R_anonymous_type_indication_459_2_543() { if (jj_done) return true; - if (jj_scan_token(NEW_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_scan_token(TYPE_T)) return true; + if (jj_scan_token(IS_T)) return true; + if (jj_3R_incomplete_type_definition_1702_2_651()) return true; return false; } - inline bool jj_3R_ifunc_1866_98_650() + inline bool jj_3R_alias_declaration_407_44_523() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_signature_3052_1_472()) return true; return false; } - inline bool jj_3R_allocator_425_3_140() + inline bool jj_3R_ifunc_1879_98_650() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3_6()) { - jj_scanpos = xsp; - if (jj_3R_allocator_427_6_304()) return true; - } + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3_6() + inline bool jj_3R_aggregate_400_39_306() { if (jj_done) return true; - if (jj_scan_token(NEW_T)) return true; - if (jj_3R_qualified_expression_2636_3_74()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_element_association_1151_1_305()) return true; return false; } - inline bool jj_3R_interface_variable_declaration_1957_3_257() + inline bool jj_3R_interface_variable_declaration_1971_3_257() { if (jj_done) return true; Token * xsp; @@ -8732,121 +8656,149 @@ void parseInline(); return false; } - inline bool jj_3R_alias_designator_420_4_458() - { - if (jj_done) return true; - if (jj_3R_operator_symbol_2216_1_369()) return true; - return false; - } - - inline bool jj_3R_interface_type_indication_1951_8_435() - { - if (jj_done) return true; - if (jj_3R_mode_view_indication_2110_3_544()) return true; - return false; - } - - inline bool jj_3R_alias_designator_419_4_457() + inline bool jj_3R_interface_type_indication_1965_8_435() { if (jj_done) return true; - if (jj_scan_token(CHARACTER_LITERAL)) return true; + if (jj_3R_mode_view_indication_2126_3_544()) return true; return false; } - inline bool jj_3R_interface_variable_declaration_1957_1_115() + inline bool jj_3R_interface_variable_declaration_1971_1_115() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_interface_variable_declaration_1957_3_257()) jj_scanpos = xsp; - if (jj_3R_identifier_list_1652_4_258()) return true; + if (jj_3R_interface_variable_declaration_1971_3_257()) jj_scanpos = xsp; + if (jj_3R_identifier_list_1663_4_258()) return true; if (jj_scan_token(COLON_T)) return true; xsp = jj_scanpos; - if (jj_3R_interface_variable_declaration_1958_37_259()) jj_scanpos = xsp; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_interface_variable_declaration_1972_37_259()) jj_scanpos = xsp; + if (jj_3R_subtype_indication_3222_3_71()) return true; xsp = jj_scanpos; if (jj_scan_token(27)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_interface_variable_declaration_1959_49_260()) jj_scanpos = xsp; + if (jj_3R_interface_variable_declaration_1973_49_260()) jj_scanpos = xsp; return false; } - inline bool jj_3R_interface_type_indication_1950_8_434() + inline bool jj_3R_interface_type_indication_1964_8_434() { if (jj_done) return true; - if (jj_3R_anonymous_type_indication_457_2_543()) return true; + if (jj_3R_anonymous_type_indication_459_2_543()) return true; return false; } - inline bool jj_3R_alias_designator_418_2_310() + inline bool jj_3R_allocator_428_6_304() + { + if (jj_done) return true; + if (jj_scan_token(NEW_T)) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; + return false; + } + + inline bool jj_3R_interface_type_indication_1963_6_268() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_alias_designator_418_2_456()) { + if (jj_3R_interface_type_indication_1963_6_433()) { jj_scanpos = xsp; - if (jj_3R_alias_designator_419_4_457()) { + if (jj_3R_interface_type_indication_1964_8_434()) { jj_scanpos = xsp; - if (jj_3R_alias_designator_420_4_458()) return true; + if (jj_3R_interface_type_indication_1965_8_435()) return true; } } return false; } - inline bool jj_3R_alias_designator_418_2_456() + inline bool jj_3R_interface_type_indication_1963_6_433() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; return false; } - inline bool jj_3R_interface_type_indication_1949_6_268() + inline bool jj_3R_ifunc_1879_87_542() { if (jj_done) return true; + if (jj_scan_token(IS_T)) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_interface_type_indication_1949_6_433()) { - jj_scanpos = xsp; - if (jj_3R_interface_type_indication_1950_8_434()) { + if (jj_3R_ifunc_1879_98_650()) { jj_scanpos = xsp; - if (jj_3R_interface_type_indication_1951_8_435()) return true; - } + if (jj_scan_token(148)) return true; } return false; } - inline bool jj_3R_interface_type_indication_1949_6_433() + inline bool jj_3R_allocator_426_3_140() { if (jj_done) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3_6()) { + jj_scanpos = xsp; + if (jj_3R_allocator_428_6_304()) return true; + } return false; } - inline bool jj_3R_ifunc_1866_87_542() + inline bool jj_3_6() { if (jj_done) return true; - if (jj_scan_token(IS_T)) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_ifunc_1866_98_650()) { - jj_scanpos = xsp; - if (jj_scan_token(148)) return true; - } + if (jj_scan_token(NEW_T)) return true; + if (jj_3R_qualified_expression_2656_3_74()) return true; return false; } - inline bool jj_3R_interface_signal_declaration_1846_104_270() + inline bool jj_3R_interface_signal_declaration_1859_104_270() { if (jj_done) return true; if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_conditional_expression_955_3_137()) return true; + if (jj_3R_conditional_expression_960_3_137()) return true; + return false; + } + + inline bool jj_3R_interface_type_declaration_1958_3_119() + { + if (jj_done) return true; + if (jj_3R_interface_incomplete_type_declaration_1937_3_267()) return true; + return false; + } + + inline bool jj_3R_alias_designator_421_4_458() + { + if (jj_done) return true; + if (jj_3R_operator_symbol_2232_1_369()) return true; + return false; + } + + inline bool jj_3R_alias_designator_420_4_457() + { + if (jj_done) return true; + if (jj_scan_token(CHARACTER_LITERAL)) return true; + return false; + } + + inline bool jj_3R_alias_designator_419_2_310() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_alias_designator_419_2_456()) { + jj_scanpos = xsp; + if (jj_3R_alias_designator_420_4_457()) { + jj_scanpos = xsp; + if (jj_3R_alias_designator_421_4_458()) return true; + } + } return false; } - inline bool jj_3R_interface_type_declaration_1944_3_119() + inline bool jj_3R_alias_designator_419_2_456() { if (jj_done) return true; - if (jj_3R_interface_incomplete_type_declaration_1923_3_267()) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } @@ -8854,7 +8806,7 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; return false; } @@ -8862,18 +8814,26 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(ALIAS_T)) return true; - if (jj_3R_alias_designator_418_2_310()) return true; + if (jj_3R_alias_designator_419_2_310()) return true; Token * xsp; xsp = jj_scanpos; if (jj_3R_alias_declaration_406_4_311()) jj_scanpos = xsp; if (jj_scan_token(IS_T)) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; xsp = jj_scanpos; if (jj_3R_alias_declaration_407_44_523()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } + inline bool jj_3R_interface_incomplete_type_declaration_1937_3_267() + { + if (jj_done) return true; + if (jj_scan_token(TYPE_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + return false; + } + inline bool jj_3R_actual_designator_360_44_368() { if (jj_done) return true; @@ -8885,7 +8845,7 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_element_association_1143_1_305()) return true; + if (jj_3R_element_association_1151_1_305()) return true; Token * xsp; while (true) { xsp = jj_scanpos; @@ -8912,7 +8872,7 @@ void parseInline(); inline bool jj_3_5() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; if (jj_scan_token(LPAREN_T)) return true; return false; } @@ -8939,25 +8899,31 @@ void parseInline(); return false; } - inline bool jj_3_4() + inline bool jj_3_75() { if (jj_done) return true; - if (jj_3R_actual_designator_358_1_72()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_interface_incomplete_type_declaration_1923_3_267() + inline bool jj_3R_wait_statement_3366_97_330() { if (jj_done) return true; - if (jj_scan_token(TYPE_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_timeout_clause_3249_1_465()) return true; + return false; + } + + inline bool jj_3_4() + { + if (jj_done) return true; + if (jj_3R_actual_designator_358_1_72()) return true; return false; } inline bool jj_3R_actual_part_385_2_614() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; if (jj_scan_token(LPAREN_T)) return true; if (jj_3R_actual_designator_358_1_72()) return true; if (jj_scan_token(RPAREN_T)) return true; @@ -8993,78 +8959,79 @@ void parseInline(); return false; } - inline bool jj_3_75() + inline bool jj_3R_param_1907_5_649() { if (jj_done) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_interface_list_1836_3_377()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } inline bool jj_3R_actual_parameter_part_371_4_297() { if (jj_done) return true; - if (jj_3R_association_list_551_1_205()) return true; + if (jj_3R_association_list_553_1_205()) return true; return false; } - inline bool jj_3_2() + inline bool jj_3R_param_1906_3_540() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_scan_token(54)) jj_scanpos = xsp; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_scan_token(77)) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_param_1907_5_649()) jj_scanpos = xsp; return false; } - inline bool jj_3R_wait_statement_3341_97_330() + inline bool jj_3_2() { if (jj_done) return true; - if (jj_3R_timeout_clause_3225_1_465()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_scan_token(54)) jj_scanpos = xsp; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_actual_designator_364_2_185() + inline bool jj_3R_interface_constant_declaration_1816_89_269() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_scan_token(VARASSIGN_T)) return true; + if (jj_3R_conditional_expression_960_3_137()) return true; return false; } - inline bool jj_3_3() + inline bool jj_3R_wait_statement_3366_71_329() { if (jj_done) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_condition_clause_917_3_464()) return true; return false; } - inline bool jj_3R_param_1893_5_649() + inline bool jj_3R_actual_designator_364_2_185() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_interface_list_1823_3_377()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_actual_designator_360_1_184() + inline bool jj_3_3() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_actual_designator_360_44_368()) jj_scanpos = xsp; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; return false; } - inline bool jj_3R_param_1892_3_540() + inline bool jj_3R_actual_designator_360_1_184() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_scan_token(77)) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_param_1893_5_649()) jj_scanpos = xsp; + if (jj_3R_actual_designator_360_44_368()) jj_scanpos = xsp; + if (jj_3R_expression_1380_20_70()) return true; return false; } @@ -9093,11 +9060,10 @@ void parseInline(); return false; } - inline bool jj_3R_interface_constant_declaration_1804_89_269() + inline bool jj_3R_variable_declaration_3336_90_520() { if (jj_done) return true; - if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_conditional_expression_955_3_137()) return true; + if (jj_3R_generic_map_aspect_1620_6_88()) return true; return false; } @@ -9105,7 +9071,7 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(ACCESS_T)) return true; - if (jj_3R_incomplete_subtype_indication_1685_3_808()) return true; + if (jj_3R_incomplete_subtype_indication_1696_3_808()) return true; return false; } @@ -9113,7 +9079,35 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(ACCESS_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; + return false; + } + + inline bool jj_3R_ifunc_1879_3_541() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_scan_token(85)) { + jj_scanpos = xsp; + if (jj_scan_token(52)) return true; + } + return false; + } + + inline bool jj_3R_ifunc_1879_2_431() + { + if (jj_done) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_ifunc_1879_3_541()) jj_scanpos = xsp; + if (jj_scan_token(FUNCTION_T)) return true; + if (jj_3R_name_2142_2_73()) return true; + if (jj_3R_param_1906_3_540()) return true; + if (jj_scan_token(RETURN_T)) return true; + if (jj_3R_name_2142_2_73()) return true; + xsp = jj_scanpos; + if (jj_3R_ifunc_1879_87_542()) jj_scanpos = xsp; return false; } @@ -9153,117 +9147,98 @@ void parseInline(); return false; } - inline bool jj_3R_wait_statement_3341_71_329() - { - if (jj_done) return true; - if (jj_3R_condition_clause_912_3_464()) return true; - return false; - } - inline bool jj_3_1() { if (jj_done) return true; if (jj_scan_token(DOT_T)) return true; - if (jj_3R_pathname_element_list_2359_3_69()) return true; + if (jj_3R_pathname_element_list_2378_3_69()) return true; return false; } - inline bool jj_3R_absolute_pathname_331_3_752() + inline bool jj_3R_wait_statement_3366_43_328() { if (jj_done) return true; - if (jj_scan_token(DOT_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_sensitivity_clause_2838_2_463()) return true; return false; } - inline bool jj_3R_ifunc_1866_3_541() + inline bool jj_3R_iproc_1870_3_430() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_scan_token(85)) { - jj_scanpos = xsp; - if (jj_scan_token(52)) return true; - } + if (jj_scan_token(PROCEDURE_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_3R_param_1906_3_540()) return true; return false; } - inline bool jj_3R_ifunc_1866_2_431() + inline bool jj_3R_absolute_pathname_331_3_752() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_ifunc_1866_3_541()) jj_scanpos = xsp; - if (jj_scan_token(FUNCTION_T)) return true; - if (jj_3R_name_2126_2_73()) return true; - if (jj_3R_param_1892_3_540()) return true; - if (jj_scan_token(RETURN_T)) return true; - if (jj_3R_name_2126_2_73()) return true; - xsp = jj_scanpos; - if (jj_3R_ifunc_1866_87_542()) jj_scanpos = xsp; + if (jj_scan_token(DOT_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_variable_declaration_3312_90_520() + inline bool jj_3R_interface_subprogram_declaration_1865_4_265() { if (jj_done) return true; - if (jj_3R_generic_map_aspect_1609_6_88()) return true; + if (jj_3R_ifunc_1879_2_431()) return true; return false; } - inline bool jj_3R_absolute_pathname_329_2_751() + inline bool jj_3R_interface_subprogram_declaration_1864_4_117() { if (jj_done) return true; - if (jj_scan_token(DOT_T)) return true; - if (jj_3R_pathname_element_list_2359_3_69()) return true; - if (jj_3R_identifier_1646_3_82()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_interface_subprogram_declaration_1864_4_264()) { + jj_scanpos = xsp; + if (jj_3R_interface_subprogram_declaration_1865_4_265()) return true; + } return false; } - inline bool jj_3R_absolute_pathname_329_2_681() + inline bool jj_3R_interface_subprogram_declaration_1864_4_264() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_absolute_pathname_329_2_751()) { - jj_scanpos = xsp; - if (jj_3R_absolute_pathname_331_3_752()) return true; - } + if (jj_3R_iproc_1870_3_430()) return true; return false; } - inline bool jj_3R_iproc_1857_3_430() + inline bool jj_3R_waveform_element_3383_19_671() { if (jj_done) return true; - if (jj_scan_token(PROCEDURE_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_3R_param_1892_3_540()) return true; + if (jj_scan_token(AFTER_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_interface_subprogram_declaration_1852_4_265() + inline bool jj_3R_absolute_pathname_329_2_751() { if (jj_done) return true; - if (jj_3R_ifunc_1866_2_431()) return true; + if (jj_scan_token(DOT_T)) return true; + if (jj_3R_pathname_element_list_2378_3_69()) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_interface_subprogram_declaration_1851_4_117() + inline bool jj_3R_absolute_pathname_329_2_681() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_interface_subprogram_declaration_1851_4_264()) { + if (jj_3R_absolute_pathname_329_2_751()) { jj_scanpos = xsp; - if (jj_3R_interface_subprogram_declaration_1852_4_265()) return true; + if (jj_3R_absolute_pathname_331_3_752()) return true; } return false; } - inline bool jj_3R_interface_subprogram_declaration_1851_4_264() + inline bool jj_3R_waveform_3375_23_616() { if (jj_done) return true; - if (jj_3R_iproc_1857_3_430()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_waveform_element_3383_2_562()) return true; return false; } @@ -9271,45 +9246,30 @@ void parseInline(); { if (jj_done) return true; if (jj_scan_token(SEMI_T)) return true; - if (jj_3R_interface_element_1809_3_122()) return true; - return false; - } - - inline bool jj_3R_wait_statement_3341_43_328() - { - if (jj_done) return true; - if (jj_3R_sensitivity_clause_2817_2_463()) return true; + if (jj_3R_interface_element_1821_3_122()) return true; return false; } - inline bool jj_3R_interface_signal_declaration_1846_2_121() + inline bool jj_3R_interface_signal_declaration_1859_2_121() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(101)) jj_scanpos = xsp; - if (jj_3R_identifier_list_1652_4_258()) return true; + if (jj_3R_identifier_list_1663_4_258()) return true; if (jj_scan_token(COLON_T)) return true; - if (jj_3R_interface_type_indication_1949_6_268()) return true; + if (jj_3R_interface_type_indication_1963_6_268()) return true; xsp = jj_scanpos; if (jj_scan_token(27)) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_interface_signal_declaration_1846_104_270()) jj_scanpos = xsp; - return false; - } - - inline bool jj_3R_waveform_element_3358_19_671() - { - if (jj_done) return true; - if (jj_scan_token(AFTER_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_interface_signal_declaration_1859_104_270()) jj_scanpos = xsp; return false; } - inline bool jj_3R_interface_package_generic_map_aspect_1836_5_432() + inline bool jj_3R_interface_package_generic_map_aspect_1849_5_432() { if (jj_done) return true; - if (jj_3R_generic_map_aspect_1609_6_88()) return true; + if (jj_3R_generic_map_aspect_1620_6_88()) return true; return false; } @@ -9324,11 +9284,13 @@ void parseInline(); return false; } - inline bool jj_3R_waveform_3350_23_616() + inline bool jj_3R_waveform_element_3383_2_562() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_waveform_element_3358_2_562()) return true; + if (jj_3R_expression_1380_20_70()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_waveform_element_3383_19_671()) jj_scanpos = xsp; return false; } @@ -9343,7 +9305,7 @@ void parseInline(); return false; } - inline bool jj_3R_interface_package_generic_map_aspect_1834_3_266() + inline bool jj_3R_interface_package_generic_map_aspect_1847_3_266() { if (jj_done) return true; Token * xsp; @@ -9352,374 +9314,371 @@ void parseInline(); jj_scanpos = xsp; if (jj_3_77()) { jj_scanpos = xsp; - if (jj_3R_interface_package_generic_map_aspect_1836_5_432()) return true; + if (jj_3R_interface_package_generic_map_aspect_1849_5_432()) return true; } } return false; } - inline bool jj_3R_interface_package_declaration_1828_3_118() + inline bool jj_3R_interface_package_declaration_1841_3_118() { if (jj_done) return true; if (jj_scan_token(PACKAGE_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(IS_T)) return true; if (jj_scan_token(NEW_T)) return true; - if (jj_3R_name_2126_2_73()) return true; - if (jj_3R_interface_package_generic_map_aspect_1834_3_266()) return true; + if (jj_3R_name_2142_2_73()) return true; + if (jj_3R_interface_package_generic_map_aspect_1847_3_266()) return true; + return false; + } + + inline bool jj_3R_waveform_3377_1_495() + { + if (jj_done) return true; + if (jj_scan_token(UNAFFECTED_T)) return true; return false; } - inline bool jj_3R_instantiation_unit_1744_86_497() + inline bool jj_3R_instantiation_unit_1755_86_497() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_interface_list_1823_3_377() + inline bool jj_3R_waveform_3375_1_494() { if (jj_done) return true; - if (jj_3R_interface_element_1809_3_122()) return true; + if (jj_3R_waveform_element_3383_2_562()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3_74()) { jj_scanpos = xsp; break; } + if (jj_3R_waveform_3375_23_616()) { jj_scanpos = xsp; break; } } - xsp = jj_scanpos; - if (jj_3_75()) jj_scanpos = xsp; return false; } - inline bool jj_3R_waveform_element_3358_2_562() + inline bool jj_3R_waveform_3375_1_382() { if (jj_done) return true; - if (jj_3R_expression_1371_20_70()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_waveform_element_3358_19_671()) jj_scanpos = xsp; - return false; - } - - inline bool jj_3R_waveform_3352_1_495() - { - if (jj_done) return true; - if (jj_scan_token(UNAFFECTED_T)) return true; - return false; - } - - inline bool jj_3R_interface_file_declaration_1814_3_429() - { - if (jj_done) return true; - if (jj_scan_token(FILE_T)) return true; - if (jj_3R_identifier_list_1652_4_258()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_waveform_3375_1_494()) { + jj_scanpos = xsp; + if (jj_3R_waveform_3377_1_495()) return true; + } return false; } - inline bool jj_3R_waveform_3350_1_494() + inline bool jj_3R_interface_list_1836_3_377() { if (jj_done) return true; - if (jj_3R_waveform_element_3358_2_562()) return true; + if (jj_3R_interface_element_1821_3_122()) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_waveform_3350_23_616()) { jj_scanpos = xsp; break; } + if (jj_3_74()) { jj_scanpos = xsp; break; } } + xsp = jj_scanpos; + if (jj_3_75()) jj_scanpos = xsp; return false; } - inline bool jj_3_73() + inline bool jj_3R_wait_statement_3366_3_327() { if (jj_done) return true; - if (jj_3R_interface_signal_declaration_1846_2_121()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_waveform_3350_1_382() + inline bool jj_3R_wait_statement_3366_1_153() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_waveform_3350_1_494()) { - jj_scanpos = xsp; - if (jj_3R_waveform_3352_1_495()) return true; - } + if (jj_3R_wait_statement_3366_3_327()) jj_scanpos = xsp; + if (jj_scan_token(WAIT_T)) return true; + xsp = jj_scanpos; + if (jj_3R_wait_statement_3366_43_328()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_wait_statement_3366_71_329()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_wait_statement_3366_97_330()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3_72() + inline bool jj_3R_interface_file_declaration_1826_3_429() { if (jj_done) return true; - if (jj_3R_interface_constant_declaration_1804_3_120()) return true; + if (jj_scan_token(FILE_T)) return true; + if (jj_3R_identifier_list_1663_4_258()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; return false; } - inline bool jj_3R_interface_element_1809_3_122() + inline bool jj_3_73() { if (jj_done) return true; - if (jj_3R_interface_declaration_1767_1_271()) return true; + if (jj_3R_interface_signal_declaration_1859_2_121()) return true; return false; } - inline bool jj_3R_wait_statement_3341_3_327() + inline bool jj_3_72() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_interface_constant_declaration_1816_3_120()) return true; return false; } - inline bool jj_3R_interface_object_declaration_1799_9_263() + inline bool jj_3R_interface_element_1821_3_122() { if (jj_done) return true; - if (jj_3R_interface_file_declaration_1814_3_429()) return true; + if (jj_3R_interface_declaration_1778_1_271()) return true; return false; } - inline bool jj_3R_interface_constant_declaration_1804_3_120() + inline bool jj_3R_interface_object_declaration_1811_9_263() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_scan_token(31)) jj_scanpos = xsp; - if (jj_3R_identifier_list_1652_4_258()) return true; - if (jj_scan_token(COLON_T)) return true; - xsp = jj_scanpos; - if (jj_scan_token(53)) jj_scanpos = xsp; - if (jj_3R_interface_type_indication_1949_6_268()) return true; - xsp = jj_scanpos; - if (jj_3R_interface_constant_declaration_1804_89_269()) jj_scanpos = xsp; + if (jj_3R_interface_file_declaration_1826_3_429()) return true; return false; } - inline bool jj_3R_wait_statement_3341_1_153() + inline bool jj_3R_interface_constant_declaration_1816_3_120() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_wait_statement_3341_3_327()) jj_scanpos = xsp; - if (jj_scan_token(WAIT_T)) return true; - xsp = jj_scanpos; - if (jj_3R_wait_statement_3341_43_328()) jj_scanpos = xsp; + if (jj_scan_token(31)) jj_scanpos = xsp; + if (jj_3R_identifier_list_1663_4_258()) return true; + if (jj_scan_token(COLON_T)) return true; xsp = jj_scanpos; - if (jj_3R_wait_statement_3341_71_329()) jj_scanpos = xsp; + if (jj_scan_token(53)) jj_scanpos = xsp; + if (jj_3R_interface_type_indication_1963_6_268()) return true; xsp = jj_scanpos; - if (jj_3R_wait_statement_3341_97_330()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_interface_constant_declaration_1816_89_269()) jj_scanpos = xsp; return false; } - inline bool jj_3R_interface_object_declaration_1797_9_262() + inline bool jj_3R_interface_object_declaration_1809_9_262() { if (jj_done) return true; - if (jj_3R_interface_signal_declaration_1846_2_121()) return true; + if (jj_3R_interface_signal_declaration_1859_2_121()) return true; return false; } - inline bool jj_3R_interface_object_declaration_1796_7_116() + inline bool jj_3R_interface_object_declaration_1808_7_116() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_interface_object_declaration_1796_7_261()) { + if (jj_3R_interface_object_declaration_1808_7_261()) { jj_scanpos = xsp; - if (jj_3R_interface_object_declaration_1797_9_262()) { + if (jj_3R_interface_object_declaration_1809_9_262()) { jj_scanpos = xsp; - if (jj_3R_interface_object_declaration_1799_9_263()) return true; + if (jj_3R_interface_object_declaration_1811_9_263()) return true; } } return false; } - inline bool jj_3R_interface_object_declaration_1796_7_261() + inline bool jj_3R_interface_object_declaration_1808_7_261() { if (jj_done) return true; - if (jj_3R_interface_constant_declaration_1804_3_120()) return true; + if (jj_3R_interface_constant_declaration_1816_3_120()) return true; return false; } - inline bool jj_3_71() + inline bool jj_3R_unconstraint_array_definition_3294_53_889() { if (jj_done) return true; - if (jj_3R_interface_subprogram_declaration_1851_4_117()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_index_subtype_definition_1749_2_863()) return true; return false; } - inline bool jj_3R_unconstraint_array_definition_3270_53_889() + inline bool jj_3R_variable_declaration_3338_3_521() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_index_subtype_definition_1738_2_863()) return true; + if (jj_scan_token(VARASSIGN_T)) return true; + if (jj_3R_conditional_expression_960_3_137()) return true; return false; } - inline bool jj_3R_interface_declaration_1786_2_441() + inline bool jj_3_71() { if (jj_done) return true; - if (jj_3R_object_class_2206_1_545()) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_interface_subprogram_declaration_1864_4_117()) return true; return false; } - inline bool jj_3_69() + inline bool jj_3R_variable_declaration_3336_1_420() { if (jj_done) return true; - if (jj_3R_interface_package_declaration_1828_3_118()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_scan_token(102)) jj_scanpos = xsp; + if (jj_scan_token(VARIABLE_T)) return true; + if (jj_3R_identifier_list_1663_4_258()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; + xsp = jj_scanpos; + if (jj_3R_variable_declaration_3336_90_520()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_variable_declaration_3338_3_521()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3_68() + inline bool jj_3R_interface_declaration_1797_2_441() { if (jj_done) return true; - if (jj_3R_interface_subprogram_declaration_1851_4_117()) return true; + if (jj_3R_object_class_2222_1_545()) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3R_interface_declaration_1783_1_440() + inline bool jj_3R_variable_assignment_statement_3331_2_555() { if (jj_done) return true; - if (jj_3R_interface_subprogram_declaration_1851_4_117()) return true; + if (jj_3R_selected_variable_assignment_2854_3_666()) return true; return false; } - inline bool jj_3R_variable_declaration_3314_3_521() + inline bool jj_3_69() { if (jj_done) return true; - if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_conditional_expression_955_3_137()) return true; + if (jj_3R_interface_package_declaration_1841_3_118()) return true; return false; } - inline bool jj_3_67() + inline bool jj_3_68() { if (jj_done) return true; - if (jj_3R_interface_object_declaration_1796_7_116()) return true; + if (jj_3R_interface_subprogram_declaration_1864_4_117()) return true; return false; } - inline bool jj_3_70() + inline bool jj_3R_interface_declaration_1794_1_440() { if (jj_done) return true; - if (jj_3R_interface_type_declaration_1944_3_119()) return true; + if (jj_3R_interface_subprogram_declaration_1864_4_117()) return true; return false; } - inline bool jj_3_66() + inline bool jj_3_168() { if (jj_done) return true; - if (jj_3R_interface_variable_declaration_1957_1_115()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_variable_declaration_3312_1_420() + inline bool jj_3R_variable_assignment_statement_3327_1_554() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_scan_token(102)) jj_scanpos = xsp; - if (jj_scan_token(VARIABLE_T)) return true; - if (jj_3R_identifier_list_1652_4_258()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; - xsp = jj_scanpos; - if (jj_3R_variable_declaration_3312_90_520()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_3R_variable_declaration_3314_3_521()) jj_scanpos = xsp; + if (jj_3_168()) jj_scanpos = xsp; + if (jj_3R_target_3237_2_150()) return true; + if (jj_scan_token(VARASSIGN_T)) return true; + if (jj_3R_conditional_or_unaffected_expression_965_2_560()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_interface_declaration_1776_1_439() + inline bool jj_3R_use_clause_3300_28_532() { if (jj_done) return true; - if (jj_3R_interface_package_declaration_1828_3_118()) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_selected_name_2821_2_508()) return true; return false; } - inline bool jj_3R_variable_assignment_statement_3307_2_555() + inline bool jj_3_67() { if (jj_done) return true; - if (jj_3R_selected_variable_assignment_2833_3_666()) return true; + if (jj_3R_interface_object_declaration_1808_7_116()) return true; return false; } - inline bool jj_3R_interface_declaration_1773_1_438() + inline bool jj_3R_variable_assignment_statement_3327_1_461() { if (jj_done) return true; - if (jj_3R_interface_subprogram_declaration_1851_4_117()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_variable_assignment_statement_3327_1_554()) { + jj_scanpos = xsp; + if (jj_3R_variable_assignment_statement_3331_2_555()) return true; + } return false; } - inline bool jj_3R_interface_declaration_1770_2_437() + inline bool jj_3_70() { if (jj_done) return true; - if (jj_3R_interface_object_declaration_1796_7_116()) return true; + if (jj_3R_interface_type_declaration_1958_3_119()) return true; return false; } - inline bool jj_3_168() + inline bool jj_3_66() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_3R_interface_variable_declaration_1971_1_115()) return true; return false; } - inline bool jj_3R_variable_assignment_statement_3303_1_554() + inline bool jj_3R_interface_declaration_1787_1_439() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3_168()) jj_scanpos = xsp; - if (jj_3R_target_3213_2_150()) return true; - if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_conditional_or_unaffected_expression_960_2_560()) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_interface_package_declaration_1841_3_118()) return true; return false; } - inline bool jj_3R_use_clause_3276_28_532() + inline bool jj_3R_interface_declaration_1784_1_438() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_selected_name_2800_2_508()) return true; + if (jj_3R_interface_subprogram_declaration_1864_4_117()) return true; return false; } - inline bool jj_3R_variable_assignment_statement_3303_1_461() + inline bool jj_3R_interface_declaration_1781_2_437() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_variable_assignment_statement_3303_1_554()) { - jj_scanpos = xsp; - if (jj_3R_variable_assignment_statement_3307_2_555()) return true; - } + if (jj_3R_interface_object_declaration_1808_7_116()) return true; + return false; + } + + inline bool jj_3_163() + { + if (jj_done) return true; + if (jj_3R_constraint_1051_5_173()) return true; return false; } - inline bool jj_3R_interface_declaration_1767_1_271() + inline bool jj_3R_interface_declaration_1778_1_271() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_interface_declaration_1767_1_436()) { + if (jj_3R_interface_declaration_1778_1_436()) { jj_scanpos = xsp; - if (jj_3R_interface_declaration_1770_2_437()) { + if (jj_3R_interface_declaration_1781_2_437()) { jj_scanpos = xsp; - if (jj_3R_interface_declaration_1773_1_438()) { + if (jj_3R_interface_declaration_1784_1_438()) { jj_scanpos = xsp; - if (jj_3R_interface_declaration_1776_1_439()) { + if (jj_3R_interface_declaration_1787_1_439()) { jj_scanpos = xsp; if (jj_3_70()) { jj_scanpos = xsp; - if (jj_3R_interface_declaration_1783_1_440()) { + if (jj_3R_interface_declaration_1794_1_440()) { jj_scanpos = xsp; - if (jj_3R_interface_declaration_1786_2_441()) return true; + if (jj_3R_interface_declaration_1797_2_441()) return true; } } } @@ -9729,18 +9688,25 @@ void parseInline(); return false; } - inline bool jj_3R_interface_declaration_1767_1_436() + inline bool jj_3R_interface_declaration_1778_1_436() { if (jj_done) return true; - if (jj_3R_interface_variable_declaration_1957_1_115()) return true; + if (jj_3R_interface_variable_declaration_1971_1_115()) return true; return false; } - inline bool jj_3R_index_constraint_1724_42_190() + inline bool jj_3R_index_constraint_1735_42_190() { if (jj_done) return true; if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_discrete_range_1128_3_87()) return true; + if (jj_3R_discrete_range_1136_3_87()) return true; + return false; + } + + inline bool jj_3R_subtype_indication_3222_85_182() + { + if (jj_done) return true; + if (jj_3R_constraint_1051_5_173()) return true; return false; } @@ -9752,557 +9718,517 @@ void parseInline(); return false; } - inline bool jj_3_163() + inline bool jj_3R_protected_type_instantiation_definition_3283_20_816() + { + if (jj_done) return true; + if (jj_3R_generic_map_aspect_1620_6_88()) return true; + return false; + } + + inline bool jj_3R_use_clause_3300_2_400() { if (jj_done) return true; - if (jj_3R_constraint_1044_5_173()) return true; + if (jj_scan_token(USE_T)) return true; + if (jj_3R_selected_name_2821_2_508()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_use_clause_3300_28_532()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_instantiation_list_1752_3_501() + inline bool jj_3R_instantiation_list_1763_3_501() { if (jj_done) return true; if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_instantiation_list_1751_3_500() + inline bool jj_3R_instantiation_list_1762_3_500() { if (jj_done) return true; if (jj_scan_token(OTHER_T)) return true; return false; } - inline bool jj_3R_instantiation_list_1750_3_499() + inline bool jj_3R_instantiation_list_1761_3_499() { if (jj_done) return true; - if (jj_3R_identifier_list_1652_4_258()) return true; + if (jj_3R_identifier_list_1663_4_258()) return true; return false; } - inline bool jj_3R_instantiation_list_1750_3_396() + inline bool jj_3R_instantiation_list_1761_3_396() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_instantiation_list_1750_3_499()) { + if (jj_3R_instantiation_list_1761_3_499()) { jj_scanpos = xsp; - if (jj_3R_instantiation_list_1751_3_500()) { + if (jj_3R_instantiation_list_1762_3_500()) { jj_scanpos = xsp; - if (jj_3R_instantiation_list_1752_3_501()) return true; + if (jj_3R_instantiation_list_1763_3_501()) return true; } } return false; } - inline bool jj_3R_instantiation_unit_1745_3_391() + inline bool jj_3R_unconstraint_array_definition_3294_1_867() { if (jj_done) return true; - if (jj_scan_token(CONFIGURATION_T)) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_scan_token(ARRAY_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_index_subtype_definition_1749_2_863()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_unconstraint_array_definition_3294_53_889()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(RPAREN_T)) return true; + if (jj_scan_token(OF_T)) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; return false; } - inline bool jj_3R_subtype_indication_3198_85_182() + inline bool jj_3R_instantiation_unit_1756_3_391() { if (jj_done) return true; - if (jj_3R_constraint_1044_5_173()) return true; + if (jj_scan_token(CONFIGURATION_T)) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_instantiation_unit_1744_3_390() + inline bool jj_3R_instantiation_unit_1755_3_390() { if (jj_done) return true; if (jj_scan_token(ENTITY_T)) return true; Token * xsp; xsp = jj_scanpos; if (jj_3_65()) jj_scanpos = xsp; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; xsp = jj_scanpos; - if (jj_3R_instantiation_unit_1744_86_497()) jj_scanpos = xsp; + if (jj_3R_instantiation_unit_1755_86_497()) jj_scanpos = xsp; + return false; + } + + inline bool jj_3R_type_mark_3289_3_195() + { + if (jj_done) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_protected_type_instantiation_definition_3259_20_816() + inline bool jj_3R_subprogram_specification_3172_118_662() { if (jj_done) return true; - if (jj_3R_generic_map_aspect_1609_6_88()) return true; + if (jj_3R_subprogram_header_3153_6_738()) return true; return false; } - inline bool jj_3R_instantiation_unit_1743_1_215() + inline bool jj_3R_instantiation_unit_1754_1_215() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_instantiation_unit_1743_1_389()) { + if (jj_3R_instantiation_unit_1754_1_389()) { jj_scanpos = xsp; - if (jj_3R_instantiation_unit_1744_3_390()) { + if (jj_3R_instantiation_unit_1755_3_390()) { jj_scanpos = xsp; - if (jj_3R_instantiation_unit_1745_3_391()) return true; + if (jj_3R_instantiation_unit_1756_3_391()) return true; } } return false; } - inline bool jj_3R_instantiation_unit_1743_1_389() + inline bool jj_3R_instantiation_unit_1754_1_389() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; if (jj_scan_token(28)) jj_scanpos = xsp; - if (jj_3R_name_2126_2_73()) return true; - return false; - } - - inline bool jj_3R_use_clause_3276_2_400() - { - if (jj_done) return true; - if (jj_scan_token(USE_T)) return true; - if (jj_3R_selected_name_2800_2_508()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_use_clause_3276_28_532()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } inline bool jj_3_64() { if (jj_done) return true; - if (jj_3R_discrete_range_1128_3_87()) return true; + if (jj_3R_discrete_range_1136_3_87()) return true; return false; } - inline bool jj_3R_index_subtype_definition_1738_2_863() + inline bool jj_3R_index_subtype_definition_1749_2_863() { if (jj_done) return true; - if (jj_3R_type_mark_3265_3_195()) return true; + if (jj_3R_type_mark_3289_3_195()) return true; if (jj_scan_token(RANGE_T)) return true; if (jj_scan_token(BOX_T)) return true; return false; } - inline bool jj_3R_unconstraint_array_definition_3270_1_867() + inline bool jj_3R_protected_type_instantiation_definition_3283_3_802() { if (jj_done) return true; - if (jj_scan_token(ARRAY_T)) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_index_subtype_definition_1738_2_863()) return true; + if (jj_scan_token(NEW_T)) return true; + if (jj_3R_name_2142_2_73()) return true; Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_unconstraint_array_definition_3270_53_889()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(RPAREN_T)) return true; - if (jj_scan_token(OF_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + xsp = jj_scanpos; + if (jj_3R_protected_type_instantiation_definition_3283_20_816()) jj_scanpos = xsp; return false; } - inline bool jj_3R_index_specification_1731_3_757() + inline bool jj_3_162() { if (jj_done) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_subprogram_specification_3150_118_662() + inline bool jj_3R_type_definition_3277_3_766() { if (jj_done) return true; - if (jj_3R_subprogram_header_3131_6_738()) return true; + if (jj_3R_protected_type_declaration_2623_4_803()) return true; return false; } - inline bool jj_3R_type_mark_3265_3_195() + inline bool jj_3R_index_specification_1742_3_757() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_index_specification_1729_2_756() + inline bool jj_3_158() { if (jj_done) return true; - if (jj_3R_discrete_range_1128_3_87()) return true; + if (jj_3R_generic_map_aspect_1620_6_88()) return true; return false; } - inline bool jj_3R_index_specification_1729_2_687() + inline bool jj_3R_index_specification_1740_2_756() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_index_specification_1729_2_756()) { - jj_scanpos = xsp; - if (jj_3R_index_specification_1731_3_757()) return true; - } + if (jj_3R_discrete_range_1136_3_87()) return true; return false; } - inline bool jj_3R_protected_type_instantiation_definition_3259_3_802() + inline bool jj_3R_index_specification_1740_2_687() { if (jj_done) return true; - if (jj_scan_token(NEW_T)) return true; - if (jj_3R_name_2126_2_73()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_protected_type_instantiation_definition_3259_20_816()) jj_scanpos = xsp; + if (jj_3R_index_specification_1740_2_756()) { + jj_scanpos = xsp; + if (jj_3R_index_specification_1742_3_757()) return true; + } return false; } - inline bool jj_3R_index_constraint_1724_3_75() + inline bool jj_3_167() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_discrete_range_1128_3_87()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_index_constraint_1724_42_190()) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_protected_type_body_2583_4_177()) return true; return false; } - inline bool jj_3R_if_statement_1676_47_758() + inline bool jj_3R_type_definition_3273_3_765() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_protected_type_instantiation_definition_3283_3_802()) return true; return false; } - inline bool jj_3_162() + inline bool jj_3R_type_definition_3272_3_764() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_file_type_definition_1464_2_801()) return true; return false; } - inline bool jj_3R_type_definition_3253_3_766() + inline bool jj_3R_subprogram_instantiation_declaration_3200_75_353() { if (jj_done) return true; - if (jj_3R_protected_type_declaration_2603_4_803()) return true; + if (jj_3R_gen_assoc_list_1544_4_172()) return true; return false; } - inline bool jj_3_158() + inline bool jj_3R_type_definition_3271_3_763() { if (jj_done) return true; - if (jj_3R_generic_map_aspect_1609_6_88()) return true; + if (jj_3R_access_type_definition_346_3_800()) return true; return false; } - inline bool jj_3R_incomplete_type_declaration_1716_3_636() + inline bool jj_3R_type_definition_3270_3_762() { if (jj_done) return true; - if (jj_scan_token(TYPE_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_composite_type_definition_825_2_799()) return true; return false; } - inline bool jj_3_167() + inline bool jj_3R_index_constraint_1735_3_75() { if (jj_done) return true; - if (jj_3R_protected_type_body_2563_4_177()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_discrete_range_1136_3_87()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_index_constraint_1735_42_190()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_subprogram_instantiation_declaration_3178_75_353() + inline bool jj_3R_type_definition_3269_1_761() { if (jj_done) return true; - if (jj_3R_gen_assoc_list_1533_4_172()) return true; + if (jj_3R_scalar_type_definition_2793_1_798()) return true; return false; } - inline bool jj_3R_type_definition_3249_3_765() + inline bool jj_3R_type_definition_3269_1_691() { if (jj_done) return true; - if (jj_3R_protected_type_instantiation_definition_3259_3_802()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_type_definition_3269_1_761()) { + jj_scanpos = xsp; + if (jj_3R_type_definition_3270_3_762()) { + jj_scanpos = xsp; + if (jj_3R_type_definition_3271_3_763()) { + jj_scanpos = xsp; + if (jj_3R_type_definition_3272_3_764()) { + jj_scanpos = xsp; + if (jj_3R_type_definition_3273_3_765()) { + jj_scanpos = xsp; + if (jj_3_167()) { + jj_scanpos = xsp; + if (jj_3R_type_definition_3277_3_766()) return true; + } + } + } + } + } + } return false; } - inline bool jj_3R_type_definition_3248_3_764() + inline bool jj_3R_if_statement_1687_47_758() { if (jj_done) return true; - if (jj_3R_file_type_definition_1454_2_801()) return true; + if (jj_3R_identifier_1657_3_82()) return true; return false; } - inline bool jj_3_62() + inline bool jj_3R_type_declaration_3264_3_514() { if (jj_done) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_incomplete_type_declaration_1727_3_636()) return true; return false; } - inline bool jj_3R_type_definition_3247_3_763() + inline bool jj_3R_incomplete_type_declaration_1727_3_636() { if (jj_done) return true; - if (jj_3R_access_type_definition_346_3_800()) return true; + if (jj_scan_token(TYPE_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_integer_incomplete_type_definition_1711_3_787() + inline bool jj_3_166() { if (jj_done) return true; - if (jj_scan_token(RANGE_T)) return true; - if (jj_scan_token(BOX_T)) return true; + if (jj_3R_full_type_declaration_1501_3_176()) return true; return false; } - inline bool jj_3R_type_definition_3246_3_762() + inline bool jj_3R_type_declaration_3262_1_415() { if (jj_done) return true; - if (jj_3R_composite_type_definition_820_2_799()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3_166()) { + jj_scanpos = xsp; + if (jj_3R_type_declaration_3264_3_514()) return true; + } return false; } - inline bool jj_3R_type_definition_3245_1_761() + inline bool jj_3_62() { if (jj_done) return true; - if (jj_3R_scalar_type_definition_2773_1_798()) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_type_definition_3245_1_691() + inline bool jj_3R_integer_incomplete_type_definition_1722_3_787() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_type_definition_3245_1_761()) { - jj_scanpos = xsp; - if (jj_3R_type_definition_3246_3_762()) { - jj_scanpos = xsp; - if (jj_3R_type_definition_3247_3_763()) { - jj_scanpos = xsp; - if (jj_3R_type_definition_3248_3_764()) { - jj_scanpos = xsp; - if (jj_3R_type_definition_3249_3_765()) { - jj_scanpos = xsp; - if (jj_3_167()) { - jj_scanpos = xsp; - if (jj_3R_type_definition_3253_3_766()) return true; - } - } - } - } - } - } + if (jj_scan_token(RANGE_T)) return true; + if (jj_scan_token(BOX_T)) return true; return false; } - inline bool jj_3R_type_declaration_3240_3_514() + inline bool jj_3R_type_conversion_3257_3_138() { if (jj_done) return true; - if (jj_3R_incomplete_type_declaration_1716_3_636()) return true; + if (jj_3R_name_2142_2_73()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_incomplete_type_definition_1699_5_734() + inline bool jj_3_165() { if (jj_done) return true; - if (jj_3R_file_incomplete_type_definition_1459_2_790()) return true; + if (jj_3R_multiplying_operation_2133_1_174()) return true; + if (jj_3R_factor_1433_1_175()) return true; return false; } - inline bool jj_3_166() + inline bool jj_3R_subprogram_instantiation_declaration_3200_58_352() { if (jj_done) return true; - if (jj_3R_full_type_declaration_1491_3_176()) return true; + if (jj_3R_signature_3052_1_472()) return true; return false; } - inline bool jj_3R_type_declaration_3238_1_415() + inline bool jj_3R_incomplete_type_definition_1710_5_734() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3_166()) { - jj_scanpos = xsp; - if (jj_3R_type_declaration_3240_3_514()) return true; - } + if (jj_3R_file_incomplete_type_definition_1469_2_790()) return true; return false; } - inline bool jj_3R_incomplete_type_definition_1698_5_733() + inline bool jj_3R_timeout_clause_3249_1_465() { if (jj_done) return true; - if (jj_3R_access_incomplete_type_definition_352_3_789()) return true; + if (jj_scan_token(FOR_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_incomplete_type_definition_1697_5_732() + inline bool jj_3R_incomplete_type_definition_1709_5_733() { if (jj_done) return true; - if (jj_3R_array_incomplete_type_definition_490_3_788()) return true; + if (jj_3R_access_incomplete_type_definition_352_3_789()) return true; return false; } - inline bool jj_3R_incomplete_type_definition_1696_5_731() + inline bool jj_3R_incomplete_type_definition_1708_5_732() { if (jj_done) return true; - if (jj_3R_integer_incomplete_type_definition_1711_3_787()) return true; + if (jj_3R_array_incomplete_type_definition_492_3_788()) return true; return false; } - inline bool jj_3R_type_conversion_3233_3_138() + inline bool jj_3R_incomplete_type_definition_1707_5_731() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_integer_incomplete_type_definition_1722_3_787()) return true; return false; } - inline bool jj_3R_subprogram_instantiation_declaration_3178_58_352() + inline bool jj_3_63() { if (jj_done) return true; - if (jj_3R_signature_3030_1_472()) return true; + if (jj_3R_floating_incomplete_type_definition_1474_4_114()) return true; return false; } - inline bool jj_3_63() + inline bool jj_3R_simpleTerm_3244_2_169() { if (jj_done) return true; - if (jj_3R_floating_incomplete_type_definition_1464_4_114()) return true; + if (jj_3R_factor_1433_1_175()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_165()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3_165() + inline bool jj_3R_incomplete_type_definition_1705_5_730() { if (jj_done) return true; - if (jj_3R_multiplying_operation_2117_1_174()) return true; - if (jj_3R_factor_1424_1_175()) return true; + if (jj_3R_physical_incomplete_type_definition_2408_5_786()) return true; return false; } - inline bool jj_3R_incomplete_type_definition_1694_5_730() + inline bool jj_3R_incomplete_type_definition_1704_5_729() { if (jj_done) return true; - if (jj_3R_physical_incomplete_type_definition_2388_5_786()) return true; + if (jj_3R_discrete_incomplete_type_definition_1121_2_785()) return true; return false; } - inline bool jj_3R_incomplete_type_definition_1693_5_729() + inline bool jj_3R_incomplete_type_definition_1703_5_728() { if (jj_done) return true; - if (jj_3R_discrete_incomplete_type_definition_1113_2_785()) return true; + if (jj_scan_token(148)) return true; return false; } - inline bool jj_3R_incomplete_type_definition_1692_5_728() + inline bool jj_3R_target_3238_3_323() { if (jj_done) return true; - if (jj_scan_token(148)) return true; + if (jj_3R_aggregate_400_3_141()) return true; return false; } - inline bool jj_3R_incomplete_type_definition_1691_2_727() + inline bool jj_3R_incomplete_type_definition_1702_2_727() { if (jj_done) return true; - if (jj_3R_private_incomplete_type_definition_2455_3_784()) return true; + if (jj_3R_private_incomplete_type_definition_2475_3_784()) return true; return false; } - inline bool jj_3R_incomplete_type_definition_1691_2_651() + inline bool jj_3R_incomplete_type_definition_1702_2_651() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_incomplete_type_definition_1691_2_727()) { + if (jj_3R_incomplete_type_definition_1702_2_727()) { jj_scanpos = xsp; - if (jj_3R_incomplete_type_definition_1692_5_728()) { + if (jj_3R_incomplete_type_definition_1703_5_728()) { jj_scanpos = xsp; - if (jj_3R_incomplete_type_definition_1693_5_729()) { + if (jj_3R_incomplete_type_definition_1704_5_729()) { jj_scanpos = xsp; - if (jj_3R_incomplete_type_definition_1694_5_730()) { + if (jj_3R_incomplete_type_definition_1705_5_730()) { jj_scanpos = xsp; if (jj_3_63()) { jj_scanpos = xsp; - if (jj_3R_incomplete_type_definition_1696_5_731()) { + if (jj_3R_incomplete_type_definition_1707_5_731()) { jj_scanpos = xsp; - if (jj_3R_incomplete_type_definition_1697_5_732()) { + if (jj_3R_incomplete_type_definition_1708_5_732()) { jj_scanpos = xsp; - if (jj_3R_incomplete_type_definition_1698_5_733()) { + if (jj_3R_incomplete_type_definition_1709_5_733()) { jj_scanpos = xsp; - if (jj_3R_incomplete_type_definition_1699_5_734()) return true; - } - } - } - } + if (jj_3R_incomplete_type_definition_1710_5_734()) return true; + } + } } } } } - return false; - } - - inline bool jj_3R_incomplete_subtype_indication_1686_5_828() - { - if (jj_done) return true; - if (jj_3R_anonymous_type_indication_457_2_543()) return true; - return false; - } - - inline bool jj_3R_timeout_clause_3225_1_465() - { - if (jj_done) return true; - if (jj_scan_token(FOR_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; - return false; - } - - inline bool jj_3R_incomplete_subtype_indication_1685_3_827() - { - if (jj_done) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; - return false; - } - - inline bool jj_3R_incomplete_subtype_indication_1685_3_808() - { - if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_incomplete_subtype_indication_1685_3_827()) { - jj_scanpos = xsp; - if (jj_3R_incomplete_subtype_indication_1686_5_828()) return true; } - return false; - } - - inline bool jj_3R_simpleTerm_3220_2_169() - { - if (jj_done) return true; - if (jj_3R_factor_1424_1_175()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_165()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_target_3214_3_323() - { - if (jj_done) return true; - if (jj_3R_aggregate_400_3_141()) return true; - return false; - } - - inline bool jj_3R_target_3213_2_150() + inline bool jj_3R_target_3237_2_150() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_target_3213_2_322()) { + if (jj_3R_target_3237_2_322()) { jj_scanpos = xsp; - if (jj_3R_target_3214_3_323()) return true; + if (jj_3R_target_3238_3_323()) return true; } return false; } @@ -10310,307 +10236,300 @@ void parseInline(); inline bool jj_3_164() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_target_3213_2_322() + inline bool jj_3R_target_3237_2_322() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_if_statement_1672_6_747() + inline bool jj_3R_incomplete_subtype_indication_1697_5_828() { if (jj_done) return true; - if (jj_scan_token(ELSE_T)) return true; - if (jj_3R_sequence_of_statements_2879_2_334()) return true; + if (jj_3R_anonymous_type_indication_459_2_543()) return true; return false; } - inline bool jj_3R_suffix_3208_3_290() + inline bool jj_3R_suffix_3232_3_290() { if (jj_done) return true; if (jj_scan_token(ALL_T)) return true; return false; } - inline bool jj_3R_suffix_3207_3_289() + inline bool jj_3R_incomplete_subtype_indication_1696_3_827() { if (jj_done) return true; - if (jj_3R_operator_symbol_2216_1_369()) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; return false; } - inline bool jj_3R_suffix_3206_3_288() + inline bool jj_3R_incomplete_subtype_indication_1696_3_808() { if (jj_done) return true; - if (jj_3R_character_literal_750_3_445()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_incomplete_subtype_indication_1696_3_827()) { + jj_scanpos = xsp; + if (jj_3R_incomplete_subtype_indication_1697_5_828()) return true; + } return false; } - inline bool jj_3R_if_statement_1665_6_746() + inline bool jj_3R_suffix_3231_3_289() { if (jj_done) return true; - if (jj_scan_token(ELSIF_T)) return true; - if (jj_3R_condition_901_3_100()) return true; - if (jj_scan_token(THEN_T)) return true; - if (jj_3R_sequence_of_statements_2879_2_334()) return true; + if (jj_3R_operator_symbol_2232_1_369()) return true; return false; } - inline bool jj_3R_suffix_3204_1_130() + inline bool jj_3R_suffix_3230_3_288() + { + if (jj_done) return true; + if (jj_3R_character_literal_754_3_445()) return true; + return false; + } + + inline bool jj_3R_suffix_3228_1_130() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_suffix_3204_1_287()) { + if (jj_3R_suffix_3228_1_287()) { jj_scanpos = xsp; - if (jj_3R_suffix_3206_3_288()) { + if (jj_3R_suffix_3230_3_288()) { jj_scanpos = xsp; - if (jj_3R_suffix_3207_3_289()) { + if (jj_3R_suffix_3231_3_289()) { jj_scanpos = xsp; - if (jj_3R_suffix_3208_3_290()) return true; + if (jj_3R_suffix_3232_3_290()) return true; } } } return false; } - inline bool jj_3R_suffix_3204_1_287() - { - if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; - return false; - } - - inline bool jj_3R_identifier_list_1652_16_427() + inline bool jj_3R_suffix_3228_1_287() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_subtype_indication_3198_4_181() + inline bool jj_3R_subtype_indication_3222_4_181() { if (jj_done) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_expression_1380_20_70()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_subtype_indication_3198_3_71() + inline bool jj_3R_subtype_indication_3222_3_71() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_subtype_indication_3198_4_181()) jj_scanpos = xsp; + if (jj_3R_subtype_indication_3222_4_181()) jj_scanpos = xsp; if (jj_3_162()) return true; while (true) { xsp = jj_scanpos; if (jj_3_162()) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_subtype_indication_3198_85_182()) jj_scanpos = xsp; + if (jj_3R_subtype_indication_3222_85_182()) jj_scanpos = xsp; return false; } - inline bool jj_3R_if_statement_1657_4_331() + inline bool jj_3R_if_statement_1683_6_747() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_scan_token(ELSE_T)) return true; + if (jj_3R_sequence_of_statements_2900_2_334()) return true; return false; } - inline bool jj_3R_if_statement_1657_3_156() + inline bool jj_3R_if_statement_1676_6_746() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_if_statement_1657_4_331()) jj_scanpos = xsp; - if (jj_scan_token(IF_T)) return true; - if (jj_3R_condition_901_3_100()) return true; + if (jj_scan_token(ELSIF_T)) return true; + if (jj_3R_condition_906_3_100()) return true; if (jj_scan_token(THEN_T)) return true; - if (jj_3R_sequence_of_statements_2879_2_334()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3R_if_statement_1665_6_746()) { jj_scanpos = xsp; break; } - } - xsp = jj_scanpos; - if (jj_3R_if_statement_1672_6_747()) jj_scanpos = xsp; - if (jj_scan_token(END_T)) return true; - if (jj_scan_token(IF_T)) return true; - xsp = jj_scanpos; - if (jj_3R_if_statement_1676_47_758()) jj_scanpos = xsp; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_sequence_of_statements_2900_2_334()) return true; return false; } - inline bool jj_3R_identifier_list_1652_4_258() + inline bool jj_3R_identifier_list_1663_16_427() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; - Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_identifier_list_1652_16_427()) { jj_scanpos = xsp; break; } - } - xsp = jj_scanpos; - if (jj_3_62()) jj_scanpos = xsp; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3R_subtype_declaration_3188_1_416() + inline bool jj_3R_subtype_declaration_3211_1_416() { if (jj_done) return true; if (jj_scan_token(SUBTYPE_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(IS_T)) return true; - if (jj_3R_subtype_indication_3198_3_71()) return true; + if (jj_3R_subtype_indication_3222_3_71()) return true; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_identifier_1647_4_198() + inline bool jj_3R_if_statement_1668_4_331() { if (jj_done) return true; - if (jj_scan_token(BASIC_IDENTIFIER)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_identifier_1646_3_82() + inline bool jj_3R_if_statement_1668_3_156() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_identifier_1646_3_197()) { - jj_scanpos = xsp; - if (jj_3R_identifier_1647_4_198()) return true; + if (jj_3R_if_statement_1668_4_331()) jj_scanpos = xsp; + if (jj_scan_token(IF_T)) return true; + if (jj_3R_condition_906_3_100()) return true; + if (jj_scan_token(THEN_T)) return true; + if (jj_3R_sequence_of_statements_2900_2_334()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_if_statement_1676_6_746()) { jj_scanpos = xsp; break; } } + xsp = jj_scanpos; + if (jj_3R_if_statement_1683_6_747()) jj_scanpos = xsp; + if (jj_scan_token(END_T)) return true; + if (jj_scan_token(IF_T)) return true; + xsp = jj_scanpos; + if (jj_3R_if_statement_1687_47_758()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_identifier_1646_3_197() - { - if (jj_done) return true; - if (jj_scan_token(EXTENDED_CHARACTER)) return true; - return false; - } - - inline bool jj_3R_group_constituent_list_1620_28_648() + inline bool jj_3_161() { if (jj_done) return true; - if (jj_scan_token(COMMA_T)) return true; - if (jj_3R_group_constituent_1614_2_647()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(OF_T)) return true; return false; } - inline bool jj_3_161() + inline bool jj_3R_identifier_list_1663_4_258() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(OF_T)) return true; + if (jj_3R_name_2142_2_73()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_identifier_list_1663_16_427()) { jj_scanpos = xsp; break; } + } + xsp = jj_scanpos; + if (jj_3_62()) jj_scanpos = xsp; return false; } - inline bool jj_3R_subprogram_instantiation_declaration_3178_2_170() + inline bool jj_3R_subprogram_instantiation_declaration_3200_2_170() { if (jj_done) return true; if (jj_scan_token(FUNCTION_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; + if (jj_3R_identifier_1657_3_82()) return true; if (jj_scan_token(IS_T)) return true; if (jj_scan_token(NEW_T)) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_name_2142_2_73()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_subprogram_instantiation_declaration_3178_58_352()) jj_scanpos = xsp; + if (jj_3R_subprogram_instantiation_declaration_3200_58_352()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_subprogram_instantiation_declaration_3178_75_353()) jj_scanpos = xsp; + if (jj_3R_subprogram_instantiation_declaration_3200_75_353()) jj_scanpos = xsp; if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_subprogram_statement_part_3173_4_793() + inline bool jj_3R_subprogram_statement_part_3195_4_793() { if (jj_done) return true; - if (jj_3R_sequential_statement_2884_5_148()) return true; + if (jj_3R_sequential_statement_2905_5_148()) return true; return false; } - inline bool jj_3R_subprogram_statement_part_3173_3_741() + inline bool jj_3R_subprogram_statement_part_3195_3_741() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_subprogram_statement_part_3173_4_793()) { jj_scanpos = xsp; break; } + if (jj_3R_subprogram_statement_part_3195_4_793()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3R_group_template_declaration_1633_2_80() + inline bool jj_3R_identifier_1658_4_198() { if (jj_done) return true; - if (jj_scan_token(GROUP_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(IS_T)) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_entity_class_entry_list_1237_2_533()) return true; - if (jj_scan_token(RPAREN_T)) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_scan_token(BASIC_IDENTIFIER)) return true; return false; } - inline bool jj_3R_subprogram_specification_3162_3_663() + inline bool jj_3R_identifier_1657_3_82() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_scan_token(77)) jj_scanpos = xsp; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_formal_parameter_list_1481_2_739()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_identifier_1657_3_197()) { + jj_scanpos = xsp; + if (jj_3R_identifier_1658_4_198()) return true; + } return false; } - inline bool jj_3R_group_declaration_1625_3_426() + inline bool jj_3R_identifier_1657_3_197() { if (jj_done) return true; - if (jj_scan_token(GROUP_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_group_constituent_list_1620_3_534()) return true; - if (jj_scan_token(RPAREN_T)) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_scan_token(EXTENDED_CHARACTER)) return true; + return false; + } + + inline bool jj_3R_group_constituent_list_1631_28_648() + { + if (jj_done) return true; + if (jj_scan_token(COMMA_T)) return true; + if (jj_3R_group_constituent_1625_2_647()) return true; return false; } - inline bool jj_3R_group_constituent_list_1620_3_534() + inline bool jj_3R_subprogram_specification_3184_3_663() { if (jj_done) return true; - if (jj_3R_group_constituent_1614_2_647()) return true; Token * xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_group_constituent_list_1620_28_648()) { jj_scanpos = xsp; break; } - } + xsp = jj_scanpos; + if (jj_scan_token(77)) jj_scanpos = xsp; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_formal_parameter_list_1491_2_739()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_group_constituent_1615_4_726() + inline bool jj_3R_group_template_declaration_1644_2_80() { if (jj_done) return true; - if (jj_3R_character_literal_750_3_445()) return true; + if (jj_scan_token(GROUP_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(IS_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_entity_class_entry_list_1245_2_533()) return true; + if (jj_scan_token(RPAREN_T)) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_subprogram_specification_3150_4_661() + inline bool jj_3R_subprogram_specification_3172_4_661() { if (jj_done) return true; Token * xsp; @@ -10622,127 +10541,145 @@ void parseInline(); return false; } - inline bool jj_3R_subprogram_specification_3150_2_549() + inline bool jj_3R_subprogram_specification_3172_2_549() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_subprogram_specification_3150_4_661()) jj_scanpos = xsp; + if (jj_3R_subprogram_specification_3172_4_661()) jj_scanpos = xsp; if (jj_scan_token(FUNCTION_T)) return true; - if (jj_3R_designator_1101_2_659()) return true; + if (jj_3R_designator_1109_2_659()) return true; xsp = jj_scanpos; - if (jj_3R_subprogram_specification_3150_118_662()) jj_scanpos = xsp; + if (jj_3R_subprogram_specification_3172_118_662()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_subprogram_specification_3162_3_663()) jj_scanpos = xsp; + if (jj_3R_subprogram_specification_3184_3_663()) jj_scanpos = xsp; if (jj_scan_token(RETURN_T)) return true; xsp = jj_scanpos; if (jj_3_161()) jj_scanpos = xsp; - if (jj_3R_type_mark_3265_3_195()) return true; + if (jj_3R_type_mark_3289_3_195()) return true; return false; } - inline bool jj_3_160() + inline bool jj_3R_group_declaration_1636_3_426() { if (jj_done) return true; - if (jj_3R_gen_assoc_list_1533_4_172()) return true; + if (jj_scan_token(GROUP_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_group_constituent_list_1631_3_534()) return true; + if (jj_scan_token(RPAREN_T)) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_group_constituent_1614_2_725() + inline bool jj_3_160() { if (jj_done) return true; - if (jj_3R_name_2126_2_73()) return true; + if (jj_3R_gen_assoc_list_1544_4_172()) return true; return false; } - inline bool jj_3R_group_constituent_1614_2_647() + inline bool jj_3_159() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_3R_group_constituent_1614_2_725()) { - jj_scanpos = xsp; - if (jj_3R_group_constituent_1615_4_726()) return true; - } + if (jj_3R_gen_interface_list_1549_4_171()) return true; return false; } - inline bool jj_3R_generic_map_aspect_1609_6_88() + inline bool jj_3R_subprogram_specification_3166_5_660() { if (jj_done) return true; - if (jj_scan_token(GENERIC_T)) return true; - if (jj_scan_token(MAP_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_association_list_551_1_205()) return true; + if (jj_3R_interface_list_1836_3_377()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3_159() + inline bool jj_3R_group_constituent_list_1631_3_534() { if (jj_done) return true; - if (jj_3R_gen_interface_list_1538_4_171()) return true; + if (jj_3R_group_constituent_1625_2_647()) return true; + Token * xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_group_constituent_list_1631_28_648()) { jj_scanpos = xsp; break; } + } return false; } - inline bool jj_3R_subprogram_specification_3144_5_660() + inline bool jj_3R_group_constituent_1626_4_726() { if (jj_done) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_interface_list_1823_3_377()) return true; - if (jj_scan_token(RPAREN_T)) return true; + if (jj_3R_character_literal_754_3_445()) return true; return false; } - inline bool jj_3R_generic_list_1604_2_196() + inline bool jj_3R_group_constituent_1625_2_725() { if (jj_done) return true; - if (jj_3R_interface_list_1823_3_377()) return true; + if (jj_3R_name_2142_2_73()) return true; return false; } - inline bool jj_3_61() + inline bool jj_3R_group_constituent_1625_2_647() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_group_constituent_1625_2_725()) { + jj_scanpos = xsp; + if (jj_3R_group_constituent_1626_4_726()) return true; + } + return false; + } + + inline bool jj_3R_generic_map_aspect_1620_6_88() + { + if (jj_done) return true; + if (jj_scan_token(GENERIC_T)) return true; + if (jj_scan_token(MAP_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_association_list_553_1_205()) return true; + if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_subprogram_specification_3136_2_548() + inline bool jj_3R_subprogram_specification_3158_2_548() { if (jj_done) return true; if (jj_scan_token(PROCEDURE_T)) return true; - if (jj_3R_designator_1101_2_659()) return true; + if (jj_3R_designator_1109_2_659()) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_subprogram_specification_3144_5_660()) jj_scanpos = xsp; + if (jj_3R_subprogram_specification_3166_5_660()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_3_159()) jj_scanpos = xsp; xsp = jj_scanpos; if (jj_3_160()) jj_scanpos = xsp; - if (jj_3R_param_1892_3_540()) return true; + if (jj_3R_param_1906_3_540()) return true; return false; } - inline bool jj_3R_subprogram_specification_3136_2_454() + inline bool jj_3R_subprogram_specification_3158_2_454() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_subprogram_specification_3136_2_548()) { + if (jj_3R_subprogram_specification_3158_2_548()) { jj_scanpos = xsp; - if (jj_3R_subprogram_specification_3150_2_549()) return true; + if (jj_3R_subprogram_specification_3172_2_549()) return true; } return false; } - inline bool jj_3R_subprogram_header_3131_6_738() + inline bool jj_3R_subprogram_header_3153_6_738() { if (jj_done) return true; if (jj_scan_token(GENERIC_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_generic_list_1604_2_196()) return true; + if (jj_3R_generic_list_1615_2_196()) return true; if (jj_scan_token(RPAREN_T)) return true; Token * xsp; xsp = jj_scanpos; @@ -10750,240 +10687,248 @@ void parseInline(); return false; } - inline bool jj_3R_generic_clause_1599_2_81() + inline bool jj_3R_generic_list_1615_2_196() { if (jj_done) return true; - if (jj_scan_token(GENERIC_T)) return true; - if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_generic_list_1604_2_196()) return true; - if (jj_scan_token(RPAREN_T)) return true; - if (jj_scan_token(SEMI_T)) return true; + if (jj_3R_interface_list_1836_3_377()) return true; return false; } - inline bool jj_3R_generate_scheme_1594_3_387() + inline bool jj_3_61() { if (jj_done) return true; - if (jj_scan_token(IF_T)) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_generate_scheme_1593_1_210() + inline bool jj_3R_subprogram_kind_3147_2_794() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_generate_scheme_1593_1_386()) { + if (jj_scan_token(46)) { jj_scanpos = xsp; - if (jj_3R_generate_scheme_1594_3_387()) return true; + if (jj_scan_token(81)) return true; } return false; } - inline bool jj_3R_generate_scheme_1593_1_386() - { - if (jj_done) return true; - if (jj_scan_token(FOR_T)) return true; - return false; - } - - inline bool jj_3R_subprogram_kind_3125_2_794() + inline bool jj_3R_generic_clause_1610_2_81() { if (jj_done) return true; - Token * xsp; - xsp = jj_scanpos; - if (jj_scan_token(46)) { - jj_scanpos = xsp; - if (jj_scan_token(81)) return true; - } + if (jj_scan_token(GENERIC_T)) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_generic_list_1615_2_196()) return true; + if (jj_scan_token(RPAREN_T)) return true; + if (jj_scan_token(SEMI_T)) return true; return false; } - inline bool jj_3R_subprogram_declarative_part_3120_4_792() + inline bool jj_3R_subprogram_declarative_part_3142_4_792() { if (jj_done) return true; - if (jj_3R_subprogram_declarative_item_3099_1_809()) return true; + if (jj_3R_subprogram_declarative_item_3121_1_809()) return true; return false; } - inline bool jj_3R_subprogram_declarative_part_3120_3_740() + inline bool jj_3R_subprogram_declarative_part_3142_3_740() { if (jj_done) return true; Token * xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_subprogram_declarative_part_3120_4_792()) { jj_scanpos = xsp; break; } + if (jj_3R_subprogram_declarative_part_3142_4_792()) { jj_scanpos = xsp; break; } } return false; } - inline bool jj_3_60() + inline bool jj_3R_generate_scheme_1605_3_387() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_scan_token(IF_T)) return true; return false; } inline bool jj_3_156() { if (jj_done) return true; - if (jj_3R_attribute_declaration_556_2_79()) return true; + if (jj_3R_attribute_declaration_558_2_79()) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3115_3_840() + inline bool jj_3R_subprogram_declarative_item_3137_3_840() { if (jj_done) return true; - if (jj_3R_group_declaration_1625_3_426()) return true; + if (jj_3R_group_declaration_1636_3_426()) return true; return false; } - inline bool jj_3R_generate_statement_1581_1_93() + inline bool jj_3R_generate_scheme_1604_1_210() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; - if (jj_3R_generate_scheme_1593_1_210()) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_generate_scheme_1604_1_386()) { + jj_scanpos = xsp; + if (jj_3R_generate_scheme_1605_3_387()) return true; + } return false; } - inline bool jj_3_59() + inline bool jj_3R_generate_scheme_1604_1_386() { if (jj_done) return true; - if (jj_3R_identifier_1646_3_82()) return true; - if (jj_scan_token(COLON_T)) return true; + if (jj_scan_token(FOR_T)) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3111_3_839() + inline bool jj_3R_subprogram_declarative_item_3133_3_839() { if (jj_done) return true; - if (jj_3R_use_clause_3276_2_400()) return true; + if (jj_3R_use_clause_3300_2_400()) return true; return false; } inline bool jj_3_157() { if (jj_done) return true; - if (jj_3R_group_template_declaration_1633_2_80()) return true; + if (jj_3R_group_template_declaration_1644_2_80()) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3110_3_838() + inline bool jj_3R_subprogram_declarative_item_3132_3_838() { if (jj_done) return true; - if (jj_3R_attribute_specification_577_3_423()) return true; + if (jj_3R_attribute_specification_580_3_423()) return true; return false; } - inline bool jj_3_58() + inline bool jj_3_60() { if (jj_done) return true; - if (jj_3R_block_declarative_item_644_3_113()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3108_1_837() + inline bool jj_3R_subprogram_declarative_item_3130_1_837() { if (jj_done) return true; - if (jj_3R_attribute_declaration_556_2_79()) return true; + if (jj_3R_attribute_declaration_558_2_79()) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3106_3_836() + inline bool jj_3R_subprogram_declarative_item_3128_3_836() { if (jj_done) return true; if (jj_3R_alias_declaration_405_2_143()) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3105_3_835() + inline bool jj_3R_subprogram_declarative_item_3127_3_835() + { + if (jj_done) return true; + if (jj_3R_file_declaration_1443_2_421()) return true; + return false; + } + + inline bool jj_3R_subprogram_declarative_item_3126_3_834() { if (jj_done) return true; - if (jj_3R_file_declaration_1434_2_421()) return true; + if (jj_3R_variable_declaration_3336_1_420()) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3104_3_834() + inline bool jj_3R_subprogram_body_3096_33_743() { if (jj_done) return true; - if (jj_3R_variable_declaration_3312_1_420()) return true; + if (jj_3R_designator_1109_2_659()) return true; return false; } - inline bool jj_3R_subprogram_body_3074_33_743() + inline bool jj_3R_subprogram_declarative_item_3125_3_833() { if (jj_done) return true; - if (jj_3R_designator_1101_2_659()) return true; + if (jj_3R_constant_declaration_1026_4_418()) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3103_3_833() + inline bool jj_3R_generate_statement_1592_1_93() { if (jj_done) return true; - if (jj_3R_constant_declaration_1020_4_418()) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; + if (jj_3R_generate_scheme_1604_1_210()) return true; + return false; + } + + inline bool jj_3_59() + { + if (jj_done) return true; + if (jj_3R_identifier_1657_3_82()) return true; + if (jj_scan_token(COLON_T)) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3102_3_832() + inline bool jj_3R_subprogram_declarative_item_3124_3_832() { if (jj_done) return true; - if (jj_3R_subtype_declaration_3188_1_416()) return true; + if (jj_3R_subtype_declaration_3211_1_416()) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3101_4_831() + inline bool jj_3R_subprogram_declarative_item_3123_4_831() { if (jj_done) return true; - if (jj_3R_subprogram_body_3061_1_664()) return true; + if (jj_3R_subprogram_body_3083_1_664()) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3100_2_830() + inline bool jj_3R_subprogram_declarative_item_3122_2_830() { if (jj_done) return true; - if (jj_3R_type_declaration_3238_1_415()) return true; + if (jj_3R_type_declaration_3262_1_415()) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3099_1_829() + inline bool jj_3R_subprogram_declarative_item_3121_1_829() { if (jj_done) return true; - if (jj_3R_subprogram_declaration_3084_1_142()) return true; + if (jj_3R_subprogram_declaration_3106_1_142()) return true; return false; } - inline bool jj_3R_subprogram_declarative_item_3099_1_809() + inline bool jj_3R_subprogram_declarative_item_3121_1_809() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_subprogram_declarative_item_3099_1_829()) { + if (jj_3R_subprogram_declarative_item_3121_1_829()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declarative_item_3100_2_830()) { + if (jj_3R_subprogram_declarative_item_3122_2_830()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declarative_item_3101_4_831()) { + if (jj_3R_subprogram_declarative_item_3123_4_831()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declarative_item_3102_3_832()) { + if (jj_3R_subprogram_declarative_item_3124_3_832()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declarative_item_3103_3_833()) { + if (jj_3R_subprogram_declarative_item_3125_3_833()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declarative_item_3104_3_834()) { + if (jj_3R_subprogram_declarative_item_3126_3_834()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declarative_item_3105_3_835()) { + if (jj_3R_subprogram_declarative_item_3127_3_835()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declarative_item_3106_3_836()) { + if (jj_3R_subprogram_declarative_item_3128_3_836()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declarative_item_3108_1_837()) { + if (jj_3R_subprogram_declarative_item_3130_1_837()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declarative_item_3110_3_838()) { + if (jj_3R_subprogram_declarative_item_3132_3_838()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declarative_item_3111_3_839()) { + if (jj_3R_subprogram_declarative_item_3133_3_839()) { jj_scanpos = xsp; if (jj_3_157()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declarative_item_3115_3_840()) return true; + if (jj_3R_subprogram_declarative_item_3137_3_840()) return true; } } } @@ -10999,114 +10944,169 @@ void parseInline(); return false; } - inline bool jj_3R_subprogram_1_3093_2_550() + inline bool jj_3_58() + { + if (jj_done) return true; + if (jj_3R_block_declarative_item_648_3_113()) return true; + return false; + } + + inline bool jj_3R_subprogram_1_3115_2_550() { if (jj_done) return true; - if (jj_3R_subprogram_body_3061_1_664()) return true; + if (jj_3R_subprogram_body_3083_1_664()) return true; return false; } inline bool jj_3_155() { if (jj_done) return true; - if (jj_3R_subprogram_instantiation_declaration_3178_2_170()) return true; + if (jj_3R_subprogram_instantiation_declaration_3200_2_170()) return true; return false; } - inline bool jj_3R_subprogram_1_3093_2_455() + inline bool jj_3R_subprogram_1_3115_2_455() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_subprogram_1_3093_2_550()) { + if (jj_3R_subprogram_1_3115_2_550()) { jj_scanpos = xsp; if (jj_scan_token(139)) return true; } return false; } - inline bool jj_3R_sequential_bock_statement_2931_159_795() + inline bool jj_3_154() { if (jj_done) return true; - if (jj_3R_label_2007_2_84()) return true; + if (jj_3R_adding_operator_393_3_168()) return true; + if (jj_3R_simpleTerm_3244_2_169()) return true; return false; } - inline bool jj_3_154() + inline bool jj_3R_sequential_bock_statement_2952_159_795() { if (jj_done) return true; - if (jj_3R_adding_operator_393_3_168()) return true; - if (jj_3R_simpleTerm_3220_2_169()) return true; + if (jj_3R_label_2022_2_84()) return true; return false; } - inline bool jj_3R_signal_declaration_2999_89_519() + inline bool jj_3R_subprogram_declaration_3109_1_309() { if (jj_done) return true; - if (jj_scan_token(VARASSIGN_T)) return true; - if (jj_3R_expression_1371_20_70()) return true; + if (jj_3R_subprogram_specification_3158_2_454()) return true; + if (jj_3R_subprogram_1_3115_2_455()) return true; return false; } - inline bool jj_3R_subprogram_declaration_3087_1_309() + inline bool jj_3R_signal_declaration_3020_89_519() { if (jj_done) return true; - if (jj_3R_subprogram_specification_3136_2_454()) return true; - if (jj_3R_subprogram_1_3093_2_455()) return true; + if (jj_scan_token(VARASSIGN_T)) return true; + if (jj_3R_expression_1380_20_70()) return true; return false; } - inline bool jj_3R_subprogram_body_3074_11_742() + inline bool jj_3R_subprogram_body_3096_11_742() { if (jj_done) return true; - if (jj_3R_subprogram_kind_3125_2_794()) return true; + if (jj_3R_subprogram_kind_3147_2_794()) return true; return false; } - inline bool jj_3R_subprogram_declaration_3084_1_142() + inline bool jj_3R_subprogram_declaration_3106_1_142() { if (jj_done) return true; Token * xsp; xsp = jj_scanpos; - if (jj_3R_subprogram_declaration_3084_1_308()) { + if (jj_3R_subprogram_declaration_3106_1_308()) { jj_scanpos = xsp; - if (jj_3R_subprogram_declaration_3087_1_309()) return true; + if (jj_3R_subprogram_declaration_3109_1_309()) return true; } return false; } - inline bool jj_3R_subprogram_declaration_3084_1_308() + inline bool jj_3R_subprogram_declaration_3106_1_308() { if (jj_done) return true; - if (jj_3R_subprogram_instantiation_declaration_3178_2_170()) return true; + if (jj_3R_subprogram_instantiation_declaration_3200_2_170()) return true; return false; } - inline bool jj_3R_simple_expression_3039_41_200() + inline bool jj_3R_simple_expression_3061_41_200() { if (jj_done) return true; if (jj_3R_adding_operator_393_3_168()) return true; - if (jj_3R_simpleTerm_3220_2_169()) return true; + if (jj_3R_simpleTerm_3244_2_169()) return true; + return false; + } + + inline bool jj_3R_signal_declaration_3020_68_518() + { + if (jj_done) return true; + if (jj_3R_signal_kind_3031_3_638()) return true; return false; } - inline bool jj_3R_gen_interface_list_1538_4_171() + inline bool jj_3R_gen_interface_list_1549_4_171() { if (jj_done) return true; if (jj_scan_token(GENERIC_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_interface_list_1823_3_377()) return true; + if (jj_3R_interface_list_1836_3_377()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } - inline bool jj_3R_gen_assoc_list_1533_4_172() + inline bool jj_3R_subprogram_body_3083_1_664() + { + if (jj_done) return true; + if (jj_scan_token(IS_T)) return true; + if (jj_3R_subprogram_declarative_part_3142_3_740()) return true; + if (jj_scan_token(BEGIN_T)) return true; + if (jj_3R_subprogram_statement_part_3195_3_741()) return true; + if (jj_scan_token(END_T)) return true; + Token * xsp; + xsp = jj_scanpos; + if (jj_3R_subprogram_body_3096_11_742()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_3R_subprogram_body_3096_33_743()) jj_scanpos = xsp; + if (jj_scan_token(SEMI_T)) return true; + return false; + } + + inline bool jj_3R_gen_assoc_list_1544_4_172() { if (jj_done) return true; if (jj_scan_token(GENERIC_T)) return true; if (jj_scan_token(MAP_T)) return true; if (jj_scan_token(LPAREN_T)) return true; - if (jj_3R_association_list_551_1_205()) return true; + if (jj_3R_association_list_553_1_205()) return true; + if (jj_scan_token(RPAREN_T)) return true; + return false; + } + + inline bool jj_3R_string_literal_3076_1_452() + { + if (jj_done) return true; + if (jj_scan_token(STRINGLITERAL)) return true; + return false; + } + + inline bool jj_3R_sequential_bock_statement_2950_124_165() + { + if (jj_done) return true; + if (jj_3R_label_2022_2_84()) return true; + return false; + } + + inline bool jj_3R_function_call_1534_1_136() + { + if (jj_done) return true; + if (jj_3R_name_2142_2_73()) return true; + if (jj_scan_token(LPAREN_T)) return true; + if (jj_3R_actual_parameter_part_371_4_297()) return true; if (jj_scan_token(RPAREN_T)) return true; return false; } diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj index ce3ba78bb6d..cea3ffb9ca5 100644 --- a/vhdlparser/vhdlparser.jj +++ b/vhdlparser/vhdlparser.jj @@ -407,7 +407,8 @@ QCString alias_declaration() : {QCString s,s1,s2;} { s+=" is "; } s1=name() {s+=s1;} [s1=signature() {s+=s1;}] { - outlineParser()->addVhdlType(s2.data(),outlineParser()->getLine(ALIAS_T),Entry::VARIABLE_SEC,VhdlSpecifier::ALIAS,0,s.data(),Protection::Public); + outlineParser()->addVhdlType(s2.data(),outlineParser()->getLine(ALIAS_T), + EntryType::makeVariable(),VhdlSpecifier::ALIAS,0,s.data(),Protection::Public); return s2+" "+s+";"; } @@ -436,7 +437,8 @@ void architecture_body() : {QCString s,s1;} m_sharedState->genLabels.resize(0); outlineParser()->pushLabel(m_sharedState->genLabels,s1); m_sharedState->lastCompound=m_sharedState->current; - outlineParser()->addVhdlType(t.data(),outlineParser()->getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlSpecifier::ARCHITECTURE,0,0,Protection::Private); + outlineParser()->addVhdlType(t.data(),outlineParser()->getLine(ARCHITECTURE_T), + EntryType::makeClass(),VhdlSpecifier::ARCHITECTURE,0,0,Protection::Private); } try { @@ -555,7 +557,8 @@ QCString attribute_declaration() : {QCString s,s1;} { s=identifier() s1=type_mark() { - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlSpecifier::ATTRIBUTE,0,s1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ATTRIBUTE_T), + EntryType::makeVariable(),VhdlSpecifier::ATTRIBUTE,0,s1.data(),Protection::Public); return " attribute "+s+":"+s1+";"; } } @@ -577,7 +580,8 @@ QCString attribute_specification(): {QCString s,s1,s2;} s=attribute_designator() s1=entity_specification() s2=conditional_expression() { QCString t= s1+" is "+s2; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlSpecifier::ATTRIBUTE,0,t.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ATTRIBUTE_T), + EntryType::makeVariable(),VhdlSpecifier::ATTRIBUTE,0,t.data(),Protection::Public); return " attribute "+s+" of "+s1+ " is "+s2+";"; } } @@ -785,7 +789,8 @@ void component_declaration() : {QCString s;} [ generic_clause() ] [ port_clause() ] { - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(COMPONENT_T),Entry::VARIABLE_SEC,VhdlSpecifier::COMPONENT,0,0,Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(COMPONENT_T), + EntryType::makeVariable(),VhdlSpecifier::COMPONENT,0,0,Protection::Public); m_sharedState->currP=VhdlSpecifier::UNKNOWN; } [ ] [ identifier() ] @@ -982,7 +987,8 @@ void configuration_declaration() : {QCString s,s1;} { m_sharedState->confName=s+"::"+s1; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(CONFIGURATION_T),Entry::VARIABLE_SEC,VhdlSpecifier::CONFIG,"configuration",s1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(CONFIGURATION_T), + EntryType::makeVariable(),VhdlSpecifier::CONFIG,"configuration",s1.data(),Protection::Public); } configuration_declarative_part() block_configuration() @@ -1022,7 +1028,8 @@ QCString constant_declaration() : {QCString s,s1,s2;Token *t=0;} if(t) s2.prepend(":="); QCString it=s1+s2; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(CONSTANT_T),Entry::VARIABLE_SEC,VhdlSpecifier::CONSTANT,0,it.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(CONSTANT_T), + EntryType::makeVariable(),VhdlSpecifier::CONSTANT,0,it.data(),Protection::Public); it.prepend("constant "); return it; } @@ -1069,7 +1076,8 @@ void context_declaration(): {QCString s,s1;} s=identifier() { m_sharedState->parse_sec=CONTEXT_SEC; } context_clause() [ ][identifier()] { m_sharedState->parse_sec=0; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(LIBRARY_T),Entry::VARIABLE_SEC,VhdlSpecifier::LIBRARY,"context",s1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(LIBRARY_T), + EntryType::makeVariable(),VhdlSpecifier::LIBRARY,"context",s1.data(),Protection::Public); } } @@ -1165,7 +1173,7 @@ QCString element_declaration() : {QCString rec_name,s1,s2;} name+=outlineParser()->getNameID().data(); outlineParser()->addVhdlType( name.c_str(),outlineParser()->getLine(), - Entry::VARIABLE_SEC, + EntryType::makeVariable(), VhdlSpecifier::RECORD,0, s1.data(), Protection::Public); @@ -1244,7 +1252,8 @@ void entity_declaration() : {QCString s;} { m_sharedState->lastEntity=m_sharedState->current; m_sharedState->lastCompound=0; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ENTITY_T),Entry::CLASS_SEC,VhdlSpecifier::ENTITY,0,0,Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ENTITY_T), + EntryType::makeClass(),VhdlSpecifier::ENTITY,0,0,Protection::Public); } entity_header() entity_declarative_part () @@ -1434,7 +1443,8 @@ QCString file_declaration() : {QCString s,s1,s2,s3;} s=identifier_list() s2=subtype_indication() [ s3=file_open_information() ] { QCString t1=s2+" "+s3; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::VFILE,0,t1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::VFILE,0,t1.data(),Protection::Public); return " file "+s+":"+s2+" "+s3+";"; } } @@ -1491,7 +1501,8 @@ QCString full_type_declaration() : { std::shared_ptr tmpEntry;QCString s s=identifier() { tmpEntry=m_sharedState->current; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::RECORD,0,0,Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::RECORD,0,0,Protection::Public); } s2=type_definition() @@ -1786,7 +1797,8 @@ interface_subprogram_declaration() { return s;} s=object_class() s1=identifier() { if (m_sharedState->parse_sec==GEN_SEC) - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,m_sharedState->currP,s1.data(),0,Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),m_sharedState->currP,s1.data(),0,Protection::Public); return s; } } @@ -1813,7 +1825,8 @@ QCString interface_file_declaration() : {QCString s,s1;} { s=identifier_list() s1=subtype_indication() { - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::VFILE,0,s1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::VFILE,0,s1.data(),Protection::Public); return QCString(" file "+s+":"+s1); } } @@ -1880,7 +1893,8 @@ QCString ifunc():{QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *t2=0;} int b=outlineParser()->getLine(PROCEDURE_T); if (a>b) b=a; - outlineParser()->addVhdlType(m_sharedState->current->name.data(),b,Entry::VARIABLE_SEC,VhdlSpecifier::GENERIC,ss.data(),0,Protection::Public); + outlineParser()->addVhdlType(m_sharedState->current->name.data(),b,EntryType::makeVariable(), + VhdlSpecifier::GENERIC,ss.data(),0,Protection::Public); } m_sharedState->currP=VhdlSpecifier::UNKNOWN;return QCString(); } @@ -1931,7 +1945,7 @@ QCString interface_incomplete_type_declaration() : {QCString s="type";QCString } else if(m_sharedState->parse_sec==GEN_SEC) { - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::GENERIC,s1.data(),"",Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),EntryType::makeVariable(),VhdlSpecifier::GENERIC,s1.data(),"",Protection::Public); } return s+" "+s1; @@ -1977,7 +1991,8 @@ QCString interface_variable_declaration() : {Token *tok=0;Token *tok1=0;Token * else { QCString i=s2+s3+s4; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,m_sharedState->currP,i.data(),s1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),m_sharedState->currP,i.data(),s1.data(),Protection::Public); } } // if component return it; @@ -2014,7 +2029,8 @@ QCString library_clause() : {QCString s;} { if ( m_sharedState->parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) ) { - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::LIBRARY,s.data(),"_library_",Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::LIBRARY,s.data(),"_library_",Protection::Public); } QCString s1="library "+s; return s1; @@ -2227,7 +2243,8 @@ void package_body() : {QCString s;} { m_sharedState->lastCompound=m_sharedState->current; s.prepend("_"); - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::CLASS_SEC,VhdlSpecifier::PACKAGE_BODY,0,0,Protection::Protected); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeClass(),VhdlSpecifier::PACKAGE_BODY,0,0,Protection::Protected); } package_body_declarative_part() @@ -2273,14 +2290,15 @@ void package_declaration(): {QCString s;} { m_sharedState->lastCompound=m_sharedState->current; std::shared_ptr clone=std::make_shared(*m_sharedState->current); - clone->section=Entry::NAMESPACE_SEC; + clone->section=EntryType::makeNamespace(); clone->vhdlSpec=VhdlSpecifier::PACKAGE; clone->name=s; clone->startLine=outlineParser()->getLine(PACKAGE_T); clone->bodyLine=outlineParser()->getLine(PACKAGE_T); clone->protection=Protection::Package; m_sharedState->current_root->moveToSubEntryAndKeep(clone); - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlSpecifier::PACKAGE,0,0,Protection::Package); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(PACKAGE_T), + EntryType::makeClass(),VhdlSpecifier::PACKAGE,0,0,Protection::Package); } package_header() package_declarative_part() @@ -2332,7 +2350,8 @@ void package_instantiation_declaration() : {QCString s,s1,s2;} s=identifier() s1=name() [gen_assoc_list()] { QCString q=" is new "+s1+s2; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(PACKAGE_T),Entry::VARIABLE_SEC,VhdlSpecifier::INSTANTIATION,"package",q.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(PACKAGE_T), + EntryType::makeVariable(),VhdlSpecifier::INSTANTIATION,"package",q.data(),Protection::Public); } } @@ -2373,7 +2392,8 @@ QCString physical_literal() : {QCString s,s1;} QCString physical_type_definition() : {QCString s,s1,s2;Token *t=0;} { t= - s=identifier() { outlineParser()->addVhdlType(s.data(),t->beginLine,Entry::VARIABLE_SEC,VhdlSpecifier::UNITS,0,0,Protection::Public);} + s=identifier() { outlineParser()->addVhdlType(s.data(),t->beginLine, + EntryType::makeVariable(),VhdlSpecifier::UNITS,0,0,Protection::Public);} ( s1=secondary_unit_declaration() )* @@ -2791,7 +2811,8 @@ QCString secondary_unit_declaration() : {QCString s,s1;Token *t1=0;} { s=identifier() t1= s1=physical_literal() { - outlineParser()->addVhdlType(s.data(),t1->beginLine,Entry::VARIABLE_SEC,VhdlSpecifier::UNITS,0,s1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),t1->beginLine, + EntryType::makeVariable(),VhdlSpecifier::UNITS,0,s1.data(),Protection::Public); return s+"="+s1; } } @@ -3001,7 +3022,8 @@ void signal_declaration() : { Token* tok=0;QCString s,s1,s2,s3,s4;} if(tok) s3.prepend(":="); s4=s1+s2+s3; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::SIGNAL,0,s4.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::SIGNAL,0,s4.data(),Protection::Public); } } QCString signal_kind() : {} @@ -3178,7 +3200,8 @@ QCString subprogram_instantiation_declaration():{QCString s,s1,s2;} s=identifier() s1=name() [s2=signature()] [gen_assoc_list()] { QCString q= " is new "+s1+s2; - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(FUNCTION_T),Entry::VARIABLE_SEC,VhdlSpecifier::INSTANTIATION,"function ",q.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(FUNCTION_T), + EntryType::makeVariable(),VhdlSpecifier::INSTANTIATION,"function ",q.data(),Protection::Public); return q; } } @@ -3187,7 +3210,8 @@ QCString subtype_declaration() : {QCString s,s1;} { s=identifier() s1=subtype_indication() { - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlSpecifier::SUBTYPE,0,s1.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),VhdlSpecifier::SUBTYPE,0,s1.data(),Protection::Public); return " subtype "+s+" is "+s1+";"; } } @@ -3286,7 +3310,7 @@ QCString unconstraint_array_definition() : {QCString s,s1,s2,s3;} { outlineParser()->addVhdlType(it.c_str(), outlineParser()->getLine(), - Entry::VARIABLE_SEC, + EntryType::makeVariable(), VhdlSpecifier::USE, it.c_str(), "_use_",Protection::Public); @@ -3330,7 +3354,8 @@ QCString variable_declaration() : {Token *tok=0;Token *t1=0;QCString s,s1,s2;} it+=":="; it+=s2; } - outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,spec,0,it.data(),Protection::Public); + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(), + EntryType::makeVariable(),spec,0,it.data(),Protection::Public); return val; }