Skip to content

SMT2 support for unbounded integers #1779

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 7 commits into from
Feb 20, 2018
Merged

SMT2 support for unbounded integers #1779

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
698ccdd
use a ranged for
kroening Jan 29, 2018
12ae728
fixes for integers in SMT2
kroening Jan 29, 2018
57ecf15
+ is multi-ary in SMT-LIB2
kroening Jan 30, 2018
dea2592
treat real and integer as 'numeric' in C front-end
kroening Feb 12, 2018
a827c77
fix: add missing integer casts and operations
polgreen Jan 30, 2018
1ebec11
get values for nondet symbols
polgreen Jan 29, 2018
897e29e
Fix CMakeLists to correctly pass test exclusion flags
chrisr-diffblue Feb 19, 2018
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
Prev Previous commit
Next Next commit
+ is multi-ary in SMT-LIB2
  • Loading branch information
@kroening
kroening committed Feb 12, 2018
commit 57ecf15ab03f7f854535bf84bcce2c4a1b4c35e8
101 changes: 58 additions & 43 deletions src/solvers/smt2/smt2_conv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2860,19 +2860,41 @@ void smt2_convt::convert_plus(const plus_exprt &expr)
{
convert_expr(expr.op0());
}
else if(expr.operands().size()==2)
else
{
if(expr.type().id()==ID_unsignedbv ||
expr.type().id()==ID_signedbv ||
expr.type().id()==ID_fixedbv)
if(expr.type().id()==ID_rational ||
expr.type().id()==ID_integer ||
expr.type().id()==ID_real)
{
// these are multi-ary in SMT-LIB2
out << "(+";

for(const auto &op : expr.operands())
{
out << ' ';
convert_expr(op);
}

out << ')';
}
else if(expr.type().id()==ID_unsignedbv ||
expr.type().id()==ID_signedbv ||
expr.type().id()==ID_fixedbv)
{
// These could be chained, i.e., need not be binary,
// but at least MathSat doesn't like that.
out << "(bvadd ";
convert_expr(expr.op0());
out << " ";
convert_expr(expr.op1());
out << ")";
if(expr.operands().size()==2)
{
out << "(bvadd ";
convert_expr(expr.op0());
out << " ";
convert_expr(expr.op1());
out << ")";
}
else
{
convert_plus(to_plus_expr(make_binary(expr)));
}
}
else if(expr.type().id()==ID_floatbv)
{
Expand All @@ -2883,43 +2905,40 @@ void smt2_convt::convert_plus(const plus_exprt &expr)
}
else if(expr.type().id()==ID_pointer)
{
exprt p=expr.op0(), i=expr.op1();
if(expr.operands().size()==2)
{
exprt p=expr.op0(), i=expr.op1();

if(p.type().id()!=ID_pointer)
p.swap(i);
if(p.type().id()!=ID_pointer)
p.swap(i);

if(p.type().id()!=ID_pointer)
INVALIDEXPR("unexpected mixture in pointer arithmetic");
if(p.type().id()!=ID_pointer)
INVALIDEXPR("unexpected mixture in pointer arithmetic");

mp_integer element_size=
pointer_offset_size(expr.type().subtype(), ns);
assert(element_size>0);
mp_integer element_size=
pointer_offset_size(expr.type().subtype(), ns);
assert(element_size>0);

out << "(bvadd ";
convert_expr(p);
out << " ";
out << "(bvadd ";
convert_expr(p);
out << " ";

if(element_size>=2)
{
out << "(bvmul ";
convert_expr(i);
out << " (_ bv" << element_size
<< " " << boolbv_width(expr.type()) << "))";
if(element_size>=2)
{
out << "(bvmul ";
convert_expr(i);
out << " (_ bv" << element_size
<< " " << boolbv_width(expr.type()) << "))";
}
else
convert_expr(i);

out << ')';
}
else
convert_expr(i);

out << ")";
}
else if(expr.type().id()==ID_rational ||
expr.type().id()==ID_integer ||
expr.type().id()==ID_real)
{
out << "(+ ";
convert_expr(expr.op0());
out << " ";
convert_expr(expr.op1());
out << ")";
{
convert_plus(to_plus_expr(make_binary(expr)));
}
}
else if(expr.type().id()==ID_vector)
{
Expand Down Expand Up @@ -2963,10 +2982,6 @@ void smt2_convt::convert_plus(const plus_exprt &expr)
else
UNEXPECTEDCASE("unsupported type for +: "+expr.type().id_string());
}
else
{
convert_plus(to_plus_expr(make_binary(expr)));
}
}

/// Converting a constant or symbolic rounding mode to SMT-LIB. Only called when
Expand Down