added RULE-16-1 and moved M6-4-3 to shared folder

Author: s-samadi

c/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.expected

@@ -0,0 +1 @@
+| test.c:5:3:24:3 | switch (...) ...  | $@ statement not well formed because the first statement in a well formed switch statement must be a case clause. | test.c:5:3:24:3 | switch (...) ...  | Switch |

c/common/test/rules/switchcasepositioncondition/SwitchCasePositionCondition.ql

@@ -0,0 +1,2 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.switchcasepositioncondition.SwitchCasePositionCondition

c/common/test/rules/switchcasepositioncondition/test.c

@@ -0,0 +1,42 @@
+void f1(int p1);
+
+void f2(int p1) {
+
+  switch (p1) {
+  start:; // NON_COMPLIANT
+  case 1:
+    if (p1) {
+      ;
+    };
+    break;
+  case 2:
+    if (p1) {
+      ;
+    }
+    break;
+  case 3:
+    if (p1) {
+      ;
+    }
+    break;
+  default:;
+    break;
+  }
+}
+void f3(int p1) {
+
+  switch (p1) { // COMPLIANT
+  case 2:
+    if (p1) {
+      ;
+    }
+    break;
+  case 3:
+    if (p1) {
+      ;
+    }
+    break;
+  default:;
+    break;
+  }
+}

c/common/test/rules/switchnotwellformed/SwitchNotWellFormed.expected

@@ -0,0 +1,3 @@
+| test.c:4:3:10:3 | switch (...) ...  | $@ statement not well formed because this $@ block uses a statement that is not allowed. | test.c:4:3:10:3 | switch (...) ...  | Switch | test.c:5:3:5:9 | case ...: | case |
+| test.c:13:3:20:3 | switch (...) ...  | $@ statement not well formed because this $@ block uses a statement that is not allowed. | test.c:13:3:20:3 | switch (...) ...  | Switch | test.c:14:3:14:10 | case ...: | case |
+| test.c:25:3:30:3 | switch (...) ...  | $@ statement not well formed because this $@ block uses a statement that is not allowed. | test.c:25:3:30:3 | switch (...) ...  | Switch | test.c:26:3:26:9 | case ...: | case |

c/common/test/rules/switchnotwellformed/SwitchNotWellFormed.ql

@@ -0,0 +1,2 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.switchnotwellformed.SwitchNotWellFormed

c/common/test/rules/switchnotwellformed/test.c

@@ -0,0 +1,40 @@
+
+void f1();
+void f2(int p1) {
+  switch (p1) {
+  case 1:
+    int y = p1; // NON_COMPLIANT - `DeclStmt` whose parent
+    // statement is the switch body
+    f1();
+    break;
+  }
+}
+void f3(int p1) {
+  switch (p1) {
+  case 10:
+    f1();
+    goto L1; // NON_COMPLIANT - `JumpStmt` whose parent statement is the//
+             // switch// body
+  case 2:
+    break;
+  }
+L1:;
+}
+
+void f4(int p1) {
+  switch (p1) {
+  case 1:
+  L1:; // NON_COMPLIANT - `LabelStmt` whose parent statement is the
+       // switch body
+    break;
+  }
+}
+
+void f5(int p1) {
+  switch (p1) {
+  case 1: // COMPLIANT
+  default:
+    p1 = 0;
+    break;
+  }
+}

c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql

@@ -0,0 +1,22 @@
+/**
+ * @id c/misra/switch-case-start-condition
+ * @name RULE-16-1: A well formed switch statement must start with a case clause
+ * @description The switch statement syntax is weak and may lead to unspecified behaviour.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity recommendation
+ * @tags external/misra/id/rule-16-1
+ *       maintainability
+ *       readability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.rules.switchcasepositioncondition.SwitchCasePositionCondition
+
+class SwitchCaseStartConditionQuery extends SwitchCasePositionConditionSharedQuery {
+  SwitchCaseStartConditionQuery() {
+    this = Statements3Package::switchCaseStartConditionQuery()
+  }
+}

c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql

@@ -0,0 +1,22 @@
+/**
+ * @id c/misra/switch-stmt-not-well-formed
+ * @name RULE-16-1: A well formed switch statement should only have expression, compound, selection, iteration or try statements within its body
+ * @description The switch statement syntax is weak and may lead to unspecified behaviour.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity recommendation
+ * @tags external/misra/id/rule-16-1
+ *       maintainability
+ *       readability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.rules.switchnotwellformed.SwitchNotWellFormed
+
+class SwitchStmtNotWellFormedQuery extends SwitchNotWellFormedSharedQuery {
+  SwitchStmtNotWellFormedQuery() {
+    this = Statements3Package::switchStmtNotWellFormedQuery()
+  }
+}

cpp/autosar/src/rules/M6-4-3/SwitchDoesNotStartWithCase.ql

@@ -16,13 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.SwitchStatement
+import codingstandards.cpp.rules.switchcasepositioncondition.SwitchCasePositionCondition
 
-from SwitchStmt switch, SwitchCase case
-where
-  not isExcluded(switch, ConditionalsPackage::switchDoesNotStartWithCaseQuery()) and
-  case = switch.getASwitchCase() and
-  switchWithCaseNotFirst(switch)
-select switch,
-  "$@ statement not well formed because the first statement in a well formed switch statement must be a case clause.",
-  switch, "Switch"
+class SwitchDoesNotStartWithCaseQuery extends SwitchCasePositionConditionSharedQuery {
+  SwitchDoesNotStartWithCaseQuery() {
+    this = ConditionalsPackage::switchDoesNotStartWithCaseQuery()
+  }
+}

cpp/autosar/src/rules/M6-4-3/SwitchStatementNotWellFormed.ql

@@ -16,13 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.SwitchStatement
+import codingstandards.cpp.rules.switchnotwellformed.SwitchNotWellFormed
 
-from SwitchStmt switch, SwitchCase case
-where
-  not isExcluded(switch, ConditionalsPackage::switchStatementNotWellFormedQuery()) and
-  case = switch.getASwitchCase() and
-  switchCaseNotWellFormed(case)
-select switch,
-  "$@ statement not well formed because this $@ block uses a statement that is not allowed.",
-  switch, "Switch", case, "case"
+class SwitchStatementNotWellFormedQuery extends SwitchNotWellFormedSharedQuery {
+  SwitchStatementNotWellFormedQuery() {
+    this = ConditionalsPackage::switchStatementNotWellFormedQuery()
+  }
+}