Declarations4: refactor RULE-8-3 compatible lib and compatible correctness

Author: knewbury01

c/misra/src/rules/RULE-8-3/Compatible.qll

@@ -13,7 +13,25 @@
 
 import cpp
 import codingstandards.c.misra
-import Compatible
+import codingstandards.cpp.Compatible
+
+predicate parameterTypesIncompatible(FunctionDeclarationEntry f1, FunctionDeclarationEntry f2) {
+  exists(ParameterDeclarationEntry p1, ParameterDeclarationEntry p2, int i |
+    p1 = f1.getParameterDeclarationEntry(i) and
+    p2 = f2.getParameterDeclarationEntry(i)
+  |
+    not typesCompatible(p1.getType(), p2.getType())
+  )
+}
+
+predicate parameterNamesIncompatible(FunctionDeclarationEntry f1, FunctionDeclarationEntry f2) {
+  exists(ParameterDeclarationEntry p1, ParameterDeclarationEntry p2, int i |
+    p1 = f1.getParameterDeclarationEntry(i) and
+    p2 = f2.getParameterDeclarationEntry(i)
+  |
+    not p1.getName() = p2.getName()
+  )
+}
 
 from FunctionDeclarationEntry f1, FunctionDeclarationEntry f2, string case
 where
@@ -27,21 +45,11 @@ where
     case = "return type"
     or
     //parameter type check
-    exists(ParameterDeclarationEntry p1, ParameterDeclarationEntry p2, int i |
-      p1 = f1.getParameterDeclarationEntry(i) and
-      p2 = f2.getParameterDeclarationEntry(i)
-    |
-      not typesCompatible(p1.getType(), p2.getType())
-    ) and
+    parameterTypesIncompatible(f1, f2) and
     case = "parameter types"
     or
     //parameter name check
-    exists(ParameterDeclarationEntry p1, ParameterDeclarationEntry p2, int i |
-      p1 = f1.getParameterDeclarationEntry(i) and
-      p2 = f2.getParameterDeclarationEntry(i)
-    |
-      not p1.getName() = p2.getName()
-    ) and
+    parameterNamesIncompatible(f1, f2) and
     case = "parameter names"
   )
 select f1, "The " + case + " of re-declaration of $@ is not compatible with declaration $@", f1,

c/misra/src/rules/RULE-8-3/DeclarationsOfAFunctionSameNameAndType.ql

@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.misra
-import Compatible
+import codingstandards.cpp.Compatible
 
 from VariableDeclarationEntry decl1, VariableDeclarationEntry decl2
 where

c/misra/src/rules/RULE-8-3/DeclarationsOfAnObjectSameNameAndType.ql

@@ -0,0 +1,8 @@
+import cpp
+
+predicate typesCompatible(Type t1, Type t2) {
+  t1 = t2
+  or
+  //signed int is same as int ect
+  t1.(IntegralType).getCanonicalArithmeticType() = t2.(IntegralType).getCanonicalArithmeticType()
+}