mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

fixes

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-08-27 11:01:45 -07:00
parent 2ede4b2c80
commit d940516df3
10 changed files with 15 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/smt/qi_queue.cpp
View file

@ -227,9 +227,8 @@ namespace smt {
TRACE("qi_queue_instance", tout << "new instance:\n" << mk_pp(instance, m_manager) << "\n";);
expr_ref s_instance(m_manager);
proof_ref pr(m_manager);
th_rewriter & simp = m_context.get_rewriter();
simp(instance, s_instance, pr);
TRACE("qi_queue_bug", tout << "new instance after simplification:\n" << mk_pp(s_instance, m_manager) << "\n";);
m_context.get_rewriter()(instance, s_instance, pr);
TRACE("qi_queue_bug", tout << "new instance after simplification:\n" << s_instance << "\n";);
if (m_manager.is_true(s_instance)) {
TRACE("checker", tout << "reduced to true, before:\n" << mk_ll_pp(instance, m_manager););

3
src/smt/smt_quick_checker.cpp
View file

@ -164,7 +164,6 @@ namespace smt {
quick_checker::quick_checker(context & c):
m_context(c),
m_manager(c.get_manager()),
m_simplifier(c.get_rewriter()),
m_collector(c),
m_new_exprs(m_manager) {
}
@ -411,7 +410,7 @@ namespace smt {
}
}
expr_ref new_expr(m_manager);
new_expr = m_simplifier.mk_app(to_app(n)->get_decl(), num_args, new_args.c_ptr());
new_expr = m_context.get_rewriter().mk_app(to_app(n)->get_decl(), num_args, new_args.c_ptr());
m_new_exprs.push_back(new_expr);
m_canonize_cache.insert(n, new_expr);
return new_expr;

1
src/smt/smt_quick_checker.h
View file

@ -77,7 +77,6 @@ namespace smt {
context & m_context;
ast_manager & m_manager;
th_rewriter & m_simplifier;
collector m_collector;
expr_ref_vector m_new_exprs;
vector<enode_vector> m_candidate_vectors;

5
src/smt/theory_arith_core.h
View file

@ -449,9 +449,8 @@ namespace smt {
expr_ref s_ante(m), s_conseq(m);
expr* s_conseq_n, * s_ante_n;
bool negated;
proof_ref pr(m);
s(ante, s_ante, pr);
s(ante, s_ante);
if (ctx.get_cancel_flag()) return;
negated = m.is_not(s_ante, s_ante_n);
if (negated) s_ante = s_ante_n;
@ -459,7 +458,7 @@ namespace smt {
literal l_ante = ctx.get_literal(s_ante);
if (negated) l_ante.neg();
s(conseq, s_conseq, pr);
s(conseq, s_conseq);
if (ctx.get_cancel_flag()) return;
negated = m.is_not(s_conseq, s_conseq_n);
if (negated) s_conseq = s_conseq_n;

3
src/smt/theory_fpa.cpp
View file

@ -385,7 +385,6 @@ namespace smt {
{
ast_manager & m = get_manager();
context & ctx = get_context();
th_rewriter & simp = ctx.get_rewriter();
expr_ref res(m), t(m);
proof_ref t_pr(m);
@ -394,7 +393,7 @@ namespace smt {
expr_ref_vector::iterator it = m_converter.m_extra_assertions.begin();
expr_ref_vector::iterator end = m_converter.m_extra_assertions.end();
for (; it != end; it++) {
simp(*it, t, t_pr);
ctx.get_rewriter()(*it, t, t_pr);
res = m.mk_and(res, t);
}
m_converter.m_extra_assertions.reset();