Simplify, improve code style

Signed-off-by: František Nečas <[email protected]>

Author: FrNecas

src/domains/predabs_domain.cpp

@@ -30,7 +30,7 @@ void predabs_domaint::initialize_value(domaint::valuet &value)
   for(std::size_t row=0; row<templ.size(); ++row)
   {
     // start from top (we can only use a gfp solver for this domain)
-    v[row]=row_valuet(false_exprt());
+    v[row]=row_valuet();
   }
 }
 

src/domains/predabs_domain.h

@@ -35,11 +35,9 @@ class predabs_domaint:public simple_domaint
 
   struct row_valuet:constant_exprt
   {
-    row_valuet() : constant_exprt(false_exprt())
-    {}
+    row_valuet() : constant_exprt(false_exprt()) {}
 
-    explicit row_valuet(const constant_exprt &value) : constant_exprt(value)
-    {}
+    explicit row_valuet(const constant_exprt &value) : constant_exprt(value) {}
   };
 
   struct templ_valuet:simple_domaint::valuet, std::vector<row_valuet>

src/ssa/address_canonizer.cpp

@@ -51,11 +51,9 @@ exprt address_canonizer(
           unsigned_char_type(),
           config.ansi_c.pointer_width);
         typecast_exprt typecast_expr(rec_result, byte_pointer);
-        exprt result;
-        plus_exprt sum(typecast_expr, *maybe_offset);
-        result=sum;
-        if(sum.type()!=address.type())
-          result=typecast_exprt(sum, address.type());
+        exprt result=plus_exprt(typecast_expr, *maybe_offset);
+        if(result.type()!=address.type())
+          result=typecast_exprt(result, address.type());
 
         return result;
       }
@@ -68,11 +66,9 @@ exprt address_canonizer(
 
       pointer_typet pointer_type(object.type(), config.ansi_c.pointer_width);
       typecast_exprt typecast_expr(rec_result, pointer_type);
-      exprt result;
-      plus_exprt sum(typecast_expr, to_index_expr(object).index());
-      result=sum;
-      if(sum.type()!=address.type())
-        result=typecast_exprt(sum, address.type());
+      exprt result=plus_exprt(typecast_expr, to_index_expr(object).index());
+      if(result.type()!=address.type())
+        result=typecast_exprt(result, address.type());
 
       return result;
     }