made CppCheck::getClangFlags() an internal function (danmar#7412)

Author: firewave

lib/cppcheck.cpp

@@ -612,32 +612,37 @@ std::string CppCheck::getLibraryDumpData() const {
     return out;
 }
 
-std::string CppCheck::getClangFlags(Standards::Language lang) const {
+/**
+ * @brief Get the clang command line flags using the Settings
+ * @param lang language guessed from filename
+ * @return Clang command line flags
+ */
+static std::string getClangFlags(const Settings& setting, Standards::Language lang) {
     std::string flags;
 
     assert(lang != Standards::Language::None);
 
     switch (lang) {
     case Standards::Language::C:
         flags = "-x c ";
-        if (!mSettings.standards.stdValueC.empty())
-            flags += "-std=" + mSettings.standards.stdValueC + " ";
+        if (!setting.standards.stdValueC.empty())
+            flags += "-std=" + setting.standards.stdValueC + " ";
         break;
     case Standards::Language::CPP:
         flags += "-x c++ ";
-        if (!mSettings.standards.stdValueCPP.empty())
-            flags += "-std=" + mSettings.standards.stdValueCPP + " ";
+        if (!setting.standards.stdValueCPP.empty())
+            flags += "-std=" + setting.standards.stdValueCPP + " ";
         break;
     case Standards::Language::None:
         break;
     }
 
-    for (const std::string &i: mSettings.includePaths)
+    for (const std::string &i: setting.includePaths)
         flags += "-I" + i + " ";
 
-    flags += getDefinesFlags(mSettings.userDefines);
+    flags += getDefinesFlags(setting.userDefines);
 
-    for (const std::string &i: mSettings.userIncludes)
+    for (const std::string &i: setting.userIncludes)
         flags += "--include " + cmdFileName(i) + " ";
 
     return flags;
@@ -668,7 +673,7 @@ unsigned int CppCheck::checkClang(const FileWithDetails &file)
 #endif
 
     const std::string args2 = "-fsyntax-only -Xclang -ast-dump -fno-color-diagnostics " +
-                              getClangFlags(file.lang()) +
+                              getClangFlags(mSettings, file.lang()) +
                               file.spath();
     const std::string redirect2 = clangStderr.empty() ? "2>&1" : ("2> " + clangStderr);
     if (mSettings.verbose && !mSettings.quiet) {

lib/cppcheck.h

@@ -23,7 +23,6 @@
 
 #include "check.h"
 #include "config.h"
-#include "standards.h"
 
 #include <cstdint>
 #include <fstream>
@@ -151,13 +150,6 @@ class CPPCHECKLIB CppCheck {
 
     std::string getLibraryDumpData() const;
 
-    /**
-     * @brief Get the clang command line flags using the Settings
-     * @param lang language guessed from filename
-     * @return Clang command line flags
-     */
-    std::string getClangFlags(Standards::Language lang) const;
-
 private:
 #ifdef HAVE_RULES
     /** Are there "simple" rules */

test/cli/clang-import_test.py

@@ -197,6 +197,13 @@ def test_cmd_def(tmp_path):
     __test_cmd(tmp_path, 'test.cpp',['-DDEF'], '-x c++ -DDEF=1')
 
 
+def test_cmd_include(tmp_path):
+    inc_file = tmp_path / 'inc.h'
+    with open(inc_file, 'wt'):
+        pass
+    __test_cmd(tmp_path, 'test.cpp',['--include=inc.h'], '-x c++ --include inc.h')
+
+
 def test_cmd_enforce_c(tmp_path):  # #13128
     __test_cmd(tmp_path, 'test.cpp',['-x', 'c'], '-x c')
 

test/testcppcheck.cpp

@@ -23,7 +23,6 @@
 #include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
-#include "standards.h"
 #include "suppressions.h"
 
 #include "simplecpp.h"
@@ -64,7 +63,6 @@ class TestCppcheck : public TestFixture {
         TEST_CASE(isPremiumCodingStandardId);
         TEST_CASE(getDumpFileContentsRawTokens);
         TEST_CASE(getDumpFileContentsLibrary);
-        TEST_CASE(getClangFlagsIncludeFile);
     }
 
     void getErrorMessages() const {
@@ -327,15 +325,6 @@ class TestCppcheck : public TestFixture {
         }
     }
 
-    void getClangFlagsIncludeFile() const {
-        Settings s;
-        s.userIncludes.emplace_back("1.h");
-        Suppressions supprs;
-        ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
-        ASSERT_EQUALS("-x c --include 1.h ", cppcheck.getClangFlags(Standards::Language::C));
-    }
-
     // TODO: test suppressions
     // TODO: test all with FS
 };