Addressing the review comments

Author: mbaluda

…/src/codingstandards/cpp/SideEffects.qll …on/src/codingstandards/c/SideEffects.qllcpp/common/src/codingstandards/cpp/SideEffects.qll renamed to c/common/src/codingstandards/c/SideEffects.qll cpp/common/src/codingstandards/cpp/SideEffects.qll renamed to c/common/src/codingstandards/c/SideEffects.qll

@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.misra
 import codingstandards.c.Ordering
-import codingstandards.cpp.SideEffects
+import codingstandards.c.SideEffects
 
 class VariableEffectOrAccess extends Expr {
   VariableEffectOrAccess() {

c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql

@@ -16,7 +16,7 @@
 import cpp
 import codingstandards.c.misra
 import codingstandards.c.Expr
-import codingstandards.cpp.SideEffects
+import codingstandards.c.SideEffects
 
 from FullExpr e, SideEffect se, CrementOperation op
 where

c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql

@@ -1,6 +1,6 @@
 /**
  * @id c/misra/loop-compound-condition
- * @name RULE-15-6: the statement forming the body of a loop shall be a compound statement
+ * @name RULE-15-6: The statement forming the body of a loop shall be a compound statement
  * @description if the body of a loop is not enclosed in braces, then this can lead to incorrect
  *              execution, and is hard for developers to maintain.
  * @kind problem

c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql

@@ -0,0 +1,25 @@
+/**
+ * @id cpp/autosar/pointer-to-member-virtual-function-with-null-pointer-constant
+ * @name A5-10-1: A pointer to member virtual function shall only be tested for equality with null-pointer-constant
+ * @description A pointer to member virtual function shall only be tested for equality with
+ *              null-pointer-constant, because an equality comparison with anything other than a
+ *              null-pointer-constant is unspecified.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/autosar/id/a5-10-1
+ *       correctness
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.PotentiallyVirtualPointerOnlyComparesToNullptr
+
+class PointerToMemberVirtualFunctionWithNullPointerConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery {
+  PointerToMemberVirtualFunctionWithNullPointerConstantQuery() {
+    this = pointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery()
+  }
+}

change_notes/2024-06-27-misra-cpp-2023-import.md

@@ -18,9 +18,9 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.PotentiallyVirtualPointerOnlyComparesToNullptr
 
-class VirtualPointerOnlyComparesToNullptrConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
+class PointerToMemberVirtualFunctionWithNullPointerConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
 {
-  VirtualPointerOnlyComparesToNullptrConstantQuery() {
-    this = PointersPackage::virtualPointerOnlyComparesToNullptrConstantQuery()
+  PointerToMemberVirtualFunctionWithNullPointerConstantQuery() {
+    this = PointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery()
   }
 }

cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql

@@ -16,9 +16,9 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy.VirtualAndNonVirtualClassInTheHierarchy
 
-class AccessibleBaseClassBothVirtualAndNonVirtualQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery
+class AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery
 {
-  AccessibleBaseClassBothVirtualAndNonVirtualQuery() {
-    this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualQuery()
+  AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() {
+    this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()
   }
 }

cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql

@@ -0,0 +1,23 @@
+/**
+ * @id cpp/autosar/accessible-base-class-both-virtual-and-non-virtual-in-hierarchy
+ * @name M10-1-3: An accessible base class shall not be both virtual and non-virtual in the same hierarchy
+ * @description A base class must not be virtual and non-virtual in the same hierarchy to avoid
+ *              copies of the object and confusing behavior.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/autosar/id/m10-1-3
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy.VirtualAndNonVirtualClassInTheHierarchy
+
+class AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery {
+  AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() {
+    this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()
+  }
+}

cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql

@@ -17,9 +17,9 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer.ArrayPassedAsFunctionArgumentDecayToAPointer
 
-class IdentifierPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
+class IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
 {
-  IdentifierPassedAsFunctionArgumentDecayToAPointerQuery() {
-    this = PointersPackage::identifierPassedAsFunctionArgumentDecayToAPointerQuery()
+  IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() {
+    this = PointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()
   }
 }