3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00

build issues

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-02-07 11:16:57 -08:00
parent 88374a15d0
commit 8c016abb12
10 changed files with 130 additions and 56 deletions

View file

@ -504,7 +504,6 @@ void asserted_formulas::propagate_values() {
flush_cache();
unsigned num_prop = 0;
unsigned num_iterations = 0;
unsigned delta_prop = m_formulas.size();
while (!inconsistent() && m_formulas.size()/20 < delta_prop) {
m_expr2depth.reset();

View file

@ -2032,11 +2032,11 @@ public:
lp::lar_base_constraint const& c = lp().constraints()[ci];
expr_ref fml(m);
expr_ref_vector ts(m);
rational rhs = c.m_right_side;
rational rhs = c.rhs();
for (auto cv : c.coeffs()) {
ts.push_back(multerm(cv.first, var2expr(cv.second)));
}
switch (c.m_kind) {
switch (c.kind()) {
case lp::LE: fml = a.mk_le(a.mk_add(ts.size(), ts.c_ptr()), a.mk_numeral(rhs, true)); break;
case lp::LT: fml = a.mk_lt(a.mk_add(ts.size(), ts.c_ptr()), a.mk_numeral(rhs, true)); break;
case lp::GE: fml = a.mk_ge(a.mk_add(ts.size(), ts.c_ptr()), a.mk_numeral(rhs, true)); break;

View file

@ -9690,7 +9690,7 @@ namespace smt {
std::string s = std::to_string(val.get_int32());
extra_deps.push_back(ctx.mk_eq_atom(fromInt, mk_int(val)));
return s.length();
return static_cast<unsigned>(s.length());
} else if (u.str.is_at(ex)) {
expr* substrBase = nullptr;
@ -9886,8 +9886,7 @@ namespace smt {
expr* theory_str::refine_function(expr* f) {
//Can we learn something better?
ast_manager & m = get_manager();
TRACE("str", tout << "learning not " << mk_pp(f, m) << std::endl;);
TRACE("str", tout << "learning not " << mk_pp(f, get_manager()) << std::endl;);
return f;
}