Fix formatting

Author: MichaelRFairhurst

c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql

@@ -22,14 +22,14 @@ import codingstandards.cpp.VariablyModifiedTypes
  * Check that the declaration entry, which may be a parameter or a variable
  * etc., seems to subsume the location of `inner`, including the declaration
  * type text.
- * 
+ *
  * The location of the `DeclarationEntry` itself points to the _identifier_
  * that is declared. This range will not include the type of the declaration.
- * 
+ *
  * For parameters, the `before` and `end` `Location` objects will be
  * constrained to the closest earlier element (parameter or function body),
  * these values can therefore be captured and inspected for debugging.
- * 
+ *
  * For declarations which occur in statements, the `before` and `end`
  * `Location` objects will be both constrained to be equal, and equal to,
  * the `Location` of the containing `DeclStmt`.
@@ -71,7 +71,6 @@ predicate declarationSubsumes(
 class InvalidDeclaration extends DeclarationEntry {
   Expr sizeExpr;
   CandidateVlaType vlaType;
-
   // `before` and `after` are captured for debugging, see doc comment for
   // `declarationSubsumes`.
   Location before;
@@ -84,9 +83,9 @@ class InvalidDeclaration extends DeclarationEntry {
       if this instanceof ParameterDeclarationEntry
       then vlaType = this.getType().(VariablyModifiedTypeIfAdjusted).getInnerVlaType()
       else vlaType = this.getType().(VariablyModifiedTypeIfUnadjusted).getInnerVlaType()
-    )
+    ) and
     // Capture only pointers to VLA types, not raw VLA types.
-    and not vlaType = this.getType()
+    not vlaType = this.getType()
   }
 
   Expr getSizeExpr() { result = sizeExpr }

c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql

@@ -45,7 +45,6 @@ predicate usedAsModifiableLvalue(Expr expr) {
   exists(AddressOfExpr parent | parent.getOperand() = expr)
   or
   exists(FieldAccess parent | parent.getQualifier() = expr and usedAsModifiableLvalue(parent))
-
 }
 
 from TemporaryLifetimeArrayExpr expr, TemporaryLifetimeArrayAccess member

c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.expected

@@ -7,11 +7,11 @@
 | test.c:25:13:25:15 | definition of p10 | Parameter p10 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int *' | test.c:25:18:25:19 | p0 | p0 |
 | test.c:28:12:28:14 | definition of p11 | Parameter p11 is adjusted to variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:28:21:28:22 | p0 | p0 |
 | test.c:32:17:32:19 | definition of p13 | Parameter p13 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'const int' | test.c:32:22:32:23 | p0 | p0 |
-| test.c:33:18:33:20 | definition of p14 | Parameter p14 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:33:23:33:24 | p0 | p0 |
+| test.c:33:17:33:19 | definition of p14 | Parameter p14 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:33:22:33:23 | p0 | p0 |
 | test.c:40:12:40:14 | definition of p17 | Parameter p17 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:40:24:40:25 | p0 | p0 |
 | test.c:41:14:41:16 | definition of p18 | Parameter p18 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:41:27:41:28 | p0 | p0 |
 | test.c:68:9:68:11 | definition of p27 | Parameter p27 is adjusted to variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:68:13:68:14 | p0 | p0 |
 | test.c:68:9:68:11 | definition of p27 | Parameter p27 is adjusted to variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:68:17:68:18 | p0 | p0 |
 | test.c:74:8:74:9 | definition of l3 | Variable l3 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'int' | test.c:74:12:74:13 | p0 | p0 |
 | test.c:79:15:79:16 | definition of l4 | Variable l4 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'int' | test.c:79:19:79:20 | p0 | p0 |
-| test.c:84:17:84:19 | declaration of td3 | Declaration td3 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:84:22:84:23 | p0 | p0 |
+| test.c:84:16:84:18 | declaration of td3 | Declaration td3 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:84:21:84:22 | p0 | p0 |

c/misra/test/rules/RULE-18-10/test.c

@@ -21,16 +21,16 @@ void f1(
 
     // Types referring to pointers to VMTs:
     // - pointer to pointer to VMT
-    int(*(*p9)[p0]), // NON-COMPLIANT
+    int(*(*p9)[p0]),   // NON-COMPLIANT
     int(*(**p10)[p0]), // NON-COMPLIANT
 
     // - array of pointers to VMT
     int (*(p11[3]))[p0], // NON-COMPLIANT
 
     // - const VMTs, const array-to-pointer adjustment
-    const int p12[p0],        // COMPLIANT
-    const int (*p13)[p0],     // NON-COMPLIANT
-    int (* const p14)[p0],    // NON-COMPLIANT
+    const int p12[p0],    // COMPLIANT
+    const int (*p13)[p0], // NON-COMPLIANT
+    int (*const p14)[p0], // NON-COMPLIANT
 
     // - function types with argument that is a pointer to a VMT
     int p15(int (*inner)[p0]),    // NON-COMPLIANT[FALSE_NEGATIVE]
@@ -58,7 +58,7 @@ void f1(
 
     // Unknown array length types:
     int p21[],       // COMPLIANT
-    int p22[][],       // COMPLIANT
+    int p22[][],     // COMPLIANT
     int (*p23)[],    // COMPLIANT
     int (*p24)[2][], // COMPLIANT
     int (*p25)[][2], // COMPLIANT
@@ -68,7 +68,7 @@ void f1(
     int p27[p0][p0] // NON-COMPLIANT
 ) {
   // Local variables may contain pointers to VMTs:
-  int l0[p0]; // COMPLIANT
+  int l0[p0];   // COMPLIANT
   int(*l1)[];   // COMPLIANT
   int(*l2)[3];  // COMPLIANT
   int(*l3)[p0]; // NON-COMPLIANT
@@ -79,9 +79,9 @@ void f1(
   static int(*l4)[p0]; // NON-COMPLIANT
 
   // Block scope typedefs may refer to VMTs
-  typedef int (*td1)[3]; // COMPLIANT
-  typedef int (*td2)[]; // COMPLIANT
-  typedef int (*td3)[p0]; // NON-COMPLIANT
+  typedef int(*td1)[3];  // COMPLIANT
+  typedef int(*td2)[];   // COMPLIANT
+  typedef int(*td3)[p0]; // NON-COMPLIANT
 
   td3 l5; // NON-COMPLIANT
 }

cpp/common/src/codingstandards/cpp/Clvalues.qll

@@ -14,4 +14,4 @@ predicate isCLValue(Expr expr) {
   not expr instanceof AssignExpr and
   not expr instanceof CommaExpr and
   not exists(Cast c | c = expr.getConversion*())
-}
+}