Merge pull request diffblue#445 from diffblue/formatting-const-in-taint-summary-cpp

Formatting const in taint summary cpp

Author: NathanJPhillips

src/taint-analysis/taint_summary.cpp

@@ -171,17 +171,17 @@ static exprt transform_external_objects(const exprt& e)
 /// \param instit: the point in the program to do the query
 /// \param [out] result: output
 static void collect_lvsa_access_paths(
-  exprt const &query,
-  namespacet const &ns,
+  const exprt &query,
+  const namespacet &ns,
   local_value_set_analysist &lvsa,
-  instruction_iteratort const &instit,
+  const instruction_iteratort &instit,
   std::set<exprt> &result)
 {
   TMPROF_BLOCK();
 
   if(query.id() == ID_side_effect)
   {
-    side_effect_exprt const &see = to_side_effect_expr(query);
+    const side_effect_exprt &see = to_side_effect_expr(query);
     if(see.get_statement()==ID_nondet)
     {
       // TODO(marek-trtik): Add computation of a proper points-to set for NONDET
@@ -204,7 +204,7 @@ static void collect_lvsa_access_paths(
       }
 
       assert(target.id()==ID_object_descriptor);
-      exprt const transformed_object =
+      const exprt transformed_object =
         transform_external_objects(
           to_object_descriptor_expr(target).object());
 
@@ -244,10 +244,10 @@ static void collect_lvsa_access_paths(
 /// Call `collect_lvsa_access_paths` and use taint_object_numbering to convert
 /// the results from `exprt`s to the format required for `lvalue_numbers_sett`
 static void collect_lvsa_access_paths(
-  exprt const& query_in,
-  namespacet const& ns,
+  const exprt &query_in,
+  const namespacet &ns,
   local_value_set_analysist& lvsa,
-  instruction_iteratort const& instit,
+  const instruction_iteratort &instit,
   object_numberingt& taint_object_numbering,
   lvalue_numbers_sett& result,
   bool &singular)
@@ -269,11 +269,11 @@ static void collect_lvsa_access_paths(
 }
 
 static void collect_lvsa_access_paths(
-  exprt const& query_in,
+  const exprt &query_in,
   namespacet const& ns,
   lvalue_numbers_sett &result,
   local_value_set_analysist& lvsa,
-  instruction_iteratort const& instit,
+  const instruction_iteratort &instit,
   object_numberingt& taint_object_numbering)
 {
   TMPROF_BLOCK();
@@ -511,12 +511,12 @@ numbered_lvalue_to_taint_mapt taint_algorithm_computing_summary_of_functiont::
 
 void taint_algorithm_computing_summary_of_functiont::assign(
   numbered_lvalue_to_taint_mapt &map,
-  taint_lvalue_numbert const lvalue,
+  const taint_lvalue_numbert lvalue,
   const taint_sett &taint)
 {
   TMPROF_BLOCK();
 
-  auto const  it = map.find(lvalue);
+  const auto it = map.find(lvalue);
   if (it == map.end())
   {
     if(!taint.is_bottom())
@@ -528,12 +528,12 @@ void taint_algorithm_computing_summary_of_functiont::assign(
 
 void taint_algorithm_computing_summary_of_functiont::maybe_assign(
   numbered_lvalue_to_taint_mapt &map,
-  taint_lvalue_numbert const lvalue,
+  const taint_lvalue_numbert lvalue,
   const taint_sett &taint)
 {
   TMPROF_BLOCK();
 
-  auto const  it = map.find(lvalue);
+  const auto it = map.find(lvalue);
   if (it == map.end())
   {
     if(!taint.is_bottom())
@@ -557,7 +557,7 @@ bool taint_algorithm_computing_summary_of_functiont::proper_subset(
   bool common_base=a.get_base()==b.get_base();
   for(auto  a_it=a.cbegin(); a_it!=a.cend(); ++a_it)
   {
-    auto const  b_it=b.find(a_it->first);
+    const auto b_it=b.find(a_it->first);
     if(b_it==b.cend())
       return false;
     // Necessarily equal?
@@ -603,7 +603,7 @@ void  taint_algorithm_computing_summary_of_functiont::
     {
       std::size_t  param_idx;
       {
-        //std::string const  caller = as_string(caller_ident);
+        //const std::string caller = as_string(caller_ident);
         const std::string param_name=
           as_string(
             numbering->at(input.first).get(ID_identifier));
@@ -626,7 +626,7 @@ void  taint_algorithm_computing_summary_of_functiont::
       *numbering);
 
     lvalue_numbers_sett resolved_lvalues;
-    for(auto const&  lvalue : argument_lvalues)
+    for(const auto &lvalue : argument_lvalues)
     {
       const auto it =
         summary->get_map_output_lvalues_to_param_indices().find(lvalue);
@@ -643,9 +643,9 @@ void  taint_algorithm_computing_summary_of_functiont::
     }
 
     taint_sett argument_taint;
-    for(auto const &lvalue : resolved_lvalues)
+    for(const auto &lvalue : resolved_lvalues)
     {
-      auto const  it = a.find(lvalue);
+      const auto it = a.find(lvalue);
       if(it != a.cend())
         argument_taint |= it->second;
     }
@@ -784,7 +784,7 @@ void taint_algorithm_computing_summary_of_functiont::initialise_domain(
     }
   }
 
-  for(const auto  lvaluenum : environment)
+  for(const auto lvaluenum : environment)
   {
     const taint_lvaluet &lvalue=numbering->at(lvaluenum);
     // This is an output parameter to get_this passed by reference
@@ -855,10 +855,10 @@ void taint_algorithm_computing_summary_of_functiont::initialise_domain(
 
 void taint_algorithm_computing_summary_of_functiont::handle_assignment(
   const code_assignt& asgn,
-  numbered_lvalue_to_taint_mapt const&  a,
+  const numbered_lvalue_to_taint_mapt &a,
   const taint_summary_inputt &input,
   numbered_lvalue_to_taint_mapt& result,
-  instruction_iteratort const& Iit,
+  const instruction_iteratort &Iit,
   local_value_set_analysist &lvsa)
 {
   TMPROF_BLOCK();
@@ -972,7 +972,7 @@ numbered_lvalue_to_taint_mapt taint_algorithm_computing_summary_of_functiont::
 {
   TMPROF_BLOCK();
 
-  goto_programt::instructiont const&  I=*Iit;
+  const goto_programt::instructiont &I=*Iit;
   numbered_lvalue_to_taint_mapt result;
   // Take a cheap read-only view of the incoming domain:
   result.set_base(&a);