Declarations4: change RULE-8-6 to share with M3-2-4

Author: knewbury01

c/misra/test/rules/RULE-8-6/IdentifierWithExternalLinkageOneDefinition.expected renamed to c/common/test/rules/identifierwithexternallinkageonedefinitionshared/IdentifierWithExternalLinkageOneDefinitionShared.expected

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

c/common/test/rules/identifierwithexternallinkageonedefinitionshared/IdentifierWithExternalLinkageOneDefinitionShared.ql

@@ -1,6 +1,6 @@
 /**
  * @id c/misra/identifier-with-external-linkage-one-definition
- * @name RULE-8-6: An identifier with external linkage shall have exactly one external definition
+ * @name RULE-8-6: An identifier with external linkage shall have exactly one definition
  * @description An identifier with multiple definitions in different translation units leads to
  *              undefined behavior.
  * @kind problem
@@ -13,26 +13,10 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.Identifiers
+import codingstandards.cpp.rules.identifierwithexternallinkageonedefinitionshared.IdentifierWithExternalLinkageOneDefinitionShared
 
-from ExternalIdentifiers d, DeclarationEntry de1, DeclarationEntry de2
-where
-  not isExcluded(d, Declarations4Package::identifierWithExternalLinkageOneDefinitionQuery()) and
-  not isExcluded([de1, de2], Declarations4Package::identifierWithExternalLinkageOneDefinitionQuery()) and
-  d.isTopLevel() and
-  d = de1.getDeclaration() and
-  d = de2.getDeclaration() and
-  de1 != de2 and
-  de1.isDefinition() and
-  de2.isDefinition() and
-  //exceptions
-  (d instanceof Function implies not d.(Function).isInline()) and
-  // Apply an ordering based on location to enforce that (de1, de2) = (de2, de1) and we only report (de1, de2).
-  (
-    de1.getFile().getAbsolutePath() < de2.getFile().getAbsolutePath()
-    or
-    de1.getFile().getAbsolutePath() = de2.getFile().getAbsolutePath() and
-    de1.getLocation().getStartLine() < de2.getLocation().getStartLine()
-  )
-select de1, "The identifier " + de1.getName() + " has external linkage and is redefined $@.", de2,
-  "here"
+class IdentifierWithExternalLinkageShallHaveOneDefinitionQuery extends IdentifierWithExternalLinkageOneDefinitionSharedSharedQuery {
+  IdentifierWithExternalLinkageShallHaveOneDefinitionQuery() {
+    this = Declarations4Package::identifierWithExternalLinkageOneDefinitionQuery()
+  }
+}

c/misra/test/rules/RULE-8-6/test.c renamed to c/common/test/rules/identifierwithexternallinkageonedefinitionshared/test.c

@@ -0,0 +1 @@
+c/common/test/rules/identifierwithexternallinkageonedefinitionshared/IdentifierWithExternalLinkageOneDefinitionShared.ql

c/misra/test/rules/RULE-8-6/test1.c renamed to c/common/test/rules/identifierwithexternallinkageonedefinitionshared/test1.c

@@ -15,28 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.Linkage
+import codingstandards.cpp.rules.identifierwithexternallinkageonedefinitionshared.IdentifierWithExternalLinkageOneDefinitionShared
 
-from Declaration d, DeclarationEntry de1, DeclarationEntry de2
-where
-  not isExcluded(d) and
-  not isExcluded([de1, de2]) and
-  hasExternalLinkage(d) and
-  d.isTopLevel() and
-  d = de1.getDeclaration() and
-  d = de2.getDeclaration() and
-  de1 != de2 and
-  de1.isDefinition() and
-  de2.isDefinition() and
-  // exceptions
-  not d instanceof TemplateClass and
-  (d instanceof Function implies not d.(Function).isInline()) and
-  // Apply an ordering based on location to enforce that (de1, de2) = (de2, de1) and we only report (de1, de2).
-  (
-    de1.getFile().getAbsolutePath() < de2.getFile().getAbsolutePath()
-    or
-    de1.getFile().getAbsolutePath() = de2.getFile().getAbsolutePath() and
-    de1.getLocation().getStartLine() < de2.getLocation().getStartLine()
-  )
-select de1, "The identifier " + de1.getName() + " has external linkage and is redefined $@.", de2,
-  "here"
+class IdentifierWithExternalLinkageOneDefinitionQuery extends IdentifierWithExternalLinkageOneDefinitionSharedSharedQuery {
+  IdentifierWithExternalLinkageOneDefinitionQuery() {
+    this = ScopePackage::identifierWithExternalLinkageShallHaveOneDefinitionQuery()
+  }
+}

c/misra/src/rules/RULE-8-6/IdentifierWithExternalLinkageOneDefinition.ql

@@ -0,0 +1 @@
+cpp/common/test/rules/identifierwithexternallinkageonedefinitionshared/IdentifierWithExternalLinkageOneDefinitionShared.ql

c/misra/test/rules/RULE-8-6/IdentifierWithExternalLinkageOneDefinition.qlref

@@ -0,0 +1,37 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Linkage
+
+abstract class IdentifierWithExternalLinkageOneDefinitionSharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof IdentifierWithExternalLinkageOneDefinitionSharedSharedQuery }
+
+query predicate problems(DeclarationEntry de1, string message, DeclarationEntry de2, string de2Str) {
+  exists(Declaration d |
+    not isExcluded(de1, getQuery()) and
+    hasExternalLinkage(d) and
+    d.isTopLevel() and
+    d = de1.getDeclaration() and
+    d = de2.getDeclaration() and
+    de1 != de2 and
+    de1.isDefinition() and
+    de2.isDefinition() and
+    // exceptions
+    not d instanceof TemplateClass and
+    (d instanceof Function implies not d.(Function).isInline()) and
+    // Apply an ordering based on location to enforce that (de1, de2) = (de2, de1) and we only report (de1, de2).
+    (
+      de1.getFile().getAbsolutePath() < de2.getFile().getAbsolutePath()
+      or
+      de1.getFile().getAbsolutePath() = de2.getFile().getAbsolutePath() and
+      de1.getLocation().getStartLine() < de2.getLocation().getStartLine()
+    ) and
+    message = "The identifier " + de1.getName() + " has external linkage and is redefined $@." and
+    de2Str = "here"
+  )
+}

c/misra/test/rules/RULE-8-6/IdentifierWithExternalLinkageOneDefinition.testref

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

cpp/autosar/src/rules/M3-2-4/IdentifierWithExternalLinkageShallHaveOneDefinition.ql

@@ -103,10 +103,11 @@
         {
           "description": "An identifier with multiple definitions in different translation units leads to undefined behavior.",
           "kind": "problem",
-          "name": "An identifier with external linkage shall have exactly one external definition",
+          "name": "An identifier with external linkage shall have exactly one definition",
           "precision": "high",
           "severity": "error",
           "short_name": "IdentifierWithExternalLinkageOneDefinition",
+          "shared_implementation_short_name": "IdentifierWithExternalLinkageOneDefinitionShared",
           "tags": [
             "correctness"
           ]

cpp/autosar/test/rules/M3-2-4/IdentifierWithExternalLinkageShallHaveOneDefinition.qlref

@@ -156,6 +156,7 @@
           "precision": "high",
           "severity": "error",
           "short_name": "IdentifierWithExternalLinkageShallHaveOneDefinition",
+          "shared_implementation_short_name": "IdentifierWithExternalLinkageOneDefinitionShared",
           "tags": [
             "correctness"
           ]