mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

fixes to mostly solver arith/euf and backtracking scopes

Browse source
This commit is contained in:
Nikolaj Bjorner 2020-10-26 11:06:34 -07:00
parent 1ee2ba2a9b
commit 8d76470a8a
25 changed files with 189 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/solver/smt_logics.cpp
View file

@ -22,10 +22,10 @@ Revision History:
bool smt_logics::supported_logic(symbol const & s) {
return logic_has_uf(s) || logic_is_allcsp(s) || logic_has_fd(s) ||
return logic_has_uf(s) || logic_is_all(s) || logic_has_fd(s) ||
logic_has_arith(s) || logic_has_bv(s) ||
logic_has_array(s) || logic_has_seq(s) || logic_has_str(s) ||
logic_has_horn(s) || logic_has_fpa(s);
logic_has_horn(s) || logic_has_fpa(s) || logic_has_datatype(s);
}
bool smt_logics::logic_has_reals_only(symbol const& s) {
@ -86,7 +86,7 @@ bool smt_logics::logic_has_arith(symbol const & s) {
s == "QF_BVFP" ||
s == "QF_S" ||
s == "QF_SLIA" ||
logic_is_allcsp(s) ||
logic_is_all(s) ||
s == "QF_FD" ||
s == "HORN" ||
s == "QF_FPLRA";
@ -106,7 +106,7 @@ bool smt_logics::logic_has_bv(symbol const & s) {
s == "QF_FPBV" ||
s == "FP" ||
s == "QF_BVFP" ||
logic_is_allcsp(s) ||
logic_is_all(s) ||
s == "QF_FD" ||
s == "SMTFD" ||
s == "HORN";
@ -128,7 +128,7 @@ bool smt_logics::logic_has_array(symbol const & s) {
s == "AUFNIRA" ||
s == "AUFBV" ||
s == "ABV" ||
logic_is_allcsp(s) ||
logic_is_all(s) ||
s == "QF_ABV" ||
s == "QF_AUFBV" ||
s == "SMTFD" ||
@ -136,15 +136,15 @@ bool smt_logics::logic_has_array(symbol const & s) {
}
bool smt_logics::logic_has_seq(symbol const & s) {
return s == "QF_BVRE" || s == "QF_S" || s == "QF_SLIA" || logic_is_allcsp(s);
return s == "QF_BVRE" || s == "QF_S" || s == "QF_SLIA" || logic_is_all(s);
}
bool smt_logics::logic_has_str(symbol const & s) {
return s == "QF_S" || s == "QF_SLIA" || logic_is_allcsp(s);
return s == "QF_S" || s == "QF_SLIA" || logic_is_all(s);
}
bool smt_logics::logic_has_fpa(symbol const & s) {
return s == "FP" || s == "QF_FP" || s == "QF_FPBV" || s == "QF_BVFP" || s == "QF_FPLRA" || logic_is_allcsp(s);
return s == "FP" || s == "QF_FP" || s == "QF_FPBV" || s == "QF_BVFP" || s == "QF_FPLRA" || logic_is_all(s);
}
bool smt_logics::logic_has_uf(symbol const & s) {
@ -156,10 +156,10 @@ bool smt_logics::logic_has_horn(symbol const& s) {
}
bool smt_logics::logic_has_pb(symbol const& s) {
return s == "QF_FD" || logic_is_allcsp(s) || logic_has_horn(s);
return s == "QF_FD" || logic_is_all(s) || logic_has_horn(s);
}
bool smt_logics::logic_has_datatype(symbol const& s) {
return s == "QF_FD" || logic_is_allcsp(s) || s == "QF_DT";
return s == "QF_FD" || s == "QF_UFDT" || logic_is_all(s) || s == "QF_DT";
}

2
src/solver/smt_logics.h
View file

@ -24,8 +24,6 @@ public:
static bool supported_logic(symbol const & s);
static bool logic_has_reals_only(symbol const& l);
static bool logic_is_all(symbol const& s) { return s == "ALL"; }
static bool logic_is_csp(symbol const& s) { return s == "CSP"; }
static bool logic_is_allcsp(symbol const& s) { return logic_is_all(s) || logic_is_csp(s); }
static bool logic_has_uf(symbol const& s);
static bool logic_has_arith(symbol const & s);
static bool logic_has_bv(symbol const & s);