let --premium=misra-c-2012 also set --addon=misra. changed addons container to a set

danmar · danmar · commit e8606a5e5a45 · 2022-10-31T15:04:16.000+01:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -230,7 +230,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
             }
 
             else if (std::strncmp(argv[i], "--addon=", 8) == 0)
-                mSettings->addons.emplace_back(argv[i]+8);
+                mSettings->addons.emplace(argv[i]+8);
 
             else if (std::strncmp(argv[i],"--addon-python=", 15) == 0)
                 mSettings->addonPython.assign(argv[i]+15);
@@ -621,7 +621,10 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
             else if (std::strncmp(argv[i], "--premium=", 10) == 0 && isCppcheckPremium()) {
                 if (!mSettings->premiumArgs.empty())
                     mSettings->premiumArgs += " ";
-                mSettings->premiumArgs += "--" + std::string(argv[i] + 10);
+                const std::string p(argv[i] + 10);
+                mSettings->premiumArgs += "--" + p;
+                if (p == "misra-c-2012")
+                    mSettings->addons.emplace("misra");
             }
 
             // --project
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -981,7 +981,7 @@ Settings MainWindow::getCppcheckSettings()
                 json += ", \"args\":[\"" + arg + "\"]";
             }
             json += " }";
-            result.addons.push_back(json.toStdString());
+            result.addons.emplace(json.toStdString());
         }
 
         if (isCppcheckPremium()) {
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -1187,8 +1187,10 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings *setti
             guiProject.analyzeAllVsConfigs = node->GetText();
         else if (strcmp(node->Name(), CppcheckXml::Parser) == 0)
             temp.clang = true;
-        else if (strcmp(node->Name(), CppcheckXml::AddonsElementName) == 0)
-            temp.addons = readXmlStringList(node, emptyString, CppcheckXml::AddonElementName, nullptr);
+        else if (strcmp(node->Name(), CppcheckXml::AddonsElementName) == 0) {
+            const auto& addons = readXmlStringList(node, emptyString, CppcheckXml::AddonElementName, nullptr);
+            temp.addons.insert(addons.cbegin(), addons.cend());
+        }
         else if (strcmp(node->Name(), CppcheckXml::TagsElementName) == 0)
             node->Attribute(CppcheckXml::TagElementName); // FIXME: Write some warning
         else if (strcmp(node->Name(), CppcheckXml::ToolsElementName) == 0) {
diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -98,9 +98,9 @@ void Settings::loadCppcheckCfg()
         for (const picojson::value &v : obj["addons"].get<picojson::array>()) {
             const std::string &s = v.get<std::string>();
             if (!Path::isAbsolute(s))
-                addons.push_back(Path::getPathFromFilename(fileName) + s);
+                addons.emplace(Path::getPathFromFilename(fileName) + s);
             else
-                addons.push_back(s);
+                addons.emplace(s);
         }
     }
     if (obj.count("suppressions") && obj["suppressions"].is<picojson::array>()) {
diff --git a/lib/settings.h b/lib/settings.h
@@ -37,6 +37,7 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <unordered_set>
 
 namespace ValueFlow {
     class Value;
@@ -99,7 +100,7 @@ class CPPCHECKLIB Settings : public cppcheck::Platform {
     void loadCppcheckCfg();
 
     /** @brief addons, either filename of python/json file or json data */
-    std::list<std::string> addons;
+    std::unordered_set<std::string> addons;
 
     /** @brief Path to the python interpreter to be used to run addons. */
     std::string addonPython;

Original file line number	Diff line number	Diff line change
`@@ -981,7 +981,7 @@ Settings MainWindow::getCppcheckSettings()`
`981`	`981`	`json += ", \"args\":[\"" + arg + "\"]";`
`982`	`982`	`}`
`983`	`983`	`json += " }";`
`984`		`- result.addons.push_back(json.toStdString());`
	`984`	`+ result.addons.emplace(json.toStdString());`
`985`	`985`	`}`
`986`	`986`
`987`	`987`	`if (isCppcheckPremium()) {`
Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,9 @@ void Settings::loadCppcheckCfg()`
`98`	`98`	`for (const picojson::value &v : obj["addons"].get<picojson::array>()) {`
`99`	`99`	`const std::string &s = v.get<std::string>();`
`100`	`100`	`if (!Path::isAbsolute(s))`
`101`		`- addons.push_back(Path::getPathFromFilename(fileName) + s);`
	`101`	`+ addons.emplace(Path::getPathFromFilename(fileName) + s);`
`102`	`102`	`else`
`103`		`- addons.push_back(s);`
	`103`	`+ addons.emplace(s);`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`if (obj.count("suppressions") && obj["suppressions"].is<picojson::array>()) {`