Update queries and .expected for DIR-4-6

Author: jeongsoolee09

c/misra/src/rules/DIR-4-6/PlainNumericalTypeUsedOverExplicitTypedef.ql

@@ -13,9 +13,7 @@
 import cpp
 import codingstandards.c.misra
 
-abstract class ForbiddenType extends Type { }
-
-class BuiltinNumericType extends ForbiddenType {
+class BuiltinNumericType extends BuiltInType {
   BuiltinNumericType() {
     /* Exclude the plain char because it does not count as a numeric type */
     this.(CharType).isExplicitlySigned()
@@ -38,15 +36,22 @@ class BuiltinNumericType extends ForbiddenType {
   }
 }
 
-class ForbiddenTypedefType extends ForbiddenType, TypedefType {
-  ForbiddenTypedefType() {
-    this.(TypedefType).getBaseType() instanceof BuiltinNumericType and
-    not this.getName().regexpMatch("u?(int|float)(4|8|16|32|64|128)_t")
-  }
+predicate forbiddenBuiltinNumericUsedInDecl(Variable var, string message) {
+  var.getType() instanceof BuiltinNumericType and
+  message = "The type " + var.getType() + " is not a fixed-width numeric type."
+}
+
+predicate forbiddenTypedef(TypedefType typedef, string message) {
+  typedef.getBaseType() instanceof BuiltinNumericType and
+  not typedef.getName().regexpMatch("u?(int|float)(4|8|16|32|64|128)_t") and
+  message = "The type " + typedef.getName() + " is not an alias to a fixed-width numeric type."
 }
 
-/* TODO: BuiltinNumericType not being flagged */
-from ForbiddenType forbiddenType
-where not isExcluded(forbiddenType, TypesPackage::plainNumericalTypeUsedOverExplicitTypedefQuery())
-select forbiddenType,
-  "The type " + forbiddenType + " is not a fixed-width numeric type nor an alias to one."
+from Element elem, string message
+where
+  not isExcluded(elem, TypesPackage::plainNumericalTypeUsedOverExplicitTypedefQuery()) and
+  (
+    forbiddenBuiltinNumericUsedInDecl(elem, message) or
+    forbiddenTypedef(elem, message)
+  )
+select elem, message

c/misra/test/rules/DIR-4-6/PlainNumericalTypeUsedOverExplicitTypedef.expected

@@ -1 +1,19 @@
-No expected results have yet been specified
+| test.c:27:5:27:26 | _astronomical_number_t | The type _astronomical_number_t is not an alias to a fixed-width numeric type. |
+| test.c:30:10:30:13 | argc | The type int is not a fixed-width numeric type. |
+| test.c:34:15:34:16 | c2 | The type signed char is not a fixed-width numeric type. |
+| test.c:35:17:35:18 | c3 | The type unsigned char is not a fixed-width numeric type. |
+| test.c:38:9:38:10 | s1 | The type short is not a fixed-width numeric type. |
+| test.c:39:16:39:17 | s2 | The type signed short is not a fixed-width numeric type. |
+| test.c:40:18:40:19 | s3 | The type unsigned short is not a fixed-width numeric type. |
+| test.c:43:7:43:8 | i1 | The type int is not a fixed-width numeric type. |
+| test.c:44:14:44:15 | i2 | The type signed int is not a fixed-width numeric type. |
+| test.c:45:16:45:17 | i3 | The type unsigned int is not a fixed-width numeric type. |
+| test.c:48:8:48:9 | l1 | The type long is not a fixed-width numeric type. |
+| test.c:49:15:49:16 | l2 | The type signed long is not a fixed-width numeric type. |
+| test.c:50:17:50:18 | l3 | The type unsigned long is not a fixed-width numeric type. |
+| test.c:53:13:53:15 | ll1 | The type long long is not a fixed-width numeric type. |
+| test.c:54:20:54:22 | ll2 | The type signed long long is not a fixed-width numeric type. |
+| test.c:55:22:55:24 | ll3 | The type unsigned long long is not a fixed-width numeric type. |
+| test.c:58:9:58:10 | f1 | The type float is not a fixed-width numeric type. |
+| test.c:61:10:61:11 | d1 | The type double is not a fixed-width numeric type. |
+| test.c:64:15:64:17 | ld1 | The type long double is not a fixed-width numeric type. |