added clang-tidy CI job and fixed warnings / added CMake option "DISABLE_CPP03_SYNTAX_CHECK" / CMake cleanups (#248)

Author: firewave

.clang-tidy

@@ -0,0 +1,4 @@
+---
+Checks:          '*,-abseil-*,-altera-*,-android-*,-cert-*,-cppcoreguidelines-*,-fuchsia-*,-google-*,-hicpp-*,-linuxkernel-*,-llvm-*,-llvmlibc-*,-mpi-*,-objc-*,-openmp-*,-zircon-*,-misc-non-private-member-variables-in-classes,-modernize-avoid-c-arrays,-modernize-use-default-member-init,-modernize-use-using,-readability-braces-around-statements,-readability-function-size,-readability-implicit-bool-conversion,-readability-isolate-declaration,-readability-magic-numbers,-readability-simplify-boolean-expr,-readability-uppercase-literal-suffix,-modernize-use-auto,-modernize-use-trailing-return-type,-bugprone-branch-clone,-modernize-pass-by-value,-modernize-loop-convert,-modernize-use-emplace,-modernize-use-equals-default,-performance-noexcept-move-constructor,-modernize-use-equals-delete,-readability-identifier-length,-readability-function-cognitive-complexity,-modernize-return-braced-init-list,-misc-no-recursion,-bugprone-easily-swappable-parameters,-bugprone-narrowing-conversions,-concurrency-mt-unsafe,-modernize-loop-convert,-clang-analyzer-core.NullDereference,-performance-move-constructor-init,-performance-inefficient-string-concatenation,-performance-no-automatic-move'
+HeaderFilterRegex: '.*'
+WarningsAsErrors: '*'

.github/workflows/clang-tidy.yml

@@ -0,0 +1,37 @@
+# Syntax reference https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+# Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
+name: clang-tidy
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install missing software
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake make
+
+      - name: Install clang
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 14
+
+      - name: Prepare CMake
+        run: |
+          mkdir cmake.output
+          cd cmake.output
+          cmake -G "Unix Makefiles" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DDISABLE_CPP03_SYNTAX_CHECK=ON ..
+          cd ..
+        env:
+          CXX: clang-14
+
+      - name: Clang-Tidy
+        run: |
+          run-clang-tidy-14 -q -j $(nproc) -p=cmake.output -extra-arg=-w

CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required (VERSION 3.5)
 project (simplecpp LANGUAGES CXX)
 
+option(DISABLE_CPP03_SYNTAX_CHECK "Disable the C++03 syntax check." OFF)
+
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     add_compile_options(-Wall -Wextra -pedantic -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls -Wshadow -Wundef -Wold-style-cast -Wno-multichar)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -22,23 +24,27 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     endif()
 endif()
 
-add_executable(simplecpp simplecpp.cpp main.cpp)
+add_library(simplecpp_obj OBJECT simplecpp.cpp)
+
+add_executable(simplecpp $<TARGET_OBJECTS:simplecpp_obj> main.cpp)
 set_property(TARGET simplecpp PROPERTY CXX_STANDARD 11)
 
-# it is not possible to set a standard older than C++14 with Visual Studio
-if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    # we need to create a dummy library as -fsyntax-only will not produce any output files causing the build to fail
-    add_library(simplecpp-03-syntax STATIC simplecpp.cpp)
-    target_compile_options(simplecpp-03-syntax PRIVATE -std=c++03)
-    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-        target_compile_options(simplecpp-03-syntax PRIVATE -Wno-long-long)
-    elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        target_compile_options(simplecpp-03-syntax PRIVATE -Wno-c++11-long-long -Wno-c++11-compat)
+if (NOT DISABLE_CPP03_SYNTAX_CHECK)
+    # it is not possible to set a standard older than C++14 with Visual Studio
+    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        # we need to create a dummy library as -fsyntax-only will not produce any output files causing the build to fail
+        add_library(simplecpp-03-syntax OBJECT simplecpp.cpp)
+        target_compile_options(simplecpp-03-syntax PRIVATE -std=c++03)
+        if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+            target_compile_options(simplecpp-03-syntax PRIVATE -Wno-long-long)
+        elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+            target_compile_options(simplecpp-03-syntax PRIVATE -Wno-c++11-long-long -Wno-c++11-compat)
+        endif()
+        add_dependencies(simplecpp simplecpp-03-syntax)
     endif()
-    add_dependencies(simplecpp simplecpp-03-syntax)
 endif()
 
-add_executable(testrunner simplecpp.cpp test.cpp)
+add_executable(testrunner $<TARGET_OBJECTS:simplecpp_obj> test.cpp)
 set_property(TARGET testrunner PROPERTY CXX_STANDARD 11)
 
 enable_testing()

simplecpp.cpp

@@ -1842,7 +1842,7 @@ namespace simplecpp {
                 return recursiveExpandToken(output, temp, loc, tok2, macros, expandedmacros2, parametertokens);
             }
 
-            else if (tok->str() == DEFINED) {
+            if (tok->str() == DEFINED) {
                 const Token *tok2 = tok->next;
                 const Token *tok3 = tok2 ? tok2->next : nullptr;
                 const Token *tok4 = tok3 ? tok3->next : nullptr;
@@ -1989,7 +1989,7 @@ namespace simplecpp {
             } else {
                 std::string strAB;
 
-                const bool varargs = variadic && args.size() >= 1U && B->str() == args[args.size()-1U];
+                const bool varargs = variadic && !args.empty() && B->str() == args[args.size()-1U];
 
                 if (expandArg(&tokensB, B, parametertokens)) {
                     if (tokensB.empty())
@@ -2008,7 +2008,7 @@ namespace simplecpp {
                 if (A->previous && A->previous->str() == "\\") {
                     if (strAB[0] == 'u' && strAB.size() == 5)
                         throw invalidHashHash::universalCharacterUB(tok->location, name(), A, strAB);
-                    else if (strAB[0] == 'U' && strAB.size() == 9)
+                    if (strAB[0] == 'U' && strAB.size() == 9)
                         throw invalidHashHash::universalCharacterUB(tok->location, name(), A, strAB);
                 }
 
@@ -2487,7 +2487,7 @@ long long simplecpp::characterLiteralToLL(const std::string& str)
 
     std::size_t pos;
 
-    if (str.size() >= 1 && str[0] == '\'') {
+    if (!str.empty() && str[0] == '\'') {
         narrow = true;
         pos = 1;
     } else if (str.size() >= 2 && str[0] == 'u' && str[1] == '\'') {
@@ -2611,7 +2611,7 @@ long long simplecpp::characterLiteralToLL(const std::string& str)
                 int additional_bytes;
                 if (value >= 0xf5)  // higher values would result in code points above 0x10ffff
                     throw std::runtime_error("assumed UTF-8 encoded source, but sequence is invalid");
-                else if (value >= 0xf0)
+                if (value >= 0xf0)
                     additional_bytes = 3;
                 else if (value >= 0xe0)
                     additional_bytes = 2;
@@ -2678,7 +2678,7 @@ static void simplifyNumbers(simplecpp::TokenList &expr)
             continue;
         if (tok->str().compare(0,2,"0x") == 0)
             tok->setstr(toString(stringToULL(tok->str())));
-        else if (!tok->number && tok->str().find('\'') != tok->str().npos)
+        else if (!tok->number && tok->str().find('\'') != std::string::npos)
             tok->setstr(toString(simplecpp::characterLiteralToLL(tok->str())));
     }
 }
@@ -2840,7 +2840,7 @@ static bool hasFile(const std::map<std::string, simplecpp::TokenList *> &filedat
     return !getFileName(filedata, sourcefile, header, dui, systemheader).empty();
 }
 
-std::map<std::string, simplecpp::TokenList*> simplecpp::load(const simplecpp::TokenList &rawtokens, std::vector<std::string> &fileNumbers, const simplecpp::DUI &dui, simplecpp::OutputList *outputList)
+std::map<std::string, simplecpp::TokenList*> simplecpp::load(const simplecpp::TokenList &rawtokens, std::vector<std::string> &filenames, const simplecpp::DUI &dui, simplecpp::OutputList *outputList)
 {
     std::map<std::string, simplecpp::TokenList*> ret;
 
@@ -2856,16 +2856,16 @@ std::map<std::string, simplecpp::TokenList*> simplecpp::load(const simplecpp::To
         std::ifstream fin(filename.c_str());
         if (!fin.is_open()) {
             if (outputList) {
-                simplecpp::Output err(fileNumbers);
+                simplecpp::Output err(filenames);
                 err.type = simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND;
-                err.location = Location(fileNumbers);
+                err.location = Location(filenames);
                 err.msg = "Can not open include file '" + filename + "' that is explicitly included.";
                 outputList->push_back(err);
             }
             continue;
         }
 
-        TokenList *tokenlist = new TokenList(fin, fileNumbers, filename, outputList);
+        TokenList *tokenlist = new TokenList(fin, filenames, filename, outputList);
         if (!tokenlist->front()) {
             delete tokenlist;
             continue;
@@ -2904,7 +2904,7 @@ std::map<std::string, simplecpp::TokenList*> simplecpp::load(const simplecpp::To
         if (!f.is_open())
             continue;
 
-        TokenList *tokens = new TokenList(f, fileNumbers, header2, outputList);
+        TokenList *tokens = new TokenList(f, filenames, header2, outputList);
         ret[header2] = tokens;
         if (tokens->front())
             filelist.push_back(tokens->front());