MISRA23 Import rules complete

Author: mbaluda

c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql

@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.SideEffect
-import codingstandards.c.Ordering
+import codingstandards.cpp.COrdering
 import codingstandards.c.orderofevaluation.VariableAccessOrdering
 
 from

c/cert/src/rules/EXP45-C/AssignmentsInSelectionStatements.ql

@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.c.Expr
+import codingstandards.cpp.CExpr
 
 Expr getRightMostOperand(CommaExpr e) {
   result = e.getRightOperand() and not result instanceof CommaExpr

c/cert/src/rules/INT30-C/UnsignedIntegerOperationsWrapAround.ql

@@ -15,24 +15,11 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.Overflow
-import semmle.code.cpp.controlflow.Guards
-import semmle.code.cpp.valuenumbering.GlobalValueNumbering
+import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps_shared.UnsignedOperationWithConstantOperandsWraps_shared
 
-from InterestingOverflowingOperation op
-where
-  not isExcluded(op, IntegerOverflowPackage::unsignedIntegerOperationsWrapAroundQuery()) and
-  op.getType().getUnderlyingType().(IntegralType).isUnsigned() and
-  // Not within a guard condition
-  not exists(GuardCondition gc | gc.getAChild*() = op) and
-  // Not guarded by a check, where the check is not an invalid overflow check
-  not op.hasValidPreCheck() and
-  // Is not checked after the operation
-  not op.hasValidPostCheck() and
-  // Permitted by exception 3
-  not op instanceof LShiftExpr and
-  // Permitted by exception 2 - zero case is handled in separate query
-  not op instanceof DivExpr and
-  not op instanceof RemExpr
-select op,
-  "Operation " + op.getOperator() + " of type " + op.getType().getUnderlyingType() + " may wrap."
+class UnsignedIntegerOperationsWrapAroundQuery extends UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery
+{
+  UnsignedIntegerOperationsWrapAroundQuery() {
+    this = IntegerOverflowPackage::unsignedIntegerOperationsWrapAroundQuery()
+  }
+}

c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.expected

@@ -0,0 +1 @@
+c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql

c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.qlref

@@ -1 +1 @@
-cpp/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql
+c/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql

c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.testref

@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.c.Ordering
+import codingstandards.cpp.COrdering
 
 class VariableAccessInFullExpressionOrdering extends Ordering::Configuration {
   VariableAccessInFullExpressionOrdering() { this = "VariableAccessInFullExpressionOrdering" }

c/cert/test/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.testref

@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.c.Expr
+import codingstandards.cpp.CExpr
 
 from FullExpr e
 select e