use code_blockt::add and ::move for adding a statement

Author: Daniel Kroening

src/ansi-c/ansi_c_entry_point.cpp

@@ -73,7 +73,7 @@ void record_function_outputs(
     output.op1()=return_symbol.symbol_expr();
     output.add_source_location()=function.location;
 
-    init_code.move_to_operands(output);
+    init_code.move(output);
   }
 
   #if 0
@@ -218,7 +218,7 @@ bool generate_ansi_c_start_function(
     call_init.add_source_location()=symbol.location;
     call_init.function()=init_it->second.symbol_expr();
 
-    init_code.move_to_operands(call_init);
+    init_code.move(call_init);
   }
 
   // build call to main function
@@ -264,7 +264,7 @@ bool generate_ansi_c_start_function(
         const binary_relation_exprt ge(argc_symbol.symbol_expr(), ID_ge, one);
 
         code_assumet assumption(ge);
-        init_code.move_to_operands(assumption);
+        init_code.move(assumption);
       }
 
       {
@@ -278,7 +278,7 @@ bool generate_ansi_c_start_function(
           argc_symbol.symbol_expr(), ID_le, bound_expr);
 
         code_assumet assumption(le);
-        init_code.move_to_operands(assumption);
+        init_code.move(assumption);
       }
 
       {
@@ -288,7 +288,7 @@ bool generate_ansi_c_start_function(
         input.op0()=address_of_exprt(
           index_exprt(string_constantt("argc"), from_integer(0, index_type())));
         input.op1()=argc_symbol.symbol_expr();
-        init_code.move_to_operands(input);
+        init_code.move(input);
       }
 
       if(parameters.size()==3)
@@ -315,7 +315,7 @@ bool generate_ansi_c_start_function(
           envp_size_symbol.symbol_expr(), ID_le, max_minus_one);
 
         code_assumet assumption(le);
-        init_code.move_to_operands(assumption);
+        init_code.move(assumption);
       }
 
       {
@@ -350,7 +350,7 @@ bool generate_ansi_c_start_function(
         // disable bounds check on that one
         index_expr.set("bounds_check", false);
 
-        init_code.copy_to_operands(code_assignt(index_expr, null));
+        init_code.add(code_assignt(index_expr, null));
       }
 
       if(parameters.size()==3)
@@ -370,7 +370,7 @@ bool generate_ansi_c_start_function(
         const equal_exprt is_null(index_expr, null);
 
         code_assumet assumption2(is_null);
-        init_code.move_to_operands(assumption2);
+        init_code.move(assumption2);
       }
 
       {
@@ -434,7 +434,7 @@ bool generate_ansi_c_start_function(
         symbol_table);
   }
 
-  init_code.move_to_operands(call_main);
+  init_code.move(call_main);
 
   // TODO: add read/modified (recursively in call graph) globals as INPUT/OUTPUT
 

src/ansi-c/c_typecheck_code.cpp

@@ -188,7 +188,7 @@ void c_typecheck_baset::typecheck_block(codet &code)
 
   // do decl-blocks
 
-  exprt new_ops;
+  code_blockt new_ops;
   new_ops.operands().reserve(code.operands().size());
 
   Forall_operands(it1, code)
@@ -211,10 +211,10 @@ void c_typecheck_baset::typecheck_block(codet &code)
 
       // codet &label_op=*code_ptr;
 
-      new_ops.move_to_operands(code_op);
+      new_ops.move(code_op);
     }
     else
-      new_ops.move_to_operands(code_op);
+      new_ops.move(code_op);
   }
 
   code.operands().swap(new_ops.operands());
@@ -486,7 +486,7 @@ void c_typecheck_baset::typecheck_for(codet &code)
     code_block.reserve_operands(2);
     code_block.move_to_operands(code.op0());
     code.op0().make_nil();
-    code_block.move_to_operands(code);
+    code_block.move(code);
     code.swap(code_block);
     typecheck_code(code); // recursive call
   }
@@ -630,7 +630,7 @@ void c_typecheck_baset::typecheck_ifthenelse(code_ifthenelset &code)
     code_blockt code_block;
     code_block.add_source_location()=code.then_case().source_location();
 
-    code_block.move_to_operands(code.then_case());
+    code_block.move(code.then_case());
     code.then_case().swap(code_block);
   }
 
@@ -643,7 +643,7 @@ void c_typecheck_baset::typecheck_ifthenelse(code_ifthenelset &code)
       code_blockt code_block;
       code_block.add_source_location()=code.else_case().source_location();
 
-      code_block.move_to_operands(code.else_case());
+      code_block.move(code.else_case());
       code.else_case().swap(code_block);
     }
 
@@ -763,7 +763,7 @@ void c_typecheck_baset::typecheck_while(code_whilet &code)
     code_blockt code_block;
     code_block.add_source_location()=code.body().source_location();
 
-    code_block.move_to_operands(code.body());
+    code_block.move(code.body());
     code.body().swap(code_block);
   }
   typecheck_code(code.body());
@@ -798,7 +798,7 @@ void c_typecheck_baset::typecheck_dowhile(code_dowhilet &code)
     code_blockt code_block;
     code_block.add_source_location()=code.body().source_location();
 
-    code_block.move_to_operands(code.body());
+    code_block.move(code.body());
     code.body().swap(code_block);
   }
   typecheck_code(code.body());

src/util/std_code.cpp

@@ -123,8 +123,8 @@ code_blockt create_fatal_assertion(
   const exprt &condition, const source_locationt &loc)
 {
   code_blockt result;
-  result.copy_to_operands(code_assertt(condition));
-  result.copy_to_operands(code_assumet(condition));
+  result.add(code_assertt(condition));
+  result.add(code_assumet(condition));
   for(auto &op : result.operands())
     op.add_source_location() = loc;
   result.add_source_location() = loc;