updated rule metadata based on PR feedback

Author: s-samadi

c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql

@@ -1,10 +1,10 @@
 /**
  * @id c/misra/nest-switch-label-in-switch-statement
- * @name RULE-16-2: A switch label shall only be used when the most closely-enclosing compound statement is the body of
- * @description Nested switch labels cause undefined behaviour.
+ * @name RULE-16-2: Nested switch labels shall not be used.
+ * @description Nested switch labels can lead to unstructured code.
  * @kind problem
  * @precision very-high
- * @problem.severity error
+ * @problem.severity recommendation
  * @tags external/misra/id/rule-16-2
  *       maintainability
  *       readability

cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll

@@ -138,6 +138,7 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isPreprocessor6QueryMetadata(query, queryId, ruleId, category) or
   isSideEffects1QueryMetadata(query, queryId, ruleId, category) or
   isSideEffects2QueryMetadata(query, queryId, ruleId, category) or
+  isStatements1QueryMetadata(query, queryId, ruleId, category) or
   isStrings1QueryMetadata(query, queryId, ruleId, category) or
   isStrings2QueryMetadata(query, queryId, ruleId, category) or
   isStrings3QueryMetadata(query, queryId, ruleId, category) or

cpp/common/src/codingstandards/cpp/exclusions/c/Statements1.qll

@@ -9,38 +9,42 @@ newtype Statements1Query =
   TEverySwitchShallHaveDefaultLabelQuery() or
   TDefaultNotFirstOrLastOfSwitchQuery()
 
-predicate isStatements1QueryMetadata(Query query, string queryId, string ruleId) {
+predicate isStatements1QueryMetadata(Query query, string queryId, string ruleId, string category) {
   query =
     // `Query` instance for the `nestSwitchLabelInSwitchStatement` query
     Statements1Package::nestSwitchLabelInSwitchStatementQuery() and
   queryId =
     // `@id` for the `nestSwitchLabelInSwitchStatement` query
     "c/misra/nest-switch-label-in-switch-statement" and
-  ruleId = "RULE-16-2"
+  ruleId = "RULE-16-2" and
+  category = "required"
   or
   query =
     // `Query` instance for the `breakShallTerminateSwitchClause` query
     Statements1Package::breakShallTerminateSwitchClauseQuery() and
   queryId =
     // `@id` for the `breakShallTerminateSwitchClause` query
     "c/misra/break-shall-terminate-switch-clause" and
-  ruleId = "RULE-16-3"
+  ruleId = "RULE-16-3" and
+  category = "required"
   or
   query =
     // `Query` instance for the `everySwitchShallHaveDefaultLabel` query
     Statements1Package::everySwitchShallHaveDefaultLabelQuery() and
   queryId =
     // `@id` for the `everySwitchShallHaveDefaultLabel` query
     "c/misra/every-switch-shall-have-default-label" and
-  ruleId = "RULE-16-4"
+  ruleId = "RULE-16-4" and
+  category = "required"
   or
   query =
     // `Query` instance for the `defaultNotFirstOrLastOfSwitch` query
     Statements1Package::defaultNotFirstOrLastOfSwitchQuery() and
   queryId =
     // `@id` for the `defaultNotFirstOrLastOfSwitch` query
     "c/misra/default-not-first-or-last-of-switch" and
-  ruleId = "RULE-16-5"
+  ruleId = "RULE-16-5" and
+  category = "required"
 }
 
 module Statements1Package {

cpp/common/src/codingstandards/cpp/rules/nestedlabelinswitch/NestedLabelInSwitch.qll

@@ -11,11 +11,11 @@ abstract class NestedLabelInSwitchSharedQuery extends Query { }
 Query getQuery() { result instanceof NestedLabelInSwitchSharedQuery }
 
 query predicate problems(
-  SwitchCase case, string message, Location caseLocation, string caseLabel, SwitchStmt switch,
+  SwitchCase nestedCase, string message, SwitchCase case, string caseLabel, SwitchStmt switch,
   string switchLabel
 ) {
   not isExcluded(nestedCase, getQuery()) and
-  switch.getASwitchCase() = nestedCase and
+  switch.getASwitchCase() = case and
   not nestedCase.getParentStmt() = switch.getChildStmt() and
   nestedCase = case and
   message =

rule_packages/c/Statements1.json

@@ -6,11 +6,11 @@
       },
       "queries": [
         {
-          "description": "Nested switch labels cause undefined behaviour.",
+          "description": "Nested switch labels can lead to unstructured code.",
           "kind": "problem",
-          "name": "A switch label shall only be used when the most closely-enclosing compound statement is the body of",
+          "name": "Nested switch labels shall not be used.",
           "precision": "very-high",
-          "severity": "error",
+          "severity": "recommendation",
           "short_name": "NestSwitchLabelInSwitchStatement",
           "shared_implementation_short_name": "NestedLabelInSwitch",
           "tags": [