Merge pull request #1851 from tautschnig/remove-expr-listt

Include list where using a std::list and drop forall_expr_list macro

Author: tautschnig

src/analyses/uninitialized_domain.cpp

@@ -16,6 +16,8 @@ Date: January 2010
 #include <util/std_expr.h>
 #include <util/std_code.h>
 
+#include <list>
+
 void uninitialized_domaint::transform(
   locationt from,
   locationt to,
@@ -43,10 +45,12 @@ void uninitialized_domaint::transform(
       std::list<exprt> read=expressions_read(*from);
       std::list<exprt> written=expressions_written(*from);
 
-      forall_expr_list(it, written) assign(*it);
+      for(const auto &expr : written)
+        assign(expr);
 
       // we only care about the *first* uninitalized use
-      forall_expr_list(it, read) assign(*it);
+      for(const auto &expr : read)
+        assign(expr);
     }
   }
 }

src/ansi-c/ansi_c_parse_tree.h

@@ -12,6 +12,8 @@ Author: Daniel Kroening, [email protected]
 
 #include "ansi_c_declaration.h"
 
+#include <list>
+
 class ansi_c_parse_treet
 {
 public:

src/ansi-c/c_typecast.h

@@ -13,6 +13,8 @@ Author: Daniel Kroening, [email protected]
 #include <util/namespace.h>
 #include <util/expr.h>
 
+#include <list>
+
 // try a type cast from expr.type() to type
 //
 // false: typecast successful, expr modified

src/ansi-c/printf_formatter.h

@@ -15,6 +15,8 @@ Author: Daniel Kroening, [email protected]
 #include <util/expr.h>
 #include <util/namespace.h>
 
+#include <list>
+
 class printf_formattert
 {
 public:

src/cbmc/bmc.cpp

@@ -139,8 +139,8 @@ void bmct::do_conversion()
   {
     status() << "converting constraints" << eom;
 
-    forall_expr_list(it, bmc_constraints)
-      prop_conv.set_to_true(*it);
+    for(const auto &constraint : bmc_constraints)
+      prop_conv.set_to_true(constraint);
   }
   // hook for cegis to freeze synthesis program vars
   freeze_program_variables();

src/cbmc/bmc.h

@@ -60,7 +60,7 @@ class bmct:public safety_checkert
   virtual ~bmct() { }
 
   // additional stuff
-  expr_listt bmc_constraints;
+  std::list<exprt> bmc_constraints;
 
   void set_ui(ui_message_handlert::uit _ui) { ui=_ui; }
 

src/cpp/cpp_parse_tree.h

@@ -14,6 +14,8 @@ Author: Daniel Kroening, [email protected]
 
 #include "cpp_item.h"
 
+#include <list>
+
 class cpp_parse_treet
 {
 public:

src/cpp/cpp_token_buffer.h

@@ -14,6 +14,8 @@ Author: Daniel Kroening, [email protected]
 
 #include "cpp_token.h"
 
+#include <list>
+
 class cpp_token_buffert
 {
 public:

src/goto-instrument/accelerate/acceleration_utils.h

@@ -12,6 +12,7 @@ Author: Matt Lewis
 #ifndef CPROVER_GOTO_INSTRUMENT_ACCELERATE_ACCELERATION_UTILS_H
 #define CPROVER_GOTO_INSTRUMENT_ACCELERATE_ACCELERATION_UTILS_H
 
+#include <list>
 #include <map>
 #include <set>
 
@@ -30,6 +31,7 @@ Author: Matt Lewis
 #include "cone_of_influence.h"
 
 typedef std::unordered_map<exprt, exprt, irep_hash> expr_mapt;
+typedef std::list<exprt> expr_listt;
 
 class acceleration_utilst
 {

src/goto-instrument/uninitialized.cpp

@@ -47,17 +47,17 @@ void uninitializedt::get_tracking(goto_programt::const_targett i_it)
 {
   std::list<exprt> objects=objects_read(*i_it);
 
-  forall_expr_list(o_it, objects)
+  for(const auto &object : objects)
   {
-    if(o_it->id()==ID_symbol)
+    if(object.id() == ID_symbol)
     {
-      const irep_idt &identifier=to_symbol_expr(*o_it).get_identifier();
+      const irep_idt &identifier = to_symbol_expr(object).get_identifier();
       const std::set<irep_idt> &uninitialized=
         uninitialized_analysis[i_it].uninitialized;
       if(uninitialized.find(identifier)!=uninitialized.end())
         tracking.insert(identifier);
     }
-    else if(o_it->id()==ID_dereference)
+    else if(object.id() == ID_dereference)
     {
     }
   }
@@ -142,11 +142,11 @@ void uninitializedt::add_assertions(goto_programt &goto_program)
         uninitialized_analysis[i_it].uninitialized;
 
       // check tracking variables
-      forall_expr_list(it, read)
+      for(const auto &object : read)
       {
-        if(it->id()==ID_symbol)
+        if(object.id() == ID_symbol)
         {
-          const irep_idt &identifier=to_symbol_expr(*it).get_identifier();
+          const irep_idt &identifier = to_symbol_expr(object).get_identifier();
 
           if(uninitialized.find(identifier)!=uninitialized.end())
           {
@@ -169,11 +169,11 @@ void uninitializedt::add_assertions(goto_programt &goto_program)
       }
 
       // set tracking variables
-      forall_expr_list(it, written)
+      for(const auto &object : written)
       {
-        if(it->id()==ID_symbol)
+        if(object.id() == ID_symbol)
         {
-          const irep_idt &identifier=to_symbol_expr(*it).get_identifier();
+          const irep_idt &identifier = to_symbol_expr(object).get_identifier();
 
           if(tracking.find(identifier)!=tracking.end())
           {