CppCheck: made some methods private / moved analyseClangTidy() calls into CppCheck (danmar#7504)

Author: firewave

cli/processexecutor.cpp

@@ -336,12 +336,9 @@ unsigned int ProcessExecutor::check()
 
                 if (iFileSettings != mFileSettings.end()) {
                     resultOfCheck = fileChecker.check(*iFileSettings);
-                    if (mSettings.clangTidy)
-                        fileChecker.analyseClangTidy(*iFileSettings);
                 } else {
                     // Read file from a file
                     resultOfCheck = fileChecker.check(*iFile);
-                    // TODO: call analyseClangTidy()?
                 }
 
                 pipewriter.writeSuppr(mSuppressions.nomsg);

cli/singleexecutor.cpp

@@ -65,8 +65,6 @@ unsigned int SingleExecutor::check()
         ++c;
         if (!mSettings.quiet)
             reportStatus(c, mFileSettings.size(), c, mFileSettings.size());
-        if (mSettings.clangTidy)
-            mCppcheck.analyseClangTidy(fs);
     }
 
     if (mCppcheck.analyseWholeProgram())

cli/threadexecutor.cpp

@@ -119,12 +119,9 @@ class ThreadData
         if (fs) {
             // file settings..
             result = fileChecker.check(*fs);
-            if (mSettings.clangTidy)
-                fileChecker.analyseClangTidy(*fs);
         } else {
             // Read file from a file
             result = fileChecker.check(*file);
-            // TODO: call analyseClangTidy()?
         }
         for (const auto& suppr : mSuppressions.nomsg.getSuppressions()) {
             // need to transfer all inline suppressions because these are used later on

lib/cppcheck.cpp

@@ -774,10 +774,15 @@ unsigned int CppCheck::check(const FileWithDetails &file)
         (void)mSuppressions.nomsg.isSuppressed(SuppressionList::ErrorMessage::fromErrorMessage(msg, {}), true);
     }
 
+    unsigned int returnValue;
     if (mSettings.clang)
-        return checkClang(file);
+        returnValue = checkClang(file);
+    else
+        returnValue = checkFile(file, "");
+
+    // TODO: call analyseClangTidy()
 
-    return checkFile(file, "");
+    return returnValue;
 }
 
 unsigned int CppCheck::check(const FileWithDetails &file, const std::string &content)
@@ -827,6 +832,8 @@ unsigned int CppCheck::check(const FileSettings &fs)
         temp.mFileInfo.pop_back();
     }
     // TODO: propagate back more data?
+    if (mSettings.clangTidy)
+        analyseClangTidy(fs); // TODO: returnValue
     return returnValue;
 }
 
@@ -1927,6 +1934,7 @@ void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
     const std::string args = "-quiet -checks=*,-clang-analyzer-*,-llvm* \"" + fileSettings.filename() + "\" -- " + allIncludes + allDefines;
     std::string output;
     if (const int exitcode = mExecuteCommand(exe, split(args), "2>&1", output)) {
+        // TODO: needs to be a proper error
         std::cerr << "Failed to execute '" << exe << "' (exitcode: " << std::to_string(exitcode) << ")" << std::endl;
         return;
     }

lib/cppcheck.h

@@ -55,6 +55,8 @@ namespace simplecpp { class TokenList; }
  * Usage: See check() for more info.
  */
 class CPPCHECKLIB CppCheck {
+    friend class TestCppcheck;
+
 public:
     using ExecuteCmdFn = std::function<int (std::string,std::vector<std::string>,std::string,std::string&)>;
 
@@ -123,7 +125,6 @@ class CPPCHECKLIB CppCheck {
     static void getErrorMessages(ErrorLogger &errorlogger);
 
     void tooManyConfigsError(const std::string &file, int numberOfConfigurations);
-    void purgedConfigurationMessage(const std::string &file, const std::string& configuration);
 
     /** Analyse whole program, run this after all TUs has been scanned.
      * This is deprecated and the plan is to remove this when
@@ -132,15 +133,15 @@ class CPPCHECKLIB CppCheck {
      */
     bool analyseWholeProgram();
 
-    /** Analyze all files using clang-tidy */
-    void analyseClangTidy(const FileSettings &fileSettings);
-
     /** analyse whole program use .analyzeinfo files or ctuinfo string */
     unsigned int analyseWholeProgram(const std::string &buildDir, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const std::string& ctuInfo);
 
     static void resetTimerResults();
     static void printTimerResults(SHOWTIME_MODES mode);
 
+private:
+    void purgedConfigurationMessage(const std::string &file, const std::string& configuration);
+
     bool isPremiumCodingStandardId(const std::string& id) const;
 
     /**
@@ -150,7 +151,9 @@ class CPPCHECKLIB CppCheck {
 
     std::string getLibraryDumpData() const;
 
-private:
+    /** Analyze all files using clang-tidy */
+    void analyseClangTidy(const FileSettings &fileSettings);
+
 #ifdef HAVE_RULES
     /** Are there "simple" rules */
     bool hasRule(const std::string &tokenlist) const;