MISRA C++ 2023 pack structure

Author: mbaluda

cpp/common/test/options

@@ -0,0 +1 @@
+semmle-extractor-options:--clang -std=c++17 -nostdinc++ -I../../../../common/test/includes/standard-library -I../../../../common/test/includes/custom-library

cpp/misra/src/misra.qll renamed to cpp/misra/src/codingstandards/cpp/misra.qll

@@ -101,7 +101,7 @@ The *effective category* is the category whose policy is applied during the eval
 The policy of a category dictates if a result can be deviated from and implements the effect described in the design section.
 The existing exclusion mechanism implemented in the predicate `isExcluded` defined in the `Exclusions.qll` library will be updated to consider the applicable policy of a guideline.
 
-Note: This changes the behavior of deviations which will no longer have an impact on Mandatory guidelines! However, this will only affect MISRA C rules because there are no MISRA C++ Guidelines with a Mandatory category.
+Note: This changes the behavior of deviations which will no longer have an impact on Mandatory MISRA guidelines!
 
 ### Specification validation
 

cpp/misra/src/misra/Customizations.qll renamed to cpp/misra/src/codingstandards/cpp/misra/Customizations.qll

@@ -774,7 +774,7 @@ c,MISRA-C-2012,RULE-22-7,Yes,Required,,,The macro EOF shall only be compared wit
 c,MISRA-C-2012,RULE-22-8,Yes,Required,,,The value of errno shall be set to zero prior to a call to an errno-setting-function,ERR30-C,Contracts3,Medium,
 c,MISRA-C-2012,RULE-22-9,Yes,Required,,,The value of errno shall be tested against zero after calling an errno-setting-function,,Contracts3,Medium,
 c,MISRA-C-2012,RULE-22-10,Yes,Required,,,The value of errno shall only be tested when the last function to be called was an errno-setting-function,,Contracts3,Medium,
-cpp,MISRA-C++-2023,RULE-0-0-1,Yes,Required,Decidable,Single Translation Unit,A function shall not contain unreachable statements,,,Medium,
+cpp,MISRA-C++-2023,RULE-0-0-1,Yes,Required,Decidable,Single Translation Unit,A function shall not contain unreachable statements,,DeadCode,Medium,
 cpp,MISRA-C++-2023,RULE-0-0-2,Yes,Advisory,Undecidable,System,Controlling expressions should not be invariant,,,Easy,
 cpp,MISRA-C++-2023,RULE-0-1-1,Yes,Advisory,Undecidable,System,A value should not be unnecessarily written to a local object,,,Medium,
 cpp,MISRA-C++-2023,RULE-0-1-2,Yes,Required,Decidable,Single Translation Unit,The value returned by a function shall be used,,,Easy,

docs/design/guideline_recategorization.md

@@ -220,6 +220,55 @@
                     "minProperties": 1
                 }
             }
+        },
+        {
+            "properties": {
+                "MISRA-C++-2023": {
+                    "description": "Rules part of the MISRA C++ 2023 standard",
+                    "type": "object",
+                    "patternProperties": {
+                        "^RULE-\\d+-\\d+-\\d+": {
+                            "description": "A coding standard rule",
+                            "type": "object",
+                            "properties": {
+                                "properties": {
+                                    "type": "object",
+                                    "properties": {
+                                        "obligation": {
+                                            "type": "string",
+                                            "enum": [
+                                                "required",
+                                                "advisory",
+                                                "mandatory"
+                                            ]
+                                        }
+                                    },
+                                    "required": [
+                                        "obligation"
+                                    ]
+                                },
+                                "queries": {
+                                    "type": "array",
+                                    "uniqueItems": true,
+                                    "items": {
+                                        "$ref": "#/$defs/query"
+                                    }
+                                },
+                                "title": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "properties",
+                                "queries",
+                                "title"
+                            ],
+                            "additionalProperties": false
+                        }
+                    },
+                    "minProperties": 1
+                }
+            }
         }
     ],
     "minProperties": 1,

rules.csv

@@ -149,7 +149,7 @@ def __init__(self, sarif_results_file_path):
                 if standard_rule_id in self.guideline_obligation_level[standard_short_name]:
                     if not self.guideline_obligation_level[standard_short_name][standard_rule_id] == obligation_level:
                         print(
-                            f"WARNING: Rule { rule['id'] } specifies a conflicting obligation level of { obligation_level }, was previously specified as { guideline_obligation_level[standard_short_name][standard_rule_id] }.")
+                            f"WARNING: Rule { rule['id'] } specifies a conflicting obligation level of { obligation_level }, was previously specified as { self.guideline_obligation_level[standard_short_name][standard_rule_id] }.")
                 else:
                     self.guideline_obligation_level[standard_short_name][standard_rule_id] = obligation_level
                 # Add deviation counts for the rule