Skip to content

Commit 7fea77e

Browse files
committed
Construct equal_exprt in a non-deprecated way
The default constructor is deprecated.
1 parent 10c607d commit 7fea77e

File tree

7 files changed

+20
-31
lines changed

7 files changed

+20
-31
lines changed

src/analyses/invariant_set.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -752,9 +752,8 @@ void invariant_sett::nnf(exprt &expr, bool negate)
752752
typecast_expr.op().type().id() == ID_unsignedbv ||
753753
typecast_expr.op().type().id() == ID_signedbv)
754754
{
755-
equal_exprt tmp;
756-
tmp.lhs() = typecast_expr.op();
757-
tmp.rhs() = from_integer(0, typecast_expr.op().type());
755+
equal_exprt tmp(
756+
typecast_expr.op(), from_integer(0, typecast_expr.op().type()));
758757
nnf(tmp, !negate);
759758
expr.swap(tmp);
760759
}
@@ -1053,9 +1052,7 @@ void invariant_sett::assignment(
10531052
const exprt &lhs,
10541053
const exprt &rhs)
10551054
{
1056-
equal_exprt equality;
1057-
equality.lhs()=lhs;
1058-
equality.rhs()=rhs;
1055+
equal_exprt equality(lhs, rhs);
10591056

10601057
// first evaluate RHS
10611058
simplify(equality.rhs());

src/ansi-c/c_typecheck_expr.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2540,8 +2540,7 @@ exprt c_typecheck_baset::do_special_functions(
25402540
throw 0;
25412541
}
25422542

2543-
equal_exprt equality_expr;
2544-
equality_expr.operands()=expr.arguments();
2543+
equal_exprt equality_expr(expr.arguments().front(), expr.arguments().back());
25452544
equality_expr.add_source_location()=source_location;
25462545

25472546
if(!base_type_eq(equality_expr.lhs().type(),

src/goto-programs/goto_convert.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,9 +1156,7 @@ exprt goto_convertt::case_guard(
11561156

11571157
forall_expr(it, case_op)
11581158
{
1159-
equal_exprt eq_expr;
1160-
eq_expr.lhs() = value;
1161-
eq_expr.rhs() = *it;
1159+
equal_exprt eq_expr(value, *it);
11621160
dest.move_to_operands(eq_expr);
11631161
}
11641162
INVARIANT(

src/solvers/flattening/boolbv_byte_extract.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ bvt boolbvt::convert_byte_extract(const byte_extract_exprt &expr)
143143

144144
// add implications
145145

146-
equal_exprt equality;
147-
equality.lhs() = expr.offset(); // index operand
146+
// index operand
147+
equal_exprt equality(expr.offset(), exprt());
148148

149149
// type of index operand
150150
const typet &constant_type = expr.offset().type();
@@ -170,8 +170,8 @@ bvt boolbvt::convert_byte_extract(const byte_extract_exprt &expr)
170170
}
171171
else
172172
{
173-
equal_exprt equality;
174-
equality.lhs() = expr.offset(); // index operand
173+
// index operand
174+
equal_exprt equality(expr.offset(), exprt());
175175

176176
// type of index operand
177177
const typet &constant_type = expr.offset().type();

src/solvers/flattening/boolbv_byte_update.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@ bvt boolbvt::convert_byte_update(const byte_update_exprt &expr)
8585
for(std::size_t offset=0; offset<bv.size(); offset+=byte_width)
8686
{
8787
// index condition
88-
equal_exprt equality;
89-
equality.lhs()=offset_expr;
90-
equality.rhs()=from_integer(offset/byte_width, offset_expr.type());
88+
equal_exprt equality(
89+
offset_expr, from_integer(offset / byte_width, offset_expr.type()));
9190
literalt equal=convert(equality);
9291

9392
bv_endianness_mapt map_op(op.type(), little_endian, ns, boolbv_width);

src/solvers/flattening/boolbv_extractbit.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,8 @@ literalt boolbvt::convert_extractbit(const extractbit_exprt &expr)
5151
std::max(address_bits(src_bv_width), index_bv_width);
5252
unsignedbv_typet index_type(index_width);
5353

54-
equal_exprt equality;
55-
equality.lhs() = expr.index();
56-
57-
if(index_type!=equality.lhs().type())
58-
equality.lhs().make_typecast(index_type);
54+
equal_exprt equality(
55+
typecast_exprt::conditional_cast(expr.index(), index_type), exprt());
5956

6057
if(prop.has_set_to())
6158
{

src/solvers/flattening/boolbv_index.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,10 @@ bvt boolbvt::convert_index(const index_exprt &expr)
144144

145145
// add implications
146146

147-
equal_exprt index_equality;
148-
index_equality.lhs()=index; // index operand
147+
// index operand
148+
equal_exprt index_equality(index, exprt());
149149

150-
equal_exprt value_equality;
151-
value_equality.lhs()=result;
150+
equal_exprt value_equality(result, exprt());
152151

153152
#ifdef COMPACT_EQUAL_CONST
154153
bv_utils.equal_const_register(convert_bv(index)); // Definitely
@@ -203,8 +202,8 @@ bvt boolbvt::convert_index(const index_exprt &expr)
203202

204203
// add implications
205204

206-
equal_exprt index_equality;
207-
index_equality.lhs()=index; // index operand
205+
// index operand
206+
equal_exprt index_equality(index, exprt());
208207

209208
#ifdef COMPACT_EQUAL_CONST
210209
bv_utils.equal_const_register(convert_bv(index)); // Definitely
@@ -232,8 +231,8 @@ bvt boolbvt::convert_index(const index_exprt &expr)
232231
{
233232
bv.resize(width);
234233

235-
equal_exprt equality;
236-
equality.lhs()=index; // index operand
234+
// index operand
235+
equal_exprt equality(index, exprt());
237236

238237
#ifdef COMPACT_EQUAL_CONST
239238
bv_utils.equal_const_register(convert_bv(index)); // Definitely

0 commit comments

Comments
 (0)