mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-02 21:37:02 +00:00
Code Activity

updates to resource exceptions, update master possibly handle pull request issue

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-12-12 11:36:49 -08:00
parent 3ff7283f94
commit a7e2fb31e3
24 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -100,7 +100,7 @@ class degree_shift_tactic : public tactic {
void checkpoint() {
if (m.canceled())
throw tactic_exception(TACTIC_CANCELED_MSG);
throw tactic_exception(m.limit().get_cancel_msg());
cooperate("degree_shift");
}

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

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

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

@ -197,7 +197,7 @@ 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(TACTIC_CANCELED_MSG);
if (m.canceled()) throw tactic_exception(m.limit().get_cancel_msg());
switch (process(x, *it, u, ev, val)) {
case NONE:
TRACE("fm_mc", tout << "no bound for:\n" << mk_ismt2_pp(*it, m) << "\n";);
@ -1543,7 +1543,7 @@ class fm_tactic : public tactic {
void checkpoint() {
cooperate("fm");
if (m.canceled())
throw tactic_exception(TACTIC_CANCELED_MSG);
throw tactic_exception(m.limit().get_cancel_msg());
if (memory::get_allocation_size() > m_max_memory)
throw tactic_exception(TACTIC_MAX_MEMORY_MSG);
}