diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-21 11:24:03 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-21 11:24:03 (GMT) |
commit | 398190cff55e8451d3f04ba8960f3a068191bc79 (patch) | |
tree | 843a374456947e36c4a8b0962543703ee8e0048c | |
parent | 0fc0de19ba79068ff7b6bad1e161393adcd865b8 (diff) | |
parent | 4cd3cdfe95a2ed77963d1adc71a0de10135743da (diff) | |
download | Doxygen-398190cff55e8451d3f04ba8960f3a068191bc79.zip Doxygen-398190cff55e8451d3f04ba8960f3a068191bc79.tar.gz Doxygen-398190cff55e8451d3f04ba8960f3a068191bc79.tar.bz2 |
Merge branch 'albert-github-feature/bug_config'
-rw-r--r-- | src/configimpl.l | 75 | ||||
-rw-r--r-- | src/doxygen.cpp | 21 | ||||
-rw-r--r-- | src/pre.l | 5 |
3 files changed, 92 insertions, 9 deletions
diff --git a/src/configimpl.l b/src/configimpl.l index 6987e59..a05293f 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -1321,6 +1321,38 @@ void Config::init() ConfigImpl::instance()->init(); } +static void checkList(QStrList &list,const char *name, bool equalRequired,bool valueRequired) +{ + const char *s=list.first(); + while (s) + { + QCString item=s; + item=item.stripWhiteSpace(); + int i=item.find('='); + if (i==-1 && equalRequired) + { + err("Illegal format for option %s, no equal sign ('=') specified for item '%s'\n",name,item.data()); + } + if (i!=-1) + { + QCString myName=item.left(i).stripWhiteSpace(); + if (myName.isEmpty()) + { + err("Illegal format for option %s, no name specified for item '%s'\n",name,item.data()); + } + else if (valueRequired) + { + QCString myValue=item.right(item.length()-i-1).stripWhiteSpace(); + if (myValue.isEmpty()) + { + err("Illegal format for option %s, no value specified for item '%s'\n",name,item.data()); + } + } + } + s=list.next(); + } +} + void Config::checkAndCorrect() { ConfigValues::instance().init(); @@ -1484,23 +1516,60 @@ void Config::checkAndCorrect() s=includePath.next(); } - // check aliases + // check PREDEFINED + if (Config_getBool(ENABLE_PREPROCESSING)) + { + QStrList &predefList = Config_getList(PREDEFINED); + s=predefList.first(); + while (s) + { + QCString predef=s; + predef=predef.stripWhiteSpace(); + int i_equals=predef.find('='); + int i_obrace=predef.find('('); + if ((i_obrace==0) || (i_equals==0) || (i_equals==1 && predef.at(i_equals-1)==':')) + { + err("Illegal PREDEFINED format '%s', no define name specified\n",predef.data()); + } + s=predefList.next(); + } + } + + // check ALIASES QStrList &aliasList = Config_getList(ALIASES); s=aliasList.first(); while (s) { QRegExp re1("[a-z_A-Z][a-z_A-Z0-9]*[ \t]*="); // alias without argument - QRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]*}[ \t]*="); // alias with argument + QRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]+}[ \t]*="); // alias with argument QCString alias=s; alias=alias.stripWhiteSpace(); if (alias.find(re1)!=0 && alias.find(re2)!=0) { - err("Illegal alias format '%s'. Use \"name=value\" or \"name{n}=value\", where n is the number of arguments\n", + err("Illegal ALIASES format '%s'. Use \"name=value\" or \"name{n}=value\", where n is the number of arguments\n", alias.data()); } s=aliasList.next(); } + // check FILTER_PATTERNS + checkList(Config_getList(FILTER_PATTERNS),"FILTER_PATTERNS",TRUE,TRUE); + + // check FILTER_SOURCE_PATTERNS + checkList(Config_getList(FILTER_SOURCE_PATTERNS),"FILTER_SOURCE_PATTERNS",FALSE,FALSE); + + // check TAGFILES + checkList(Config_getList(TAGFILES),"TAGFILES",FALSE,TRUE); + + // check EXTRA_SEARCH_MAPPINGS + if (Config_getBool(SEARCHENGINE) && Config_getBool(GENERATE_HTML)) + { + checkList(Config_getList(EXTRA_SEARCH_MAPPINGS),"EXTRA_SEARCH_MAPPING",TRUE,TRUE); + } + + // check TCL_SUBST + checkList(Config_getList(TCL_SUBST),"TCL_SUBST",TRUE,TRUE); + // check if GENERATE_TREEVIEW and GENERATE_HTMLHELP are both enabled if (Config_getBool(GENERATE_TREEVIEW) && Config_getBool(GENERATE_HTMLHELP)) { diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 52f9ceb..c36c5ce 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -8993,6 +8993,7 @@ static void readTagFile(const std::shared_ptr<Entry> &root,const char *tl) { fileName = tagLine.left(eqPos).stripWhiteSpace(); destName = tagLine.right(tagLine.length()-eqPos-1).stripWhiteSpace(); + if (fileName.isEmpty() || destName.isEmpty()) return; QFileInfo fi(fileName); Doxygen::tagDestinationDict.insert(fi.absFilePath().utf8(),new QCString(destName)); //printf("insert tagDestination %s->%s\n",fi.fileName().data(),destName.data()); @@ -10496,11 +10497,22 @@ void adjustConfiguration() while (mapping) { QCString mapStr = mapping; - int i; - if ((i=mapStr.find('='))!=-1) + int i=mapStr.find('='); + if (i==-1) + { + mapping = extMaps.next(); + continue; + } + else { - QCString ext=mapStr.left(i).stripWhiteSpace().lower(); - QCString language=mapStr.mid(i+1).stripWhiteSpace().lower(); + QCString ext = mapStr.left(i).stripWhiteSpace().lower(); + QCString language = mapStr.mid(i+1).stripWhiteSpace().lower(); + if (ext.isEmpty() || language.isEmpty()) + { + mapping = extMaps.next(); + continue; + } + if (!updateLanguageMapping(ext,language)) { err("Failed to map file extension '%s' to unsupported language '%s'.\n" @@ -10516,7 +10528,6 @@ void adjustConfiguration() mapping = extMaps.next(); } - // add predefined macro name to a dictionary QStrList &expandAsDefinedList =Config_getList(EXPAND_AS_DEFINED); s=expandAsDefinedList.first(); @@ -3267,7 +3267,10 @@ void Preprocessor::processFile(const char *fileName,BufStr &input,BufStr &output int i_cbrace=ds.find(')'); bool nonRecursive = i_equals>0 && ds.at(i_equals-1)==':'; - if (i_obrace==0) continue; // no define name + if ((i_obrace==0) || (i_equals==0) || (i_equals==1 && ds.at(i_equals-1)==':')) + { + continue; // no define name + } if (i_obrace<i_equals && i_cbrace<i_equals && i_obrace!=-1 && i_cbrace!=-1 && |