diff options
| -rw-r--r-- | src/commentscan.l | 8 | ||||
| -rw-r--r-- | src/configimpl.l | 4 | ||||
| -rwxr-xr-x | src/fortranscanner.l | 1 | ||||
| -rw-r--r-- | src/namespacedef.cpp | 22 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/template.cpp | 1 | ||||
| -rw-r--r-- | src/utf8.cpp | 2 |
6 files changed, 21 insertions, 17 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index b9022a6..399f5fb 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -1222,6 +1222,10 @@ STopt [^\n@\\]* <ParamArg1>"," { addOutput(yyscanner," , "); } +<ParamArg1>{DOCNL} { + if (*yytext=='\n') yyextra->lineNr++; + addOutput(yyscanner," "); + } <ParamArg1>{ID} { addOutput(yyscanner,yytext); BEGIN( Comment ); @@ -1921,6 +1925,10 @@ STopt [^\n@\\]* addOutput(yyscanner,yytext); } + /* +<*>. { fprintf(stderr,"Lex scanner %s %sdefault rule for state %s: #%s#\n", __FILE__,yyextra->fileName ? ("(" + yyextra->fileName +") ").data(): "",stateToString(YY_START),yytext);} +<*>\n { fprintf(stderr,"Lex scanner %s %sdefault rule newline for state %s.\n", __FILE__, yyextra->fileName ? ("(" + yyextra->fileName +") ").data(): "",stateToString(YY_START));} + */ %% diff --git a/src/configimpl.l b/src/configimpl.l index fbaf3ae..1285fba 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -1625,8 +1625,8 @@ void Config::checkAndCorrect() for (const auto &alias : aliasList) { // match aliases of the form re1='name=' and re2='name{2} =' - static const reg::Ex re1(R"(\a\w*\s*=)"); - static const reg::Ex re2(R"(\a\w*{\d+}\s*=)"); + static const reg::Ex re1(R"(^\a\w*\s*=)"); + static const reg::Ex re2(R"(^\a\w*{\d+}\s*=)"); if (!reg::search(alias,re1) && !reg::search(alias,re2)) { err("Illegal ALIASES format '%s'. Use \"name=value\" or \"name{n}=value\", where n is the number of arguments\n", diff --git a/src/fortranscanner.l b/src/fortranscanner.l index f36b6ae..328612a 100755 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -378,6 +378,7 @@ SCOPENAME ({ID}{BS}"::"{BS})* if (YY_START != Prepass) { yyextra->comments.clear(); + yyextra->inputStringPrepass=QCString(); yy_push_state(Prepass,yyscanner); } diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index cb2e4de..db855ba 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -1391,23 +1391,19 @@ void NamespaceDefImpl::sortMemberLists() if (ml->needsSorting()) { ml->sort(); ml->setNeedsSorting(FALSE); } } - if (Config_getBool(SORT_BRIEF_DOCS)) + auto classComp = [](const ClassLinkedRefMap::Ptr &c1,const ClassLinkedRefMap::Ptr &c2) { - auto classComp = [](const ClassLinkedRefMap::Ptr &c1,const ClassLinkedRefMap::Ptr &c2) - { - return Config_getBool(SORT_BY_SCOPE_NAME) ? - qstricmp(c1->name(), c2->name())<0 : - qstricmp(c1->className(), c2->className())<0; - }; + return Config_getBool(SORT_BY_SCOPE_NAME) ? + qstricmp(c1->name(), c2->name())<0 : + qstricmp(c1->className(), c2->className())<0; + }; - std::sort(classes.begin(), classes.end(), classComp); - std::sort(interfaces.begin(),interfaces.end(),classComp); - std::sort(structs.begin(), structs.end(), classComp); - std::sort(exceptions.begin(),exceptions.end(),classComp); + std::sort(classes.begin(), classes.end(), classComp); + std::sort(interfaces.begin(),interfaces.end(),classComp); + std::sort(structs.begin(), structs.end(), classComp); + std::sort(exceptions.begin(),exceptions.end(),classComp); - } - // TODO: inconsistent: should be only done when SORT_BRIEF_DOCS is enabled... auto namespaceComp = [](const NamespaceLinkedRefMap::Ptr &n1,const NamespaceLinkedRefMap::Ptr &n2) { return qstricmp(n1->name(),n2->name())<0; diff --git a/src/template.cpp b/src/template.cpp index 9f3fe44..9ae2c11 100644..100755 --- a/src/template.cpp +++ b/src/template.cpp @@ -4024,6 +4024,7 @@ class TemplateNodeCycle : public TemplateNodeCreator<TemplateNodeCycle> void render(TextStream &ts, TemplateContext *c) { TemplateContextImpl *ci = dynamic_cast<TemplateContextImpl*>(c); + if (ci==0) return; // should not happen ci->setLocation(m_templateName,m_line); if (m_index<m_args.size()) { diff --git a/src/utf8.cpp b/src/utf8.cpp index 9ffc168..a00f615 100644 --- a/src/utf8.cpp +++ b/src/utf8.cpp @@ -117,8 +117,6 @@ static inline uint32_t convertUTF8CharToUnicode(const char *s,size_t bytesLeft,i return uc; } } - len=0; - return 0; } std::string getUTF8CharAt(const std::string &input,size_t pos) |