removed need for friend declaration of test class in Preprocessor / cleanups (#7918)

Author: firewave

lib/preprocessor.h

@@ -99,15 +99,11 @@ class CPPCHECKLIB RemarkComment {
  * configurations that exist in a source file.
  */
 class CPPCHECKLIB WARN_UNUSED Preprocessor {
-    // TODO: get rid of this
-    friend class TestPreprocessor;
-
 public:
     /** character that is inserted in expanded macros */
     static char macroChar;
 
-    explicit Preprocessor(simplecpp::TokenList& tokens, const Settings& settings, ErrorLogger &errorLogger, Standards::Language lang);
-    virtual ~Preprocessor() = default;
+    Preprocessor(simplecpp::TokenList& tokens, const Settings& settings, ErrorLogger &errorLogger, Standards::Language lang);
 
     void inlineSuppressions(SuppressionList &suppressions);
 
@@ -146,11 +142,14 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
 
     static bool hasErrors(const simplecpp::Output &output);
 
+protected:
+    void reportOutput(const simplecpp::OutputList &outputList, bool showerror);
+
+    static bool hasErrors(const simplecpp::OutputList &outputList);
+
 private:
     void handleErrors(const simplecpp::OutputList &outputList, bool throwError);
 
-    void reportOutput(const simplecpp::OutputList &outputList, bool showerror);
-
     static void simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList);
 
     /**
@@ -164,8 +163,6 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
     void missingInclude(const std::string &filename, unsigned int linenr, const std::string &header, HeaderTypes headerType);
     void error(const std::string &filename, unsigned int linenr, const std::string &msg);
 
-    static bool hasErrors(const simplecpp::OutputList &outputList);
-
     void addRemarkComments(const simplecpp::TokenList &tokens, std::vector<RemarkComment> &remarkComments) const;
 
     simplecpp::TokenList& mTokens;

test/testpreprocessor.cpp

@@ -49,12 +49,21 @@ class TestPreprocessor : public TestFixture {
     TestPreprocessor() : TestFixture("TestPreprocessor") {}
 
 private:
+    class PreprocessorTest : public Preprocessor
+    {
+        friend class TestPreprocessor;
+    public:
+        PreprocessorTest(simplecpp::TokenList& tokens, const Settings& settings, ErrorLogger &errorLogger, Standards::Language lang)
+            : Preprocessor(tokens, settings, errorLogger, lang)
+        {}
+    };
+
     template<size_t size>
     std::string expandMacros(const char (&code)[size], ErrorLogger &errorLogger) const {
         simplecpp::OutputList outputList;
         std::vector<std::string> files;
         simplecpp::TokenList tokens1 = simplecpp::TokenList(code, files, "file.cpp", &outputList);
-        Preprocessor p(tokens1, settingsDefault, errorLogger, Path::identify(tokens1.getFiles()[0], false));
+        PreprocessorTest p(tokens1, settingsDefault, errorLogger, Path::identify(tokens1.getFiles()[0], false));
         simplecpp::TokenList tokens2 = p.preprocess("", files, true);
         p.reportOutput(outputList, true);
         return tokens2.stringify();
@@ -119,15 +128,15 @@ class TestPreprocessor : public TestFixture {
 
         simplecpp::TokenList tokens(code, size, files, Path::simplifyPath(filename), &outputList);
         // TODO: we should be using the actual Preprocessor implementation
-        Preprocessor preprocessor(tokens, settings, errorlogger, Path::identify(tokens.getFiles()[0], false));
+        PreprocessorTest preprocessor(tokens, settings, errorlogger, Path::identify(tokens.getFiles()[0], false));
         if (inlineSuppression)
             preprocessor.inlineSuppressions(*inlineSuppression);
         preprocessor.removeComments();
         preprocessor.simplifyPragmaAsm();
 
         preprocessor.reportOutput(outputList, true);
 
-        if (Preprocessor::hasErrors(outputList))
+        if (PreprocessorTest::hasErrors(outputList))
             return {};
 
         std::map<std::string, std::string> cfgcode;