TemplateSimplifier: removed need for test class friend declaration / cleaned up member access (#8068)

Author: firewave

lib/templatesimplifier.h

@@ -45,8 +45,6 @@ struct newInstantiation;
 
 /** @brief Simplify templates from the preprocessed and partially simplified code. */
 class CPPCHECKLIB TemplateSimplifier {
-    friend class TestSimplifyTemplate;
-
 public:
     explicit TemplateSimplifier(Tokenizer &tokenizer);
 
@@ -267,6 +265,7 @@ class CPPCHECKLIB TemplateSimplifier {
     static Token *findTemplateDeclarationEnd(Token *tok);
     static const Token *findTemplateDeclarationEnd(const Token *tok);
 
+protected:
     /**
      * Match template declaration/instantiation
      * @param instance template instantiation
@@ -277,6 +276,7 @@ class CPPCHECKLIB TemplateSimplifier {
      */
     static bool instantiateMatch(const Token *instance, std::size_t numberOfArguments, bool variadic, const char patternAfter[]);
 
+public: // TODO: only needs to be public for tests
     /**
      * Match template declaration/instantiation
      * @param tok The ">" token e.g. before "class"
@@ -285,6 +285,7 @@ class CPPCHECKLIB TemplateSimplifier {
      */
     int getTemplateNamePosition(const Token *tok);
 
+private:
     /**
      * Get class template name position
      * @param tok The ">" token e.g. before "class"
@@ -309,6 +310,7 @@ class CPPCHECKLIB TemplateSimplifier {
      * */
     static bool getTemplateNamePositionTemplateVariable(const Token *tok, int &namepos);
 
+public:
     /**
      * Simplify templates
      * @param maxtime time when the simplification should be stopped
@@ -324,6 +326,7 @@ class CPPCHECKLIB TemplateSimplifier {
      */
     static bool simplifyNumericCalculations(Token *tok, bool isTemplate = true);
 
+private:
     /**
      * Simplify constant calculations such as "1+2" => "3".
      * This also performs simple cleanup of parentheses etc.
@@ -338,7 +341,6 @@ class CPPCHECKLIB TemplateSimplifier {
      */
     void simplifyTemplateArgs(Token *start, const Token *end, std::vector<newInstantiation>* newInst = nullptr);
 
-private:
     /**
      * Get template declarations
      * @return true if code has templates.
@@ -445,6 +447,7 @@ class CPPCHECKLIB TemplateSimplifier {
                               const std::list<std::string> &typeStringsUsedInTemplateInstantiation,
                               const std::string &newName);
 
+protected:
     /**
      * @brief TemplateParametersInDeclaration
      * @param tok  template < typename T, typename S >
@@ -456,6 +459,7 @@ class CPPCHECKLIB TemplateSimplifier {
         const Token * tok,
         std::vector<const Token *> & typeParametersInDeclaration);
 
+private:
     /**
      * Remove a specific "template < ..." template class/function
      */

test/testsimplifytemplate.cpp

@@ -321,6 +321,11 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(dumpTemplateArgFrom);
     }
 
+    class TemplateSimplifierTest : public TemplateSimplifier
+    {
+        friend class TestSimplifyTemplate;
+    };
+
     class TokenizerTest : public Tokenizer
     {
         friend class TestSimplifyTemplate;
@@ -5649,7 +5654,7 @@ class TestSimplifyTemplate : public TestFixture {
         tokenizer.splitTemplateRightAngleBrackets(false);
 
         std::vector<const Token *> typeParametersInDeclaration;
-        TemplateSimplifier::getTemplateParametersInDeclaration(tokenizer.tokens()->tokAt(2), typeParametersInDeclaration);
+        TemplateSimplifierTest::getTemplateParametersInDeclaration(tokenizer.tokens()->tokAt(2), typeParametersInDeclaration);
 
         if (params.size() != typeParametersInDeclaration.size())
             return false;
@@ -5949,7 +5954,7 @@ class TestSimplifyTemplate : public TestFixture {
 
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        return (TemplateSimplifier::instantiateMatch)(tokenizer.tokens(), numberOfArguments, false, patternAfter);
+        return (TemplateSimplifierTest::instantiateMatch)(tokenizer.tokens(), numberOfArguments, false, patternAfter);
     }
 
     void instantiateMatchTest() {