better typing for statements in code_blockt

Author: Daniel Kroening

src/goto-instrument/dump_c.cpp

@@ -1057,26 +1057,28 @@ static bool find_block_position_rec(
   const irep_idt &identifier,
   codet &root,
   code_blockt* &dest,
-  exprt::operandst::iterator &before)
+  code_blockt::code_operandst::iterator &before)
 {
   if(!root.has_operands())
     return false;
 
   code_blockt *our_dest=nullptr;
 
-  exprt::operandst &operands=root.operands();
-  exprt::operandst::iterator first_found=operands.end();
+  auto &operands=root.statements();
+  code_blockt::code_operandst::iterator first_found=operands.end();
 
-  Forall_expr(it, operands)
+  for(auto it=operands.begin();
+      it!=operands.end();
+      it++)
   {
     bool found=false;
 
     // be aware of the skip-carries-type hack
     if(it->id()==ID_code &&
-       to_code(*it).get_statement()!=ID_skip)
+       it->get_statement()!=ID_skip)
       found=find_block_position_rec(
         identifier,
-        to_code(*it),
+        *it,
         our_dest,
         before);
     else
@@ -1154,14 +1156,14 @@ void dump_ct::insert_local_static_decls(
     cleanup_decl(d, redundant, type_decls);
 
     code_blockt *dest_ptr=nullptr;
-    exprt::operandst::iterator before=b.operands().end();
+    auto before=b.statements().end();
 
     // some use of static variables might be optimised out if it is
     // within an if(false) { ... } block
     if(find_block_position_rec(*it, b, dest_ptr, before))
     {
       CHECK_RETURN(dest_ptr!=nullptr);
-      dest_ptr->operands().insert(before, d);
+      dest_ptr->statements().insert(before, d);
     }
   }
 }
@@ -1191,14 +1193,14 @@ void dump_ct::insert_local_type_decls(
     skip.type()=type;
 
     code_blockt *dest_ptr=nullptr;
-    exprt::operandst::iterator before=b.operands().end();
+    auto before=b.statements().end();
 
     // we might not find it in case a transparent union type cast
     // has been removed by cleanup operations
     if(find_block_position_rec(*it, b, dest_ptr, before))
     {
       CHECK_RETURN(dest_ptr!=nullptr);
-      dest_ptr->operands().insert(before, skip);
+      dest_ptr->statements().insert(before, skip);
     }
   }
 }

src/goto-instrument/goto_program2code.cpp

@@ -1706,10 +1706,10 @@ static bool move_label_ifthenelse(
 
   code_blockt &block=to_code_block(to_code(expr));
   if(!block.has_operands() ||
-      to_code(block.operands().back()).get_statement()!=ID_label)
+      to_code(block.statements().back()).get_statement()!=ID_label)
     return false;
 
-  code_labelt &label=to_code_label(to_code(block.operands().back()));
+  code_labelt &label=to_code_label(block.statements().back());
   if(label.get_label().empty() ||
       label.code().get_statement()!=ID_skip)
     return false;