Factor out shared clauses to common

Author: jeongsoolee09

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

@@ -12,21 +12,16 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.BuiltInNumericTypes
 
-class BuiltinNumericType extends BuiltInType {
-  BuiltinNumericType() {
+class BuiltInNumericType extends BuiltInType {
+  BuiltInNumericType() {
     /* Exclude the plain char because it does not count as a numeric type */
     this.(CharType).isExplicitlySigned()
     or
     this.(CharType).isExplicitlyUnsigned()
     or
-    this instanceof ShortType
-    or
-    this instanceof IntType
-    or
-    this instanceof LongType
-    or
-    this instanceof LongLongType
+    this instanceof BuiltInIntegerType
     or
     this instanceof FloatType
     or
@@ -37,12 +32,13 @@ class BuiltinNumericType extends BuiltInType {
 }
 
 predicate forbiddenBuiltinNumericUsedInDecl(Variable var, string message) {
-  var.getType() instanceof BuiltinNumericType and
+  var.getType() instanceof BuiltInNumericType and
+  not var instanceof ExcludedVariable and
   message = "The type " + var.getType() + " is not a fixed-width numeric type."
 }
 
 predicate forbiddenTypedef(TypedefType typedef, string message) {
-  typedef.getBaseType() instanceof BuiltinNumericType and
+  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."
 }

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

@@ -1,5 +1,4 @@
 | 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. |

cpp/autosar/src/rules/A3-9-1/VariableWidthIntegerTypesUsed.ql

@@ -18,32 +18,16 @@
 import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.EncapsulatingFunctions
-
-/**
- * any `Parameter` in a main function like:
- * int main(int argc, char *argv[])
- */
-class ExcludedVariable extends Parameter {
-  ExcludedVariable() { getFunction() instanceof MainFunction }
-}
+import codingstandards.cpp.BuiltInNumericTypes
 
 from Variable v
 where
   not isExcluded(v, DeclarationsPackage::variableWidthIntegerTypesUsedQuery()) and
   (
-    v.getType() instanceof PlainCharType
-    or
-    v.getType() instanceof UnsignedCharType
-    or
+    v.getType() instanceof BuiltInIntegerType or
+    v.getType() instanceof PlainCharType or
+    v.getType() instanceof UnsignedCharType or
     v.getType() instanceof SignedCharType
-    or
-    v.getType() instanceof ShortType
-    or
-    v.getType() instanceof IntType
-    or
-    v.getType() instanceof LongType
-    or
-    v.getType() instanceof LongLongType
   ) and
   not v instanceof ExcludedVariable
 select v, "Variable '" + v.getName() + "' has variable-width type."

cpp/common/src/codingstandards/cpp/BuiltInNumericTypes.qll

@@ -0,0 +1,22 @@
+import cpp
+import codingstandards.cpp.EncapsulatingFunctions
+
+class BuiltInIntegerType extends BuiltInType {
+  BuiltInIntegerType() {
+    this instanceof ShortType
+    or
+    this instanceof IntType
+    or
+    this instanceof LongType
+    or
+    this instanceof LongLongType
+  }
+}
+
+/**
+ * any `Parameter` in a main function like:
+ * int main(int argc, char *argv[])
+ */
+class ExcludedVariable extends Parameter {
+  ExcludedVariable() { getFunction() instanceof MainFunction }
+}