Skip to content

Commit 050bdf7

Browse files
mbaludambaluda
committed
Addressing the review comments
1 parent e3113f6 commit 050bdf7

File tree

33 files changed

+233
-79
lines changed

33 files changed

+233
-79
lines changed

‎cpp/common/src/codingstandards/cpp/SideEffects.qll renamed to ‎c/common/src/codingstandards/c/SideEffects.qll

File renamed without changes.

‎c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import cpp
1515
import codingstandards.c.misra
1616
import codingstandards.c.Ordering
17-
import codingstandards.cpp.SideEffects
17+
import codingstandards.c.SideEffects
1818

1919
class VariableEffectOrAccess extends Expr {
2020
VariableEffectOrAccess() {

‎c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import cpp
1717
import codingstandards.c.misra
1818
import codingstandards.c.Expr
19-
import codingstandards.cpp.SideEffects
19+
import codingstandards.c.SideEffects
2020

2121
from FullExpr e, SideEffect se, CrementOperation op
2222
where

‎c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @id c/misra/loop-compound-condition
3-
* @name RULE-15-6: the statement forming the body of a loop shall be a compound statement
3+
* @name RULE-15-6: The statement forming the body of a loop shall be a compound statement
44
* @description if the body of a loop is not enclosed in braces, then this can lead to incorrect
55
* execution, and is hard for developers to maintain.
66
* @kind problem

‎change_notes/2024-06-27-misra-cpp-2023-import.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/**
2+
* @id cpp/autosar/pointer-to-member-virtual-function-with-null-pointer-constant
3+
* @name A5-10-1: A pointer to member virtual function shall only be tested for equality with null-pointer-constant
4+
* @description A pointer to member virtual function shall only be tested for equality with
5+
* null-pointer-constant, because an equality comparison with anything other than a
6+
* null-pointer-constant is unspecified.
7+
* @kind problem
8+
* @precision very-high
9+
* @problem.severity error
10+
* @tags external/autosar/id/a5-10-1
11+
* correctness
12+
* external/autosar/allocated-target/implementation
13+
* external/autosar/enforcement/automated
14+
* external/autosar/obligation/required
15+
*/
16+
17+
import cpp
18+
import codingstandards.cpp.autosar
19+
import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.PotentiallyVirtualPointerOnlyComparesToNullptr
20+
21+
class PointerToMemberVirtualFunctionWithNullPointerConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery {
22+
PointerToMemberVirtualFunctionWithNullPointerConstantQuery() {
23+
this = pointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery()
24+
}
25+
}

‎cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import cpp
1818
import codingstandards.cpp.autosar
1919
import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.PotentiallyVirtualPointerOnlyComparesToNullptr
2020

21-
class VirtualPointerOnlyComparesToNullptrConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
21+
class PointerToMemberVirtualFunctionWithNullPointerConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
2222
{
23-
VirtualPointerOnlyComparesToNullptrConstantQuery() {
24-
this = PointersPackage::virtualPointerOnlyComparesToNullptrConstantQuery()
23+
PointerToMemberVirtualFunctionWithNullPointerConstantQuery() {
24+
this = PointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery()
2525
}
2626
}

‎cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import cpp
1616
import codingstandards.cpp.autosar
1717
import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy.VirtualAndNonVirtualClassInTheHierarchy
1818

19-
class AccessibleBaseClassBothVirtualAndNonVirtualQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery
19+
class AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery
2020
{
21-
AccessibleBaseClassBothVirtualAndNonVirtualQuery() {
22-
this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualQuery()
21+
AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() {
22+
this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()
2323
}
2424
}

‎cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/**
2+
* @id cpp/autosar/accessible-base-class-both-virtual-and-non-virtual-in-hierarchy
3+
* @name M10-1-3: An accessible base class shall not be both virtual and non-virtual in the same hierarchy
4+
* @description A base class must not be virtual and non-virtual in the same hierarchy to avoid
5+
* copies of the object and confusing behavior.
6+
* @kind problem
7+
* @precision very-high
8+
* @problem.severity warning
9+
* @tags external/autosar/id/m10-1-3
10+
* external/autosar/allocated-target/implementation
11+
* external/autosar/enforcement/automated
12+
* external/autosar/obligation/required
13+
*/
14+
15+
import cpp
16+
import codingstandards.cpp.autosar
17+
import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy.VirtualAndNonVirtualClassInTheHierarchy
18+
19+
class AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery {
20+
AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() {
21+
this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()
22+
}
23+
}

‎cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import cpp
1717
import codingstandards.cpp.autosar
1818
import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer.ArrayPassedAsFunctionArgumentDecayToAPointer
1919

20-
class IdentifierPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
20+
class IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
2121
{
22-
IdentifierPassedAsFunctionArgumentDecayToAPointerQuery() {
23-
this = PointersPackage::identifierPassedAsFunctionArgumentDecayToAPointerQuery()
22+
IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() {
23+
this = PointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()
2424
}
2525
}

‎cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/**
2+
* @id cpp/autosar/identifier-with-array-type-passed-as-function-argument-decay-to-a-pointer
3+
* @name M5-2-12: An identifier with array type passed as a function argument shall not decay to a pointer
4+
* @description An identifier with array type passed as a function argument shall not decay to a
5+
* pointer to prevent loss of its bounds.
6+
* @kind problem
7+
* @precision very-high
8+
* @problem.severity warning
9+
* @tags external/autosar/id/m5-2-12
10+
* correctness
11+
* external/autosar/allocated-target/implementation
12+
* external/autosar/enforcement/automated
13+
* external/autosar/obligation/required
14+
*/
15+
16+
import cpp
17+
import codingstandards.cpp.autosar
18+
import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer.ArrayPassedAsFunctionArgumentDecayToAPointer
19+
20+
class IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery {
21+
IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() {
22+
this = pointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()
23+
}
24+
}

‎cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/**
2+
* @id cpp/autosar/unary-minus-operator-applied-to-an-expression-whose-underlying-type-is-unsigned
3+
* @name M5-3-2: The unary minus operator shall not be applied to an expression whose underlying type is unsigned
4+
* @description The unary minus operator shall not be applied to an expression whose underlying type
5+
* is unsigned.
6+
* @kind problem
7+
* @precision very-high
8+
* @problem.severity error
9+
* @tags external/autosar/id/m5-3-2
10+
* external/autosar/allocated-target/implementation
11+
* external/autosar/enforcement/automated
12+
* external/autosar/obligation/required
13+
*/
14+
15+
import cpp
16+
import codingstandards.cpp.autosar
17+
import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression.BuiltInUnaryOperatorAppliedToUnsignedExpression
18+
19+
class UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery {
20+
UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() {
21+
this = OperatorsPackage::unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery()
22+
}
23+
}

‎cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import cpp
1616
import codingstandards.cpp.autosar
1717
import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression.BuiltInUnaryOperatorAppliedToUnsignedExpression
1818

19-
class UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery
19+
class UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery
2020
{
21-
UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery() {
22-
this = OperatorsPackage::unaryMinusOperatorAppliedToAnUnsignedExpressionQuery()
21+
UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() {
22+
this = OperatorsPackage::unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery()
2323
}
2424
}

‎cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import cpp
1717
import codingstandards.cpp.autosar
1818
import codingstandards.cpp.rules.nonglobalfunctionmain.NonGlobalFunctionMain
1919

20-
class IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery extends NonGlobalFunctionMainSharedQuery
20+
class IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery extends NonGlobalFunctionMainSharedQuery
2121
{
22-
IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery() {
23-
this = NamingPackage::identifierMainUsedForAFunctionOtherThanGlobalMainQuery()
22+
IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() {
23+
this = NamingPackage::identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery()
2424
}
2525
}

‎cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/**
2+
* @id cpp/autosar/identifier-main-used-for-a-function-other-than-the-global-function-main
3+
* @name M7-3-2: The identifier main shall not be used for a function other than the global function main
4+
* @description Reusing the name main in non-main contexts can lead to developer confusion.
5+
* @kind problem
6+
* @precision very-high
7+
* @problem.severity warning
8+
* @tags external/autosar/id/m7-3-2
9+
* maintainability
10+
* readability
11+
* external/autosar/allocated-target/implementation
12+
* external/autosar/enforcement/automated
13+
* external/autosar/obligation/required
14+
*/
15+
16+
import cpp
17+
import codingstandards.cpp.autosar
18+
import codingstandards.cpp.rules.nonglobalfunctionmain.NonGlobalFunctionMain
19+
20+
class IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery extends NonGlobalFunctionMainSharedQuery {
21+
IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() {
22+
this = NamingPackage::identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery()
23+
}
24+
}

‎cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import cpp
1818
import codingstandards.cpp.autosar
1919
import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments.OverridingShallSpecifyDifferentDefaultArguments
2020

21-
class VirtualFunctionParametersUseSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery
21+
class VirtualFunctionParametersUseTheSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery
2222
{
23-
VirtualFunctionParametersUseSameDefaultArgumentsQuery() {
24-
this = VirtualFunctionsPackage::virtualFunctionParametersUseSameDefaultArgumentsQuery()
23+
VirtualFunctionParametersUseTheSameDefaultArgumentsQuery() {
24+
this = VirtualFunctionsPackage::virtualFunctionParametersUseTheSameDefaultArgumentsQuery()
2525
}
2626
}

‎cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/**
2+
* @id cpp/autosar/virtual-function-parameters-use-the-same-default-arguments
3+
* @name M8-3-1: Parameters in an overriding virtual function shall have the same default arguments or no default arguments
4+
* @description Parameters in an overriding virtual function shall either use the same default
5+
* arguments as the function they override, or else shall not specify any default
6+
* arguments.
7+
* @kind problem
8+
* @precision very-high
9+
* @problem.severity warning
10+
* @tags external/autosar/id/m8-3-1
11+
* correctness
12+
* external/autosar/allocated-target/implementation
13+
* external/autosar/enforcement/automated
14+
* external/autosar/obligation/required
15+
*/
16+
17+
import cpp
18+
import codingstandards.cpp.autosar
19+
import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments.OverridingShallSpecifyDifferentDefaultArguments
20+
21+
class VirtualFunctionParametersUseTheSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery {
22+
VirtualFunctionParametersUseTheSameDefaultArgumentsQuery() {
23+
this = VirtualFunctionsPackage::virtualFunctionParametersUseTheSameDefaultArgumentsQuery()
24+
}
25+
}

‎cpp/autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.testref

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.ql

‎cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.testref

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql

‎cpp/common/src/codingstandards/cpp/exclusions/cpp/Inheritance.qll

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ newtype InheritanceQuery =
1010
THierarchiesShouldBeBasedOnInterfaceClassesQuery() or
1111
TClassesShouldNotBeDerivedFromVirtualBasesQuery() or
1212
TBaseClassCanBeVirtualOnlyInDiamondHierarchyQuery() or
13-
TAccessibleBaseClassBothVirtualAndNonVirtualQuery() or
13+
TAccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() or
1414
TUniqueAccessibleEntityNamesInMultipleInheritanceQuery() or
1515
TDynamicTypeOfThisUsedFromConstructorOrDestructorQuery() or
1616
TDowncastingShouldNotBePerformedOnPolymorphicTypesQuery() or
@@ -74,11 +74,11 @@ predicate isInheritanceQueryMetadata(Query query, string queryId, string ruleId,
7474
category = "required"
7575
or
7676
query =
77-
// `Query` instance for the `accessibleBaseClassBothVirtualAndNonVirtual` query
78-
InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualQuery() and
77+
// `Query` instance for the `accessibleBaseClassBothVirtualAndNonVirtualInHierarchy` query
78+
InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() and
7979
queryId =
80-
// `@id` for the `accessibleBaseClassBothVirtualAndNonVirtual` query
81-
"cpp/autosar/accessible-base-class-both-virtual-and-non-virtual" and
80+
// `@id` for the `accessibleBaseClassBothVirtualAndNonVirtualInHierarchy` query
81+
"cpp/autosar/accessible-base-class-both-virtual-and-non-virtual-in-hierarchy" and
8282
ruleId = "M10-1-3" and
8383
category = "required"
8484
or
@@ -180,11 +180,11 @@ module InheritancePackage {
180180
TQueryCPP(TInheritancePackageQuery(TBaseClassCanBeVirtualOnlyInDiamondHierarchyQuery()))
181181
}
182182

183-
Query accessibleBaseClassBothVirtualAndNonVirtualQuery() {
183+
Query accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() {
184184
//autogenerate `Query` type
185185
result =
186-
// `Query` type for `accessibleBaseClassBothVirtualAndNonVirtual` query
187-
TQueryCPP(TInheritancePackageQuery(TAccessibleBaseClassBothVirtualAndNonVirtualQuery()))
186+
// `Query` type for `accessibleBaseClassBothVirtualAndNonVirtualInHierarchy` query
187+
TQueryCPP(TInheritancePackageQuery(TAccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()))
188188
}
189189

190190
Query uniqueAccessibleEntityNamesInMultipleInheritanceQuery() {

‎cpp/common/src/codingstandards/cpp/exclusions/cpp/Naming.qll

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ newtype NamingQuery =
2020
TNameOfStandardLibraryMacroOrObjectReusedQuery() or
2121
TNameOfStandardLibraryFunctionIsOverriddenQuery() or
2222
TDifferentIdentifiersNotTypographicallyUnambiguousQuery() or
23-
TIdentifierMainUsedForAFunctionOtherThanGlobalMainQuery() or
23+
TIdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() or
2424
TUnnamedNamespacesInHeaderFileQuery() or
2525
TNonIdenticalIdentifierUsedForTheParameterInReDeclarationOfAFunctionQuery() or
2626
TRedefiningOfStandardLibraryNameQuery() or
@@ -178,11 +178,11 @@ predicate isNamingQueryMetadata(Query query, string queryId, string ruleId, stri
178178
category = "required"
179179
or
180180
query =
181-
// `Query` instance for the `identifierMainUsedForAFunctionOtherThanGlobalMain` query
182-
NamingPackage::identifierMainUsedForAFunctionOtherThanGlobalMainQuery() and
181+
// `Query` instance for the `identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain` query
182+
NamingPackage::identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() and
183183
queryId =
184-
// `@id` for the `identifierMainUsedForAFunctionOtherThanGlobalMain` query
185-
"cpp/autosar/identifier-main-used-for-a-function-other-than-global-main" and
184+
// `@id` for the `identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain` query
185+
"cpp/autosar/identifier-main-used-for-a-function-other-than-the-global-function-main" and
186186
ruleId = "M7-3-2" and
187187
category = "required"
188188
or
@@ -390,11 +390,11 @@ module NamingPackage {
390390
TQueryCPP(TNamingPackageQuery(TDifferentIdentifiersNotTypographicallyUnambiguousQuery()))
391391
}
392392

393-
Query identifierMainUsedForAFunctionOtherThanGlobalMainQuery() {
393+
Query identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() {
394394
//autogenerate `Query` type
395395
result =
396-
// `Query` type for `identifierMainUsedForAFunctionOtherThanGlobalMain` query
397-
TQueryCPP(TNamingPackageQuery(TIdentifierMainUsedForAFunctionOtherThanGlobalMainQuery()))
396+
// `Query` type for `identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain` query
397+
TQueryCPP(TNamingPackageQuery(TIdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery()))
398398
}
399399

400400
Query unnamedNamespacesInHeaderFileQuery() {

‎cpp/common/src/codingstandards/cpp/exclusions/cpp/Operators.qll

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ newtype OperatorsQuery =
1717
TUnsignedBitwiseOperatorWithoutCastQuery() or
1818
TCommaOperatorAndOperatorAndTheOperatorOverloadedQuery() or
1919
TEachOperandOfTheOperatorTheLogicalAndOrTheLogicalOperatorsShallHaveTypeBoolQuery() or
20-
TUnaryMinusOperatorAppliedToAnUnsignedExpressionQuery() or
20+
TUnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() or
2121
TUnaryOperatorOverloadedQuery()
2222

2323
predicate isOperatorsQueryMetadata(Query query, string queryId, string ruleId, string category) {
@@ -139,11 +139,11 @@ predicate isOperatorsQueryMetadata(Query query, string queryId, string ruleId, s
139139
category = "required"
140140
or
141141
query =
142-
// `Query` instance for the `unaryMinusOperatorAppliedToAnUnsignedExpression` query
143-
OperatorsPackage::unaryMinusOperatorAppliedToAnUnsignedExpressionQuery() and
142+
// `Query` instance for the `unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned` query
143+
OperatorsPackage::unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() and
144144
queryId =
145-
// `@id` for the `unaryMinusOperatorAppliedToAnUnsignedExpression` query
146-
"cpp/autosar/unary-minus-operator-applied-to-an-unsigned-expression" and
145+
// `@id` for the `unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned` query
146+
"cpp/autosar/unary-minus-operator-applied-to-an-expression-whose-underlying-type-is-unsigned" and
147147
ruleId = "M5-3-2" and
148148
category = "required"
149149
or
@@ -249,11 +249,11 @@ module OperatorsPackage {
249249
TQueryCPP(TOperatorsPackageQuery(TEachOperandOfTheOperatorTheLogicalAndOrTheLogicalOperatorsShallHaveTypeBoolQuery()))
250250
}
251251

252-
Query unaryMinusOperatorAppliedToAnUnsignedExpressionQuery() {
252+
Query unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() {
253253
//autogenerate `Query` type
254254
result =
255-
// `Query` type for `unaryMinusOperatorAppliedToAnUnsignedExpression` query
256-
TQueryCPP(TOperatorsPackageQuery(TUnaryMinusOperatorAppliedToAnUnsignedExpressionQuery()))
255+
// `Query` type for `unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned` query
256+
TQueryCPP(TOperatorsPackageQuery(TUnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery()))
257257
}
258258

259259
Query unaryOperatorOverloadedQuery() {

0 commit comments

Comments
 (0)