mirror of
https://github.com/Z3Prover/z3
synced 2025-04-15 21:38:44 +00:00
parent
9c6b29164d
commit
dc6a8fde34
|
@ -214,12 +214,10 @@ 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();
|
||||||
|
@ -227,12 +225,10 @@ private:
|
||||||
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);
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue