3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-27 00:18:45 +00:00

build fixes

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2024-11-14 21:55:44 -08:00
parent ca6ec0d9e4
commit 3f407982f3
4 changed files with 9 additions and 9 deletions

View file

@ -790,17 +790,16 @@ public:
r = m.mk_or(r, emp); r = m.mk_or(r, emp);
return true; return true;
} }
if (uncnstr(args[1])) { if (uncnstr(args[1]) && seq.is_string(args[0]->get_sort())) {
// x contains y -> r // x contains y -> r
// y -> if r then x else x + x // y -> if r then x else x + x + a
mk_fresh_uncnstr_var_for(f, r); mk_fresh_uncnstr_var_for(f, r);
if (m_mc) if (m_mc)
add_def(args[1], m.mk_ite(r, args[0], seq.str.mk_concat(args[0], args[0]))); add_def(args[1], m.mk_ite(r, args[0], seq.str.mk_concat(args[0], args[0], seq.str.mk_string(zstring("a")))));
return true; return true;
} }
return false; return false;
default: default:
verbose_stream() << f->get_name() << "\n";
return false; return false;
} }

View file

@ -33,7 +33,7 @@ namespace sls {
virtual void set_value(expr* t, expr* v) = 0; virtual void set_value(expr* t, expr* v) = 0;
virtual void force_phase(sat::literal lit) = 0; virtual void force_phase(sat::literal lit) = 0;
virtual void set_has_new_best_phase(bool b) = 0; virtual void set_has_new_best_phase(bool b) = 0;
virtual bool get_value(expr* v, expr_ref& val) = 0; virtual bool get_smt_value(expr* v, expr_ref& val) = 0;
virtual bool get_best_phase(sat::bool_var v) = 0; virtual bool get_best_phase(sat::bool_var v) = 0;
virtual expr* bool_var2expr(sat::bool_var v) = 0; virtual expr* bool_var2expr(sat::bool_var v) = 0;
virtual void inc_activity(sat::bool_var v, double inc) = 0; virtual void inc_activity(sat::bool_var v, double inc) = 0;

View file

@ -101,7 +101,7 @@ namespace sls {
void inc_activity(sat::bool_var v, double inc) override {} void inc_activity(sat::bool_var v, double inc) override {}
unsigned get_num_bool_vars() const override; unsigned get_num_bool_vars() const override;
bool parallel_mode() const override { return false; } bool parallel_mode() const override { return false; }
bool get_value(expr* v, expr_ref& value) override { return false; } bool get_smt_value(expr* v, expr_ref& value) override { return false; }
}; };

View file

@ -110,8 +110,9 @@ namespace smt {
void set_finished() override; void set_finished() override;
unsigned get_num_bool_vars() const override; unsigned get_num_bool_vars() const override;
void inc_activity(sat::bool_var v, double inc) override; void inc_activity(sat::bool_var v, double inc) override;
bool parallel_mode() const { return m_parallel_mode; } bool parallel_mode() const override { return m_parallel_mode; }
bool get_value(expr* v, expr_ref& value) override; bool get_smt_value(expr* v, expr_ref& value) override;
}; };
} }