TokenList: reduced dependency on settings

Author: firewave

lib/tokenize.cpp

@@ -3361,10 +3361,10 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
     if (mTimerResults) {
         Timer t("Tokenizer::simplifyTokens1::createAst", mSettings->showtime, mTimerResults);
         list.createAst();
-        list.validateAst();
+        list.validateAst(mSettings->debugnormal);
     } else {
         list.createAst();
-        list.validateAst();
+        list.validateAst(mSettings->debugnormal);
     }
 
     if (mTimerResults) {

lib/tokenlist.cpp

@@ -1722,10 +1722,10 @@ namespace {
     };
 }
 
-void TokenList::validateAst() const
+void TokenList::validateAst(bool print) const
 {
     OnException oe{[&] {
-            if (mSettings && mSettings->debugnormal)
+            if (print)
                 mTokensFrontBack.front->printOut();
         }};
     // Check for some known issues in AST to avoid crash/hang later on

lib/tokenlist.h

@@ -171,7 +171,7 @@ class CPPCHECKLIB TokenList {
      * Check abstract syntax tree.
      * Throws InternalError on failure
      */
-    void validateAst() const;
+    void validateAst(bool print) const;
 
     /**
      * Verify that the given token is an element of the tokenlist.

test/testtokenize.cpp

@@ -5980,7 +5980,7 @@ class TestTokenizer : public TestFixture {
         tokenList.prepareTernaryOpForAST();
         tokenList.list.createAst();
 
-        tokenList.list.validateAst();
+        tokenList.list.validateAst(false);
 
         // Basic AST validation
         for (const Token *tok = tokenList.list.front(); tok; tok = tok->next()) {