WIP 16-7

Author: s-samadi

c/misra/src/rules/RULE-16-7/SwitchExpressionBoolCondition.ql

@@ -1,18 +1,20 @@
 /**
  * @id c/misra/switch-expression-bool-condition
  * @name RULE-16-7: A switch-expression shall not have essentially Boolean type
- * @description 
+ * @description An `if-else` construct is more appropriate for boolean controlled expression.
  * @kind problem
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-16-7
+ *       readability
+ *       maintainability
  *       external/misra/obligation/required
  */
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.SwitchStatement
 
-from
-where
-  not isExcluded(x, Statements2Package::switchExpressionBoolConditionQuery()) and
-select
+from BooleanSwitchStmt boolSwitch
+where not isExcluded(boolSwitch, Statements2Package::switchExpressionBoolConditionQuery())
+select boolSwitch, "Boolean expression used in switch."

c/misra/test/rules/RULE-16-7/SwitchExpressionBoolCondition.expected

@@ -1 +0,0 @@
-No expected results have yet been specified

c/misra/test/rules/RULE-16-7/test.c

@@ -0,0 +1,36 @@
+void f1(int p1) {
+
+  switch (p1) // COMPLIANT
+  {
+  case 1:;
+    break;
+  case 2:;
+    break;
+  default:
+    break;
+  }
+}
+
+void f2(int p1) {
+  switch (p1 == 1) // NON_COMPLIANT
+  {
+  case 0:
+    break;
+  case 1:
+    break;
+  default:
+    break;
+  }
+}
+
+void f3(char *p1) {
+  switch (p1 == "CODEQL") // NON_COMPLIANT
+  {
+  case 0:
+    break;
+  case 1:
+    break;
+  default:
+    break;
+  }
+}

rule_packages/c/Statements2.json

@@ -27,9 +27,9 @@
       },
       "queries": [
         {
-          "description": "Any label referenced by a goto statement shall be declared in the same block, or in any block enclosing the goto statement",
+          "description": "Any label referenced by a goto statement shall be declared in the same block, or in any block enclosing the goto statement.",
           "kind": "problem",
-          "name": "The goto statement and any of its label shall be declared or enclosed in the same block. ",
+          "name": "The goto statement and any of its label shall be declared or enclosed in the same block",
           "precision": "high",
           "severity": "recommendation",
           "short_name": "GotoLabelBlockCondition",
@@ -87,13 +87,16 @@
       },
       "queries": [
         {
-          "description": "",
+          "description": "An `if-else` construct is more appropriate for boolean controlled expression.",
           "kind": "problem",
           "name": "A switch-expression shall not have essentially Boolean type",
           "precision": "very-high",
           "severity": "error",
           "short_name": "SwitchExpressionBoolCondition",
-          "tags": []
+          "tags": [
+            "readability",
+            "maintainability"
+          ]
         }
       ],
       "title": "A switch-expression shall not have essentially Boolean type"