mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-06 19:21:22 +00:00
Code Activity

fix #3557

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-04-03 16:37:59 -07:00
parent 0b856638e9
commit 426e4cc75c
65 changed files with 135 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tactic/arith/arith_bounds_tactic.cpp
View file

@ -33,9 +33,7 @@ struct arith_bounds_tactic : public tactic {
}
void checkpoint() {
if (m.canceled()) {
throw tactic_exception(m.limit().get_cancel_msg());
}
tactic::checkpoint(m);
}

2
src/tactic/arith/degree_shift_tactic.cpp
View file

@ -97,7 +97,7 @@ class degree_shift_tactic : public tactic {
void checkpoint() {
if (m.canceled())
if (!m.inc())
throw tactic_exception(m.limit().get_cancel_msg());
}

2
src/tactic/arith/diff_neq_tactic.cpp
View file

@ -288,7 +288,7 @@ class diff_neq_tactic : public tactic {
init_forbidden();
unsigned nvars = num_vars();
while (m_stack.size() < nvars) {
if (m.canceled())
if (!m.inc())
throw tactic_exception(m.limit().get_cancel_msg());
TRACE("diff_neq_tactic", display_model(tout););
var x = m_stack.size();

5
src/tactic/arith/fm_tactic.cpp
View file

@ -198,7 +198,8 @@ class fm_tactic : public tactic {
clauses::iterator it = m_clauses[i].begin();
clauses::iterator end = m_clauses[i].end();
for (; it != end; ++it) {
if (m.canceled()) throw tactic_exception(m.limit().get_cancel_msg());
if (!m.inc())
throw tactic_exception(m.limit().get_cancel_msg());
switch (process(x, *it, u, *md, val)) {
case NONE:
TRACE("fm_mc", tout << "no bound for:\n" << mk_ismt2_pp(*it, m) << "\n";);
@ -1542,7 +1543,7 @@ class fm_tactic : public tactic {
}
void checkpoint() {
if (m.canceled())
if (!m.inc())
throw tactic_exception(m.limit().get_cancel_msg());
if (memory::get_allocation_size() > m_max_memory)
throw tactic_exception(TACTIC_MAX_MEMORY_MSG);

2
src/tactic/arith/lia2card_tactic.cpp
View file

@ -164,7 +164,7 @@ public:
}
void checkpoint() {
if (m.canceled()) {
if (!m.inc()) {
throw tactic_exception(m.limit().get_cancel_msg());
}
}