Skip to content

Commit bf7a636

Browse files
committed
Shorten shared query name
1 parent 5740aaa commit bf7a636

File tree

13 files changed

+46
-63
lines changed

13 files changed

+46
-63
lines changed

cpp/autosar/src/rules/A9-6-2/BitFieldsShouldNotBeDeclaredAutosarCpp.ql

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,18 @@
1010
* @problem.severity recommendation
1111
* @tags external/autosar/id/a9-6-2
1212
* maintainability
13+
* portability
1314
* external/autosar/allocated-target/design
1415
* external/autosar/enforcement/partially-automated
1516
* external/autosar/obligation/required
1617
*/
1718

1819
import cpp
1920
import codingstandards.cpp.autosar
20-
import codingstandards.cpp.rules.bitfieldsshallbeusedonlywheninterfacingtohardwareorconformingtocommunicationprotocols.BitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocols
21+
import codingstandards.cpp.rules.bitfieldsshouldnotbedeclared.BitFieldsShouldNotBeDeclared
2122

22-
module BitFieldsShouldNotBeDeclaredAutosarCppConfig implements
23-
BitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocolsConfigSig
24-
{
23+
module BitFieldsShouldNotBeDeclaredAutosarCppConfig implements BitFieldsShouldNotBeDeclaredConfigSig {
2524
Query getQuery() { result = RepresentationPackage::bitFieldsShouldNotBeDeclaredAutosarCppQuery() }
2625
}
2726

28-
import BitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocols<BitFieldsShouldNotBeDeclaredAutosarCppConfig>
27+
import BitFieldsShouldNotBeDeclared<BitFieldsShouldNotBeDeclaredAutosarCppConfig>

cpp/autosar/test/rules/A9-6-2/AuditPossibleHardwareInterfaceDueToBitFieldUsageInDataTypeDefinition.expected

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cpp/common/test/rules/bitfieldsshallbeusedonlywheninterfacingtohardwareorconformingtocommunicationprotocols/BitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocols.ql
1+
cpp/common/test/rules/bitfieldsshouldnotbedeclared/BitFieldsShouldNotBeDeclared.ql

cpp/common/src/codingstandards/cpp/rules/bitfieldsshallbeusedonlywheninterfacingtohardwareorconformingtocommunicationprotocols/BitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocols.qll

Lines changed: 0 additions & 33 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/**
2+
* Provides a configurable module BitFieldsShouldNotBeDeclared with a `problems` predicate
3+
* for the following issue:
4+
* The usage of bit-fields increases code complexity and certain aspects of bit-field
5+
* manipulation can be error prone and implementation defined. Hence a bit-field usage
6+
* is reserved only when interfacing to hardware or conformance to communication
7+
* protocols.
8+
*/
9+
10+
import cpp
11+
import codingstandards.cpp.Customizations
12+
import codingstandards.cpp.Exclusions
13+
14+
signature module BitFieldsShouldNotBeDeclaredConfigSig {
15+
Query getQuery();
16+
}
17+
18+
module BitFieldsShouldNotBeDeclared<BitFieldsShouldNotBeDeclaredConfigSig Config> {
19+
query predicate problems(Element e, string message) {
20+
not isExcluded(e, Config::getQuery()) and message = "<replace with problem alert message for >"
21+
}
22+
}

cpp/common/test/rules/bitfieldsshallbeusedonlywheninterfacingtohardwareorconformingtocommunicationprotocols/BitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocols.ql

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

cpp/common/test/rules/bitfieldsshallbeusedonlywheninterfacingtohardwareorconformingtocommunicationprotocols/BitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocols.expected renamed to cpp/common/test/rules/bitfieldsshouldnotbedeclared/BitFieldsShouldNotBeDeclared.expected

File renamed without changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// GENERATED FILE - DO NOT MODIFY
2+
import codingstandards.cpp.rules.bitfieldsshouldnotbedeclared.BitFieldsShouldNotBeDeclared
3+
4+
module TestFileConfig implements BitFieldsShouldNotBeDeclaredConfigSig {
5+
Query getQuery() { result instanceof TestQuery }
6+
}
7+
8+
import BitFieldsShouldNotBeDeclared<TestFileConfig>

cpp/common/test/rules/bitfieldsshallbeusedonlywheninterfacingtohardwareorconformingtocommunicationprotocols/test.cpp renamed to cpp/common/test/rules/bitfieldsshouldnotbedeclared/test.cpp

File renamed without changes.

cpp/misra/src/rules/RULE-12-2-1/BitFieldsShouldNotBeDeclaredMisraCpp.ql

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@
99
* @tags external/misra/id/rule-12-2-1
1010
* scope/single-translation-unit
1111
* correctness
12+
* portability
1213
* external/misra/enforcement/decidable
1314
* external/misra/obligation/advisory
1415
*/
1516

1617
import cpp
1718
import codingstandards.cpp.misra
18-
import codingstandards.cpp.rules.bitfieldsshallbeusedonlywheninterfacingtohardwareorconformingtocommunicationprotocols.BitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocols
19+
import codingstandards.cpp.rules.bitfieldsshouldnotbedeclared.BitFieldsShouldNotBeDeclared
1920

20-
module BitFieldsShouldNotBeDeclaredMisraCppConfig implements
21-
BitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocolsConfigSig
22-
{
21+
module BitFieldsShouldNotBeDeclaredMisraCppConfig implements BitFieldsShouldNotBeDeclaredConfigSig {
2322
Query getQuery() { result = Banned5Package::bitFieldsShouldNotBeDeclaredMisraCppQuery() }
2423
}
2524

26-
import BitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocols<BitFieldsShouldNotBeDeclaredMisraCppConfig>
25+
import BitFieldsShouldNotBeDeclared<BitFieldsShouldNotBeDeclaredMisraCppConfig>

0 commit comments

Comments
 (0)