mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

normalize newlines for if

Browse source
This commit is contained in:
Nikolaj Bjorner 2023-10-10 13:42:02 -07:00
parent d04807e8c3
commit 6445d01557
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/qe/mbp/mbp_qel.cpp
View file

@ -32,7 +32,7 @@ Revision History:
namespace mbp { namespace mbp {
class mbp_qel::impl { class mbp_qel::impl {
private: private:
ast_manager &m; ast_manager &m;
array_util m_array_util; array_util m_array_util;
datatype_util m_dt_util; datatype_util m_dt_util;
@ -105,11 +105,12 @@ class mbp_qel::impl {
mbp_tg_plugin *get_plugin(family_id fid) { mbp_tg_plugin *get_plugin(family_id fid) {
for (auto p : m_plugins) for (auto p : m_plugins)
if (p->get_family_id() == fid) return p; if (p->get_family_id() == fid)
return p;
return nullptr; return nullptr;
} }
public: public:
impl(ast_manager &m, params_ref const &p) impl(ast_manager &m, params_ref const &p)
: m(m), m_array_util(m), m_dt_util(m), m_params(p), m_tg(m) {} : m(m), m_array_util(m), m_dt_util(m), m_params(p), m_tg(m) {}
@ -119,7 +120,8 @@ class mbp_qel::impl {
} }
void operator()(app_ref_vector &vars, expr_ref &fml, model &mdl) { void operator()(app_ref_vector &vars, expr_ref &fml, model &mdl) {
if (vars.empty()) return; if (vars.empty())
return;
init(vars, fml, mdl); init(vars, fml, mdl);
// Apply MBP rules till saturation // Apply MBP rules till saturation
@ -177,8 +179,10 @@ class mbp_qel::impl {
tout << "\n";); tout << "\n";);
std::function<bool(expr *)> non_core = [&](expr *e) { std::function<bool(expr *)> non_core = [&](expr *e) {
if (is_app(e) && is_partial_eq(to_app(e))) return true; if (is_app(e) && is_partial_eq(to_app(e)))
if (m.is_ite(e) || m.is_or(e) || m.is_implies(e) || m.is_and(e) || m.is_distinct(e)) return true; return true;
if (m.is_ite(e) || m.is_or(e) || m.is_implies(e) || m.is_and(e) || m.is_distinct(e))
return true;
return red_vars.is_marked(e); return red_vars.is_marked(e);
}; };
@ -203,9 +207,11 @@ class mbp_qel::impl {
} }
std::function<bool(expr *)> substituted = [&](expr *e) { std::function<bool(expr *)> substituted = [&](expr *e) {
if (is_app(e) && is_partial_eq(to_app(e))) return true; return
if (m.is_ite(e)) return true; (is_app(e) && is_partial_eq(to_app(e))) ||
return red_vars.is_marked(e) || s_vars.is_marked(e); m.is_ite(e) ||
red_vars.is_marked(e) ||
s_vars.is_marked(e);
}; };
// remove all substituted variables // remove all substituted variables