Add TypeCategory suffix

Author: lcartey

cpp/misra/src/codingstandards/cpp/misra/BuiltInTypeRules.qll

@@ -13,10 +13,10 @@ module MisraCpp23BuiltInTypes {
    * A MISRA C++ 2023 type category.
    */
   newtype TypeCategory =
-    Integral() or
-    FloatingPoint() or
-    Character() or
-    Other()
+    IntegralTypeCategory() or
+    FloatingPointTypeCategory() or
+    CharacterTypeCategory() or
+    OtherTypeCategory()
 
   /**
    * Gets the type category of a built-in type.
@@ -31,7 +31,7 @@ module MisraCpp23BuiltInTypes {
       t instanceof Char32Type or
       t instanceof Char8Type
     ) and
-    result = Character()
+    result = CharacterTypeCategory()
     or
     (
       // The 5 standard integral types, covering both signed/unsigned variants
@@ -43,21 +43,21 @@ module MisraCpp23BuiltInTypes {
       t instanceof LongType or
       t instanceof LongLongType
     ) and
-    result = Integral()
+    result = IntegralTypeCategory()
     or
     (
       t instanceof FloatType or
       t instanceof DoubleType or
       t instanceof LongDoubleType
     ) and
-    result = FloatingPoint()
+    result = FloatingPointTypeCategory()
     or
     (
       t instanceof BoolType or
       t instanceof VoidType or
       t instanceof NullPointerType
     ) and
-    result = Other()
+    result = OtherTypeCategory()
   }
 
   /**
@@ -119,7 +119,7 @@ module MisraCpp23BuiltInTypes {
   class CharacterType extends MisraBuiltInType {
     CharacterType() {
       // A type whose type category is character
-      getBuiltInTypeCategory(builtInType) = Character()
+      getBuiltInTypeCategory(builtInType) = CharacterTypeCategory()
     }
   }
 
@@ -134,7 +134,8 @@ module MisraCpp23BuiltInTypes {
   class NumericType extends MisraBuiltInType {
     NumericType() {
       // A type whose type category is either integral or a floating-point
-      getBuiltInTypeCategory(builtInType) = [Integral().(TypeCategory), FloatingPoint()]
+      getBuiltInTypeCategory(builtInType) =
+        [IntegralTypeCategory().(TypeCategory), FloatingPointTypeCategory()]
     }
 
     Signedness getSignedness() {

cpp/misra/src/rules/RULE-7-0-5/NoSignednessChangeFromPromotion.ql

@@ -97,8 +97,8 @@ class IntegerPromotion extends IntegerPromotionOrUsualArithmeticConversionAsCast
     // This deliberately excludes integer promotions from `bool` and unscoped enums which do not
     // have a fixed underlying type, because neither of these are considered integral types in the
     // MISRA C++ rules.
-    fromType.getTypeCategory() = MisraCpp23BuiltInTypes::Integral() and
-    toType.getTypeCategory() = MisraCpp23BuiltInTypes::Integral()
+    fromType.getTypeCategory() = MisraCpp23BuiltInTypes::IntegralTypeCategory() and
+    toType.getTypeCategory() = MisraCpp23BuiltInTypes::IntegralTypeCategory()
   }
 
   override string getKindOfConversion() { result = "Integer promotion" }
@@ -150,7 +150,7 @@ class ImpliedIntegerPromotion extends IntegerPromotionOrUsualArithmeticConversio
     // However, you cannot have an integer promotion on a float, so we restrict
     // this to integral types only
     fromType = this.getType() and
-    fromType.getTypeCategory() = MisraCpp23BuiltInTypes::Integral() and
+    fromType.getTypeCategory() = MisraCpp23BuiltInTypes::IntegralTypeCategory() and
     // If the size is less than int, then it is an implied integer promotion
     fromType.getBuiltInSize() < sizeOfInt()
   }
@@ -223,8 +223,8 @@ where
   // Exception 2: allow safe conversions from integral to floating-point types
   not (
     e.isConstant() and
-    fromType.getTypeCategory() = MisraCpp23BuiltInTypes::Integral() and
-    toType.getTypeCategory() = MisraCpp23BuiltInTypes::FloatingPoint()
+    fromType.getTypeCategory() = MisraCpp23BuiltInTypes::IntegralTypeCategory() and
+    toType.getTypeCategory() = MisraCpp23BuiltInTypes::FloatingPointTypeCategory()
   )
 select e,
   c.getKindOfConversion() + " from '" + fromType.getName() + "' to '" + toType.getName() +

cpp/misra/src/rules/RULE-7-0-6/NumericAssignmentTypeMismatch.ql

@@ -48,7 +48,7 @@ predicate isValidConstantAssignment(
       val <= targetType.getIntegralUpperBound()
       or
       // All floating point types can represent all integer values
-      targetType.getTypeCategory() = MisraCpp23BuiltInTypes::FloatingPoint()
+      targetType.getTypeCategory() = MisraCpp23BuiltInTypes::FloatingPointTypeCategory()
     )
   )
 }