dump: output language to dumpfile

danmar · danmar · commit ad8c1e26f0be · 2022-11-20T12:30:09.000+01:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -527,9 +527,9 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                 }
 
                 if (str == "c")
-                    mSettings->enforcedLang = Settings::C;
+                    mSettings->enforcedLang = Settings::Language::C;
                 else if (str == "c++")
-                    mSettings->enforcedLang = Settings::CPP;
+                    mSettings->enforcedLang = Settings::Language::CPP;
                 else {
                     printError("unknown language '" + str + "' enforced.");
                     return false;
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -260,8 +260,24 @@ static void createDumpFile(const Settings& settings,
         std::ofstream fout(getCtuInfoFileName(dumpFile));
     }
 
+    std::string language;
+    switch (settings.enforcedLang) {
+    case Settings::Language::C:
+        language = " language=\"c\"";
+        break;
+    case Settings::Language::CPP:
+        language = " language=\"cpp\"";
+        break;
+    case Settings::Language::None:
+        if (Path::isCPP(filename))
+            language = " language=\"cpp\"";
+        else if (Path::isC(filename))
+            language = " language=\"c\"";
+        break;
+    }
+
     fdump << "<?xml version=\"1.0\"?>" << std::endl;
-    fdump << "<dumps>" << std::endl;
+    fdump << "<dumps" << language << ">" << std::endl;
     fdump << "  <platform"
           << " name=\"" << settings.platformString() << '\"'
           << " char_bit=\"" << settings.char_bit << '\"'
diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -49,7 +49,7 @@ Settings::Settings()
     debugtemplate(false),
     debugwarnings(false),
     dump(false),
-    enforcedLang(None),
+    enforcedLang(Language::None),
     exceptionHandling(false),
     exitCode(0),
     force(false),
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -121,8 +121,8 @@ void TokenList::determineCppC()
         mIsC = Path::isC(getSourceFilePath());
         mIsCpp = Path::isCPP(getSourceFilePath());
     } else {
-        mIsC = mSettings->enforcedLang == Settings::C || (mSettings->enforcedLang == Settings::None && Path::isC(getSourceFilePath()));
-        mIsCpp = mSettings->enforcedLang == Settings::CPP || (mSettings->enforcedLang == Settings::None && Path::isCPP(getSourceFilePath()));
+        mIsC = mSettings->enforcedLang == Settings::Language::C || (mSettings->enforcedLang == Settings::Language::None && Path::isC(getSourceFilePath()));
+        mIsCpp = mSettings->enforcedLang == Settings::Language::CPP || (mSettings->enforcedLang == Settings::Language::None && Path::isCPP(getSourceFilePath()));
     }
 
     if (mIsCpp) {
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -418,17 +418,17 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         {
             const char * const argv[] = {"cppcheck", "file.cpp"};
-            settings.enforcedLang = Settings::None;
+            settings.enforcedLang = Settings::Language::None;
             ASSERT(defParser.parseFromArgs(2, argv));
-            ASSERT_EQUALS(Settings::None, settings.enforcedLang);
+            ASSERT_EQUALS(Settings::Language::None, settings.enforcedLang);
             ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
         }
         CLEAR_REDIRECT_OUTPUT;
         {
             const char * const argv[] = {"cppcheck", "-x", "c++", "file.cpp"};
-            settings.enforcedLang = Settings::None;
+            settings.enforcedLang = Settings::Language::None;
             ASSERT(defParser.parseFromArgs(4, argv));
-            ASSERT_EQUALS(Settings::CPP, settings.enforcedLang);
+            ASSERT_EQUALS(Settings::Language::CPP, settings.enforcedLang);
             ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
         }
         CLEAR_REDIRECT_OUTPUT;
@@ -446,17 +446,17 @@ class TestCmdlineParser : public TestFixture {
         CLEAR_REDIRECT_OUTPUT;
         {
             const char * const argv[] = {"cppcheck", "--language=c++", "file.cpp"};
-            settings.enforcedLang = Settings::None;
+            settings.enforcedLang = Settings::Language::None;
             ASSERT(defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(Settings::CPP, settings.enforcedLang);
+            ASSERT_EQUALS(Settings::Language::CPP, settings.enforcedLang);
             ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
         }
         CLEAR_REDIRECT_OUTPUT;
         {
             const char * const argv[] = {"cppcheck", "--language=c", "file.cpp"};
-            settings.enforcedLang = Settings::None;
+            settings.enforcedLang = Settings::Language::None;
             ASSERT(defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(Settings::C, settings.enforcedLang);
+            ASSERT_EQUALS(Settings::Language::C, settings.enforcedLang);
             ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
         }
         CLEAR_REDIRECT_OUTPUT;

Original file line number	Diff line number	Diff line change
`@@ -418,17 +418,17 @@ class TestCmdlineParser : public TestFixture {`
`418`	`418`	`REDIRECT;`
`419`	`419`	`{`
`420`	`420`	`const char * const argv[] = {"cppcheck", "file.cpp"};`
`421`		`- settings.enforcedLang = Settings::None;`
	`421`	`+ settings.enforcedLang = Settings::Language::None;`
`422`	`422`	`ASSERT(defParser.parseFromArgs(2, argv));`
`423`		`- ASSERT_EQUALS(Settings::None, settings.enforcedLang);`
	`423`	`+ ASSERT_EQUALS(Settings::Language::None, settings.enforcedLang);`
`424`	`424`	`ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);`
`425`	`425`	`}`
`426`	`426`	`CLEAR_REDIRECT_OUTPUT;`
`427`	`427`	`{`
`428`	`428`	`const char * const argv[] = {"cppcheck", "-x", "c++", "file.cpp"};`
`429`		`- settings.enforcedLang = Settings::None;`
	`429`	`+ settings.enforcedLang = Settings::Language::None;`
`430`	`430`	`ASSERT(defParser.parseFromArgs(4, argv));`
`431`		`- ASSERT_EQUALS(Settings::CPP, settings.enforcedLang);`
	`431`	`+ ASSERT_EQUALS(Settings::Language::CPP, settings.enforcedLang);`
`432`	`432`	`ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);`
`433`	`433`	`}`
`434`	`434`	`CLEAR_REDIRECT_OUTPUT;`
`@@ -446,17 +446,17 @@ class TestCmdlineParser : public TestFixture {`
`446`	`446`	`CLEAR_REDIRECT_OUTPUT;`
`447`	`447`	`{`
`448`	`448`	`const char * const argv[] = {"cppcheck", "--language=c++", "file.cpp"};`
`449`		`- settings.enforcedLang = Settings::None;`
	`449`	`+ settings.enforcedLang = Settings::Language::None;`
`450`	`450`	`ASSERT(defParser.parseFromArgs(3, argv));`
`451`		`- ASSERT_EQUALS(Settings::CPP, settings.enforcedLang);`
	`451`	`+ ASSERT_EQUALS(Settings::Language::CPP, settings.enforcedLang);`
`452`	`452`	`ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);`
`453`	`453`	`}`
`454`	`454`	`CLEAR_REDIRECT_OUTPUT;`
`455`	`455`	`{`
`456`	`456`	`const char * const argv[] = {"cppcheck", "--language=c", "file.cpp"};`
`457`		`- settings.enforcedLang = Settings::None;`
	`457`	`+ settings.enforcedLang = Settings::Language::None;`
`458`	`458`	`ASSERT(defParser.parseFromArgs(3, argv));`
`459`		`- ASSERT_EQUALS(Settings::C, settings.enforcedLang);`
	`459`	`+ ASSERT_EQUALS(Settings::Language::C, settings.enforcedLang);`
`460`	`460`	`ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);`
`461`	`461`	`}`
`462`	`462`	`CLEAR_REDIRECT_OUTPUT;`