mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-28 08:58:44 +00:00
Code Activity

fix #3670

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-04-01 15:35:53 -07:00
parent 4c69f9e31b
commit 2ac8d3461e
2 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

98
src/ast/macros/quasi_macros.cpp
View file

@ -23,7 +23,7 @@ Revision History:
#include "ast/rewriter/var_subst.h" #include "ast/rewriter/var_subst.h"
quasi_macros::quasi_macros(ast_manager & m, macro_manager & mm) : quasi_macros::quasi_macros(ast_manager & m, macro_manager & mm) :
m_manager(m), m(m),
m_macro_manager(mm), m_macro_manager(mm),
m_rewriter(m), m_rewriter(m),
m_new_vars(m), m_new_vars(m),
@ -153,12 +153,12 @@ bool quasi_macros::is_quasi_macro(expr * e, app_ref & a, expr_ref & t) const {
// Our definition of a quasi-macro: // Our definition of a quasi-macro:
// Forall X. f[X] = T[X], where f[X] is a term starting with symbol f, f is uninterpreted, // Forall X. f[X] = T[X], where f[X] is a term starting with symbol f, f is uninterpreted,
// f[X] contains all universally quantified variables, and f does not occur in T[X]. // f[X] contains all universally quantified variables, and f does not occur in T[X].
TRACE("quasi_macros", tout << "Checking for quasi macro: " << mk_pp(e, m_manager) << std::endl;); TRACE("quasi_macros", tout << "Checking for quasi macro: " << mk_pp(e, m) << std::endl;);
if (is_forall(e)) { if (is_forall(e)) {
quantifier * q = to_quantifier(e); quantifier * q = to_quantifier(e);
expr * qe = q->get_expr(), *lhs = nullptr, *rhs = nullptr; expr * qe = q->get_expr(), *lhs = nullptr, *rhs = nullptr;
if ((m_manager.is_eq(qe, lhs, rhs))) { if ((m.is_eq(qe, lhs, rhs))) {
if (is_non_ground_uninterp(lhs) && is_unique(to_app(lhs)->get_decl()) && if (is_non_ground_uninterp(lhs) && is_unique(to_app(lhs)->get_decl()) &&
!depends_on(rhs, to_app(lhs)->get_decl()) && fully_depends_on(to_app(lhs), q)) { !depends_on(rhs, to_app(lhs)->get_decl()) && fully_depends_on(to_app(lhs), q)) {
@ -171,14 +171,14 @@ bool quasi_macros::is_quasi_macro(expr * e, app_ref & a, expr_ref & t) const {
t = lhs; t = lhs;
return true; return true;
} }
} else if (m_manager.is_not(qe, lhs) && is_non_ground_uninterp(lhs) && } else if (m.is_not(qe, lhs) && is_non_ground_uninterp(lhs) &&
is_unique(to_app(lhs)->get_decl())) { // this is like f(...) = false is_unique(to_app(lhs)->get_decl())) { // this is like f(...) = false
a = to_app(lhs); a = to_app(lhs);
t = m_manager.mk_false(); t = m.mk_false();
return true; return true;
} else if (is_non_ground_uninterp(qe) && is_unique(to_app(qe)->get_decl())) { // this is like f(...) = true } else if (is_non_ground_uninterp(qe) && is_unique(to_app(qe)->get_decl())) { // this is like f(...) = true
a = to_app(qe); a = to_app(qe);
t = m_manager.mk_true(); t = m.mk_true();
return true; return true;
} }
} }
@ -208,8 +208,8 @@ void quasi_macros::quasi_macro_to_macro(quantifier * q, app * a, expr * t, quant
m_new_var_names.push_back(symbol(m_new_name.str().c_str())); m_new_var_names.push_back(symbol(m_new_name.str().c_str()));
m_new_qsorts.push_back(f->get_domain()[i]); m_new_qsorts.push_back(f->get_domain()[i]);
m_new_vars.push_back(m_manager.mk_var(inx + q->get_num_decls(), f->get_domain()[i])); m_new_vars.push_back(m.mk_var(inx + q->get_num_decls(), f->get_domain()[i]));
m_new_eqs.push_back(m_manager.mk_eq(m_new_vars.back(), a->get_arg(i))); m_new_eqs.push_back(m.mk_eq(m_new_vars.back(), a->get_arg(i)));
} else { } else {
var * v = to_var(a->get_arg(i)); var * v = to_var(a->get_arg(i));
m_new_vars.push_back(v); m_new_vars.push_back(v);
@ -219,7 +219,7 @@ void quasi_macros::quasi_macro_to_macro(quantifier * q, app * a, expr * t, quant
// Reverse the new variable names and sorts. [CMW: There is a smarter way to do this.] // Reverse the new variable names and sorts. [CMW: There is a smarter way to do this.]
vector<symbol> new_var_names_rev; vector<symbol> new_var_names_rev;
sort_ref_vector new_qsorts_rev(m_manager); sort_ref_vector new_qsorts_rev(m);
unsigned i = m_new_var_names.size(); unsigned i = m_new_var_names.size();
while (i > 0) { while (i > 0) {
i--; i--;
@ -235,28 +235,28 @@ void quasi_macros::quasi_macro_to_macro(quantifier * q, app * a, expr * t, quant
// Macro := Forall m_new_vars . appl = ITE( m_new_eqs, t, f_else) // Macro := Forall m_new_vars . appl = ITE( m_new_eqs, t, f_else)
app_ref appl(m_manager); app_ref appl(m);
expr_ref eq(m_manager); expr_ref eq(m);
appl = m_manager.mk_app(f, m_new_vars.size(), m_new_vars.c_ptr()); appl = m.mk_app(f, m_new_vars.size(), m_new_vars.c_ptr());
func_decl * fd = m_manager.mk_fresh_func_decl(f->get_name(), symbol("else"), func_decl * fd = m.mk_fresh_func_decl(f->get_name(), symbol("else"),
f->get_arity(), f->get_domain(), f->get_arity(), f->get_domain(),
f->get_range()); f->get_range());
expr * f_else = m_manager.mk_app(fd, m_new_vars.size(), m_new_vars.c_ptr()); expr * f_else = m.mk_app(fd, m_new_vars.size(), m_new_vars.c_ptr());
expr_ref ite(m_manager); expr_ref ite(m);
ite = m_manager.mk_ite(m_manager.mk_and(m_new_eqs.size(), m_new_eqs.c_ptr()), t, f_else); ite = m.mk_ite(m.mk_and(m_new_eqs.size(), m_new_eqs.c_ptr()), t, f_else);
eq = m_manager.mk_eq(appl, ite); eq = m.mk_eq(appl, ite);
macro = m_manager.mk_quantifier(forall_k, new_var_names_rev.size(), macro = m.mk_quantifier(forall_k, new_var_names_rev.size(),
new_qsorts_rev.c_ptr(), new_var_names_rev.c_ptr(), eq); new_qsorts_rev.c_ptr(), new_var_names_rev.c_ptr(), eq);
} }
bool quasi_macros::find_macros(unsigned n, expr * const * exprs) { bool quasi_macros::find_macros(unsigned n, expr * const * exprs) {
TRACE("quasi_macros", tout << "Finding quasi-macros in: " << std::endl; TRACE("quasi_macros", tout << "Finding quasi-macros in: " << std::endl;
for (unsigned i = 0 ; i < n ; i++) for (unsigned i = 0 ; i < n ; i++)
tout << i << ": " << mk_pp(exprs[i], m_manager) << std::endl; ); tout << i << ": " << mk_pp(exprs[i], m) << std::endl; );
bool res = false; bool res = false;
m_occurrences.reset(); m_occurrences.reset();
@ -272,16 +272,16 @@ bool quasi_macros::find_macros(unsigned n, expr * const * exprs) {
// Find all macros // Find all macros
for (unsigned i = 0 ; i < n ; i++) { for (unsigned i = 0 ; i < n ; i++) {
app_ref a(m_manager); app_ref a(m);
expr_ref t(m_manager); expr_ref t(m);
if (is_quasi_macro(exprs[i], a, t)) { if (is_quasi_macro(exprs[i], a, t)) {
quantifier_ref macro(m_manager); quantifier_ref macro(m);
quasi_macro_to_macro(to_quantifier(exprs[i]), a, t, macro); quasi_macro_to_macro(to_quantifier(exprs[i]), a, t, macro);
TRACE("quasi_macros", tout << "Found quasi macro: " << mk_pp(exprs[i], m_manager) << std::endl; TRACE("quasi_macros", tout << "Found quasi macro: " << mk_pp(exprs[i], m) << std::endl;
tout << "Macro: " << mk_pp(macro, m_manager) << std::endl; ); tout << "Macro: " << mk_pp(macro, m) << std::endl; );
proof * pr = nullptr; proof * pr = nullptr;
if (m_manager.proofs_enabled()) if (m.proofs_enabled())
pr = m_manager.mk_def_axiom(macro); pr = m.mk_def_axiom(macro);
expr_dependency * dep = nullptr; expr_dependency * dep = nullptr;
if (m_macro_manager.insert(a->get_decl(), macro, pr, dep)) if (m_macro_manager.insert(a->get_decl(), macro, pr, dep))
res = true; res = true;
@ -294,7 +294,7 @@ bool quasi_macros::find_macros(unsigned n, expr * const * exprs) {
bool quasi_macros::find_macros(unsigned n, justified_expr const * exprs) { bool quasi_macros::find_macros(unsigned n, justified_expr const * exprs) {
TRACE("quasi_macros", tout << "Finding quasi-macros in: " << std::endl; TRACE("quasi_macros", tout << "Finding quasi-macros in: " << std::endl;
for (unsigned i = 0 ; i < n ; i++) for (unsigned i = 0 ; i < n ; i++)
tout << i << ": " << mk_pp(exprs[i].get_fml(), m_manager) << std::endl; ); tout << i << ": " << mk_pp(exprs[i].get_fml(), m) << std::endl; );
bool res = false; bool res = false;
m_occurrences.reset(); m_occurrences.reset();
@ -311,16 +311,16 @@ bool quasi_macros::find_macros(unsigned n, justified_expr const * exprs) {
// Find all macros // Find all macros
for ( unsigned i = 0 ; i < n ; i++ ) { for ( unsigned i = 0 ; i < n ; i++ ) {
app_ref a(m_manager); app_ref a(m);
expr_ref t(m_manager); expr_ref t(m);
if (is_quasi_macro(exprs[i].get_fml(), a, t)) { if (is_quasi_macro(exprs[i].get_fml(), a, t)) {
quantifier_ref macro(m_manager); quantifier_ref macro(m);
quasi_macro_to_macro(to_quantifier(exprs[i].get_fml()), a, t, macro); quasi_macro_to_macro(to_quantifier(exprs[i].get_fml()), a, t, macro);
TRACE("quasi_macros", tout << "Found quasi macro: " << mk_pp(exprs[i].get_fml(), m_manager) << std::endl; TRACE("quasi_macros", tout << "Found quasi macro: " << mk_pp(exprs[i].get_fml(), m) << std::endl;
tout << "Macro: " << mk_pp(macro, m_manager) << std::endl; ); tout << "Macro: " << mk_pp(macro, m) << std::endl; );
proof * pr = nullptr; proof * pr = nullptr;
if (m_manager.proofs_enabled()) if (m.proofs_enabled())
pr = m_manager.mk_def_axiom(macro); pr = m.mk_def_axiom(macro);
if (m_macro_manager.insert(a->get_decl(), macro, pr)) if (m_macro_manager.insert(a->get_decl(), macro, pr))
res = true; res = true;
} }
@ -330,16 +330,15 @@ bool quasi_macros::find_macros(unsigned n, justified_expr const * exprs) {
} }
void quasi_macros::apply_macros(unsigned n, expr * const * exprs, proof * const * prs, expr_dependency * const* deps, expr_ref_vector & new_exprs, proof_ref_vector & new_prs, expr_dependency_ref_vector& new_deps) { void quasi_macros::apply_macros(unsigned n, expr * const * exprs, proof * const * prs, expr_dependency * const* deps, expr_ref_vector & new_exprs, proof_ref_vector & new_prs, expr_dependency_ref_vector& new_deps) {
for ( unsigned i = 0 ; i < n ; i++ ) { for (unsigned i = 0 ; i < n ; i++ ) {
expr_ref r(m_manager), rs(m_manager); expr_ref r(m);
proof_ref pr(m_manager), ps(m_manager); proof_ref pr(m);
expr_dependency_ref dep(m_manager); expr_dependency_ref dep(m);
proof * p = m_manager.proofs_enabled() ? prs[i] : nullptr; proof * p = m.proofs_enabled() ? prs[i] : nullptr;
m_macro_manager.expand_macros(exprs[i], p, deps[i], r, pr, dep); m_macro_manager.expand_macros(exprs[i], p, deps[i], r, pr, dep);
m_rewriter(r); m_rewriter(r);
new_exprs.push_back(r); new_exprs.push_back(r);
new_prs.push_back(ps); new_prs.push_back(pr);
new_deps.push_back(dep); new_deps.push_back(dep);
} }
} }
@ -353,7 +352,7 @@ bool quasi_macros::operator()(unsigned n, expr * const * exprs, proof * const *
// just copy them over // just copy them over
for ( unsigned i = 0 ; i < n ; i++ ) { for ( unsigned i = 0 ; i < n ; i++ ) {
new_exprs.push_back(exprs[i]); new_exprs.push_back(exprs[i]);
if (m_manager.proofs_enabled()) if (m.proofs_enabled())
new_prs.push_back(prs[i]); new_prs.push_back(prs[i]);
} }
return false; return false;
@ -361,14 +360,14 @@ bool quasi_macros::operator()(unsigned n, expr * const * exprs, proof * const *
} }
void quasi_macros::apply_macros(unsigned n, justified_expr const* fmls, vector<justified_expr>& new_fmls) { void quasi_macros::apply_macros(unsigned n, justified_expr const* fmls, vector<justified_expr>& new_fmls) {
for ( unsigned i = 0 ; i < n ; i++ ) { for (unsigned i = 0 ; i < n ; i++) {
expr_ref r(m_manager), rs(m_manager); expr_ref r(m);
proof_ref pr(m_manager), ps(m_manager); proof_ref pr(m);
proof * p = m_manager.proofs_enabled() ? fmls[i].get_proof() : nullptr; proof * p = m.proofs_enabled() ? fmls[i].get_proof() : nullptr;
expr_dependency_ref dep(m_manager); expr_dependency_ref dep(m);
m_macro_manager.expand_macros(fmls[i].get_fml(), p, nullptr, r, pr, dep); m_macro_manager.expand_macros(fmls[i].get_fml(), p, nullptr, r, pr, dep);
m_rewriter(r); m_rewriter(r);
new_fmls.push_back(justified_expr(m_manager, r, pr)); new_fmls.push_back(justified_expr(m, r, pr));
} }
} }
@ -376,7 +375,8 @@ bool quasi_macros::operator()(unsigned n, justified_expr const* fmls, vector<jus
if (find_macros(n, fmls)) { if (find_macros(n, fmls)) {
apply_macros(n, fmls, new_fmls); apply_macros(n, fmls, new_fmls);
return true; return true;
} else { }
else {
// just copy them over // just copy them over
for ( unsigned i = 0 ; i < n ; i++ ) { for ( unsigned i = 0 ; i < n ; i++ ) {
new_fmls.push_back(fmls[i]); new_fmls.push_back(fmls[i]);

2
src/ast/macros/quasi_macros.h
View file

@ -30,7 +30,7 @@ Revision History:
class quasi_macros { class quasi_macros {
typedef obj_map<func_decl, unsigned> occurrences_map; typedef obj_map<func_decl, unsigned> occurrences_map;
ast_manager & m_manager; ast_manager & m;
macro_manager & m_macro_manager; macro_manager & m_macro_manager;
th_rewriter m_rewriter; th_rewriter m_rewriter;
occurrences_map m_occurrences; occurrences_map m_occurrences;