Tokenizer: removed TestTokenizer friend class declaration

Author: firewave

lib/tokenize.h

@@ -49,8 +49,6 @@ class CPPCHECKLIB Tokenizer {
 
     friend class SymbolDatabase;
 
-    friend class TestTokenizer;
-
 public:
     Tokenizer(TokenList tokenList, ErrorLogger &errorLogger);
     ~Tokenizer();
@@ -191,6 +189,7 @@ class CPPCHECKLIB Tokenizer {
      */
     void simplifyVariableMultipleAssign();
 
+protected:
     /**
      * Simplify the 'C Alternative Tokens'
      * Examples:
@@ -200,6 +199,7 @@ class CPPCHECKLIB Tokenizer {
      */
     bool simplifyCAlternativeTokens();
 
+private:
     /** Add braces to an if-block, for-block, etc.
      * @return true if no syntax errors
      */
@@ -307,10 +307,12 @@ class CPPCHECKLIB Tokenizer {
 
     void fillTypeSizes();
 
+protected:
     void combineOperators();
 
     void combineStringAndCharLiterals();
 
+private:
     void concatenateNegativeNumberAndAnyPositive();
 
     void simplifyExternC();
@@ -327,6 +329,7 @@ class CPPCHECKLIB Tokenizer {
 
     void findComplicatedSyntaxErrorsInTemplates();
 
+protected:
     /**
      * Modify strings in the token list by replacing hex and oct
      * values. E.g. "\x61" -> "a" and "\000" -> "\0"
@@ -360,12 +363,12 @@ class CPPCHECKLIB Tokenizer {
      */
     void createLinks();
 
-private:
     /**
      * Setup links between < and >.
      */
     void createLinks2();
 
+private:
     /**
      * Set isCast() for C++ casts
      */
@@ -439,9 +442,11 @@ class CPPCHECKLIB Tokenizer {
      */
     void simplifyCppcheckAttribute();
 
+protected:
     /** Simplify c++20 spaceship operator */
     void simplifySpaceshipOperator();
 
+private:
     /**
      * Remove keywords "volatile", "inline", "register", and "restrict"
      */
@@ -528,11 +533,13 @@ class CPPCHECKLIB Tokenizer {
      */
     void simplifyCoroutines();
 
+protected:
     /**
      * Prepare ternary operators with parentheses so that the AST can be created
      * */
     void prepareTernaryOpForAST();
 
+private:
     /**
      * report error message
      */

test/testtokenize.cpp

@@ -508,6 +508,15 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyRedundantParentheses);
     }
 
+    class TokenizerTest : public Tokenizer
+    {
+        friend class TestTokenizer;
+    public:
+        TokenizerTest(TokenList tokenList, ErrorLogger &errorLogger)
+            : Tokenizer(std::move(tokenList), errorLogger)
+        {}
+    };
+
     struct TokenizeOptions
     {
         bool expand = true;
@@ -3782,7 +3791,7 @@ class TestTokenizer : public TestFixture {
 
     void simplifyString() {
         TokenList tokenlist{settings0, Standards::Language::CPP};
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         ASSERT_EQUALS("\"abc\"", tokenizer.simplifyString("\"abc\""));
         ASSERT_EQUALS("\"\n\"", tokenizer.simplifyString("\"\\xa\""));
         ASSERT_EQUALS("\"3\"", tokenizer.simplifyString("\"\\x33\""));
@@ -6349,7 +6358,7 @@ class TestTokenizer : public TestFixture {
         if (!tokenlist.createTokensFromString(data))
             return "ERROR";
 
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.combineStringAndCharLiterals();
         tokenizer.combineOperators();
         tokenizer.simplifySpaceshipOperator();