Skip to content

Commit 5f30b77

Browse files
committed
remove remaining occurrences/reference to Types
1 parent 1610215 commit 5f30b77

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ predicate isAppropriateTypedef(Type type) {
3232

3333
from BitField bitField
3434
where
35-
not isExcluded(bitField, TypesPackage::bitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery()) and
35+
not isExcluded(bitField, BitfieldTypesPackage::bitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery()) and
3636
/* A violation would neither an appropriate primitive type nor an appropriate typedef. */
3737
not (isAppropriatePrimitive(bitField.getType()) or isAppropriateTypedef(bitField.getType()))
3838
select bitField, "Bit-field " + bitField + " is declared on type " + bitField + "."

c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ predicate isSingleBit(BitField bitField) {
3434

3535
from BitField bitField
3636
where
37-
not isExcluded(bitField, TypesPackage::singleBitNamedBitFieldsOfASignedTypeQuery()) and
37+
not isExcluded(bitField, BitfieldTypesPackage::singleBitNamedBitFieldsOfASignedTypeQuery()) and
3838
isSingleBit(bitField) and // Single-bit,
3939
not bitField.isAnonymous() and // named,
4040
isSigned(bitField.getType()) // but its type is signed.

cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import Strings1
4343
import Strings2
4444
import Strings3
4545
import Syntax
46-
import Types
4746

4847
/** The TQuery type representing this language * */
4948
newtype TCQuery =
@@ -87,8 +86,7 @@ newtype TCQuery =
8786
TStrings1PackageQuery(Strings1Query q) or
8887
TStrings2PackageQuery(Strings2Query q) or
8988
TStrings3PackageQuery(Strings3Query q) or
90-
TSyntaxPackageQuery(SyntaxQuery q) or
91-
TTypesPackageQuery(TypesQuery q)
89+
TSyntaxPackageQuery(SyntaxQuery q)
9290

9391
/** The metadata predicate * */
9492
predicate isQueryMetadata(Query query, string queryId, string ruleId, string category) {
@@ -132,6 +130,5 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
132130
isStrings1QueryMetadata(query, queryId, ruleId, category) or
133131
isStrings2QueryMetadata(query, queryId, ruleId, category) or
134132
isStrings3QueryMetadata(query, queryId, ruleId, category) or
135-
isSyntaxQueryMetadata(query, queryId, ruleId, category) or
136-
isTypesQueryMetadata(query, queryId, ruleId, category)
133+
isSyntaxQueryMetadata(query, queryId, ruleId, category)
137134
}

0 commit comments

Comments
 (0)