moved some --debug --verbose logic out of Tokenizer

Author: firewave

cli/cmdlineparser.cpp

@@ -446,6 +446,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
     bool def = false;
     bool maxconfigs = false;
+    bool debug = false;
 
     ImportProject::Type projectType = ImportProject::Type::NONE;
     ImportProject project;
@@ -651,6 +652,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mSettings.cppHeaderProbe = true;
         }
 
+        else if (std::strcmp(argv[i], "--debug") == 0)
+            debug = true;
+
         else if (std::strcmp(argv[i], "--debug-ast") == 0)
             mSettings.debugast = true;
 
@@ -663,8 +667,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mSettings.debugignore = true;
 
         // Show --debug output after the first simplifications
-        else if (std::strcmp(argv[i], "--debug") == 0 ||
-                 std::strcmp(argv[i], "--debug-normal") == 0)
+        else if (std::strcmp(argv[i], "--debug-normal") == 0)
             mSettings.debugnormal = true;
 
         // Show debug warnings for lookup for configuration files
@@ -1610,10 +1613,17 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
     if (mSettings.force)
         mSettings.maxConfigs = INT_MAX;
-
     else if ((def || mSettings.preprocessOnly) && !maxconfigs)
         mSettings.maxConfigs = 1U;
 
+    if (debug) {
+        mSettings.debugnormal = true;
+        if (mSettings.verbose) {
+            mSettings.debugast = true;
+            mSettings.debugsymdb = true;
+        }
+    }
+
     if (mSettings.jobs > 1 && mSettings.buildDir.empty()) {
         // TODO: bail out instead?
         if (mSettings.checks.isEnabled(Checks::unusedFunction))

lib/tokenize.cpp

@@ -5938,7 +5938,6 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 }
 //---------------------------------------------------------------------------
 
-// TODO: do not depend on --verbose
 void Tokenizer::printDebugOutput(std::ostream &out) const
 {
     if (!list.front())
@@ -5959,11 +5958,12 @@ void Tokenizer::printDebugOutput(std::ostream &out) const
     if (mSymbolDatabase) {
         if (xml)
             mSymbolDatabase->printXml(out);
-        else if (mSettings.debugsymdb || (mSettings.debugnormal && mSettings.verbose))
+        else if (mSettings.debugsymdb)
             mSymbolDatabase->printOut("Symbol database");
     }
 
-    if (mSettings.debugast || (mSettings.debugnormal && mSettings.verbose))
+    // TODO: do not depend on --verbose
+    if (mSettings.debugast)
         list.front()->printAst(mSettings.verbose, xml, list.getFiles(), out);
 
     if (mSettings.debugnormal || mSettings.debugvalueflow)

test/testcmdlineparser.cpp

@@ -462,6 +462,9 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(debugSymdb);
         TEST_CASE(debugAst);
         TEST_CASE(debugValueflow);
+        TEST_CASE(debugNormal);
+        TEST_CASE(debug);
+        TEST_CASE(debugVerbose);
 
         TEST_CASE(ignorepaths1);
         TEST_CASE(ignorepaths2);
@@ -3173,6 +3176,33 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(true, settings->debugvalueflow);
     }
 
+    void debugNormal() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-normal", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugnormal);
+    }
+
+    void debug() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugnormal);
+        ASSERT_EQUALS(false, settings->debugvalueflow);
+        ASSERT_EQUALS(false, settings->debugast);
+        ASSERT_EQUALS(false, settings->debugsymdb);
+    }
+
+    void debugVerbose() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug", "--verbose", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugnormal);
+        ASSERT_EQUALS(false, settings->debugvalueflow);
+        ASSERT_EQUALS(true, settings->debugast);
+        ASSERT_EQUALS(true, settings->debugsymdb);
+    }
+
     void ignorepaths1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc", "file.cpp"};