Added RULE-15-7 and moved M6-4-2 to shared folder

Author: s-samadi

c/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.expected

@@ -0,0 +1,3 @@
+| test.c:16:3:20:3 | if (...) ...  | The $@ construct does not terminate with else statement. | test.c:16:3:20:3 | if (...) ...  | `if...else` |
+| test.c:33:5:37:5 | if (...) ...  | The $@ construct does not terminate with else statement. | test.c:33:5:37:5 | if (...) ...  | `if...else` |
+| test.c:45:3:55:3 | if (...) ...  | The $@ construct does not terminate with else statement. | test.c:45:3:55:3 | if (...) ...  | `if...else` |

c/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql

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

c/common/test/rules/ifelseterminationconstruct/test.c

@@ -0,0 +1,56 @@
+void f1(int p1) {
+
+  if (p1) { // COMPLIANT
+    ;
+  } else if (p1) {
+    ;
+  } else {
+    ;
+  }
+}
+
+void f2(int p1) {
+  if (p1) { // COMPLIANT
+    ;
+  }
+  if (p1) { // NON_COMPLIANT
+    ;
+  } else if (p1) {
+    ;
+  }
+}
+
+void f3(int p1) {
+
+  if (p1) { // COMPLIANT
+    ;
+  } else {
+    ;
+  }
+  if (p1) { // COMPLIANT
+    ;
+  } else if (p1) {
+    if (p1) { // NON_COMPLIANT
+      ;
+    } else if (p1) {
+      ;
+    }
+  } else {
+    ;
+  }
+}
+
+void f4(int p1) {
+
+  if (p1) { // NON_COMPLIANT
+    ;
+  } else if (p1) {
+    if (p1) { // COMPLIANT
+      ;
+    } else if (p1) {
+      ;
+    } else {
+      ;
+    }
+  }
+}

c/misra/src/rules/RULE-15-7/IfElseEndCondition.ql

@@ -0,0 +1,22 @@
+/**
+ * @id c/misra/if-else-end-condition
+ * @name RULE-15-7: All if / else if constructs shall be terminated with an else statement
+ * @description Terminating an `if...else` construct is a defensive programming technique.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity recommendation
+ * @tags external/misra/id/rule-15-7
+ *       readability
+ *       maintainability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.rules.ifelseterminationconstruct.IfElseTerminationConstruct
+
+class IfElseEndConditionQuery extends IfElseTerminationConstructSharedQuery {
+  IfElseEndConditionQuery() {
+    this = Statements3Package::ifElseEndConditionQuery()
+  }
+}

cpp/autosar/src/rules/M6-4-2/IfElseTerminationCondition.ql

@@ -15,10 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.ifelseterminationconstruct.IfElseTerminationConstruct
 
-from IfStmt ifStmt, IfStmt ifElse
-where
-  not isExcluded(ifStmt, ConditionalsPackage::ifElseTerminationConditionQuery()) and
-  ifStmt.getElse() = ifElse and
-  not ifElse.hasElse()
-select ifStmt, "The $@ if statement does not terminate with an else construct.", ifElse, "if...else"
+class IfElseTerminationConditionQuery extends IfElseTerminationConstructSharedQuery {
+  IfElseTerminationConditionQuery() {
+    this = ConditionalsPackage::ifElseTerminationConditionQuery()
+  }
+}

cpp/autosar/test/rules/M6-4-2/IfElseTerminationCondition.expected

@@ -0,0 +1 @@
+cpp/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.ql

cpp/autosar/test/rules/M6-4-2/IfElseTerminationCondition.qlref

@@ -0,0 +1,22 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class IfElseTerminationConstructSharedQuery extends Query { }
+
+Query getQuery() { result instanceof IfElseTerminationConstructSharedQuery }
+
+query predicate problems(IfStmt ifStmt, string message, IfStmt ifLocation, string ifElseString) {
+  not isExcluded(ifStmt, getQuery()) and
+  exists(IfStmt ifElse |
+    ifStmt.getElse() = ifElse and
+    not ifElse.hasElse()
+  ) and
+  ifLocation = ifStmt and
+  message = "The $@ construct does not terminate with else statement." and
+  ifElseString = "`if...else`"
+}

cpp/autosar/test/rules/M6-4-2/IfElseTerminationCondition.testref

@@ -0,0 +1,3 @@
+| test.cpp:23:3:27:3 | if (...) ...  | The $@ construct does not terminate with else statement. | test.cpp:23:3:27:3 | if (...) ...  | `if...else` |
+| test.cpp:43:5:47:5 | if (...) ...  | The $@ construct does not terminate with else statement. | test.cpp:43:5:47:5 | if (...) ...  | `if...else` |
+| test.cpp:57:3:67:3 | if (...) ...  | The $@ construct does not terminate with else statement. | test.cpp:57:3:67:3 | if (...) ...  | `if...else` |