From d5bccd950e8b94e8ec1a1e9250e1d8f16ed000114efcbf6a6caa244475c072d0 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 10 Jul 2020 07:38:16 +0000 Subject: [PATCH] - version update to 1.8.18 Removed functionality * Removed support for TCL (code is too buggy and unmaintained, language not very popular) Features * Added the few missing French translations [view] * Updated Swedish translation to match the latest version [view] * Adding check on configuration setting EXTENSION_MAPPING [view] * Adding commands `\rtfinclude`, `\docbookinclude`, `\maninclude` and `\xmlinclude` [view] * output on doxyparse if a function is a prototype [view] * print protection information on doxyparse [view] * Creation of svg images for formulas with inkscape [view] * Improve formula handling and rendering. [view] * Doxygen version in the messages output (#7640) [view] * Doxygen version information (#7645) [view] * Enabling Travis builds for s390x [view] * Relative markdown file reference (#7032) [view] Bugs fixed * see https://www.doxygen.nl/manual/changelog.html - modified patches % doxygen-no-lowercase-man-names.patch (refreshed) % vhdlparser-no-return.patch (refreshed) - deleted patches - 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch (upstreamed) - PR_7193_fix_blank_file_patterns.patch (upstreamed) - doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch (upstreamed) - doxygen-git-not-required.patch (upstreamed) - reproducible-sort.patch (upstreamed) OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=149 --- ...ding-external-tag-files-with-TOC-pro.patch | 51 - PR_7193_fix_blank_file_patterns.patch | 48 - doxygen-1.8.16.src.tar.gz | 3 - doxygen-1.8.18.src.tar.gz | 3 + ...f2357ae764f2c8190d067aff801bc0a56721.patch | 24 - doxygen-git-not-required.patch | 13 - doxygen-no-lowercase-man-names.patch | 20 +- doxygen.changes | 31 + doxygen.spec | 17 +- doxywizard.spec | 2 +- reproducible-sort.patch | 31 - vhdlparser-no-return.patch | 1272 ++++++++++++++--- 12 files changed, 1158 insertions(+), 357 deletions(-) delete mode 100644 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch delete mode 100644 PR_7193_fix_blank_file_patterns.patch delete mode 100644 doxygen-1.8.16.src.tar.gz create mode 100644 doxygen-1.8.18.src.tar.gz delete mode 100644 doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch delete mode 100644 doxygen-git-not-required.patch delete mode 100644 reproducible-sort.patch diff --git a/0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch b/0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch deleted file mode 100644 index 9525ac3..0000000 --- a/0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 316902302c6af1ec43f9d1ad4d57d30a9a9fadf7 Mon Sep 17 00:00:00 2001 -From: albert-github -Date: Mon, 9 Sep 2019 13:28:28 +0200 -Subject: [PATCH] issue #7248: Including external tag files with TOC produces a - broken index.qhp - -Ignore automatically generated anchor names when importing a tag file. ---- - src/tagreader.cpp | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -diff --git a/src/tagreader.cpp b/src/tagreader.cpp -index 56dbe7d..d79d9b5 100644 ---- a/src/tagreader.cpp -+++ b/src/tagreader.cpp -@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler - - void endDocAnchor() - { -+ // Check whether or not the tag is automatically generate, in that case ignore the tag. -+ switch(m_state) -+ { -+ case InClass: -+ case InFile: -+ case InNamespace: -+ case InGroup: -+ case InPage: -+ case InMember: -+ case InPackage: -+ case InDir: -+ if (QString(m_curString).startsWith("autotoc_md")) return; -+ break; -+ default: -+ warn("Unexpected tag 'docanchor' found"); -+ return; -+ } - switch(m_state) - { - case InClass: m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; -@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler - case InMember: m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; - case InPackage: m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; - case InDir: m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; -- default: warn("Unexpected tag 'docanchor' found"); break; -+ default: warn("Unexpected tag 'docanchor' found"); break; // Not really necessary anymore - } - } - --- -2.24.1 - diff --git a/PR_7193_fix_blank_file_patterns.patch b/PR_7193_fix_blank_file_patterns.patch deleted file mode 100644 index 1d70466..0000000 --- a/PR_7193_fix_blank_file_patterns.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a27369dbf3cccbe4b96bfde1aca49d96d4b396f0 Mon Sep 17 00:00:00 2001 -From: albert-github -Date: Tue, 13 Aug 2019 19:23:42 +0200 -Subject: [PATCH] issue #7190 1.8.16: Blank FILE_PATTERNS => no files processed - -This is actually a regression on #7195. Due to the fact that the init() routine has moved up, the settings for `FILE_PATTERNS` have already been done and a call to init does not operate on the `FILE_PATTERNS` variable but on the structure from which the `FILE_PATTERNS` was derived. We have should here operate on the `FILE_PATTERNS` directly as well., bu getting the default values out of the underlying structure. ---- - src/configimpl.h | 1 + - src/configimpl.l | 12 +++++++++--- - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/src/configimpl.h b/src/configimpl.h -index 1594d47a3..55e056e8b 100644 ---- a/src/configimpl.h -+++ b/src/configimpl.h -@@ -126,6 +126,7 @@ class ConfigList : public ConfigOption - void setWidgetType(WidgetType w) { m_widgetType = w; } - WidgetType widgetType() const { return m_widgetType; } - QStrList *valueRef() { return &m_value; } -+ QStrList getDefault() { return m_defaultValue; } - void writeTemplate(FTextStream &t,bool sl,bool); - void compareDoxyfile(FTextStream &t); - void substEnvVars(); -diff --git a/src/configimpl.l b/src/configimpl.l -index bcb5a8c34..2d91e1206 100644 ---- a/src/configimpl.l -+++ b/src/configimpl.l -@@ -1652,11 +1652,17 @@ void Config::checkAndCorrect() - QStrList &filePatternList = Config_getList(FILE_PATTERNS); - if (filePatternList.isEmpty()) - { -- ConfigOption * opt = ConfigImpl::instance()->get("FILE_PATTERNS"); -- if (opt->kind()==ConfigOption::O_List) -+ ConfigOption * opt = ConfigImpl::instance()->get("FILE_PATTERNS"); -+ if (opt->kind()==ConfigOption::O_List) -+ { -+ QStrList l = ((ConfigList*)opt)->getDefault(); -+ const char *p = l.first(); -+ while (p) - { -- ((ConfigList*)opt)->init(); -+ filePatternList.append(p); -+ p = l.next(); - } -+ } - } - - // add default pattern if needed diff --git a/doxygen-1.8.16.src.tar.gz b/doxygen-1.8.16.src.tar.gz deleted file mode 100644 index a2139b0..0000000 --- a/doxygen-1.8.16.src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff981fb6f5db4af9deb1dd0c0d9325e0f9ba807d17bd5750636595cf16da3c82 -size 5497317 diff --git a/doxygen-1.8.18.src.tar.gz b/doxygen-1.8.18.src.tar.gz new file mode 100644 index 0000000..fb5f674 --- /dev/null +++ b/doxygen-1.8.18.src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18173d9edc46d2d116c1f92a95d683ec76b6b4b45b817ac4f245bb1073d00656 +size 5188787 diff --git a/doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch b/doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch deleted file mode 100644 index c74dd45..0000000 --- a/doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 64f1f2357ae764f2c8190d067aff801bc0a56721 Mon Sep 17 00:00:00 2001 -From: Eric Niebler -Date: Tue, 10 Sep 2019 10:48:55 -0700 -Subject: [PATCH] Latest libclang needs C++14 - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7aa1c01fc..2644ceb49 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,8 +49,8 @@ if (use_libclang) - endif() - endif() - --# use C++11 standard for compiling (libclang option requires it) --set(CMAKE_CXX_STANDARD 11) -+# use C++14 standard for compiling (libclang option requires it) -+set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS ON) - diff --git a/doxygen-git-not-required.patch b/doxygen-git-not-required.patch deleted file mode 100644 index abc003b..0000000 --- a/doxygen-git-not-required.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: doxygen-1.8.16/cmake/git_watcher.cmake -=================================================================== ---- doxygen-1.8.16.orig/cmake/git_watcher.cmake 2019-07-30 15:10:10.000000000 +0200 -+++ doxygen-1.8.16/cmake/git_watcher.cmake 2019-09-30 10:10:55.145977348 +0200 -@@ -69,7 +69,7 @@ CHECK_OPTIONAL_VARIABLE(GIT_WORKING_DIR - # Check the optional git variable. - # If it's not set, we'll try to find it using the CMake packaging system. - if(NOT DEFINED GIT_EXECUTABLE) -- find_package(Git QUIET REQUIRED) -+ find_package(Git QUIET) - endif() - CHECK_REQUIRED_VARIABLE(GIT_EXECUTABLE) - diff --git a/doxygen-no-lowercase-man-names.patch b/doxygen-no-lowercase-man-names.patch index 3150e62..59afbdc 100644 --- a/doxygen-no-lowercase-man-names.patch +++ b/doxygen-no-lowercase-man-names.patch @@ -1,12 +1,12 @@ -Index: doxygen-1.8.10/src/fortranscanner.l +Index: doxygen-1.8.18/src/fortranscanner.l =================================================================== ---- doxygen-1.8.10.orig/src/fortranscanner.l -+++ doxygen-1.8.10/src/fortranscanner.l -@@ -2090,7 +2090,6 @@ static void initEntry() - */ - static void addCurrentEntry(int case_insens) +--- doxygen-1.8.18.orig/src/fortranscanner.l 2020-07-10 09:10:24.205905062 +0200 ++++ doxygen-1.8.18/src/fortranscanner.l 2020-07-10 09:13:31.570972499 +0200 +@@ -2357,7 +2357,6 @@ static void initEntry(yyscan_t yyscanner + static void addCurrentEntry(yyscan_t yyscanner,bool case_insens) { -- if (case_insens) current->name = current->name.lower(); - //printf("===Adding entry %s to %s\n", current->name.data(), current_root->name.data()); - current_root->addSubEntry(current); - last_entry = current; + struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; +- if (case_insens) yyextra->current->name = yyextra->current->name.lower(); + //printf("===Adding entry %s to %s\n", yyextra->current->name.data(), yyextra->current_root->name.data()); + yyextra->last_entry = yyextra->current; + yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); diff --git a/doxygen.changes b/doxygen.changes index 4b3db5b..23d54ec 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Jul 10 07:34:45 UTC 2020 - pgajdos@suse.com + +- version update to 1.8.18 + Removed functionality + * Removed support for TCL (code is too buggy and unmaintained, language not very popular) + Features + * Added the few missing French translations [view] + * Updated Swedish translation to match the latest version [view] + * Adding check on configuration setting EXTENSION_MAPPING [view] + * Adding commands `\rtfinclude`, `\docbookinclude`, `\maninclude` and `\xmlinclude` [view] + * output on doxyparse if a function is a prototype [view] + * print protection information on doxyparse [view] + * Creation of svg images for formulas with inkscape [view] + * Improve formula handling and rendering. [view] + * Doxygen version in the messages output (#7640) [view] + * Doxygen version information (#7645) [view] + * Enabling Travis builds for s390x [view] + * Relative markdown file reference (#7032) [view] + Bugs fixed + * see https://www.doxygen.nl/manual/changelog.html +- modified patches + % doxygen-no-lowercase-man-names.patch (refreshed) + % vhdlparser-no-return.patch (refreshed) +- deleted patches + - 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch (upstreamed) + - PR_7193_fix_blank_file_patterns.patch (upstreamed) + - doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch (upstreamed) + - doxygen-git-not-required.patch (upstreamed) + - reproducible-sort.patch (upstreamed) + ------------------------------------------------------------------- Wed Jul 8 07:53:57 UTC 2020 - Franz Sirl diff --git a/doxygen.spec b/doxygen.spec index 356e41f..f1bb1bd 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -19,7 +19,7 @@ # build with "--with libclang" to enable libclang support %bcond_with libclang Name: doxygen -Version: 1.8.16 +Version: 1.8.18 Release: 0 Summary: Automated C, C++, and Java Documentation Generator # qtools are used for building and they are GPL-3.0 licensed @@ -33,16 +33,8 @@ Patch0: %{name}-modify_footer.patch Patch1: %{name}-no-lowercase-man-names.patch # PATCH-FIX-UPSTREAM: add missing returns to non-void functions Patch3: vhdlparser-no-return.patch -# really do not require git executable -Patch5: doxygen-git-not-required.patch Patch6: doxygen-llvm-libs.patch -# PATCH-FIX-UPSTREAM: Populate FILE_PATTERN default if not set (issue#7190) -Patch7: PR_7193_fix_blank_file_patterns.patch -# PATCH-FIX-UPSTREAM Including external tag files with TOC produces a broken index.qhp -Patch8: 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch -Patch9: reproducible-sort.patch Patch10: doxygen-libclang-cpp.patch -Patch11: doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: flex @@ -69,20 +61,13 @@ as well. %patch0 -p1 %patch1 -p1 %patch3 -p1 -%patch5 -p1 %if %{with libclang} %patch6 %endif -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %if %{with libclang} %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 %patch10 -p1 %endif -%if 0%{?suse_version} > 1500 -%patch11 -p1 -%endif %endif %build diff --git a/doxywizard.spec b/doxywizard.spec index b157d66..4093fb2 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -17,7 +17,7 @@ Name: doxywizard -Version: 1.8.16 +Version: 1.8.18 Release: 0 Summary: Graphical User Interface for Doxygen # qtools are used for building and they are GPL-3.0 licensed diff --git a/reproducible-sort.patch b/reproducible-sort.patch deleted file mode 100644 index 248ab97..0000000 --- a/reproducible-sort.patch +++ /dev/null @@ -1,31 +0,0 @@ -From dc67dbe5bd5a48756c591ad02b9f68fbd2a57687 Mon Sep 17 00:00:00 2001 -From: Dimitri van Heesch -Date: Sun, 19 Jan 2020 20:31:52 +0100 -Subject: [PATCH] issue #7474: [1.8.16 regression] HTML output varies from ASLR - ---- - src/memberlist.cpp | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/memberlist.cpp b/src/memberlist.cpp -index 278023bb6..edd164bec 100644 ---- a/src/memberlist.cpp -+++ b/src/memberlist.cpp -@@ -75,8 +75,15 @@ int MemberList::compareValues(const MemberDef *c1, const MemberDef *c2) const - return 1; - } - int cmp = qstricmp(c1->name(),c2->name()); -- if (cmp==0) cmp = qstricmp(c1->argsString(),c2->argsString()); -- return cmp!=0 ? cmp : c1->getDefLine()-c2->getDefLine(); -+ if (cmp==0 && c1->argsString() && c2->argsString()) -+ { -+ cmp = qstricmp(c1->argsString(),c2->argsString()); -+ } -+ if (cmp==0) -+ { -+ cmp = c1->getDefLine()-c2->getDefLine(); -+ } -+ return cmp; - } - - int MemberList::countInheritableMembers(const ClassDef *inheritedFrom) const diff --git a/vhdlparser-no-return.patch b/vhdlparser-no-return.patch index d4ef610..85e4ac5 100644 --- a/vhdlparser-no-return.patch +++ b/vhdlparser-no-return.patch @@ -1,484 +1,1436 @@ -Index: doxygen-1.8.14/vhdlparser/VhdlParser.cc +Index: doxygen-1.8.18/vhdlparser/VhdlParser.cc =================================================================== ---- doxygen-1.8.14.orig/vhdlparser/VhdlParser.cc -+++ doxygen-1.8.14/vhdlparser/VhdlParser.cc -@@ -61,6 +61,7 @@ return tok->image.c_str(); +--- doxygen-1.8.18.orig/vhdlparser/VhdlParser.cc 2020-07-10 09:16:16.163910205 +0200 ++++ doxygen-1.8.18/vhdlparser/VhdlParser.cc 2020-07-10 09:21:27.033679741 +0200 +@@ -56,6 +56,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -75,6 +76,7 @@ QCString VhdlParser::access_type_definit - +@@ -68,6 +69,7 @@ QCString VhdlParser::access_type_definit + } str=tok->image.c_str(); return str+str1; assert(false); +return QCString(); - } + } -@@ -117,6 +119,7 @@ return str; +@@ -111,6 +113,7 @@ return str; } } assert(false); +return QCString(); - } + } -@@ -186,6 +189,7 @@ s+="(";s+=s1+")";return s; +@@ -120,6 +123,7 @@ QCString VhdlParser::actual_parameter_pa + } + return s; + assert(false); ++return QCString(); + } + + +@@ -167,6 +171,7 @@ s+="(";s+=s1+")";return s; } } assert(false); +return QCString(); - } + } -@@ -230,6 +234,7 @@ return "&"; +@@ -205,6 +210,7 @@ return "&"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -402,6 +407,7 @@ return s; +@@ -243,6 +249,7 @@ s+=","+s1; + } + return "("+s+")"; + assert(false); ++return QCString(); + } + + +@@ -310,6 +317,7 @@ outlineParser()->addVhdlType(s2.data(),o + + return s2+" "+s+";"; + assert(false); ++return QCString(); + } + + +@@ -349,6 +357,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -633,6 +639,7 @@ return s; +@@ -552,6 +561,7 @@ return s; } } assert(false); +return QCString(); - } + } -@@ -846,6 +853,7 @@ return tok->image.c_str(); +@@ -599,6 +609,7 @@ s.prepend("assert "); + if(t1) s2.prepend(" report "); + return s+s1+s2; + assert(false); ++return QCString(); + } + + +@@ -629,6 +640,7 @@ QCString VhdlParser::assertion_statement + if(t) s+=":"; + return s+s1+";"; + assert(false); ++return QCString(); + } + + +@@ -650,6 +662,7 @@ QCString VhdlParser::association_element + } + return s+" => "+s1; + assert(false); ++return QCString(); + } + + +@@ -682,6 +695,7 @@ s+=","+s1; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -704,6 +718,7 @@ QCString VhdlParser::attribute_declarati + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,s1.data(),Public); + return " attribute "+s+":"+s1+";"; + assert(false); ++return QCString(); + } + + +@@ -734,6 +749,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -1717,6 +1725,7 @@ return " others "; +@@ -794,6 +810,7 @@ s+=s1; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -823,6 +840,7 @@ QCString t= s1+" is "+s2; + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,t.data(),Public); + return " attribute "+s+" of "+s1+ " is "+s2+";"; + assert(false); ++return QCString(); + } + + +@@ -832,6 +850,7 @@ QCString VhdlParser::base() {Token *tok= + } + return tok->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -841,6 +860,7 @@ QCString VhdlParser::base_specifier() {T + } + return tok->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -850,6 +870,7 @@ QCString VhdlParser::base_unit_declarati + } + return s; + assert(false); ++return QCString(); + } + + +@@ -859,6 +880,7 @@ QCString VhdlParser::based_integer() {To + } + return tok->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -868,6 +890,7 @@ QCString VhdlParser::based_literal() {To + } + return tok->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -877,6 +900,7 @@ QCString VhdlParser::basic_identifier() + } + return tok->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -932,6 +956,7 @@ QCString VhdlParser::bit_string_literal( + } + return tok->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -941,6 +966,7 @@ QCString VhdlParser::bit_value() {Token + } + return tok->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -1472,6 +1498,7 @@ QCString VhdlParser::character_literal() + } + return tok->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -1525,6 +1552,7 @@ return " others "; } } assert(false); +return QCString(); - } + } -@@ -2014,6 +2023,7 @@ return s+"#"; +@@ -1557,6 +1585,7 @@ s+="|";s+=s1; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -1776,6 +1805,7 @@ return s+"#"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -2626,6 +2636,7 @@ return s; +@@ -1962,6 +1992,7 @@ QCString VhdlParser::condition() {QCStri + } + return s; + assert(false); ++return QCString(); + } + + +@@ -1974,6 +2005,7 @@ QCString VhdlParser::condition_clause() + } + return " until "+s; + assert(false); ++return QCString(); + } + + +@@ -2234,6 +2266,7 @@ if(t) + it.prepend("constant "); + return it; + assert(false); ++return QCString(); + } + + +@@ -2252,6 +2285,7 @@ QCString VhdlParser::constraint_array_de + } + return s+" "+s1; + assert(false); ++return QCString(); + } + + +@@ -2292,6 +2326,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -2717,6 +2728,7 @@ return s+" inertial "; +@@ -2339,6 +2374,7 @@ QCString VhdlParser::decimal_literal() { + } + return tok->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -2388,6 +2424,7 @@ return s+" inertial "; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -2818,6 +2830,7 @@ return s; +@@ -2479,6 +2516,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -2851,6 +2864,7 @@ return tok->image.c_str(); +@@ -2508,6 +2546,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -2918,6 +2932,7 @@ return s; +@@ -2563,6 +2602,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -3048,6 +3063,7 @@ return tok->image.c_str(); +@@ -2586,6 +2626,7 @@ if(!s.isEmpty()) + return s+"=>"+s1; + return s1; + assert(false); ++return QCString(); + } + + +@@ -2613,6 +2654,7 @@ QCString name; + s2=rec_name+":"+s1; + return s2; + assert(false); ++return QCString(); + } + + +@@ -2679,6 +2721,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -3246,6 +3262,7 @@ return "file"; +@@ -2843,6 +2886,7 @@ return "file"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -3733,6 +3750,7 @@ return "all"; +@@ -2868,6 +2912,7 @@ s+="<>"; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -2905,6 +2950,7 @@ s2+=",";s2+=s; + } + return s1+s2; + assert(false); ++return QCString(); + } + + +@@ -3169,6 +3215,7 @@ QCString VhdlParser::entity_designator() + } + return s+s1; + assert(false); ++return QCString(); + } + + +@@ -3272,6 +3319,7 @@ return "all"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -3849,6 +3867,7 @@ return s; +@@ -3287,6 +3335,7 @@ QCString VhdlParser::entity_specificatio + } + return s+":"+s1; + assert(false); ++return QCString(); + } + + +@@ -3376,6 +3425,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -3883,6 +3902,7 @@ return s; +@@ -3406,6 +3456,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -4121,6 +4141,7 @@ return "or" ; +@@ -3444,6 +3495,7 @@ s+=",";s+=s1; + } + return "("+s+")"; + assert(false); ++return QCString(); + } + + +@@ -3508,6 +3560,7 @@ m_sharedState->lab.resize(0); + + return s+s1+s2+";"; + assert(false); ++return QCString(); + } + + +@@ -3545,6 +3598,7 @@ s+=s1;s+=s2; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -3610,6 +3664,7 @@ return "or" ; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -4217,6 +4238,7 @@ s1="not ";return s1+s; +@@ -3619,6 +3674,7 @@ QCString VhdlParser::extended_identifier + } + return t->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -3722,6 +3778,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -4368,6 +4390,7 @@ return tok->image.c_str(); +@@ -3759,6 +3816,7 @@ QCString t1=s2+" "+s3; + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,t1.data(),Public); + return " file "+s+":"+s2+" "+s3+";"; + assert(false); ++return QCString(); + } + + +@@ -3768,6 +3826,7 @@ QCString VhdlParser::file_logical_name() + } + return s; + assert(false); ++return QCString(); + } + + +@@ -3810,6 +3869,7 @@ QCString VhdlParser::file_open_informati + } + s2="open "+s+" is "+s1; return s2; + assert(false); ++return QCString(); + } + + +@@ -3825,6 +3885,7 @@ QCString VhdlParser::file_type_definitio + } + s1=" file of "+s; return s1; + assert(false); ++return QCString(); + } + + +@@ -3834,6 +3895,7 @@ QCString VhdlParser::floating_type_defin + } + return s; + assert(false); ++return QCString(); + } + + +@@ -3866,6 +3928,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -4688,6 +4711,7 @@ return s; +@@ -3875,6 +3938,7 @@ QCString VhdlParser::formal_parameter_li + } + return s; + assert(false); ++return QCString(); + } + + +@@ -3906,6 +3970,7 @@ s+"("+s1+")"; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -3947,6 +4012,7 @@ if (s2.contains("#")) { + tmpEntry.reset(); + return "type "+s+" is "+s2+";"; + assert(false); ++return QCString(); + } + + +@@ -3965,6 +4031,7 @@ QCString VhdlParser::function_call() {QC + } + return s+"("+s1+")"; + assert(false); ++return QCString(); + } + + +@@ -4089,6 +4156,7 @@ QCString VhdlParser::generic_list() {QCS + } + return s; + assert(false); ++return QCString(); + } + + +@@ -4140,6 +4208,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -4849,6 +4873,7 @@ return tok->image.c_str(); +@@ -4174,6 +4243,7 @@ s2+=",";s2+=s1; + } + return s+s2; + assert(false); ++return QCString(); + } + + +@@ -4204,6 +4274,7 @@ QCString VhdlParser::group_declaration() + } + return "group "+s+":"+s1+"("+s2+");"; + assert(false); ++return QCString(); + } + + +@@ -4231,6 +4302,7 @@ QCString VhdlParser::group_template_decl + } + return "group "+s+ "is ("+s1+");"; + assert(false); ++return QCString(); + } + + +@@ -4273,6 +4345,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -5135,6 +5160,7 @@ return s; +@@ -4305,6 +4378,7 @@ str+=",";str+=str1; + } + return str; + assert(false); ++return QCString(); + } + + +@@ -4431,6 +4505,7 @@ QCString VhdlParser::incomplete_type_dec + } + return "type "+s+";"; + assert(false); ++return QCString(); + } + + +@@ -4472,6 +4547,7 @@ s+=",";s+=s1; + } + return s+")"; + assert(false); ++return QCString(); + } + + +@@ -4523,6 +4599,7 @@ return s; } } assert(false); +return QCString(); - } + } -@@ -5268,6 +5294,7 @@ s1="configuration ";return s; +@@ -4538,6 +4615,7 @@ QCString VhdlParser::index_subtype_defin + } + return s+" range <> "; + assert(false); ++return QCString(); + } + + +@@ -4634,6 +4712,7 @@ s1="configuration ";return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -5313,6 +5340,7 @@ return tok->image.c_str(); +@@ -4675,6 +4754,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -5422,6 +5450,7 @@ if (parse_sec==GEN_SEC) +@@ -4684,6 +4764,7 @@ QCString VhdlParser::integer() {Token *t + } + return t->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -4693,6 +4774,7 @@ QCString VhdlParser::integer_type_defini + } + return s; + assert(false); ++return QCString(); + } + + +@@ -4760,6 +4842,7 @@ if (m_sharedState->parse_sec==GEN_SEC) } } assert(false); +return QCString(); - } + } -@@ -5687,6 +5716,7 @@ QCString q=lab+" for "+s; +@@ -4769,6 +4852,7 @@ QCString VhdlParser::interface_element() + } + return s; + assert(false); ++return QCString(); + } + + +@@ -4788,6 +4872,7 @@ QCString VhdlParser::interface_file_decl + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public); + return " file "+s+":"+s1; + assert(false); ++return QCString(); + } + + +@@ -4820,6 +4905,7 @@ s2+=";";s2+=s1; + } + return s+s2; + assert(false); ++return QCString(); + } + + +@@ -4952,6 +5038,7 @@ if(tok) + } // if component + return it; + assert(false); ++return QCString(); + } + + +@@ -4993,6 +5080,7 @@ QCString q=m_sharedState->lab+" for "+s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -5764,6 +5794,7 @@ return s; +@@ -5002,6 +5090,7 @@ QCString VhdlParser::label() {QCString s + } + return s; + assert(false); ++return QCString(); + } + + +@@ -5024,6 +5113,7 @@ if ( m_sharedState->parse_sec==0 && Conf + QCString s1="library "+s; + return s1; + assert(false); ++return QCString(); + } + + +@@ -5054,6 +5144,7 @@ return s; } } assert(false); +return QCString(); - } + } -@@ -5826,6 +5857,7 @@ return "null"; +@@ -5106,6 +5197,7 @@ return "null"; } } assert(false); +return QCString(); - } + } -@@ -5971,6 +6003,7 @@ return "not"; +@@ -5115,6 +5207,7 @@ QCString VhdlParser::logical_operator() + } + return s; + assert(false); ++return QCString(); + } + + +@@ -5192,6 +5285,7 @@ QCString q = s+" loop "+s2+" end loop" + + FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop.data(),0); + return q; + assert(false); ++return QCString(); + } + + +@@ -5230,6 +5324,7 @@ return "not"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -6037,6 +6070,7 @@ return "linkage"; +@@ -5286,6 +5381,7 @@ return "linkage"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -6092,6 +6126,7 @@ return tok->image.c_str(); +@@ -5333,6 +5429,7 @@ return tok->image.c_str(); errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -6532,6 +6567,7 @@ return s; +@@ -5410,6 +5507,7 @@ return s; + } + } + assert(false); ++return QCString(); + } + + +@@ -5435,6 +5533,7 @@ s+=s1; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -5525,6 +5624,7 @@ s+=")";return s; + } + } + assert(false); ++return QCString(); + } + + +@@ -5574,6 +5674,7 @@ s+="(";s+=s1;s+=")"; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -5618,6 +5719,7 @@ s+=",";s+=s1; + } + return s+")"; + assert(false); ++return QCString(); + } + + +@@ -5681,6 +5783,7 @@ if(t) s+=":"; + if(t1) s2.prepend("when "); + return s+s1+s2+";"; + assert(false); ++return QCString(); + } + + +@@ -5713,6 +5816,7 @@ s+=":"; + } + return s+="null"; + assert(false); ++return QCString(); + } + + +@@ -5744,6 +5848,7 @@ return s; } } assert(false); +return QCString(); - } + } -@@ -6613,6 +6649,7 @@ return "type"; +@@ -5812,6 +5917,7 @@ return "type"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -7423,6 +7460,7 @@ return s; +@@ -5821,6 +5927,7 @@ QCString VhdlParser::operator_symbol() { + } + return tok->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -6344,6 +6451,7 @@ QCString VhdlParser::parameter_specifica + } + return s+" in "+s1; + assert(false); ++return QCString(); + } + + +@@ -6362,6 +6470,7 @@ QCString VhdlParser::physical_literal() + } + s+=" ";s+=s1;s.prepend(" "); return s; + assert(false); ++return QCString(); + } + + +@@ -6420,6 +6529,7 @@ outlineParser()->addVhdlType(s.data(),t- + } + return s; + assert(false); ++return QCString(); + } + + +@@ -6449,6 +6559,7 @@ QCString VhdlParser::port_list() {QCStri + } + return s; + assert(false); ++return QCString(); + } + + +@@ -6545,6 +6656,7 @@ return s; } } assert(false); +return QCString(); - } + } -@@ -7695,6 +7733,7 @@ return s; +@@ -6624,6 +6736,7 @@ s1.prepend("("); s1.append(")"); + } + return s+s1; + assert(false); ++return QCString(); + } + + +@@ -6651,6 +6764,7 @@ s+=":"; + } + return s+s1+";"; + assert(false); ++return QCString(); + } + + +@@ -6782,6 +6896,7 @@ return s; } } assert(false); +return QCString(); - } + } -@@ -8054,6 +8093,7 @@ return s; +@@ -6821,6 +6936,7 @@ s+=s1; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -7065,6 +7181,7 @@ s+="(";s+=s1;s+=")"; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -7094,6 +7211,7 @@ return s; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -8233,6 +8273,7 @@ return "/="; +@@ -7106,6 +7224,7 @@ QCString VhdlParser::range_constraint() + } + return " range "+s; + assert(false); ++return QCString(); + } + + +@@ -7191,6 +7310,7 @@ QCString VhdlParser::relation() {QCStrin + } + return s+s1+s2; + assert(false); ++return QCString(); + } + + +@@ -7310,6 +7430,7 @@ return "?/="; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -8405,6 +8446,7 @@ return s+" "+s1+"%"; - errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; - } +@@ -7361,6 +7482,7 @@ if(t) s.append(":"); + if(t1) s2.prepend(" severity "); + return s+s1+s2+";"; assert(false); +return QCString(); - } + } -@@ -8766,6 +8808,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_ +@@ -7428,6 +7550,7 @@ s+=":"; + } + return s+" return "+s1+";"; + assert(false); ++return QCString(); + } + + +@@ -7470,6 +7593,7 @@ return s+" "+s1; } } assert(false); +return QCString(); - } + } -@@ -8877,6 +8920,7 @@ return "ror"; - errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; - } +@@ -7511,6 +7635,7 @@ QCString VhdlParser::secondary_unit_decl + outlineParser()->addVhdlType(s.data(),t1->beginLine,Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,s1.data(),Public); + return s+"="+s1; assert(false); +return QCString(); - } + } -@@ -8910,6 +8954,7 @@ return "-"; - errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; +@@ -7526,6 +7651,7 @@ QCString VhdlParser::selected_name() {QC } + return s+"."+s1; assert(false); +return QCString(); - } + } -@@ -9004,6 +9049,7 @@ return s+s1+"<="+s2+s3+";"; +@@ -7606,6 +7732,7 @@ QCString VhdlParser::sensitivity_clause( + s.prepend(" on "); + return s; + assert(false); ++return QCString(); + } + + +@@ -7638,6 +7765,7 @@ s+=",";s+=s1; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -7660,6 +7788,7 @@ s+=s1; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -7768,6 +7897,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_ } } assert(false); +return QCString(); - } + } -@@ -9108,6 +9154,7 @@ return "bus"; +@@ -7798,6 +7928,7 @@ QCString VhdlParser::shift_expression() + } + return s+s1+s2; + assert(false); ++return QCString(); + } + + +@@ -7863,6 +7994,7 @@ return "ror"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -9178,6 +9225,7 @@ return "all"; +@@ -7892,6 +8024,7 @@ return "-"; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } -@@ -9651,6 +9699,7 @@ return s; +@@ -7971,6 +8104,7 @@ return s+s1+"<="+s2+s3+";"; } } assert(false); +return QCString(); - } + } -@@ -10066,6 +10115,7 @@ return " all "; +@@ -8060,6 +8194,7 @@ return "bus"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -8121,6 +8256,7 @@ return "all"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -8191,6 +8327,7 @@ s+="return ";s+=s1; + } + s1="["+s+"]";return s1; + assert(false); ++return QCString(); + } + + +@@ -8236,6 +8373,7 @@ s+=s1;s+=s2; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -8261,6 +8399,7 @@ QCString VhdlParser::slice_name() {QCStr + } + return s+"("+s1+")"; + assert(false); ++return QCString(); + } + + +@@ -8270,6 +8409,7 @@ QCString VhdlParser::string_literal() {T + } + return tok->image.c_str(); + assert(false); ++return QCString(); + } + + +@@ -8525,6 +8665,7 @@ return s; } } assert(false); +return QCString(); - } + } -@@ -10102,6 +10152,7 @@ return s; - errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; +@@ -8565,6 +8706,7 @@ s+=s1; } + return s; assert(false); +return QCString(); - } + } -@@ -10204,6 +10255,7 @@ return s; +@@ -8810,6 +8952,7 @@ QCString VhdlParser::subtype_declaration + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SUBTYPE,0,s1.data(),Public); + return " subtype "+s+" is "+s1+";"; + assert(false); ++return QCString(); + } + + +@@ -8825,6 +8968,7 @@ QCString VhdlParser::reslution_indicatio + } + return "("+s+")"; + assert(false); ++return QCString(); + } + + +@@ -8869,6 +9013,7 @@ QCString VhdlParser::subtype_indication( + } + return s+" "+s1+" "+s2; + assert(false); ++return QCString(); + } + + +@@ -8916,6 +9061,7 @@ return " all "; } } assert(false); +return QCString(); - } + } -@@ -10288,6 +10340,7 @@ return ""; +@@ -8948,6 +9094,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -8976,6 +9123,7 @@ s+=s1;s+=s2; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -8988,6 +9136,7 @@ QCString VhdlParser::timeout_clause() {Q + } + return " for "+s; + assert(false); ++return QCString(); + } + + +@@ -9006,6 +9155,7 @@ QCString VhdlParser::type_conversion() { + } + return s+"("+s1+")"; + assert(false); ++return QCString(); + } + + +@@ -9035,6 +9185,7 @@ return s; } } assert(false); +return QCString(); - } + } -@@ -10479,6 +10532,7 @@ return ""; - errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; - } - assert(false); -+return QCString(); - } - - -@@ -10713,6 +10767,7 @@ return " unaffected "; - errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; - } - assert(false); -+return QCString(); - } - - -@@ -11197,6 +11252,7 @@ return s; - errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; - } - assert(false); -+return QCString(); - } - - -@@ -11687,6 +11743,7 @@ return t->image.data(); - errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; - } - assert(false); -+return QCString(); - } - - -@@ -11731,6 +11788,7 @@ return s; - errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; - } - assert(false); -+return QCString(); - } - - -@@ -11776,6 +11834,7 @@ return "."+s; +@@ -9107,6 +9258,7 @@ return ""; } } assert(false); +return QCString(); - } + } -@@ -12578,6 +12637,7 @@ return s; +@@ -9116,6 +9268,7 @@ QCString VhdlParser::type_mark() {QCStri + } + return s; + assert(false); ++return QCString(); + } + + +@@ -9163,6 +9316,7 @@ s3+=",";s3+=s1; + } + return "array("+s+s3+") of "+s2; + assert(false); ++return QCString(); + } + + +@@ -9212,6 +9366,7 @@ QCStringList ql1=QCStringList::split("," + s1="use "+s; + return s1; + assert(false); ++return QCString(); + } + + +@@ -9269,6 +9424,7 @@ return ""; errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; } assert(false); +return QCString(); - } + } + + +@@ -9339,6 +9495,7 @@ int spec; + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,spec,0,it.data(),Public); + return val; + assert(false); ++return QCString(); + } + + +@@ -9408,6 +9565,7 @@ QCString VhdlParser::wait_statement() {Q + if(t) s.append(":"); + return s+" wait "+s1+s2+s3+";"; + assert(false); ++return QCString(); + } + + +@@ -9482,6 +9640,7 @@ return " unaffected "; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -9510,6 +9669,7 @@ s1.prepend(" after "); + } + return s+s1; + assert(false); ++return QCString(); + } + + +@@ -9548,6 +9708,7 @@ QCString VhdlParser::protected_type_body + } + return ""; + assert(false); ++return QCString(); + } + + +@@ -9721,6 +9882,7 @@ outlineParser()->error_skipto(END_T); + } + return ""; + assert(false); ++return QCString(); + } + + +@@ -9819,6 +9981,7 @@ s+=".";s+=s1; + } + return "context "+s ; + assert(false); ++return QCString(); + } + + +@@ -9927,6 +10090,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -10002,6 +10166,7 @@ QCString VhdlParser::interface_package_d + m_sharedState->current->name=s; + return "package "+s+" is new "+s1; + assert(false); ++return QCString(); + } + + +@@ -10044,6 +10209,7 @@ QCString q= " is new "+s1+s2; + outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(FUNCTION_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"function ",q.data(),Public); + return q; + assert(false); ++return QCString(); + } + + +@@ -10388,6 +10554,7 @@ QCString t="<<"+s; + QCString t1=s1+":"+s2+">>"; + return s+s1; + assert(false); ++return QCString(); + } + + +@@ -10426,6 +10593,7 @@ return t->image.data(); + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -10464,6 +10632,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -10502,6 +10671,7 @@ return "."+s; + } + } + assert(false); ++return QCString(); + } + + +@@ -10523,6 +10693,7 @@ QCString VhdlParser::relative_pathname() + } + return s+s1+s2; + assert(false); ++return QCString(); + } + + +@@ -10552,6 +10723,7 @@ s+="^."; + } + return s; + assert(false); ++return QCString(); + } + + +@@ -10583,6 +10755,7 @@ if(!s1.isEmpty()) + + return s; + assert(false); ++return QCString(); + } + + +@@ -10619,6 +10792,7 @@ s2+=s1;s2+="."; + } + return s+s2; + assert(false); ++return QCString(); + } + + +@@ -10631,6 +10805,7 @@ QCString VhdlParser::package_path_name() + } + return "@"+s; + assert(false); ++return QCString(); + } + + +@@ -11194,6 +11369,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -11210,6 +11386,7 @@ QCString VhdlParser::iproc() {QCString s + m_sharedState->current->name=s; + return "procedure "+s+s1; + assert(false); ++return QCString(); + } + + +@@ -11311,6 +11488,7 @@ QCString q; + } + m_sharedState->currP=0;return ""; + assert(false); ++return QCString(); + } + + +@@ -11357,6 +11535,7 @@ if(tok) + m_sharedState->param_sec=0; + return s+"("+s1+")"; + assert(false); ++return QCString(); + }