Skip to content

Commit 8566bb2

Browse files
Rename SourceCodeImplementedOnlyOnce to handle just inline funcs.
1 parent 5a72bef commit 8566bb2

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

cpp/common/src/codingstandards/cpp/exclusions/cpp/Declarations8.qll

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ import RuleMetadata
44
import codingstandards.cpp.exclusions.RuleMetadata
55

66
newtype Declarations8Query =
7-
TSourceCodeImplementedOnlyOnceQuery() or
7+
TDuplicateInlineFunctionDefinitionsQuery() or
88
TTemplateSpecializationWrongLocationQuery() or
99
TDuplicateTypeDefinitionsQuery()
1010

1111
predicate isDeclarations8QueryMetadata(Query query, string queryId, string ruleId, string category) {
1212
query =
13-
// `Query` instance for the `sourceCodeImplementedOnlyOnce` query
14-
Declarations8Package::sourceCodeImplementedOnlyOnceQuery() and
13+
// `Query` instance for the `duplicateInlineFunctionDefinitions` query
14+
Declarations8Package::duplicateInlineFunctionDefinitionsQuery() and
1515
queryId =
16-
// `@id` for the `sourceCodeImplementedOnlyOnce` query
17-
"cpp/misra/source-code-implemented-only-once" and
16+
// `@id` for the `duplicateInlineFunctionDefinitions` query
17+
"cpp/misra/duplicate-inline-function-definitions" and
1818
ruleId = "RULE-6-2-3" and
1919
category = "required"
2020
or
@@ -38,11 +38,11 @@ predicate isDeclarations8QueryMetadata(Query query, string queryId, string ruleI
3838
}
3939

4040
module Declarations8Package {
41-
Query sourceCodeImplementedOnlyOnceQuery() {
41+
Query duplicateInlineFunctionDefinitionsQuery() {
4242
//autogenerate `Query` type
4343
result =
44-
// `Query` type for `sourceCodeImplementedOnlyOnce` query
45-
TQueryCPP(TDeclarations8PackageQuery(TSourceCodeImplementedOnlyOnceQuery()))
44+
// `Query` type for `duplicateInlineFunctionDefinitions` query
45+
TQueryCPP(TDeclarations8PackageQuery(TDuplicateInlineFunctionDefinitionsQuery()))
4646
}
4747

4848
Query templateSpecializationWrongLocationQuery() {

cpp/misra/src/rules/RULE-6-2-3/SourceCodeImplementedOnlyOnce.ql renamed to cpp/misra/src/rules/RULE-6-2-3/DuplicateInlineFunctionDefinitions.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @id cpp/misra/source-code-implemented-only-once
2+
* @id cpp/misra/duplicate-inline-function-definitions
33
* @name RULE-6-2-3: The source code used to implement an entity shall appear only once
44
* @description Implementing an entity in multiple source locations increases the risk of ODR
55
* violations and undefined behavior.
@@ -34,7 +34,7 @@ module FunDeclEquiv =
3434

3535
from FunctionDeclarationEntry d1, FunctionDeclarationEntry d2, string namespace, string name
3636
where
37-
not isExcluded([d1, d2], Declarations8Package::sourceCodeImplementedOnlyOnceQuery()) and
37+
not isExcluded([d1, d2], Declarations8Package::duplicateInlineFunctionDefinitionsQuery()) and
3838
interestedInFunctions(d1, d2) and
3939
FunDeclEquiv::equalParameterTypes(d1, d2) and
4040
d1.getDeclaration().hasQualifiedName(namespace, name) and

cpp/misra/test/rules/RULE-6-2-3/SourceCodeImplementedOnlyOnce.expected renamed to cpp/misra/test/rules/RULE-6-2-3/DuplicateInlineFunctionDefinitions.expected

File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rules/RULE-6-2-3/DuplicateInlineFunctionDefinitions.ql

cpp/misra/test/rules/RULE-6-2-3/SourceCodeImplementedOnlyOnce.qlref

Lines changed: 0 additions & 1 deletion
This file was deleted.

rule_packages/cpp/Declarations8.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"name": "The source code used to implement an entity shall appear only once",
1313
"precision": "very-high",
1414
"severity": "error",
15-
"short_name": "SourceCodeImplementedOnlyOnce",
15+
"short_name": "DuplicateInlineFunctionDefinitions",
1616
"tags": [
1717
"correctness",
1818
"maintainability",

0 commit comments

Comments
 (0)