Use (non-trivial) constructors for exprt/codet

This is more efficient, type safe, and easier to read.

Author: tautschnig

src/ansi-c/c_typecheck_expr.cpp

@@ -1300,7 +1300,7 @@ void c_typecheck_baset::typecheck_expr_index(exprt &expr)
     // p[i] is syntactic sugar for *(p+i)
 
     typecheck_arithmetic_pointer(expr.op0());
-    exprt addition(ID_plus, array_expr.type());
+    plus_exprt addition(array_expr.type());
     addition.operands().swap(expr.operands());
     expr.add_to_operands(std::move(addition));
     expr.id(ID_dereference);

src/cpp/cpp_typecheck_constructor.cpp

@@ -128,9 +128,7 @@ void cpp_typecheckt::default_ctor(
   decl.type().subtype().make_nil();
   decl.add_source_location()=source_location;
 
-  decl.value().id(ID_code);
-  decl.value().type()=typet(ID_code);
-  decl.value().set(ID_statement, ID_block);
+  decl.value() = code_blockt();
   decl.add(ID_cv).make_nil();
   decl.add(ID_throw_decl).make_nil();
 

src/cpp/cpp_typecheck_conversions.cpp

@@ -1402,9 +1402,8 @@ bool cpp_typecheckt::reference_binding(
   {
     {
       // create temporary object
-      exprt tmp=exprt(ID_side_effect, type.subtype());
-      tmp.set(ID_statement, ID_temporary_object);
-      tmp.add_source_location()=expr.source_location();
+      side_effect_exprt tmp(
+        ID_temporary_object, type.subtype(), expr.source_location());
       // tmp.set(ID_C_lvalue, true);
       tmp.add_to_operands(std::move(new_expr));
       new_expr.swap(tmp);

src/cpp/cpp_typecheck_destructor.cpp

@@ -37,9 +37,7 @@ void cpp_typecheckt::default_dtor(
   decl.type().id(ID_function_type);
   decl.type().subtype().make_nil();
 
-  decl.value().id(ID_code);
-  decl.value().add(ID_type).id(ID_code);
-  decl.value().set(ID_statement, ID_block);
+  decl.value() = code_blockt();
   decl.add(ID_cv).make_nil();
   decl.add(ID_throw_decl).make_nil();
 

src/goto-instrument/goto_program2code.cpp

@@ -315,33 +315,31 @@ goto_programt::const_targett goto_program2codet::convert_assign_varargs(
   const exprt this_va_list_expr=assign.lhs();
   const exprt &r=skip_typecast(assign.rhs());
 
-  // we don't bother setting the type
-  code_function_callt f;
-  f.lhs().make_nil();
-
   if(r.id()==ID_constant &&
      (r.is_zero() || to_constant_expr(r).get_value()==ID_NULL))
   {
-    f.function() = symbol_exprt("va_end", code_typet({}, empty_typet()));
-    f.arguments().push_back(this_va_list_expr);
+    code_function_callt f(
+      symbol_exprt("va_end", code_typet({}, empty_typet())),
+      {this_va_list_expr});
     f.arguments().back().type().id(ID_gcc_builtin_va_list);
 
     dest.add_to_operands(std::move(f));
   }
   else if(r.id()==ID_address_of)
   {
-    f.function() = symbol_exprt("va_start", code_typet({}, empty_typet()));
-    f.arguments().push_back(this_va_list_expr);
-    f.arguments().back().type().id(ID_gcc_builtin_va_list);
-    f.arguments().push_back(to_address_of_expr(r).object());
+    code_function_callt f(
+      symbol_exprt("va_start", code_typet({}, empty_typet())),
+      {this_va_list_expr, to_address_of_expr(r).object()});
+    f.arguments().front().type().id(ID_gcc_builtin_va_list);
 
     dest.add_to_operands(std::move(f));
   }
   else if(r.id()==ID_side_effect &&
           to_side_effect_expr(r).get_statement()==ID_gcc_builtin_va_arg_next)
   {
-    f.function() = symbol_exprt("va_arg", code_typet({}, empty_typet()));
-    f.arguments().push_back(this_va_list_expr);
+    code_function_callt f(
+      symbol_exprt("va_arg", code_typet({}, empty_typet())),
+      {this_va_list_expr});
     f.arguments().back().type().id(ID_gcc_builtin_va_list);
 
     side_effect_expr_function_callt type_of;
@@ -388,10 +386,10 @@ goto_programt::const_targett goto_program2codet::convert_assign_varargs(
   }
   else
   {
-    f.function() = symbol_exprt("va_copy", code_typet({}, empty_typet()));
-    f.arguments().push_back(this_va_list_expr);
-    f.arguments().back().type().id(ID_gcc_builtin_va_list);
-    f.arguments().push_back(r);
+    code_function_callt f(
+      symbol_exprt("va_copy", code_typet({}, empty_typet())),
+      {this_va_list_expr, r});
+    f.arguments().front().type().id(ID_gcc_builtin_va_list);
 
     dest.add_to_operands(std::move(f));
   }

src/goto-programs/goto_convert.cpp

@@ -1151,7 +1151,7 @@ exprt goto_convertt::case_guard(
     return equal_exprt(value, case_op.at(0));
   else
   {
-    exprt dest = exprt(ID_or, bool_typet());
+    or_exprt dest;
     dest.reserve_operands(case_op.size());
 
     forall_expr(it, case_op)

src/goto-symex/slice_by_trace.cpp

@@ -305,7 +305,8 @@ void symex_slice_by_tracet::compute_ts_back(
               eq_conds.push_back(equal_exprt(*pvi, std::move(constant_value)));
               pvi++;
             }
-            exprt val_merge=exprt(ID_and, typet(ID_bool));
+
+            and_exprt val_merge;
             val_merge.operands().reserve(eq_conds.size()+1);
             val_merge.copy_to_operands(merge[j+1]);
             for(std::list<exprt>::iterator k=eq_conds.begin();