diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2021-05-01 12:29:09 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2021-05-01 12:29:09 (GMT) |
| commit | 6abf5b9ff20697ade2ace2fabf39ada5142b8150 (patch) | |
| tree | 39e814927d9baff3e7cfbd54fe69d8c9e730a943 | |
| parent | 22ce9444ca5c73c8a343685309c1812c7f8d263b (diff) | |
| download | Doxygen-6abf5b9ff20697ade2ace2fabf39ada5142b8150.zip Doxygen-6abf5b9ff20697ade2ace2fabf39ada5142b8150.tar.gz Doxygen-6abf5b9ff20697ade2ace2fabf39ada5142b8150.tar.bz2 | |
Changed plantumlStart from const char *[] to std::set<QCString>
| -rw-r--r-- | src/docparser.cpp | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp index d7c044e..de28a65 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -69,7 +69,7 @@ //--------------------------------------------------------------------------- -static const char *sectionLevelToName[] = +static const char *g_sectionLevelToName[] = { "page", "section", @@ -79,10 +79,13 @@ static const char *sectionLevelToName[] = "subparagraph" }; -static const char *plantumlStart[] = {"uml", "bpm", "wire", "dot", "ditaa", - "salt", "math", "latex", "gantt", "mindmap", - "wbs", "yaml", "creole", "json", "flow", - "board", "git"}; +static std::set<QCString> g_plantumlEngine { + "uml", "bpm", "wire", "dot", "ditaa", + "salt", "math", "latex", "gantt", "mindmap", + "wbs", "yaml", "creole", "json", "flow", + "board", "git" +}; + //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -5543,7 +5546,6 @@ int DocPara::handleCommand(const QCString &cmdName, const int tok) QCString sectionId = ""; int idx = fullMatch.find('{'); int idxEnd = fullMatch.find("}",idx+1); - QCString cmdName; StringVector optList; QCString engine; if (idx != -1) // options present @@ -5554,20 +5556,16 @@ int DocPara::handleCommand(const QCString &cmdName, const int tok) { if (opt.empty()) continue; bool found = false; - QCString locOpt = opt; - locOpt = locOpt.lower(); - for (int i = 0; i < sizeof(plantumlStart) / sizeof(*plantumlStart); i++) + QCString locOpt(opt); + locOpt = locOpt.stripWhiteSpace().lower(); + if (g_plantumlEngine.find(locOpt)!=g_plantumlEngine.end()) { - if (locOpt == plantumlStart[i]) + if (!engine.isEmpty()) { - if (!engine.isEmpty()) - { - warn(g_fileName,getDoctokinizerLineNr(), "Multiple definition of engine for '\\startuml'"); - } - engine = plantumlStart[i]; - found = true; - break; + warn(g_fileName,getDoctokinizerLineNr(), "Multiple definition of engine for '\\startuml'"); } + engine = locOpt; + found = true; } if (!found) { @@ -6866,7 +6864,7 @@ int DocSection::parse() else if (retval==RetVal_Subsubsection && m_level<=Doxygen::subpageNestingLevel+2) { if ((m_level<=1+Doxygen::subpageNestingLevel) && !g_token->sectionId.startsWith("autotoc_md")) - warn_doc_error(g_fileName,getDoctokinizerLineNr(),"Unexpected subsubsection command found inside %s!",sectionLevelToName[m_level]); + warn_doc_error(g_fileName,getDoctokinizerLineNr(),"Unexpected subsubsection command found inside %s!",g_sectionLevelToName[m_level]); // then parse any number of nested sections while (retval==RetVal_Subsubsection) // more sections follow { @@ -6880,7 +6878,7 @@ int DocSection::parse() else if (retval==RetVal_Paragraph && m_level<=std::min(5,Doxygen::subpageNestingLevel+3)) { if ((m_level<=2+Doxygen::subpageNestingLevel) && !g_token->sectionId.startsWith("autotoc_md")) - warn_doc_error(g_fileName,getDoctokinizerLineNr(),"Unexpected paragraph command found inside %s!",sectionLevelToName[m_level]); + warn_doc_error(g_fileName,getDoctokinizerLineNr(),"Unexpected paragraph command found inside %s!",g_sectionLevelToName[m_level]); // then parse any number of nested sections while (retval==RetVal_Paragraph) // more sections follow { |