From e049a04cbeabc10f13afe8b3f61e87d3cac7c7c7 Mon Sep 17 00:00:00 2001 From: albert-github Date: Thu, 4 Mar 2021 11:09:11 +0100 Subject: Spelling correction Spelling corrections as found by Fossies --- src/defargs.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defargs.l b/src/defargs.l index 18e9505..36ed99c 100644 --- a/src/defargs.l +++ b/src/defargs.l @@ -771,7 +771,7 @@ static bool nameIsActuallyPartOfType(QCString &name) } /*! Converts an argument string into an ArgumentList. - * \param[in] lang langage of the current argument list + * \param[in] lang language of the current argument list * \param[in] argsString the list of Arguments. * \param[out] extraTypeChars point to string to which trailing characters * for complex types are written to -- cgit v0.12 From 236a4850f55c82d8fa345d383092ececf8689c5e Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Thu, 18 Mar 2021 22:42:52 +0100 Subject: Update build_cmake.yml --- .github/workflows/build_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 9708ae1..1dcac1d 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -101,7 +101,7 @@ jobs: run: | sudo apt remove llvm-8 clang-8 libclang-common-8-dev clang-format-8 libllvm8 sudo apt remove llvm-9 llvm-9-dev llvm-9-tools llvm-9-runtime clang-9 libclang-common-9-dev clang-format-9 libllvm9 - #sudo apt remove llvm-10 llvm-10-dev llvm-10-tools llvm-10-runtime clang-10 clang-format-10 libclang-common-10-dev libclang-cpp10 libclang1-10 libllvm10 + sudo apt remove llvm-11 llvm-11-dev llvm-11-tools llvm-11-runtime clang-11 clang-format-11 libclang-common-11-dev libclang-cpp11 libclang1-11 libllvm11 sudo apt-get autoremove sudo apt-get clean #sudo apt install libclang-9-dev libclang-common-9-dev -- cgit v0.12 From 74d0d9fbdd1b9c4f3f93370023566299c272f6e5 Mon Sep 17 00:00:00 2001 From: albert-github Date: Fri, 19 Mar 2021 10:55:38 +0100 Subject: Building Cygwin version of doxygen fails The ghc filesystem does not support, resulting in: ``` .../src/filesystem.hpp:76:2: error: #error "Operating system currently not supported! 76 | #error "Operating system currently not supported!" | ^~~~~ ``` Added Cygwin in selection of supported "GHC_OS_DETECTED". --- src/filesystem.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filesystem.hpp b/src/filesystem.hpp index bdb174a..fffec69 100644 --- a/src/filesystem.hpp +++ b/src/filesystem.hpp @@ -54,7 +54,7 @@ #ifndef GHC_OS_DETECTED #if defined(__APPLE__) && defined(__MACH__) #define GHC_OS_MACOS -#elif defined(__linux__) +#elif defined(__linux__) || defined(__CYGWIN__) #define GHC_OS_LINUX #if defined(__ANDROID__) #define GHC_OS_ANDROID -- cgit v0.12 From 35f7bd152336d2b259fc8d145ba1543db72f5b90 Mon Sep 17 00:00:00 2001 From: albert-github Date: Fri, 19 Mar 2021 12:24:25 +0100 Subject: Correcting spelling errors in filesystem.hpp Correcting spelling errors in filesystem.hpp (reported upstream as https://github.com/gulrak/filesystem/pull/109) --- src/filesystem.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/filesystem.hpp b/src/filesystem.hpp index fffec69..e45f296 100644 --- a/src/filesystem.hpp +++ b/src/filesystem.hpp @@ -255,7 +255,7 @@ #define LWG_2682_BEHAVIOUR //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // LWG #2395 makes crate_directory/create_directories not emit an error if there is a regular -// file with that name, it is superceded by P1164R1, so only activate if really needed +// file with that name, it is superseded by P1164R1, so only activate if really needed // #define LWG_2935_BEHAVIOUR //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // LWG #2936 enables new element wise (more expensive) path comparison @@ -275,7 +275,7 @@ // as UTF-8 encoded. With this define you can enfoce the old behavior on Windows, using // std::string as backend and for fs::path::native() and char for fs::path::c_str(). This // needs more conversions so it is (an was before v1.5) slower, bot might help keeping source -// homogenous in a multi platform project. +// homogeneous in a multi platform project. // #define GHC_WIN_DISABLE_WSTRING_STORAGE_TYPE //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // Raise errors/exceptions when invalid unicode codepoints or UTF-8 sequences are found, @@ -296,7 +296,7 @@ #define GHC_WITH_EXCEPTIONS #endif #if !defined(GHC_WITH_EXCEPTIONS) && defined(GHC_RAISE_UNICODE_ERRORS) -#error "Can't raise unicode errors whith exception support disabled" +#error "Can't raise unicode errors with exception support disabled" #endif namespace ghc { @@ -368,7 +368,7 @@ public: using path_helper_base::preferred_separator; // 30.10.10.1 enumeration format - /// The path format in wich the constructor argument is given. + /// The path format in which the constructor argument is given. enum format { generic_format, ///< The generic format, internally used by ///< ghc::filesystem::path with slashes -- cgit v0.12 From 97180872760800dc9f0be3ebe7532c2452195db3 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 20 Mar 2021 14:43:37 +0100 Subject: Some regressions on the templated approach Although the templated approach is highly experimental there are a number of regressions fixed: - context.cpp - incorrect if condition due to: Refactoring: cleanup unused qtools headers (commit: b89561e0c61aec5cae6eafc354f81a3bf071a777) - garbled messages due to missing end of line in message - htmllayout.tpl - doxygen.luma has been replaced by doxygen.cpp --- src/context.cpp | 32 ++++++++++++++++---------------- templates/html/htmllayout.tpl | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/context.cpp b/src/context.cpp index 0064051..ec1d7a4 100644 --- a/src/context.cpp +++ b/src/context.cpp @@ -255,9 +255,9 @@ class PropertyMapper void addProperty(const char *name,typename PropertyFunc::Handler handle) { auto it = m_map.find(name); - if (it==m_map.end()) + if (it!=m_map.end()) { - err("Error: adding property '%s' more than once",name); + err("adding property '%s' more than once\n",name); } else { @@ -1278,7 +1278,7 @@ static TemplateVariant parseDoc(const Definition *def,const QCString &file,int l break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } QCString docs = ts.str().c_str(); @@ -1315,7 +1315,7 @@ static TemplateVariant parseCode(MemberDef *md,const QCString &scopeName,const Q break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } QCString s = t.str(); @@ -1370,7 +1370,7 @@ static TemplateVariant parseCode(const FileDef *fd,const QCString &relPath) break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } QCString s = t.str(); @@ -1978,7 +1978,7 @@ class ClassContext::Private : public DefinitionContext break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } g_globals.dynSectionId++; @@ -2024,7 +2024,7 @@ class ClassContext::Private : public DefinitionContext break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } g_globals.dynSectionId++; @@ -2075,7 +2075,7 @@ class ClassContext::Private : public DefinitionContext break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } g_globals.dynSectionId++; @@ -3080,7 +3080,7 @@ class FileContext::Private : public DefinitionContext break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } g_globals.dynSectionId++; @@ -3132,7 +3132,7 @@ class FileContext::Private : public DefinitionContext break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } g_globals.dynSectionId++; @@ -3546,7 +3546,7 @@ class DirContext::Private : public DefinitionContext break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } g_globals.dynSectionId++; @@ -4960,7 +4960,7 @@ class MemberContext::Private : public DefinitionContext break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } g_globals.dynSectionId++; @@ -4976,7 +4976,7 @@ class MemberContext::Private : public DefinitionContext { if (hasReferencedByRelation().toBool()) { - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); } return TemplateVariant(""); } @@ -5032,7 +5032,7 @@ class MemberContext::Private : public DefinitionContext break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } g_globals.dynSectionId++; @@ -5048,7 +5048,7 @@ class MemberContext::Private : public DefinitionContext { if (hasReferencesRelation().toBool()) { - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); } return TemplateVariant(""); } @@ -5305,7 +5305,7 @@ class ModuleContext::Private : public DefinitionContext break; // TODO: support other generators default: - err("context.cpp: output format not yet supported"); + err("context.cpp: output format not yet supported\n"); break; } g_globals.dynSectionId++; diff --git a/templates/html/htmllayout.tpl b/templates/html/htmllayout.tpl index 74d83c6..b79f835 100644 --- a/templates/html/htmllayout.tpl +++ b/templates/html/htmllayout.tpl @@ -12,7 +12,7 @@ {% resource 'tab_s.lum' %} {% resource 'tab_h.lum' %} {% resource 'bc_s.luma' %} -{% resource 'doxygen.luma' %} +{% resource 'doxygen.svg' %} {% resource 'closed.luma' %} {% resource 'open.luma' %} {% resource 'bdwn.luma' %} -- cgit v0.12 From 2059db4f1b1662a28a7ba3ac714bae43947899b8 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 20 Mar 2021 17:48:12 +0100 Subject: Regression: dead code in classdef.cpp According to coverity: ``` assignment: Assigning: firstSpan = true. 3037 bool firstSpan=true; 3038 for (const auto &s : sl) 3039 { cond_const: Condition firstSpan, taking true branch. Now the value of firstSpan is equal to 1. const: At condition firstSpan, the value of firstSpan must be equal to 1. dead_error_condition: The condition !firstSpan cannot be true. 3040 if (!firstSpan) 3041 { CID 315162 (#1 of 1): Logically dead code (DEADCODE)dead_error_begin: Execution cannot reach this statement: ol->writeString(""); 3043 firstSpan=false; 3044 } ``` this problem has been introduced in: Refactoring: Replaced QDir with Dir (Commit: 0d05e79d67b5b808918541f429b06805207e8bdb) Reformulated loop and condition, also it is not guaranteed that the list contains a member so adjested also for an empty list/ --- src/classdef.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/classdef.cpp b/src/classdef.cpp index f1d9c60..17b9acb 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -2998,7 +2998,6 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const ) && memberWritten) { - ol.writeString(""); StringVector sl; if (lang==SrcLangExt_VHDL) { @@ -3040,11 +3039,15 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const if (!firstSpan) { ol.writeString(""); + } + else + { + ol.writeString(""); firstSpan=false; } ol.docify(s.c_str()); } - ol.writeString(""); + if (!firstSpan) ol.writeString(""); } if (memberWritten) { -- cgit v0.12 From e6b9db67f4a851c62c95ecffd5fc027b33cb195a Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 20 Mar 2021 18:45:29 +0100 Subject: Regression: dead code in configimpl.l According to coverity: ``` CID 315169 (#1 of 1): Structurally dead code (UNREACHABLE)unreachable: This code cannot be reached: if (!fileOpened) { config.... ``` this problem has been introduced in: Refactoring: replace QFile/FTextStream with fstream/stringstream (Commit: fa1897b1889f7bf74de68f1ac99cf3be343a7551) --- src/configimpl.l | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/configimpl.l b/src/configimpl.l index 99f15a4..4443f9c 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -1313,7 +1313,6 @@ static QCString configFileToString(const char *name) return ret; }; - bool fileOpened=FALSE; if (name[0]=='-' && name[1]==0) // read from stdin { // read contents from stdin into contents string @@ -1324,16 +1323,11 @@ static QCString configFileToString(const char *name) std::ifstream f(name,std::istream::in); if (!f.is_open()) { - config_err("file '%s' not found\n",name); + config_term("file '%s' not found or could not be opened\n",name); return ""; } return stream2string(f); } - if (!fileOpened) - { - config_term("cannot open file '%s' for reading\n",name); - } - return ""; } bool ConfigImpl::parseString(const char *fn,const char *str,bool update) -- cgit v0.12 From b94119589ddd302e0dc42df072768c8ffd4ef559 Mon Sep 17 00:00:00 2001 From: albert-github Date: Mon, 22 Mar 2021 11:49:58 +0100 Subject: Maintenance doxygen internal Doxyfiles The Doxyfiles for the doxygen internal doxygen documentation had some obsolete entries and was lacking a new file (filesystem.hpp) --- Doxyfile | 3 +-- qtools/Doxyfile | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Doxyfile b/Doxyfile index bee971f..1f5cbe1 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,4 +1,3 @@ -# Doxyfile 1.8.16 #--------------------------------------------------------------------------- # Project related configuration options @@ -12,7 +11,6 @@ OUTPUT_DIRECTORY = doxygen_docs CREATE_SUBDIRS = YES ALLOW_UNICODE_NAMES = NO OUTPUT_LANGUAGE = English -OUTPUT_TEXT_DIRECTION = None BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = @@ -110,6 +108,7 @@ INPUT = src \ libxml INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.h \ + *.hpp \ *.cpp \ *.l \ *.md diff --git a/qtools/Doxyfile b/qtools/Doxyfile index d3ab25a..af0497a 100644 --- a/qtools/Doxyfile +++ b/qtools/Doxyfile @@ -1,4 +1,3 @@ -# Doxyfile 1.8.14 #--------------------------------------------------------------------------- # Project related configuration options @@ -136,7 +135,6 @@ VERBATIM_HEADERS = YES # Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 4 IGNORE_PREFIX = Q #--------------------------------------------------------------------------- # Configuration options related to the HTML output @@ -283,7 +281,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES -MSCGEN_PATH = DIA_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES -- cgit v0.12 From ac964d50c0af9726bfd1a100ae4fbbdc25662110 Mon Sep 17 00:00:00 2001 From: albert-github Date: Mon, 22 Mar 2021 15:40:44 +0100 Subject: Maintenance of .gitignore A file and a directory, generated by the doxygen internal documentation, were not excluded from the list that should go into the repository. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b599b7a..987aa13 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ /doxygen_docs /doxygen.tag /build* +/qtools_docs +/warnings.log tags -- cgit v0.12 From 94c6d80d8fd7c0e6270787287a856c150fbea901 Mon Sep 17 00:00:00 2001 From: "Kolleck, Martin" Date: Mon, 22 Mar 2021 17:15:11 +0100 Subject: Fix deadlock when using `WARN_AS_ERROR = YES`. --- src/message.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/message.cpp b/src/message.cpp index 6c7c8ac..eb20c19 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -122,9 +122,11 @@ static void handle_warn_as_error() { if (warnBehavior == WARN_YES) { - std::unique_lock lock(g_mutex); - QCString msgText = " (warning treated as error, aborting now)\n"; - fwrite(msgText.data(),1,msgText.length(),warnFile); + { + std::unique_lock lock(g_mutex); + QCString msgText = " (warning treated as error, aborting now)\n"; + fwrite(msgText.data(),1,msgText.length(),warnFile); + } exit(1); } warnStat = true; -- cgit v0.12