Skip to content

introduce make_boolean_expr #4722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 30, 2019
Merged

introduce make_boolean_expr #4722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5d7dee
introduce make_boolean_expr
May 28, 2019
ca2dab5
use make_boolean_expr instead of exprt::make_bool
May 28, 2019
e60d6e9
deprecate exprt::make_bool
May 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ansi-c/c_typecheck_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ void c_typecheck_baset::typecheck_expr_main(exprt &expr)
subtypes[1].remove(ID_C_volatile);
subtypes[1].remove(ID_C_restricted);

expr.make_bool(gcc_types_compatible_p(subtypes[0], subtypes[1]));
expr = make_boolean_expr(gcc_types_compatible_p(subtypes[0], subtypes[1]));
expr.add_source_location()=source_location;
}
else if(expr.id()==ID_clang_builtin_convertvector)
Expand Down
1 change: 1 addition & 0 deletions src/util/expr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ class exprt:public irept
DEPRECATED(SINCE(2019, 1, 19, "use typecast_exprt() instead"))
void make_typecast(const typet &_type);

DEPRECATED(SINCE(2019, 5, 28, "use make_boolean_expr(value) instead"))
void make_bool(bool value);

bool is_constant() const;
Expand Down
8 changes: 8 additions & 0 deletions src/util/expr_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,3 +281,11 @@ bool is_constantt::is_constant_address_of(const exprt &expr) const

return false;
}

constant_exprt make_boolean_expr(bool value)
{
if(value)
return true_exprt();
else
return false_exprt();
}
4 changes: 4 additions & 0 deletions src/util/expr_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Author: Daniel Kroening, [email protected]

#include <functional>

class constant_exprt;
class exprt;
class symbol_exprt;
class update_exprt;
Expand Down Expand Up @@ -96,4 +97,7 @@ class is_constantt
virtual bool is_constant_address_of(const exprt &) const;
};

/// returns true_exprt if given true and false_exprt otherwise
constant_exprt make_boolean_expr(bool);

#endif // CPROVER_UTIL_EXPR_UTIL_H
8 changes: 4 additions & 4 deletions src/util/simplify_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ bool simplify_exprt::simplify_sign(exprt &expr)
if(type.id()==ID_floatbv)
{
ieee_floatt value(to_constant_expr(expr.op0()));
expr.make_bool(value.get_sign());
expr = make_boolean_expr(value.get_sign());
return false;
}
else if(type.id()==ID_signedbv ||
Expand All @@ -124,7 +124,7 @@ bool simplify_exprt::simplify_sign(exprt &expr)
const auto value = numeric_cast<mp_integer>(expr.op0());
if(value.has_value())
{
expr.make_bool(*value >= 0);
expr = make_boolean_expr(*value >= 0);
return false;
}
}
Expand Down Expand Up @@ -561,7 +561,7 @@ bool simplify_exprt::simplify_typecast(exprt &expr)

if(expr_type_id==ID_bool)
{
expr.make_bool(int_value!=0);
expr = make_boolean_expr(int_value != 0);
return false;
}

Expand Down Expand Up @@ -646,7 +646,7 @@ bool simplify_exprt::simplify_typecast(exprt &expr)

if(expr_type_id==ID_bool)
{
expr.make_bool(int_value!=0);
expr = make_boolean_expr(int_value != 0);
return false;
}

Expand Down
6 changes: 3 additions & 3 deletions src/util/simplify_expr_boolean.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ bool simplify_exprt::simplify_boolean(exprt &expr)

if(operands.empty())
{
expr.make_bool(negate);
expr = make_boolean_expr(negate);
return false;
}
else if(operands.size()==1)
Expand Down Expand Up @@ -135,13 +135,13 @@ bool simplify_exprt::simplify_boolean(exprt &expr)
op.type().id()==ID_bool &&
expr_set.find(op.op0())!=expr_set.end())
{
expr.make_bool(expr.id()==ID_or);
expr = make_boolean_expr(expr.id() == ID_or);
return false;
}

if(operands.empty())
{
expr.make_bool(expr.id()==ID_and);
expr = make_boolean_expr(expr.id() == ID_and);
return false;
}
else if(operands.size()==1)
Expand Down
15 changes: 8 additions & 7 deletions src/util/simplify_expr_floatbv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Author: Daniel Kroening, [email protected]

#include "arith_tools.h"
#include "expr.h"
#include "expr_util.h"
#include "ieee_float.h"
#include "invariant.h"
#include "namespace.h"
Expand All @@ -27,7 +28,7 @@ bool simplify_exprt::simplify_isinf(exprt &expr)
if(expr.op0().is_constant())
{
ieee_floatt value(to_constant_expr(expr.op0()));
expr.make_bool(value.is_infinity());
expr = make_boolean_expr(value.is_infinity());
return false;
}

Expand All @@ -42,7 +43,7 @@ bool simplify_exprt::simplify_isnan(exprt &expr)
if(expr.op0().is_constant())
{
ieee_floatt value(to_constant_expr(expr.op0()));
expr.make_bool(value.is_NaN());
expr = make_boolean_expr(value.is_NaN());
return false;
}

Expand All @@ -57,7 +58,7 @@ bool simplify_exprt::simplify_isnormal(exprt &expr)
if(expr.op0().is_constant())
{
ieee_floatt value(to_constant_expr(expr.op0()));
expr.make_bool(value.is_normal());
expr = make_boolean_expr(value.is_normal());
return false;
}

Expand Down Expand Up @@ -119,7 +120,7 @@ bool simplify_exprt::simplify_sign(exprt &expr)
if(type.id()==ID_floatbv)
{
ieee_floatt value(to_constant_expr(expr.op0()));
expr.make_bool(value.get_sign());
expr = make_boolean_expr(value.get_sign());
return false;
}
else if(type.id()==ID_signedbv ||
Expand All @@ -128,7 +129,7 @@ bool simplify_exprt::simplify_sign(exprt &expr)
mp_integer value;
if(!to_integer(expr.op0(), value))
{
expr.make_bool(value>=0);
expr = make_boolean_expr(value>=0);
return false;
}
}
Expand Down Expand Up @@ -381,9 +382,9 @@ bool simplify_exprt::simplify_ieee_float_relation(exprt &expr)
ieee_floatt f1(to_constant_expr(expr.op1()));

if(expr.id()==ID_ieee_float_notequal)
expr.make_bool(f0.ieee_not_equal(f1));
expr = make_boolean_expr(f0.ieee_not_equal(f1));
else if(expr.id()==ID_ieee_float_equal)
expr.make_bool(f0.ieee_equal(f1));
expr = make_boolean_expr(f0.ieee_equal(f1));
else
UNREACHABLE;

Expand Down
38 changes: 19 additions & 19 deletions src/util/simplify_expr_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ bool simplify_exprt::simplify_extractbit(exprt &expr)
src_bit_width,
numeric_cast_v<std::size_t>(*index_converted_to_int));

expr.make_bool(bit);
expr = make_boolean_expr(bit);

return false;
}
Expand Down Expand Up @@ -1425,7 +1425,7 @@ bool simplify_exprt::simplify_inequality_both_constant(exprt &expr)
}
equal = tmp0_const.is_zero() && tmp1_const.is_zero();
}
expr.make_bool(expr.id() == ID_equal ? equal : !equal);
expr = make_boolean_expr(expr.id() == ID_equal ? equal : !equal);
return false;
}

Expand All @@ -1435,13 +1435,13 @@ bool simplify_exprt::simplify_inequality_both_constant(exprt &expr)
fixedbvt f1(tmp1_const);

if(expr.id() == ID_ge)
expr.make_bool(f0 >= f1);
expr = make_boolean_expr(f0 >= f1);
else if(expr.id() == ID_le)
expr.make_bool(f0 <= f1);
expr = make_boolean_expr(f0 <= f1);
else if(expr.id() == ID_gt)
expr.make_bool(f0 > f1);
expr = make_boolean_expr(f0 > f1);
else if(expr.id() == ID_lt)
expr.make_bool(f0 < f1);
expr = make_boolean_expr(f0 < f1);
else
UNREACHABLE;

Expand All @@ -1453,13 +1453,13 @@ bool simplify_exprt::simplify_inequality_both_constant(exprt &expr)
ieee_floatt f1(tmp1_const);

if(expr.id() == ID_ge)
expr.make_bool(f0 >= f1);
expr = make_boolean_expr(f0 >= f1);
else if(expr.id() == ID_le)
expr.make_bool(f0 <= f1);
expr = make_boolean_expr(f0 <= f1);
else if(expr.id() == ID_gt)
expr.make_bool(f0 > f1);
expr = make_boolean_expr(f0 > f1);
else if(expr.id() == ID_lt)
expr.make_bool(f0 < f1);
expr = make_boolean_expr(f0 < f1);
else
UNREACHABLE;

Expand All @@ -1476,13 +1476,13 @@ bool simplify_exprt::simplify_inequality_both_constant(exprt &expr)
return true;

if(expr.id() == ID_ge)
expr.make_bool(r0 >= r1);
expr = make_boolean_expr(r0 >= r1);
else if(expr.id() == ID_le)
expr.make_bool(r0 <= r1);
expr = make_boolean_expr(r0 <= r1);
else if(expr.id() == ID_gt)
expr.make_bool(r0 > r1);
expr = make_boolean_expr(r0 > r1);
else if(expr.id() == ID_lt)
expr.make_bool(r0 < r1);
expr = make_boolean_expr(r0 < r1);
else
UNREACHABLE;

Expand All @@ -1501,13 +1501,13 @@ bool simplify_exprt::simplify_inequality_both_constant(exprt &expr)
return true;

if(expr.id() == ID_ge)
expr.make_bool(*v0 >= *v1);
expr = make_boolean_expr(*v0 >= *v1);
else if(expr.id() == ID_le)
expr.make_bool(*v0 <= *v1);
expr = make_boolean_expr(*v0 <= *v1);
else if(expr.id() == ID_gt)
expr.make_bool(*v0 > *v1);
expr = make_boolean_expr(*v0 > *v1);
else if(expr.id() == ID_lt)
expr.make_bool(*v0 < *v1);
expr = make_boolean_expr(*v0 < *v1);
else
UNREACHABLE;

Expand Down Expand Up @@ -1669,7 +1669,7 @@ bool simplify_exprt::simplify_inequality_no_constant(exprt &expr)

if(ok)
{
expr.make_bool(result);
expr = make_boolean_expr(result);
return false;
}
}
Expand Down
9 changes: 5 additions & 4 deletions src/util/simplify_expr_pointer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ bool simplify_exprt::simplify_inequality_address_of(exprt &expr)
bool equal = to_symbol_expr(tmp0.op0()).get_identifier() ==
to_symbol_expr(tmp1.op0()).get_identifier();

expr.make_bool(expr.id()==ID_equal?equal:!equal);
expr = make_boolean_expr(expr.id() == ID_equal ? equal : !equal);

return false;
}
Expand All @@ -454,15 +454,15 @@ bool simplify_exprt::simplify_inequality_address_of(exprt &expr)
bool equal = to_dynamic_object_expr(tmp0.op0()).get_instance() ==
to_dynamic_object_expr(tmp1.op0()).get_instance();

expr.make_bool(expr.id() == ID_equal ? equal : !equal);
expr = make_boolean_expr(expr.id() == ID_equal ? equal : !equal);

return false;
}
else if(
(tmp0.op0().id() == ID_symbol && tmp1.op0().id() == ID_dynamic_object) ||
(tmp0.op0().id() == ID_dynamic_object && tmp1.op0().id() == ID_symbol))
{
expr.make_bool(expr.id() != ID_equal);
expr = make_boolean_expr(expr.id() != ID_equal);

return false;
}
Expand Down Expand Up @@ -580,7 +580,8 @@ bool simplify_exprt::simplify_is_dynamic_object(exprt &expr)
const irep_idt identifier=to_symbol_expr(op.op0()).get_identifier();

// this is for the benefit of symex
expr.make_bool(has_prefix(id2string(identifier), SYMEX_DYNAMIC_PREFIX));
expr = make_boolean_expr(
has_prefix(id2string(identifier), SYMEX_DYNAMIC_PREFIX));
return false;
}
else if(op.op0().id()==ID_string_constant)
Expand Down