Skip to content

simplifier: use new interface #4872

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 2 commits into from
Jul 13, 2019
Merged

simplifier: use new interface #4872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf3800a
simplifier: use new interface
Jul 3, 2019
30c134f
simplifier: flip expression case split to new interface
Jul 3, 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
126 changes: 97 additions & 29 deletions src/util/simplify_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,8 +1309,7 @@ bool simplify_exprt::simplify_if_preorder(if_exprt &expr)
return result;
}

NODISCARD simplify_exprt::resultt<>
simplify_exprt::simplify_if(const if_exprt &expr)
simplify_exprt::resultt<> simplify_exprt::simplify_if(const if_exprt &expr)
{
const exprt &cond = expr.cond();
const exprt &truevalue = expr.true_case();
Expand Down Expand Up @@ -1429,11 +1428,9 @@ bool simplify_exprt::get_values(
return true;
}

bool simplify_exprt::simplify_lambda(exprt &)
simplify_exprt::resultt<> simplify_exprt::simplify_lambda(const exprt &expr)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're touching this interface, can we make it consume a const array_comprehension_exprt &expr please?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's defer -- there is the very independent issue of the confusion between array comprehension and lambda expressions (as in Chruch's lambda calculus). Look at 5f0808c.

{
bool result=true;

return result;
return unchanged(expr);
}

bool simplify_exprt::simplify_with(exprt &expr)
Expand Down Expand Up @@ -2423,30 +2420,24 @@ simplify_exprt::simplify_byte_update(const byte_update_exprt &expr)
return unchanged(expr);
}

bool simplify_exprt::simplify_complex(exprt &expr)
simplify_exprt::resultt<> simplify_exprt::simplify_complex(const exprt &expr)
{
if(expr.id() == ID_complex_real)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be two separate functions rather than branching twice on the same id in quick succession? (Once to figure out we need to call simplify_complex and then this one here. We could then have a typesafe interface.)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, can be split; will add to #4874

{
complex_real_exprt &complex_real_expr = to_complex_real_expr(expr);
auto &complex_real_expr = to_complex_real_expr(expr);

if(complex_real_expr.op().id() == ID_complex)
{
expr = to_complex_expr(complex_real_expr.op()).real();
return false;
}
return to_complex_expr(complex_real_expr.op()).real();
}
else if(expr.id() == ID_complex_imag)
{
complex_imag_exprt &complex_imag_expr = to_complex_imag_expr(expr);
auto &complex_imag_expr = to_complex_imag_expr(expr);

if(complex_imag_expr.op().id() == ID_complex)
{
expr = to_complex_expr(complex_imag_expr.op()).imag();
return false;
}
return to_complex_expr(complex_imag_expr.op()).imag();
}

return true;
return unchanged(expr);
}

bool simplify_exprt::simplify_node_preorder(exprt &expr)
Expand Down Expand Up @@ -2512,7 +2503,14 @@ bool simplify_exprt::simplify_node(exprt &expr)
}
}
else if(expr.id()==ID_lambda)
no_change = simplify_lambda(expr) && no_change;
{
auto r = simplify_lambda(expr);
if(r.has_changed())
{
no_change = false;
expr = r.expr;
}
}
else if(expr.id()==ID_with)
no_change = simplify_with(expr) && no_change;
else if(expr.id()==ID_update)
Expand Down Expand Up @@ -2605,7 +2603,14 @@ bool simplify_exprt::simplify_node(exprt &expr)
}
}
else if(expr.id()==ID_bitnot)
no_change = simplify_bitnot(expr) && no_change;
{
auto r = simplify_bitnot(expr);
if(r.has_changed())
{
no_change = false;
expr = r.expr;
}
}
else if(expr.id()==ID_bitand ||
expr.id()==ID_bitor ||
expr.id()==ID_bitxor)
Expand Down Expand Up @@ -2684,15 +2689,43 @@ bool simplify_exprt::simplify_node(exprt &expr)
}
}
else if(expr.id()==ID_unary_minus)
no_change = simplify_unary_minus(expr) && no_change;
{
auto r = simplify_unary_minus(expr);
if(r.has_changed())
{
no_change = false;
expr = r.expr;
}
}
else if(expr.id()==ID_unary_plus)
no_change = simplify_unary_plus(expr) && no_change;
{
auto r = simplify_unary_plus(expr);
if(r.has_changed())
{
no_change = false;
expr = r.expr;
}
}
else if(expr.id()==ID_not)
no_change = simplify_not(expr) && no_change;
{
auto r = simplify_not(expr);
if(r.has_changed())
{
no_change = false;
expr = r.expr;
}
}
else if(expr.id()==ID_implies ||
expr.id()==ID_or || expr.id()==ID_xor ||
expr.id()==ID_and)
no_change = simplify_boolean(expr) && no_change;
{
auto r = simplify_boolean(expr);
if(r.has_changed())
{
no_change = false;
expr = r.expr;
}
}
else if(expr.id()==ID_dereference)
{
auto r = simplify_dereference(to_dereference_expr(expr));
Expand Down Expand Up @@ -2721,11 +2754,32 @@ bool simplify_exprt::simplify_node(exprt &expr)
}
}
else if(expr.id()==ID_extractbit)
no_change = simplify_extractbit(expr) && no_change;
{
auto r = simplify_extractbit(expr);
if(r.has_changed())
{
no_change = false;
expr = r.expr;
}
}
else if(expr.id()==ID_concatenation)
no_change = simplify_concatenation(expr) && no_change;
{
auto r = simplify_concatenation(expr);
if(r.has_changed())
{
no_change = false;
expr = r.expr;
}
}
else if(expr.id()==ID_extractbits)
no_change = simplify_extractbits(to_extractbits_expr(expr)) && no_change;
{
auto r = simplify_extractbits(to_extractbits_expr(expr));
if(r.has_changed())
{
no_change = false;
expr = r.expr;
}
}
else if(expr.id()==ID_ieee_float_equal ||
expr.id()==ID_ieee_float_notequal)
{
Expand All @@ -2737,7 +2791,14 @@ bool simplify_exprt::simplify_node(exprt &expr)
}
}
else if(expr.id() == ID_bswap)
no_change = simplify_bswap(to_bswap_expr(expr)) && no_change;
{
auto r = simplify_bswap(to_bswap_expr(expr));
if(r.has_changed())
{
no_change = false;
expr = r.expr;
}
}
else if(expr.id()==ID_isinf)
{
auto r = simplify_isinf(to_unary_expr(expr));
Expand Down Expand Up @@ -2795,7 +2856,14 @@ bool simplify_exprt::simplify_node(exprt &expr)
}
}
else if(expr.id() == ID_complex_real || expr.id() == ID_complex_imag)
no_change = simplify_complex(expr) && no_change;
{
auto r = simplify_complex(expr);
if(r.has_changed())
{
no_change = false;
expr = r.expr;
}
}

#ifdef DEBUGX
if(
Expand Down
Loading