Tokenizer: removed TestSimplifyTypedef friend class declaration

Author: firewave

lib/tokenize.h

@@ -49,7 +49,6 @@ class CPPCHECKLIB Tokenizer {
 
     friend class SymbolDatabase;
 
-    friend class TestSimplifyTypedef;
     friend class TestTokenizer;
 
 public:
@@ -230,7 +229,9 @@ class CPPCHECKLIB Tokenizer {
      * typedef A mytype;
      * A c;
      */
+protected:
     void simplifyTypedef();
+private:
     void simplifyTypedefCpp();
     /**
      * Move typedef token to the left og the expression
@@ -398,12 +399,14 @@ class CPPCHECKLIB Tokenizer {
      */
     void validateC() const;
 
+protected:
     /**
      * assert that tokens are ok - used during debugging for example
      * to catch problems in simplifyTokenList1/2.
      */
     void validate() const;
 
+private:
     /** Detect unknown macros and throw unknownMacro */
     void reportUnknownMacros() const;
 

test/helpers.h

@@ -231,6 +231,7 @@ struct LibraryHelper
 };
 
 class SimpleTokenizer2 : public Tokenizer {
+    friend class TestSimplifyTypedef; // TODO: get rid of this
 public:
     template<size_t size>
     SimpleTokenizer2(const Settings &settings, ErrorLogger &errorlogger, const char (&code)[size], const std::string& file0)

test/testsimplifytypedef.cpp

@@ -257,6 +257,15 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(typedefInfo3);
     }
 
+    class TokenizerTest : public Tokenizer
+    {
+        friend class TestSimplifyTypedef;
+    public:
+        TokenizerTest(TokenList tokenList, ErrorLogger &errorLogger)
+            : Tokenizer(std::move(tokenList), errorLogger)
+        {}
+    };
+
     struct TokOptions
     {
         bool simplify = true;
@@ -280,7 +289,7 @@ class TestSimplifyTypedef : public TestFixture {
         TokenList tokenlist{settings1, Standards::Language::CPP};
         if (!tokenlist.createTokensFromString(data))
             return "";
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
 
@@ -315,7 +324,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         if (!TokenListHelper::createTokensFromString(tokenlist, data, "file.c"))
             return "";
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
         try {
@@ -331,7 +340,7 @@ class TestSimplifyTypedef : public TestFixture {
         TokenList tokenlist{settings1, Standards::Language::C};
         if (!TokenListHelper::createTokensFromString(tokenlist, code, "file.c"))
             return {};
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
         try {
@@ -4457,7 +4466,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         TokenList tokenlist{settings1, Standards::Language::C};
         ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
 
@@ -4499,7 +4508,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         TokenList tokenlist{settings1, Standards::Language::C};
         ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
 
@@ -4517,7 +4526,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         TokenList tokenlist{settings1, Standards::Language::C};
         ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();