Clang-format cleanup

Author: Sonny Martin

src/util/simplify_expr.cpp

@@ -1365,7 +1365,8 @@ bool simplify_exprt::simplify_update(exprt &expr)
     {
       const irep_idt &component_name=
         e.get(ID_component_name);
-      const struct_typet &value_ptr_struct_type=to_struct_type(value_ptr_type);
+      const struct_typet &value_ptr_struct_type =
+        to_struct_type(value_ptr_type);
       if(!value_ptr_struct_type.has_component(component_name))
         return true;
       auto &designator_as_struct_expr = to_struct_expr(*value_ptr);
@@ -1402,8 +1403,8 @@ bool simplify_exprt::simplify_object(exprt &expr)
   }
   else if(expr.id()==ID_typecast)
   {
-    auto const& typecast_expr = to_typecast_expr(expr);
-    const typet &op_type=ns.follow(typecast_expr.op().type());
+    auto const &typecast_expr = to_typecast_expr(expr);
+    const typet &op_type = ns.follow(typecast_expr.op().type());
 
     if(op_type.id()==ID_pointer)
     {
@@ -1419,10 +1420,11 @@ bool simplify_exprt::simplify_object(exprt &expr)
       // We do a bit of special treatment for (TYPE *)(a+(int)&o) and
       // (TYPE *)(a+(int)((T*)&o+x)), which are re-written to '&o'.
 
-      exprt casted_expr=typecast_expr.op();
-      if(casted_expr.id()==ID_plus && casted_expr.operands().size()==2)
+      exprt casted_expr = typecast_expr.op();
+      if(casted_expr.id() == ID_plus && casted_expr.operands().size() == 2)
       {
-        exprt cand=casted_expr.op0().id()==ID_typecast?casted_expr.op0():casted_expr.op1();
+        exprt cand = casted_expr.op0().id() == ID_typecast ? casted_expr.op0()
+                                                           : casted_expr.op1();
 
         if(cand.id()==ID_typecast &&
            cand.operands().size()==1 &&

src/util/simplify_expr_boolean.cpp

@@ -213,9 +213,8 @@ bool simplify_exprt::simplify_not(exprt &expr)
   }
   else if(op.id()==ID_exists) // !(exists: a) <-> forall: not a
   {
-    auto const& op_as_exists = to_exists_expr(op);
-    forall_exprt rewritten_op(op_as_exists.symbol()
-      , op_as_exists.where());
+    auto const &op_as_exists = to_exists_expr(op);
+    forall_exprt rewritten_op(op_as_exists.symbol(), op_as_exists.where());
     rewritten_op.where().make_not();
     simplify_node(rewritten_op.where());
     expr = rewritten_op;

src/util/std_expr.h

@@ -4515,17 +4515,19 @@ class exists_exprt:public quantifier_exprt
 inline const exists_exprt &to_exists_expr(const exprt &expr)
 {
   PRECONDITION(expr.id() == ID_exists);
-  DATA_INVARIANT(expr.operands().size()== 2,
+  DATA_INVARIANT(
+    expr.operands().size() == 2,
     "exists expressions have exactly two operands");
-  return static_cast<const exists_exprt&>(expr);
+  return static_cast<const exists_exprt &>(expr);
 }
 
 inline exists_exprt &to_exists_expr(exprt &expr)
 {
   PRECONDITION(expr.id() == ID_exists);
-  DATA_INVARIANT(expr.operands().size()== 2,
-                 "exists expressions have exactly two operands");
-  return static_cast<exists_exprt&>(expr);
+  DATA_INVARIANT(
+    expr.operands().size() == 2,
+    "exists expressions have exactly two operands");
+  return static_cast<exists_exprt &>(expr);
 }
 
 /// \brief The popcount (counting the number of bits set to 1) expression