add separate report types for misra C editions

Author: ludviggunne

cli/cmdlineparser.cpp

@@ -1305,8 +1305,12 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mSettings.reportType = ReportType::certC;
             } else if (typeStr == "cert-cpp-2016") {
                 mSettings.reportType = ReportType::certCpp;
-            } else if (typeStr == "misra-c-2012" || typeStr == "misra-c-2023") {
-                mSettings.reportType = ReportType::misraC;
+            } else if (typeStr == "misra-c-2012") {
+                mSettings.reportType = ReportType::misraC2012;
+            } else if (typeStr == "misra-c-2023") {
+                mSettings.reportType = ReportType::misraC2023;
+            } else if (typeStr == "misra-c-2025") {
+                mSettings.reportType = ReportType::misraC2025;
             } else if (typeStr == "misra-cpp-2008") {
                 mSettings.reportType = ReportType::misraCpp2008;
             } else if (typeStr == "misra-cpp-2023") {
@@ -1957,6 +1961,7 @@ void CmdLineParser::printHelp() const
         "                          * cert-cpp-2016    Cert C++ 2016\n"
         "                          * misra-c-2012     Misra C 2012\n"
         "                          * misra-c-2023     Misra C 2023\n"
+        "                          * misra-c-2025     Misra C 2025\n"
         "                          * misra-cpp-2008   Misra C++ 2008\n"
         "                          * misra-cpp-2023   Misra C++ 2023\n"
         "    --rule=<rule>        Match regular expression.\n"

lib/checkers.h

@@ -31,9 +31,11 @@ enum class ReportType : std::uint8_t {
     autosar = 1,
     certC = 2,
     certCpp = 3,
-    misraC = 4,
-    misraCpp2008 = 5,
-    misraCpp2023 = 6,
+    misraC2012 = 4,
+    misraC2023 = 5,
+    misraC2025 = 6,
+    misraCpp2008 = 7,
+    misraCpp2023 = 8,
 };
 
 namespace checkers {

lib/errorlogger.cpp

@@ -945,24 +945,40 @@ std::string getClassification(const std::string &guideline, ReportType reportTyp
         return getClassification(checkers::certCInfo, guideline);
     case ReportType::certCpp:
         return getClassification(checkers::certCppInfo, guideline);
-    case ReportType::misraC:
+    case ReportType::misraC2012:
+    case ReportType::misraC2023:
+    case ReportType::misraC2025:
     {
-        auto components = splitString(guideline, '.');
+        const bool isDirective = guideline.find("Dir ") == 0;
+
+        const std::size_t offset = isDirective ? 4 : 0;
+        auto components = splitString(guideline.substr(offset), '.');
         if (components.size() != 2)
             return "";
 
         const int a = std::stoi(components[0]);
         const int b = std::stoi(components[1]);
 
-        const std::vector<checkers::MisraInfo> &info = checkers::misraC2012Rules;
-        const auto it = std::find_if(info.cbegin(), info.cend(), [&](const checkers::MisraInfo &i) {
+        const std::vector<checkers::MisraInfo> *info = nullptr;
+        switch (reportType) {
+        case ReportType::misraC2012:
+            info = isDirective ? &checkers::misraC2012Directives : &checkers::misraC2012Rules;
+            break;
+        case ReportType::misraC2023:
+            info = isDirective ? &checkers::misraC2023Directives : &checkers::misraC2023Rules;
+            break;
+        case ReportType::misraC2025:
+            info = isDirective ? &checkers::misraC2025Directives : &checkers::misraC2025Rules;
+            break;
+        default:
+            break;
+        }
+
+        const auto it = std::find_if(info->cbegin(), info->cend(), [&](const checkers::MisraInfo &i) {
                 return i.a == a && i.b == b;
             });
 
-        if (it == info.cend())
-            return "";
-
-        return it->str;
+        return it == info->cend() ? "" : it->str;
     }
     case ReportType::misraCpp2008:
     case ReportType::misraCpp2023:
@@ -1022,9 +1038,13 @@ std::string getGuideline(const std::string &errId, ReportType reportType,
                            guideline.begin(), static_cast<int (*)(int)>(std::toupper));
         }
         break;
-    case ReportType::misraC:
+    case ReportType::misraC2012:
+    case ReportType::misraC2023:
+    case ReportType::misraC2025:
         if (errId.rfind("misra-c20", 0) == 0 || errId.rfind("premium-misra-c-20", 0) == 0)
             guideline = errId.substr(errId.rfind('-') + 1);
+        if (errId.find("dir") != std::string::npos)
+            guideline = "Dir " + guideline;
         break;
     case ReportType::misraCpp2008:
         if (errId.rfind("misra-cpp-2008-", 0) == 0)
@@ -1074,7 +1094,9 @@ std::map<std::string, std::string> createGuidelineMapping(ReportType reportType)
         idMapping1 = &checkers::idMappingCertC;
         ext1 = "-C";
         break;
-    case ReportType::misraC:
+    case ReportType::misraC2012:
+    case ReportType::misraC2023:
+    case ReportType::misraC2025:
         idMapping1 = &checkers::idMappingMisraC;
         break;
     case ReportType::misraCpp2008:

man/cppcheck.1.xml

@@ -594,6 +594,7 @@ There are false positives with this option. Each result must be carefully invest
               <glossentry><glossterm>cert-cpp-2016</glossterm><glossdef><para>Cert C++ 2016</para></glossdef></glossentry>
               <glossentry><glossterm>misra-c-2012</glossterm><glossdef><para>Misra C 2012</para></glossdef></glossentry>
               <glossentry><glossterm>misra-c-2023</glossterm><glossdef><para>Misra C 2023</para></glossdef></glossentry>
+              <glossentry><glossterm>misra-c-2025</glossterm><glossdef><para>Misra C 2025</para></glossdef></glossentry>
               <glossentry><glossterm>misra-cpp-2008</glossterm><glossdef><para>Misra C++ 2008</para></glossdef></glossentry>
               <glossentry><glossterm>misra-cpp-2023</glossterm><glossdef><para>Misra C++ 2023</para></glossdef></glossentry>
             </glosslist>