mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-19 04:13:38 +00:00
Code Activity

fix #5340

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-06-15 13:53:22 -05:00
parent 9c6b29164d
commit dc6a8fde34
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ast/rewriter/quant_hoist.cpp
View file

@ -214,26 +214,22 @@ private:
pull_quantifier(a->get_arg(i), qt, vars, tmp, use_fresh, rewrite_ok); pull_quantifier(a->get_arg(i), qt, vars, tmp, use_fresh, rewrite_ok);
args.push_back(tmp); args.push_back(tmp);
} }
if (rewrite_ok) { if (rewrite_ok)
m_rewriter.mk_and(args.size(), args.data(), result); m_rewriter.mk_and(args.size(), args.data(), result);
} else
else {
result = m.mk_and (args.size (), args.data ()); result = m.mk_and (args.size (), args.data ());
} }
}
else if (m.is_or(fml)) { else if (m.is_or(fml)) {
num_args = to_app(fml)->get_num_args(); num_args = to_app(fml)->get_num_args();
for (unsigned i = 0; i < num_args; ++i) { for (unsigned i = 0; i < num_args; ++i) {
pull_quantifier(to_app(fml)->get_arg(i), qt, vars, tmp, use_fresh, rewrite_ok); pull_quantifier(to_app(fml)->get_arg(i), qt, vars, tmp, use_fresh, rewrite_ok);
args.push_back(tmp); args.push_back(tmp);
} }
if (rewrite_ok) { if (rewrite_ok)
m_rewriter.mk_or(args.size(), args.data(), result); m_rewriter.mk_or(args.size(), args.data(), result);
} else
else {
result = m.mk_or (args.size (), args.data ()); result = m.mk_or (args.size (), args.data ());
} }
}
else if (m.is_not(fml)) { else if (m.is_not(fml)) {
pull_quantifier(to_app(fml)->get_arg(0), negate(qt), vars, tmp, use_fresh, rewrite_ok); pull_quantifier(to_app(fml)->get_arg(0), negate(qt), vars, tmp, use_fresh, rewrite_ok);
negate(qt); negate(qt);

2
src/tactic/smtlogics/quant_tactics.cpp
View file

@ -107,7 +107,7 @@ tactic * mk_lra_tactic(ast_manager & m, params_ref const & p) {
mk_qe_lite_tactic(m, p), mk_qe_lite_tactic(m, p),
cond(mk_has_quantifier_probe(), cond(mk_has_quantifier_probe(),
cond(mk_is_lira_probe(), cond(mk_is_lira_probe(),
mk_qsat_tactic(m, p), or_else(mk_qsat_tactic(m, p), mk_smt_tactic(m)),
mk_smt_tactic(m)), mk_smt_tactic(m)),
mk_smt_tactic(m))); mk_smt_tactic(m)));
st->updt_params(p); st->updt_params(p);