unit tests: avoid deprecated constructors

This will enable removing those deprecated constructors.

Author: kroening

unit/util/expr_cast/expr_cast.cpp

@@ -145,19 +145,23 @@ SCENARIO("expr_dynamic_cast",
 
   GIVEN("A byte extract expression with little endianness")
   {
-    auto byte = byte_extract_exprt(ID_byte_extract_little_endian);
-    byte.op() = symbol_exprt(typet());
-    byte.offset() = constant_exprt("0", typet());
+    auto byte = byte_extract_exprt(
+      ID_byte_extract_little_endian,
+      symbol_exprt(typet()),
+      constant_exprt("0", typet()),
+      typet());
     THEN("try_expr_dynamic_cast<byte_extract_expr> returns non-empty")
     {
       REQUIRE(expr_try_dynamic_cast<byte_extract_exprt>(byte));
     }
   }
   GIVEN("A byte extract expression with big endianness")
   {
-    auto byte = byte_extract_exprt(ID_byte_extract_big_endian);
-    byte.op() = symbol_exprt(typet());
-    byte.offset() = constant_exprt("0", typet());
+    auto byte = byte_extract_exprt(
+      ID_byte_extract_big_endian,
+      symbol_exprt(typet()),
+      constant_exprt("0", typet()),
+      typet());
     THEN("try_expr_dynamic_cast<byte_extract_expr> returns non-empty")
     {
       REQUIRE(expr_try_dynamic_cast<byte_extract_exprt>(byte));
@@ -177,19 +181,23 @@ SCENARIO("can_cast_expr", "[core][utils][expr_cast][can_cast_expr]")
 {
   GIVEN("A byte extract expression with little endianness")
   {
-    auto byte = byte_extract_exprt(ID_byte_extract_little_endian);
-    byte.op() = symbol_exprt(typet());
-    byte.offset() = constant_exprt("0", typet());
+    auto byte = byte_extract_exprt(
+      ID_byte_extract_little_endian,
+      symbol_exprt(typet()),
+      constant_exprt("0", typet()),
+      typet());
     THEN("can_expr_expr<byte_extract_expr> returns true")
     {
       REQUIRE(can_cast_expr<byte_extract_exprt>(byte));
     }
   }
   GIVEN("A byte extract expression with big endianness")
   {
-    auto byte = byte_extract_exprt(ID_byte_extract_big_endian);
-    byte.op() = symbol_exprt(typet());
-    byte.offset() = constant_exprt("0", typet());
+    auto byte = byte_extract_exprt(
+      ID_byte_extract_big_endian,
+      symbol_exprt(typet()),
+      constant_exprt("0", typet()),
+      typet());
     THEN("can_expr_expr<byte_extract_expr> returns true")
     {
       REQUIRE(can_cast_expr<byte_extract_exprt>(byte));

unit/util/irep_sharing.cpp

@@ -120,7 +120,7 @@ SCENARIO("exprt_sharing_trade_offs", "[!mayfail][core][utils][exprt]")
 {
   GIVEN("An expression created with add_to_operands(std::move(...))")
   {
-    multi_ary_exprt test_expr(ID_1);
+    multi_ary_exprt test_expr(ID_1, {}, typet());
     exprt test_subexpr(ID_1);
     exprt test_subsubexpr(ID_1);
     test_subexpr.add_to_operands(std::move(test_subsubexpr));
@@ -154,7 +154,7 @@ SCENARIO("exprt_sharing", "[core][utils][exprt]")
 {
   GIVEN("An expression created with add_to_operands(std::move(...))")
   {
-    multi_ary_exprt test_expr(ID_1);
+    multi_ary_exprt test_expr(ID_1, {}, typet());
     exprt test_subexpr(ID_1);
     exprt test_subsubexpr(ID_1);
     test_subexpr.add_to_operands(std::move(test_subsubexpr));