checkimpl

Author: firewave

lib/checkboost.cpp

@@ -18,6 +18,7 @@
 
 #include "checkboost.h"
 
+#include "checkimpl.h"
 #include "errortypes.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -31,7 +32,20 @@ namespace {
 
 static const CWE CWE664(664);
 
-void CheckBoost::checkBoostForeachModification()
+class CheckBoostImpl : public CheckImpl
+{
+public:
+    /** This constructor is used when running checks. */
+    CheckBoostImpl(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
+
+    /** @brief %Check for container modification while using the BOOST_FOREACH macro */
+    void checkBoostForeachModification();
+
+    void boostForeachError(const Token *tok);
+};
+
+void CheckBoostImpl::checkBoostForeachModification()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -57,9 +71,24 @@ void CheckBoost::checkBoostForeachModification()
     }
 }
 
-void CheckBoost::boostForeachError(const Token *tok)
+void CheckBoostImpl::boostForeachError(const Token *tok)
 {
     reportError(tok, Severity::error, "boostForeachError",
                 "BOOST_FOREACH caches the end() iterator. It's undefined behavior if you modify the container inside.", CWE664, Certainty::normal
                 );
 }
+
+void CheckBoost::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    if (!tokenizer.isCPP())
+        return;
+
+    CheckBoostImpl checkBoost(&tokenizer, tokenizer.getSettings(), errorLogger);
+    checkBoost.checkBoostForeachModification();
+}
+
+void CheckBoost::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckBoostImpl c(nullptr, settings, errorLogger);
+    c.boostForeachError(nullptr);
+}

lib/checkboost.h

@@ -24,13 +24,11 @@
 
 #include "check.h"
 #include "config.h"
-#include "tokenize.h"
 
 #include <string>
 
 class ErrorLogger;
 class Settings;
-class Token;
 
 /// @addtogroup Checks
 /// @{
@@ -40,35 +38,13 @@ class Token;
 class CPPCHECKLIB CheckBoost : public Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    CheckBoost() : Check(myName()) {}
-
-    /** This constructor is used when running checks. */
-    CheckBoost(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    CheckBoost() : Check("Boost usage") {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        if (!tokenizer.isCPP())
-            return;
-
-        CheckBoost checkBoost(&tokenizer, tokenizer.getSettings(), errorLogger);
-        checkBoost.checkBoostForeachModification();
-    }
-
-    /** @brief %Check for container modification while using the BOOST_FOREACH macro */
-    void checkBoostForeachModification();
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
 private:
-    void boostForeachError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckBoost c(nullptr, settings, errorLogger);
-        c.boostForeachError(nullptr);
-    }
-
-    static std::string myName() {
-        return "Boost usage";
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     std::string classInfo() const override {
         return "Check for invalid usage of Boost:\n"