codet now inherits from irept

Author: Daniel Kroening

src/ansi-c/c_typecheck_code.cpp

@@ -30,8 +30,6 @@ void c_typecheck_baset::typecheck_code(codet &code)
     throw 0;
   }
 
-  code.type()=code_typet();
-
   const irep_idt &statement=code.get_statement();
 
   if(statement==ID_expression)

src/ansi-c/c_typecheck_expr.cpp

@@ -773,7 +773,7 @@ void c_typecheck_baset::typecheck_expr_operands(exprt &expr)
     code_declt decl(symbol.symbol_expr());
     decl.add_source_location()=declaration.source_location();
 
-    expr.op0()=decl;
+    expr.get_sub()[0] = decl;
 
     typecheck_expr(expr.op1());
   }
@@ -1021,7 +1021,7 @@ void c_typecheck_baset::typecheck_expr_sizeof(exprt &expr)
       ID_statement_expression, void_type(), expr.source_location());
     auto decl_block=code_blockt::from_list(clean_code);
     decl_block.set_statement(ID_decl_block);
-    side_effect_expr.copy_to_operands(decl_block);
+    side_effect_expr.get_sub().push_back(decl_block);
     clean_code.clear();
 
     // We merge the side-effect into the operand of the typecast,
@@ -1078,7 +1078,7 @@ void c_typecheck_baset::typecheck_expr_typecast(exprt &expr)
       ID_statement_expression, void_type(), expr.source_location());
     auto decl_block=code_blockt::from_list(clean_code);
     decl_block.set_statement(ID_decl_block);
-    side_effect_expr.copy_to_operands(decl_block);
+    side_effect_expr.get_sub().push_back(decl_block);
     clean_code.clear();
 
     // We merge the side-effect into the operand of the typecast,

src/cpp/cpp_destructor.cpp

@@ -53,7 +53,6 @@ optionalt<codet> cpp_typecheckt::cpp_destructor(
       throw 0;
     }
 
-    new_code.type().id(ID_code);
     new_code.add_source_location()=source_location;
     new_code.set_statement(ID_block);
 
@@ -68,7 +67,7 @@ optionalt<codet> cpp_typecheckt::cpp_destructor(
 
       auto i_code = cpp_destructor(source_location, index);
       if(i_code.has_value())
-        new_code.move_to_operands(i_code.value());
+        to_code_block(new_code).add(i_code.value());
     }
   }
   else

src/cpp/cpp_typecheck_code.cpp

@@ -25,12 +25,10 @@ void cpp_typecheckt::typecheck_code(codet &code)
 
   if(statement==ID_try_catch)
   {
-    code.type() = code_typet({}, empty_typet());
     typecheck_try_catch(code);
   }
   else if(statement==ID_member_initializer)
   {
-    code.type() = code_typet({}, empty_typet());
     typecheck_member_initializer(code);
   }
   else if(statement==ID_msc_if_exists ||
@@ -418,7 +416,7 @@ void cpp_typecheckt::typecheck_decl(codet &code)
         "declarator type should match symbol type");
     }
 
-    new_code.move_to_operands(decl_statement);
+    new_code.add_to_operands(std::move(decl_statement));
 
     // is there a constructor to be called?
     if(symbol.value.is_not_nil())
@@ -439,7 +437,7 @@ void cpp_typecheckt::typecheck_decl(codet &code)
         symbol.location, object_expr, declarator.init_args().operands());
 
       if(constructor_call.has_value())
-        new_code.move_to_operands(constructor_call.value());
+        new_code.add_to_operands(std::move(constructor_call.value()));
     }
   }
 

src/cpp/cpp_typecheck_compound_type.cpp

@@ -666,14 +666,16 @@ void cpp_typecheckt::typecheck_compound_declarator(
           exprt already_typechecked(ID_already_typechecked);
           already_typechecked.move_to_operands(expr_call);
 
-          func_symb.value = code_returnt(already_typechecked).make_block();
+          func_symb.value =
+            code_returnt(already_typechecked).make_block().as_expr();
         }
         else
         {
           exprt already_typechecked(ID_already_typechecked);
           already_typechecked.move_to_operands(expr_call);
 
-          func_symb.value = code_expressiont(already_typechecked).make_block();
+          func_symb.value =
+            code_expressiont(already_typechecked).make_block().as_expr();
         }
 
         // add this new function to the list of components

src/cpp/cpp_typecheck_constructor.cpp

@@ -47,7 +47,7 @@ static void copy_parent(
   code_assignt code(dereference_exprt(op0), op1);
   code.add_source_location() = source_location;
 
-  block.operands().push_back(code);
+  block.operands().push_back(code.as_expr());
 }
 
 /// Generate code to copy the member.
@@ -76,7 +76,7 @@ static void copy_member(
   code_expressiont code(assign);
   code.add_source_location() = source_location;
 
-  block.operands().push_back(code);
+  block.operands().push_back(code.as_expr());
 }
 
 /// Generate code to copy the member.
@@ -113,7 +113,7 @@ static void copy_array(
   code_expressiont code(assign);
   code.add_source_location() = source_location;
 
-  block.operands().push_back(code);
+  block.operands().push_back(code.as_expr());
 }
 
 /// Generate code for implicit default constructors
@@ -590,7 +590,7 @@ void cpp_typecheckt::full_member_initialization(
         }
         vbases.pop_front();
       }
-      cond.move_to_operands(block);
+      cond.add_to_operands(block.as_expr());
       final_initializers.move_to_sub(cond);
     }
 
@@ -680,7 +680,7 @@ void cpp_typecheckt::full_member_initialization(
         {
           codet tmp(ID_member_initializer);
           tmp.swap(final_initializers.get_sub().back());
-          cond.move_to_operands(tmp);
+          cond.add_to_operands(tmp.as_expr());
           final_initializers.get_sub().back().swap(cond);
         }
       }

src/cpp/cpp_typecheck_declaration.cpp

@@ -59,7 +59,7 @@ void cpp_typecheckt::convert_anonymous_union(
 
   code_declt decl_statement(cpp_symbol_expr(symbol));
 
-  new_code.move_to_operands(decl_statement);
+  new_code.add_to_operands(decl_statement);
 
   // do scoping
   symbolt union_symbol=
@@ -178,7 +178,7 @@ void cpp_typecheckt::convert_non_template_declaration(
         declarator.init_args().operands());
 
       if(constructor.has_value())
-        symbol.value = constructor.value();
+        symbol.value = constructor.value().as_expr();
       else
         symbol.value = nil_exprt();
     }

src/cpp/cpp_typecheck_function.cpp

@@ -102,7 +102,7 @@ void cpp_typecheckt::convert_function(symbolt &symbol)
       !symbol.value.has_operands() || !symbol.value.op0().has_operands() ||
       symbol.value.op0().op0().id() != ID_already_typechecked)
     {
-      symbol.value.copy_to_operands(dtor(msymb));
+      symbol.value.copy_to_operands(dtor(msymb).as_expr());
     }
   }
 

src/cpp/cpp_typecheck_initializer.cpp

@@ -183,7 +183,7 @@ void cpp_typecheckt::convert_initializer(symbolt &symbol)
       cpp_constructor(symbol.value.source_location(), expr_symbol, ops);
 
     if(constructor.has_value())
-      symbol.value = constructor.value();
+      symbol.value = constructor.value().as_expr();
     else
       symbol.value = nil_exprt();
   }
@@ -292,7 +292,7 @@ void cpp_typecheckt::zero_initializer(
     already_typechecked(assign.lhs());
 
     typecheck_code(assign);
-    ops.push_back(assign);
+    ops.push_back(assign.as_expr());
   }
   else if(final_type.id()==ID_incomplete_struct ||
           final_type.id()==ID_incomplete_union)
@@ -320,6 +320,6 @@ void cpp_typecheckt::zero_initializer(
     already_typechecked(assign.lhs());
 
     typecheck_code(assign);
-    ops.push_back(assign);
+    ops.push_back(assign.as_expr());
   }
 }

src/cpp/expr2cpp.cpp

@@ -441,15 +441,15 @@ std::string expr2cppt::convert_code(
   const codet &src,
   unsigned indent)
 {
-  const irep_idt &statement=src.get(ID_statement);
+  const irep_idt &statement = src.get_statement();
 
   if(statement==ID_cpp_delete ||
      statement==ID_cpp_delete_array)
-    return convert_code_cpp_delete(src, indent);
+    return convert_code_cpp_delete(src.as_expr(), indent);
 
   if(statement==ID_cpp_new ||
      statement==ID_cpp_new_array)
-    return convert_cpp_new(src, indent);
+    return convert_cpp_new(src.as_expr(), indent);
 
   return expr2ct::convert_code(src, indent);
 }