Merge branch 'main' into jeongsoolee09/MISRA-C++-2023-Banned856

Author: jeongsoolee09

c/cert/src/rules/DCL40-C/ExternalIdentifiers.qll

@@ -21,42 +21,11 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.types.Compatible
-import ExternalIdentifiers
+import codingstandards.cpp.rules.incompatiblefunctiondeclaration.IncompatibleFunctionDeclaration
 
-predicate interestedInFunctions(
-  FunctionDeclarationEntry f1, FunctionDeclarationEntry f2, ExternalIdentifiers d
-) {
-  not f1 = f2 and
-  d = f1.getDeclaration() and
-  d = f2.getDeclaration()
+module IncompatibleFunctionDeclarationsCppConfig implements IncompatibleFunctionDeclarationConfigSig
+{
+  Query getQuery() { result = Declarations2Package::incompatibleFunctionDeclarationsQuery() }
 }
 
-predicate interestedInFunctions(FunctionDeclarationEntry f1, FunctionDeclarationEntry f2) {
-  interestedInFunctions(f1, f2, _)
-}
-
-module FuncDeclEquiv =
-  FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>;
-
-from ExternalIdentifiers d, FunctionDeclarationEntry f1, FunctionDeclarationEntry f2
-where
-  not isExcluded(f1, Declarations2Package::incompatibleFunctionDeclarationsQuery()) and
-  not isExcluded(f2, Declarations2Package::incompatibleFunctionDeclarationsQuery()) and
-  interestedInFunctions(f1, f2, d) and
-  (
-    //return type check
-    not FuncDeclEquiv::equalReturnTypes(f1, f2)
-    or
-    //parameter type check
-    not FuncDeclEquiv::equalParameterTypes(f1, f2)
-  ) and
-  // Apply ordering on start line, trying to avoid the optimiser applying this join too early
-  // in the pipeline
-  exists(int f1Line, int f2Line |
-    f1.getLocation().hasLocationInfo(_, f1Line, _, _, _) and
-    f2.getLocation().hasLocationInfo(_, f2Line, _, _, _) and
-    f1Line >= f2Line
-  )
-select f1, "The object $@ is not compatible with re-declaration $@", f1, f1.getName(), f2,
-  f2.getName()
+import IncompatibleFunctionDeclaration<IncompatibleFunctionDeclarationsCppConfig>

c/cert/src/rules/DCL40-C/IncompatibleFunctionDeclarations.ql

@@ -20,16 +20,10 @@
 
 import cpp
 import codingstandards.c.cert
-import ExternalIdentifiers
+import codingstandards.cpp.rules.incompatibleobjectdeclaration.IncompatibleObjectDeclaration
 
-from VariableDeclarationEntry decl1, VariableDeclarationEntry decl2
-where
-  not isExcluded(decl1, Declarations2Package::incompatibleObjectDeclarationsQuery()) and
-  not isExcluded(decl2, Declarations2Package::incompatibleObjectDeclarationsQuery()) and
-  not decl1.getUnspecifiedType() = decl2.getUnspecifiedType() and
-  decl1.getDeclaration() instanceof ExternalIdentifiers and
-  decl2.getDeclaration() instanceof ExternalIdentifiers and
-  decl1.getLocation().getStartLine() >= decl2.getLocation().getStartLine() and
-  decl1.getVariable().getName() = decl2.getVariable().getName()
-select decl1, "The object $@ is not compatible with re-declaration $@", decl1, decl1.getName(),
-  decl2, decl2.getName()
+module IncompatibleObjectDeclarationsCppConfig implements IncompatibleObjectDeclarationConfigSig {
+  Query getQuery() { result = Declarations2Package::incompatibleObjectDeclarationsQuery() }
+}
+
+import IncompatibleObjectDeclaration<IncompatibleObjectDeclarationsCppConfig>

c/cert/src/rules/DCL40-C/IncompatibleObjectDeclarations.ql

@@ -0,0 +1 @@
+c/common/test/rules/incompatiblefunctiondeclaration/IncompatibleFunctionDeclaration.ql

c/cert/test/rules/DCL40-C/IncompatibleFunctionDeclarations.expected

@@ -0,0 +1 @@
+c/common/test/rules/incompatibleobjectdeclaration/IncompatibleObjectDeclaration.ql

c/cert/test/rules/DCL40-C/IncompatibleFunctionDeclarations.qlref

@@ -0,0 +1,4 @@
+| test1.c:1:12:1:12 | declaration of f | The object is not compatible with a re-declaration $@. | test.c:1:6:1:6 | definition of f | f |
+| test.c:1:6:1:6 | definition of f | The object is not compatible with a re-declaration $@. | test1.c:1:12:1:12 | declaration of f | f |
+| test.c:5:6:5:7 | declaration of f1 | The object is not compatible with a re-declaration $@. | test1.c:2:13:2:14 | declaration of f1 | f1 |
+| test.c:6:6:6:7 | definition of f2 | The object is not compatible with a re-declaration $@. | test1.c:3:6:3:7 | definition of f2 | f2 |