move query implementations to Query.qll files to avoid isPOD deprecation warning in test output

Author: erik-krogh

cpp/autosar/src/rules/A11-0-1/NonPodTypeShouldBeDefinedAsClass.ql

@@ -15,12 +15,8 @@
  *       external/autosar/obligation/advisory
  */
 
-import cpp
-import codingstandards.cpp.autosar
-import codingstandards.cpp.Typehelpers
+import NonPodTypeShouldBeDefinedAsClassQuery
 
 from Struct s
-where
-  not isExcluded(s, ClassesPackage::nonPodTypeShouldBeDefinedAsClassQuery()) and
-  not s.isPOD()
+where problem(s)
 select s, "Non-POD type defined as struct instead of class."

cpp/autosar/src/rules/A11-0-1/NonPodTypeShouldBeDefinedAsClassQuery.qll

@@ -0,0 +1,8 @@
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.Typehelpers
+
+predicate problem(Struct s) {
+  not isExcluded(s, ClassesPackage::nonPodTypeShouldBeDefinedAsClassQuery()) and
+  not s.isPOD()
+}

cpp/autosar/src/rules/A12-0-2/OperationsAssumingMemoryLayoutPerformedOnObjects.ql

@@ -15,30 +15,8 @@
  *       external/autosar/obligation/required
  */
 
-import cpp
-import codingstandards.cpp.autosar
-
-class Object extends Class {
-  Object() { not this.(Struct).isPOD() }
-}
-
-predicate isPointerToObject(Expr e) {
-  e.(VariableAccess).getType().(PointerType).getBaseType() instanceof Object
-  or
-  e.(AddressOfExpr).getOperand().getType() instanceof Object
-}
+import OperationsAssumingMemoryLayoutPerformedOnObjectsQuery
 
 from FunctionCall fc, string functionName
-where
-  not isExcluded(fc, ExpressionsPackage::operationsAssumingMemoryLayoutPerformedOnObjectsQuery()) and
-  /*
-   * Note: this list was arbitrarily chosen, based on <https://en.cppreference.com/w/c/string/byte>,
-   * and may be incomplete.
-   */
-
-  functionName in [
-      "memcmp", "memset", "memset_s", "memcpy", "memcpy_s", "memmove", "memmove_s", "free"
-    ] and
-  fc.getTarget().hasGlobalOrStdName(functionName) and
-  isPointerToObject(fc.getAnArgument())
+where problem(fc, functionName)
 select fc, "Use of an object as argument to 'std::" + functionName + "'."

cpp/autosar/src/rules/A12-0-2/OperationsAssumingMemoryLayoutPerformedOnObjectsQuery.qll

@@ -0,0 +1,25 @@
+import cpp
+import codingstandards.cpp.autosar
+
+class Object extends Class {
+  Object() { not this.(Struct).isPOD() }
+}
+predicate isPointerToObject(Expr e) {
+  e.(VariableAccess).getType().(PointerType).getBaseType() instanceof Object
+  or
+  e.(AddressOfExpr).getOperand().getType() instanceof Object
+}
+
+predicate problem(FunctionCall fc, string functionName) {
+  not isExcluded(fc, ExpressionsPackage::operationsAssumingMemoryLayoutPerformedOnObjectsQuery()) and
+  /*
+   * Note: this list was arbitrarily chosen, based on <https://en.cppreference.com/w/c/string/byte>,
+   * and may be incomplete.
+   */
+
+  functionName in [
+      "memcmp", "memset", "memset_s", "memcpy", "memcpy_s", "memmove", "memmove_s", "free"
+    ] and
+  fc.getTarget().hasGlobalOrStdName(functionName) and
+  isPointerToObject(fc.getAnArgument())
+}

cpp/autosar/src/rules/A9-6-1/DataTypesUsedForInterfacingWithHardwareOrProtocolsMustBeTrivialAndStandardLayout.ql

@@ -14,15 +14,9 @@
  *       external/autosar/obligation/required
  */
 
-import cpp
-import codingstandards.cpp.autosar
-import codingstandards.cpp.HardwareOrProtocolInterface
-import codingstandards.cpp.ImplicitHardwareOrProtocolInterfaceClass
+import DataTypesUsedForInterfacingWithHardwareOrProtocolsMustBeTrivialAndStandardLayoutQuery
 
 from HardwareOrProtocolInterfaceClass c
-where
-  not isExcluded(c,
-    ClassesPackage::dataTypesUsedForInterfacingWithHardwareOrProtocolsMustBeTrivialAndStandardLayoutQuery()) and
-  not c.isPOD()
+where problem(c)
 select c,
   "Data type used for hardware interface or communication protocol is not standard layout and trivial."

cpp/autosar/src/rules/A9-6-1/DataTypesUsedForInterfacingWithHardwareOrProtocolsMustBeTrivialAndStandardLayoutQuery.qll

@@ -0,0 +1,10 @@
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.HardwareOrProtocolInterface
+import codingstandards.cpp.ImplicitHardwareOrProtocolInterfaceClass
+
+predicate problem(HardwareOrProtocolInterfaceClass c) {
+  not isExcluded(c,
+    ClassesPackage::dataTypesUsedForInterfacingWithHardwareOrProtocolsMustBeTrivialAndStandardLayoutQuery()) and
+  not c.isPOD()
+}

cpp/autosar/src/rules/M11-0-1/MemberDataInNonPodClassTypesNotPrivate.ql

@@ -13,17 +13,8 @@
  *       external/autosar/obligation/required
  */
 
-import cpp
-import codingstandards.cpp.autosar
-
-class NonPODType extends Class {
-  NonPODType() { not this.isPOD() }
-}
+import MemberDataInNonPodClassTypesNotPrivateQuery
 
 from NonPODType p, Field f
-where
-  not isExcluded(p, ClassesPackage::memberDataInNonPodClassTypesNotPrivateQuery()) and
-  f = p.getAField() and
-  not f.isCompilerGenerated() and
-  (f.isProtected() or f.isPublic())
+where problem(p, f)
 select f, "Member data in a non-POD class is not private."

cpp/autosar/src/rules/M11-0-1/MemberDataInNonPodClassTypesNotPrivateQuery.qll

@@ -0,0 +1,13 @@
+import cpp
+import codingstandards.cpp.autosar
+
+class NonPODType extends Class {
+  NonPODType() { not this.isPOD() }
+}
+
+predicate problem(NonPODType p, Field f) {
+  not isExcluded(p, ClassesPackage::memberDataInNonPodClassTypesNotPrivateQuery()) and
+  f = p.getAField() and
+  not f.isCompilerGenerated() and
+  (f.isProtected() or f.isPublic())
+}