Restructure code to use constructors and add std::move

This simplifies the code structure and ensures RAII where possible.

Author: tautschnig

jbmc/src/java_bytecode/java_entry_point.cpp

@@ -204,7 +204,8 @@ static void java_static_lifetime_init(
         set_class_identifier(
           to_struct_expr(*zero_object), ns, to_symbol_type(sym.type));
 
-        code_block.add(code_assignt(sym.symbol_expr(), *zero_object));
+        code_block.add(
+          std::move(code_assignt(sym.symbol_expr(), *zero_object)));
 
         // Then call the init function:
         code_block.add(std::move(initializer_call));
@@ -762,7 +763,7 @@ bool generate_java_start_function(
 
   // Exceptional return: catch and assign to exc_symbol.
   code_landingpadt landingpad(exc_symbol.symbol_expr());
-  init_code.add(toplevel_catch);
+  init_code.add(std::move(toplevel_catch));
   init_code.add(std::move(landingpad));
 
   // Converge normal and exceptional return:

jbmc/src/java_bytecode/java_static_initializers.cpp

@@ -687,9 +687,8 @@ code_ifthenelset get_clinit_wrapper_body(
   wrapper_body.cond() = check_already_run;
 
   // add the "already-run = false" statement
-  code_blockt init_body;
   code_assignt set_already_run(already_run_symbol.symbol_expr(), true_exprt());
-  init_body.move(set_already_run);
+  code_blockt init_body({set_already_run});
 
   clinit_wrapper_do_recursive_calls(
     symbol_table,

jbmc/src/java_bytecode/remove_java_new.cpp

@@ -299,9 +299,9 @@ goto_programt::targett remove_java_newt::lower_java_new_array(
     for_body.add(std::move(init_decl));
 
     code_assignt init_subarray(init_sym, sub_java_new);
+    for_body.add(std::move(init_subarray));
     code_assignt assign_subarray(
       deref_expr, typecast_exprt(init_sym, deref_expr.type()));
-    for_body.move(init_subarray);
     for_body.add(std::move(assign_subarray));
 
     for_loop.init() = code_assignt(tmp_i, from_integer(0, tmp_i.type()));

src/cpp/cpp_constructor.cpp

@@ -192,8 +192,7 @@ optionalt<codet> cpp_typecheckt::cpp_constructor(
       side_effect_exprt assign(ID_assign, typet(), source_location);
       assign.move_to_operands(member, val);
       typecheck_side_effect_assignment(assign);
-      code_expressiont code_exp(assign);
-      block.move(code_exp);
+      block.add(std::move(code_expressiont(assign)));
     }
 
     // enter struct scope

src/util/nondet.cpp

@@ -95,7 +95,6 @@ code_blockt generate_nondet_switch(
   if(switch_cases.size() == 1)
     return code_blockt({switch_cases[0]});
 
-  code_switcht result_switch;
   code_blockt result_block;
 
   const symbol_exprt &switch_value = generate_nondet_int(
@@ -108,23 +107,20 @@ code_blockt generate_nondet_switch(
     symbol_table,
     result_block);
 
-  result_switch.value() = switch_value;
-
   code_blockt switch_block;
   size_t case_number = 0;
   for(const auto &switch_case : switch_cases)
   {
     code_blockt this_block;
     this_block.add(switch_case);
     this_block.add(code_breakt());
-    code_switch_caset this_case;
-    this_case.case_op() = from_integer(case_number, switch_value.type());
-    this_case.code() = this_block;
-    switch_block.move(this_case);
+    code_switch_caset this_case(
+      from_integer(case_number, switch_value.type()), this_block);
+    switch_block.add(std::move(this_case));
     ++case_number;
   }
 
-  result_switch.body() = switch_block;
+  code_switcht result_switch(switch_value, switch_block);
   result_block.add(std::move(result_switch));
   return result_block;
 }