Fix #13981 (cli: import gui project that uses misra c 2012 with cppcheck premium) (danmar#7677)

Author: danmar

cli/cmdlineparser.cpp

@@ -1126,7 +1126,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
             mSettings.checkAllConfigurations = false;     // Can be overridden with --max-configs or --force
             std::string projectFile = argv[i]+10;
-            projectType = project.import(projectFile, &mSettings, &mSuppressions);
+            projectType = project.import(projectFile, &mSettings, &mSuppressions, isCppcheckPremium());
             if (projectType == ImportProject::Type::CPPCHECK_GUI) {
                 for (const std::string &lib : project.guiProject.libraries)
                     mSettings.libraries.emplace_back(lib);

lib/importproject.cpp

@@ -165,7 +165,7 @@ void ImportProject::fsSetIncludePaths(FileSettings& fs, const std::string &basep
     }
 }
 
-ImportProject::Type ImportProject::import(const std::string &filename, Settings *settings, Suppressions *supprs)
+ImportProject::Type ImportProject::import(const std::string &filename, Settings *settings, Suppressions *supprs, bool premium)
 {
     std::ifstream fin(filename);
     if (!fin.is_open())
@@ -201,7 +201,7 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
             return ImportProject::Type::BORLAND;
         }
     } else if (settings && supprs && endsWith(filename, ".cppcheck")) {
-        if (importCppcheckGuiProject(fin, *settings, *supprs)) {
+        if (importCppcheckGuiProject(fin, *settings, *supprs, premium)) {
             setRelativePaths(filename);
             return ImportProject::Type::CPPCHECK_GUI;
         }
@@ -1287,7 +1287,7 @@ static std::string istream_to_string(std::istream &istr)
     return std::string(std::istreambuf_iterator<char>(istr), eos);
 }
 
-bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &settings, Suppressions &supprs)
+bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &settings, Suppressions &supprs, bool premium)
 {
     tinyxml2::XMLDocument doc;
     const std::string xmldata = istream_to_string(istr);
@@ -1371,6 +1371,13 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
         else if (strcmp(name, CppcheckXml::AddonsElementName) == 0) {
             const auto& addons = readXmlStringList(node, "", CppcheckXml::AddonElementName, nullptr);
             temp.addons.insert(addons.cbegin(), addons.cend());
+            if (premium) {
+                auto it = temp.addons.find("misra");
+                if (it != temp.addons.end()) {
+                    temp.addons.erase(it);
+                    temp.premiumArgs += " --misra-c-2012";
+                }
+            }
         }
         else if (strcmp(name, CppcheckXml::TagsElementName) == 0)
             node->Attribute(CppcheckXml::TagElementName); // FIXME: Write some warning

lib/importproject.h

@@ -98,10 +98,10 @@ class CPPCHECKLIB WARN_UNUSED ImportProject {
     void ignorePaths(const std::vector<std::string> &ipaths, bool debug = false);
     void ignoreOtherConfigs(const std::string &cfg);
 
-    Type import(const std::string &filename, Settings *settings=nullptr, Suppressions *supprs=nullptr);
+    Type import(const std::string &filename, Settings *settings=nullptr, Suppressions *supprs=nullptr, bool premium=false);
 protected:
     bool importCompileCommands(std::istream &istr);
-    bool importCppcheckGuiProject(std::istream &istr, Settings &settings, Suppressions &supprs);
+    bool importCppcheckGuiProject(std::istream &istr, Settings &settings, Suppressions &supprs, bool premium);
 
 private:
     struct SharedItemsProject {

test/testimportproject.cpp

@@ -70,6 +70,7 @@ class TestImportProject : public TestFixture {
         TEST_CASE(importCompileCommandsDirectoryMissing); // 'directory' field missing
         TEST_CASE(importCompileCommandsDirectoryInvalid); // 'directory' field not a string
         TEST_CASE(importCppcheckGuiProject);
+        TEST_CASE(importCppcheckGuiProjectPremiumMisra);
         TEST_CASE(ignorePaths);
         TEST_CASE(testVcxprojUnicode);
     }
@@ -431,14 +432,34 @@ class TestImportProject : public TestFixture {
         Settings s;
         Suppressions supprs;
         TestImporter project;
-        ASSERT_EQUALS(true, project.importCppcheckGuiProject(istr, s, supprs));
+        ASSERT_EQUALS(true, project.importCppcheckGuiProject(istr, s, supprs, false));
         ASSERT_EQUALS(1, project.guiProject.pathNames.size());
         ASSERT_EQUALS("cli/", project.guiProject.pathNames[0]);
         ASSERT_EQUALS(1, s.includePaths.size());
         ASSERT_EQUALS("lib/", s.includePaths.front());
         ASSERT_EQUALS(true, s.inlineSuppressions);
     }
 
+    void importCppcheckGuiProjectPremiumMisra() const {
+        REDIRECT;
+        constexpr char xml[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                               "<project>\n"
+                               "    <paths>\n"
+                               "        <dir name=\"m1.c\"/>\n"
+                               "    </paths>\n"
+                               "    <addons>\n"
+                               "        <addon>misra</addon>\n"  // <- Premium: add premium argument misra-c-2012
+                               "    </addons>\n"
+                               "</project>";
+        std::istringstream istr(xml);
+        Settings s;
+        Suppressions supprs;
+        TestImporter project;
+        ASSERT_EQUALS(true, project.importCppcheckGuiProject(istr, s, supprs, true));
+        ASSERT_EQUALS("--misra-c-2012", s.premiumArgs);
+        ASSERT(s.addons.empty());
+    }
+
     void ignorePaths() const {
         FileSettings fs1{"foo/bar", Standards::Language::CPP, 0};
         FileSettings fs2{"qwe/rty", Standards::Language::CPP, 0};