Encapsulate Bitwise class in module.

Author: lcartey

c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql

@@ -178,7 +178,7 @@ predicate isInappropriateEssentialType(
     child =
       [
         operator.(BinaryBitwiseOperation).getAnOperand(),
-        operator.(AssignBitwiseOperationFixed).getAnOperand()
+        operator.(Bitwise::AssignBitwiseOperation).getAnOperand()
       ] and
     not operator instanceof LShiftExpr and
     not operator instanceof RShiftExpr and

cpp/autosar/src/rules/M5-0-20/BitwiseOperatorOperandsHaveDifferentUnderlyingType.ql

@@ -23,7 +23,7 @@ predicate isBinaryBitwiseOperation(Operation o, VariableAccess l, VariableAccess
     l = bbo.getLeftOperand() and r = bbo.getRightOperand()
   )
   or
-  exists(AssignBitwiseOperationFixed abo | abo = o |
+  exists(Bitwise::AssignBitwiseOperation abo | abo = o |
     l = abo.getLValue() and
     r = abo.getRValue()
   )

cpp/autosar/src/rules/M5-0-21/BitwiseOperatorAppliedToSignedTypes.ql

@@ -25,7 +25,7 @@ where
   (
     o instanceof UnaryBitwiseOperation or
     o instanceof BinaryBitwiseOperation or
-    o instanceof AssignBitwiseOperationFixed
+    o instanceof Bitwise::AssignBitwiseOperation
   ) and
   o.getAnOperand() = va and
   va.getTarget().getUnderlyingType().(IntegralType).isSigned()

cpp/common/src/codingstandards/cpp/Bitwise.qll

@@ -2,17 +2,19 @@
  * A library for addressing issues in bitwise operator modelling in our database schema.
  */
 
-import cpp
+private import cpp as cpp
 
-/**
- * A binary bitwise assign operation, excluding += and -= on pointers, which seem to be erroneously
- * included.
- */
-class AssignBitwiseOperationFixed extends AssignBitwiseOperation {
-  AssignBitwiseOperationFixed() {
-    // exclude += and -= on pointers, which seem to be erroneously included
-    // in the database schema
-    not this instanceof AssignPointerAddExpr and
-    not this instanceof AssignPointerSubExpr
+module Bitwise {
+  /**
+   * A binary bitwise assign operation, excluding += and -= on pointers, which seem to be erroneously
+   * included.
+   */
+  class AssignBitwiseOperation extends cpp::AssignBitwiseOperation {
+    AssignBitwiseOperation() {
+      // exclude += and -= on pointers, which seem to be erroneously included
+      // in the database schema
+      not this instanceof cpp::AssignPointerAddExpr and
+      not this instanceof cpp::AssignPointerSubExpr
+    }
   }
 }