Rule 8.2.6: Query improvements

 - Simplify the query implementation - Improve query message

Author: lcartey

cpp/misra/src/rules/RULE-8-2-6/IntToPointerCastProhibited.ql

@@ -15,29 +15,26 @@
 import cpp
 import codingstandards.cpp.misra
 
-fromCastcast,TypesourceType,TypetargetType
+fromCastcast,TypesourceType,PointerTypetargetType,stringtypeKind
 where
 notisExcluded(cast, Conversions2Package::intToPointerCastProhibitedQuery())and
-sourceType=cast.getExpr().getType().stripTopLevelSpecifiers()and
-targetType=cast.getType().stripTopLevelSpecifiers()and
-targetTypeinstanceofPointerTypeand
-nottargetTypeinstanceofFunctionPointerTypeand
-not(
-// Exception: casts between void pointers are allowed
-targetType.(PointerType).getBaseType().stripTopLevelSpecifiers()instanceofVoidTypeand
-sourceTypeinstanceofPointerTypeand
-sourceType.(PointerType).getBaseType().stripTopLevelSpecifiers()instanceofVoidType
-)and
+sourceType=cast.getExpr().getType().getUnspecifiedType()and
+targetType=cast.getType().getUnspecifiedType()and
 (
 // Integral types
-sourceTypeinstanceofIntegralType
+sourceTypeinstanceofIntegralTypeand
+typeKind="integral"
 or
 // Enumerated types
-sourceTypeinstanceofEnum
+sourceTypeinstanceofEnumand
+typeKind="enumerated"
 or
 // Pointer to void type
-sourceTypeinstanceofPointerTypeand
-sourceType.(PointerType).getBaseType().stripTopLevelSpecifiers()instanceofVoidType
+sourceType.(PointerType).getBaseType()instanceofVoidTypeand
+typeKind="pointer to void"and
+// Exception: casts between void pointers are allowed
+nottargetType.getBaseType()instanceofVoidType
 )
 selectcast,
-"Cast from '"+sourceType.toString()+"' to '"+targetType.toString()+"' is prohibited."
+"Cast from "+typeKind+" type '"+cast.getExpr().getType()+"' to pointer type '"+
+cast.getType()+"'."

cpp/misra/test/rules/RULE-8-2-6/IntToPointerCastProhibited.expected

@@ -1,11 +1,11 @@
-| test.cpp:15:20:15:53 | reinterpret_cast<TestStruct *>... | Cast from 'signed int' to 'TestStruct *' is prohibited. |
-| test.cpp:16:20:16:53 | reinterpret_cast<TestStruct *>... | Cast from 'signed long' to 'TestStruct *' is prohibited. |
-| test.cpp:17:22:17:57 | reinterpret_cast<int32_t *>... | Cast from 'signed long' to 'int32_t *' is prohibited. |
-| test.cpp:24:20:24:53 | reinterpret_cast<TestStruct *>... | Cast from 'TestEnum' to 'TestStruct *' is prohibited. |
-| test.cpp:25:22:25:57 | reinterpret_cast<int32_t *>... | Cast from 'TestEnum' to 'int32_t *' is prohibited. |
-| test.cpp:32:20:32:48 | static_cast<TestStruct *>... | Cast from 'void *' to 'TestStruct *' is prohibited. |
-| test.cpp:33:20:33:53 | reinterpret_cast<TestStruct *>... | Cast from 'void *' to 'TestStruct *' is prohibited. |
-| test.cpp:34:22:34:52 | static_cast<int32_t *>... | Cast from 'void *' to 'int32_t *' is prohibited. |
-| test.cpp:35:22:35:57 | reinterpret_cast<int32_t *>... | Cast from 'void *' to 'int32_t *' is prohibited. |
-| test.cpp:43:14:43:41 | reinterpret_cast<void *>... | Cast from 'signed int' to 'void *' is prohibited. |
-| test.cpp:44:14:44:41 | reinterpret_cast<void *>... | Cast from 'signed long' to 'void *' is prohibited. |
+| test.cpp:15:20:15:53 | reinterpret_cast<TestStruct *>... | Cast from integral type 'int32_t' to pointer type 'TestStruct *'. |
+| test.cpp:16:20:16:53 | reinterpret_cast<TestStruct *>... | Cast from integral type 'int64_t' to pointer type 'TestStruct *'. |
+| test.cpp:17:22:17:57 | reinterpret_cast<int32_t *>... | Cast from integral type 'int64_t' to pointer type 'int32_t *'. |
+| test.cpp:24:20:24:53 | reinterpret_cast<TestStruct *>... | Cast from enumerated type 'TestEnum' to pointer type 'TestStruct *'. |
+| test.cpp:25:22:25:57 | reinterpret_cast<int32_t *>... | Cast from enumerated type 'TestEnum' to pointer type 'int32_t *'. |
+| test.cpp:32:20:32:48 | static_cast<TestStruct *>... | Cast from pointer to void type 'void *' to pointer type 'TestStruct *'. |
+| test.cpp:33:20:33:53 | reinterpret_cast<TestStruct *>... | Cast from pointer to void type 'void *' to pointer type 'TestStruct *'. |
+| test.cpp:34:22:34:52 | static_cast<int32_t *>... | Cast from pointer to void type 'void *' to pointer type 'int32_t *'. |
+| test.cpp:35:22:35:57 | reinterpret_cast<int32_t *>... | Cast from pointer to void type 'void *' to pointer type 'int32_t *'. |
+| test.cpp:43:14:43:41 | reinterpret_cast<void *>... | Cast from integral type 'int32_t' to pointer type 'void *'. |
+| test.cpp:44:14:44:41 | reinterpret_cast<void *>... | Cast from integral type 'int64_t' to pointer type 'void *'. |