clang-format fixes

jezhiggins · jezhiggins · commit 681e8354c7ac · 2021-01-30T11:50:38.000Z
diff --git a/regression/goto-analyzer/value-set-addition-01/main.c b/regression/goto-analyzer/value-set-addition-01/main.c
@@ -1,4 +1,4 @@
-int main(int argc, char argv[]) 
+int main(int argc, char argv[])
 {
   int p = 1;
 
diff --git a/regression/goto-analyzer/value-set-addition-02/main.c b/regression/goto-analyzer/value-set-addition-02/main.c
@@ -1,4 +1,4 @@
-int main(int argc, char argv[]) 
+int main(int argc, char argv[])
 {
   int p = 2;
   int q = 3;
diff --git a/regression/goto-analyzer/value-set-addition-03/main.c b/regression/goto-analyzer/value-set-addition-03/main.c
@@ -1,11 +1,11 @@
 int unknown();
 
-int main(int argc, char argv[]) 
+int main(int argc, char argv[])
 {
   int p = 2;
 
-  if (unknown())
+  if(unknown())
     p += 2;
   else
-    p += 3; 
+    p += 3;
 }
diff --git a/regression/goto-analyzer/value-set-addition-04/main.c b/regression/goto-analyzer/value-set-addition-04/main.c
@@ -1,15 +1,14 @@
 int unknown();
 
-int main(int argc, char argv[]) 
+int main(int argc, char argv[])
 {
   int p = 2;
   int q = 3;
 
-  if (unknown())
+  if(unknown())
     p += 2;
   else
     p += 3;
 
-
   int t = p + q;
 }
diff --git a/regression/goto-analyzer/value-set-addition-05/main.c b/regression/goto-analyzer/value-set-addition-05/main.c
@@ -1,13 +1,17 @@
 int unknown();
 
-int main(int argc, char argv[]) {
+int main(int argc, char argv[])
+{
   int p;
   int q;
 
-  if (unknown()) {
+  if(unknown())
+  {
     p = 2;
     q = 5;
-  } else {
+  }
+  else
+  {
     p = 3;
     q = 10;
   }
diff --git a/regression/goto-analyzer/value-set-addition-06/main.c b/regression/goto-analyzer/value-set-addition-06/main.c
@@ -1,17 +1,17 @@
 int unknown();
 
-int main(int argc, char argv[]) 
+int main(int argc, char argv[])
 {
   int p;
   int q;
   int r = 20;
 
-  if (unknown()) 
+  if(unknown())
   {
     p = 2;
     q = 5;
-  } 
-  else 
+  }
+  else
   {
     p = 3;
     q = 10;
diff --git a/regression/goto-analyzer/value-set-addition-07/main.c b/regression/goto-analyzer/value-set-addition-07/main.c
@@ -1,14 +1,23 @@
 int unknown();
 
-int main(int argc, char argv[]) 
+int main(int argc, char argv[])
 {
   int p;
   int q;
   int r = 20;
 
-  if (unknown()) p = 2; else p = 3;
-  if (unknown()) q = 5; else q = 10;
-  if (unknown()) r = 20; else r = 30;
+  if(unknown())
+    p = 2;
+  else
+    p = 3;
+  if(unknown())
+    q = 5;
+  else
+    q = 10;
+  if(unknown())
+    r = 20;
+  else
+    r = 30;
 
   int t = p + q + r;
 }
diff --git a/regression/goto-analyzer/value-set-addition-08/main.c b/regression/goto-analyzer/value-set-addition-08/main.c
@@ -1,14 +1,22 @@
 int unknown();
 
-int main(int argc, char argv[]) 
+int main(int argc, char argv[])
 {
   int p;
   int q;
-  int r = 20;;
+  int r = 20;
+  ;
 
-  if (unknown()) p = 2; else p = 3;
-  if (unknown()) p = 4;
-  if (unknown()) q = 5; else q = 10;
+  if(unknown())
+    p = 2;
+  else
+    p = 3;
+  if(unknown())
+    p = 4;
+  if(unknown())
+    q = 5;
+  else
+    q = 10;
 
   int t = p + q + r;
 }
diff --git a/regression/goto-analyzer/value-set-convert-to-interval/main.c b/regression/goto-analyzer/value-set-convert-to-interval/main.c
@@ -6,7 +6,7 @@ int main(void)
 {
   int a = 0;
   int b = 20;
-  switch (x) 
+  switch(x)
   {
   case 1:
     a = 1;
diff --git a/regression/goto-analyzer/value-set-function-pointers-incremented-02/main.c b/regression/goto-analyzer/value-set-function-pointers-incremented-02/main.c
@@ -25,9 +25,9 @@ int main(void)
 
   // function pointer incremented should be top
   fptr_t fun_incremented = f;
-  if (i)
+  if(i)
     ++fun_incremented;
-  else 
+  else
     fun_incremented = h;
   fun_incremented(5);
   fptr_t fun_incremented_show = fun_incremented;
diff --git a/regression/goto-analyzer/value-set-unary-minus-01/main.c b/regression/goto-analyzer/value-set-unary-minus-01/main.c
@@ -1,4 +1,5 @@
-int main(int argc, char argv[]) {
+int main(int argc, char argv[])
+{
   int p = 1;
 
   int q = -p;
diff --git a/regression/goto-analyzer/value-set-unary-minus-02/main.c b/regression/goto-analyzer/value-set-unary-minus-02/main.c
@@ -1,8 +1,9 @@
-int main(int argc, char argv[]) {
+int main(int argc, char argv[])
+{
   int unknown;
   int p;
 
-  switch (unknown)
+  switch(unknown)
   {
   case 0:
     p = 0;
diff --git a/regression/goto-analyzer/value-set-unary-not-02/main.c b/regression/goto-analyzer/value-set-unary-not-02/main.c
@@ -3,7 +3,7 @@ int main(int argc, char argv[])
   int unknown;
   int p;
 
-  switch (unknown)
+  switch(unknown)
   {
   case 0:
     p = 0;
diff --git a/regression/goto-analyzer/variable-sensitivity-array-value-set-access-02/main.c b/regression/goto-analyzer/variable-sensitivity-array-value-set-access-02/main.c
@@ -2,11 +2,15 @@ int unknown();
 
 int main(int argc, char argv[])
 {
-  int array[2] = { 1, 2 };
+  int array[2] = {1, 2};
   int p;
 
-  if (unknown()) p = 0; else p = 1;
-  if (unknown()) array[0] = 3;
+  if(unknown())
+    p = 0;
+  else
+    p = 1;
+  if(unknown())
+    array[0] = 3;
 
   int t = array[p];
 }
diff --git a/src/analyses/variable-sensitivity/abstract_environment.h b/src/analyses/variable-sensitivity/abstract_environment.h
@@ -180,8 +180,8 @@ class abstract_environmentt
   /// the appropriate wrapper object around the supplied object
   /// If no such configuration is enabled, the supplied object will be
   /// returned unchanged
-  virtual abstract_object_pointert add_object_context(
-    const abstract_object_pointert &abstract_object) const;
+  virtual abstract_object_pointert
+  add_object_context(const abstract_object_pointert &abstract_object) const;
 
   /// Computes the join between "this" and "b"
   ///
diff --git a/src/analyses/variable-sensitivity/constant_abstract_value.cpp b/src/analyses/variable-sensitivity/constant_abstract_value.cpp
@@ -38,7 +38,10 @@ constant_abstract_valuet::constant_abstract_valuet(const typet &t)
 {
 }
 
-constant_abstract_valuet::constant_abstract_valuet(const typet &t, bool tp, bool bttm)
+constant_abstract_valuet::constant_abstract_valuet(
+  const typet &t,
+  bool tp,
+  bool bttm)
   : abstract_value_objectt(t, tp, bttm), value()
 {
 }
diff --git a/src/analyses/variable-sensitivity/full_struct_abstract_object.cpp b/src/analyses/variable-sensitivity/full_struct_abstract_object.cpp
@@ -100,7 +100,8 @@ abstract_object_pointert full_struct_abstract_objectt::read_component(
     }
     else
     {
-      return environment.abstract_object_factory(member_expr.type(), ns, true, false);
+      return environment.abstract_object_factory(
+        member_expr.type(), ns, true, false);
     }
   }
 }
diff --git a/src/analyses/variable-sensitivity/interval_abstract_value.cpp b/src/analyses/variable-sensitivity/interval_abstract_value.cpp
@@ -223,7 +223,10 @@ interval_abstract_valuet::interval_abstract_valuet(const typet &t)
 {
 }
 
-interval_abstract_valuet::interval_abstract_valuet(const typet &t, bool tp, bool bttm)
+interval_abstract_valuet::interval_abstract_valuet(
+  const typet &t,
+  bool tp,
+  bool bttm)
   : abstract_value_objectt(t, tp, bttm), interval(t), merge_count(0)
 {
 }
@@ -238,9 +241,9 @@ interval_abstract_valuet::interval_abstract_valuet(
   const constant_interval_exprt &e,
   int merge_count)
   : abstract_value_objectt(
-  e.type(),
-  e.is_top() || merge_count > 10,
-  e.is_bottom()),
+      e.type(),
+      e.is_top() || merge_count > 10,
+      e.is_bottom()),
     interval(e),
     merge_count(merge_count)
 {
@@ -251,10 +254,10 @@ interval_abstract_valuet::interval_abstract_valuet(
   const abstract_environmentt &environment,
   const namespacet &ns)
   : interval_abstract_valuet(
-  represents_interval(e)
-  ? make_interval_expr(e)
-  : (e.operands().size() == 2 ? interval_from_relation(e)
-                              : constant_interval_exprt(e.type())))
+      represents_interval(e)
+        ? make_interval_expr(e)
+        : (e.operands().size() == 2 ? interval_from_relation(e)
+                                    : constant_interval_exprt(e.type())))
 {
 }
 
@@ -350,7 +353,7 @@ abstract_object_pointert interval_abstract_valuet::expression_transform(
 
   constant_interval_exprt result = interval_operands[0]->interval;
 
-  for (size_t opIndex = 1; opIndex != interval_operands.size(); ++opIndex)
+  for(size_t opIndex = 1; opIndex != interval_operands.size(); ++opIndex)
   {
     auto &interval_next = interval_operands[opIndex]->interval;
     result = result.eval(expr.id(), interval_next);
@@ -364,7 +367,7 @@ abstract_object_pointert interval_abstract_valuet::expression_transform(
 
 abstract_object_pointert interval_abstract_valuet::evaluate_conditional(
   const exprt &expr,
-  const std::vector<interval_abstract_value_pointert>& interval_operands,
+  const std::vector<interval_abstract_value_pointert> &interval_operands,
   const abstract_environmentt &env,
   const namespacet &ns)
 {
@@ -389,13 +392,15 @@ abstract_object_pointert interval_abstract_valuet::evaluate_conditional(
   }
 
   return condition_result.is_true()
-    ? env.abstract_object_factory(true_interval.type(), true_interval, ns)
-    : env.abstract_object_factory(false_interval.type(), false_interval, ns);
+           ? env.abstract_object_factory(
+               true_interval.type(), true_interval, ns)
+           : env.abstract_object_factory(
+               false_interval.type(), false_interval, ns);
 }
 
 abstract_object_pointert interval_abstract_valuet::evaluate_unary_expr(
   const exprt &expr,
-  const std::vector<interval_abstract_value_pointert>& interval_operands,
+  const std::vector<interval_abstract_value_pointert> &interval_operands,
   const abstract_environmentt &environment,
   const namespacet &ns)
 {
@@ -405,7 +410,8 @@ abstract_object_pointert interval_abstract_valuet::evaluate_unary_expr(
   {
     const typecast_exprt &tce = to_typecast_expr(expr);
 
-    const constant_interval_exprt &new_interval = operand_expr.typecast(tce.type());
+    const constant_interval_exprt &new_interval =
+      operand_expr.typecast(tce.type());
 
     INVARIANT(
       new_interval.type() == expr.type(),
@@ -421,7 +427,6 @@ abstract_object_pointert interval_abstract_valuet::evaluate_unary_expr(
   return environment.abstract_object_factory(expr.type(), interval_result, ns);
 }
 
-
 void interval_abstract_valuet::output(
   std::ostream &out,
   const ai_baset &ai,
diff --git a/src/analyses/variable-sensitivity/interval_abstract_value.h b/src/analyses/variable-sensitivity/interval_abstract_value.h
@@ -86,12 +86,12 @@ class interval_abstract_valuet : public abstract_value_objectt
 private:
   static abstract_object_pointert evaluate_conditional(
     const exprt &expr,
-    const std::vector<interval_abstract_value_pointert>& interval_operands,
+    const std::vector<interval_abstract_value_pointert> &interval_operands,
     const abstract_environmentt &environment,
     const namespacet &ns);
   static abstract_object_pointert evaluate_unary_expr(
     const exprt &expr,
-    const std::vector<interval_abstract_value_pointert>& interval_operands,
+    const std::vector<interval_abstract_value_pointert> &interval_operands,
     const abstract_environmentt &environment,
     const namespacet &ns);
 
diff --git a/src/analyses/variable-sensitivity/value_set_abstract_object.cpp b/src/analyses/variable-sensitivity/value_set_abstract_object.cpp
diff --git a/src/analyses/variable-sensitivity/value_set_abstract_object.h b/src/analyses/variable-sensitivity/value_set_abstract_object.h
diff --git a/src/analyses/variable-sensitivity/variable_sensitivity_object_factory.cpp b/src/analyses/variable-sensitivity/variable_sensitivity_object_factory.cpp
diff --git a/src/analyses/variable-sensitivity/variable_sensitivity_object_factory.h b/src/analyses/variable-sensitivity/variable_sensitivity_object_factory.h

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-int main(int argc, char argv[])`
	`1`	`+int main(int argc, char argv[])`
`2`	`2`	`{`
`3`	`3`	`int p = 1;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`int unknown();`
`2`	`2`
`3`		`-int main(int argc, char argv[])`
	`3`	`+int main(int argc, char argv[])`
`4`	`4`	`{`
`5`	`5`	`int p = 2;`
`6`	`6`
`7`		`- if (unknown())`
	`7`	`+ if(unknown())`
`8`	`8`	`p += 2;`
`9`	`9`	`else`
`10`		`- p += 3;`
	`10`	`+ p += 3;`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ int main(void)`
`6`	`6`	`{`
`7`	`7`	`int a = 0;`
`8`	`8`	`int b = 20;`
`9`		`- switch (x)`
	`9`	`+ switch(x)`
`10`	`10`	`{`
`11`	`11`	`case 1:`
`12`	`12`	`a = 1;`