moved some more debug logic out of Tokenizer

Author: firewave

cli/cmdlineparser.cpp

@@ -1624,6 +1624,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
     if (debug) {
         mSettings.debugnormal = true;
+        mSettings.debugvalueflow = true;
         if (mSettings.verbose) {
             mSettings.debugast = true;
             mSettings.debugsymdb = true;

lib/tokenize.cpp

@@ -5968,7 +5968,7 @@ void Tokenizer::printDebugOutput(std::ostream &out) const
     if (mSettings.debugast)
         list.front()->printAst(xml, list.getFiles(), out);
 
-    if (mSettings.debugnormal || mSettings.debugvalueflow)
+    if (mSettings.debugvalueflow)
         list.front()->printValueFlow(list.getFiles(), xml, out);
 
     if (xml)

test/testcmdlineparser.cpp

@@ -3193,7 +3193,7 @@ class TestCmdlineParser : public TestFixture {
         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(true, settings->debugvalueflow);
         ASSERT_EQUALS(false, settings->debugast);
         ASSERT_EQUALS(false, settings->debugsymdb);
     }
@@ -3203,7 +3203,7 @@ class TestCmdlineParser : public TestFixture {
         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->debugvalueflow);
         ASSERT_EQUALS(true, settings->debugast);
         ASSERT_EQUALS(true, settings->debugsymdb);
     }