always print verbose AST with --debug-ast [skip ci]

Author: firewave

lib/token.cpp

@@ -1655,7 +1655,7 @@ static void astStringXml(const Token *tok, nonneg int indent, std::ostream &out)
     }
 }
 
-void Token::printAst(bool verbose, bool xml, const std::vector<std::string> &fileNames, std::ostream &out) const
+void Token::printAst(bool xml, const std::vector<std::string> &fileNames, std::ostream &out) const
 {
     if (!xml)
         out << "\n\n##AST" << std::endl;
@@ -1672,10 +1672,8 @@ void Token::printAst(bool verbose, bool xml, const std::vector<std::string> &fil
                     << "\" column=\"" << tok->column() << "\">" << std::endl;
                 astStringXml(tok, 2U, out);
                 out << "</ast>" << std::endl;
-            } else if (verbose)
+            } else
                 out << "[" << fileNames[tok->fileIndex()] << ":" << tok->linenr() << "]" << std::endl << tok->astStringVerbose() << std::endl;
-            else
-                out << tok->astString(" ") << std::endl;
             if (tok->str() == "(")
                 tok = tok->link();
         }

lib/token.h

@@ -1559,7 +1559,7 @@ class CPPCHECKLIB Token {
 
     std::string expressionString() const;
 
-    void printAst(bool verbose, bool xml, const std::vector<std::string> &fileNames, std::ostream &out) const;
+    void printAst(bool xml, const std::vector<std::string> &fileNames, std::ostream &out) const;
 
     void printValueFlow(const std::vector<std::string>& files, bool xml, std::ostream &out) const;
 

lib/tokenize.cpp

@@ -5962,9 +5962,8 @@ void Tokenizer::printDebugOutput(std::ostream &out) const
             mSymbolDatabase->printOut("Symbol database");
     }
 
-    // TODO: do not depend on --verbose
     if (mSettings.debugast)
-        list.front()->printAst(mSettings.verbose, xml, list.getFiles(), out);
+        list.front()->printAst(xml, list.getFiles(), out);
 
     if (mSettings.debugnormal || mSettings.debugvalueflow)
         list.front()->printValueFlow(list.getFiles(), xml, out);

test/cli/other_test.py

@@ -3467,7 +3467,6 @@ def test_debug_ast(tmp_path):
     __test_debug_ast(tmp_path, False)
 
 
-@pytest.mark.xfail(strict=True)  # TODO: remove dependency on --verbose
 def test_debug_ast_verbose_nodiff(tmp_path):
     # make sure --verbose does not change the output
     assert __test_debug_ast(tmp_path, False) == __test_debug_ast(tmp_path, True)