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

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

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

View file

@ -333,7 +333,7 @@ struct goal2sat::imp {
loop:
cooperate("goal2sat");
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);
frame & fr = m_frame_stack.back();
@ -626,7 +626,7 @@ struct sat2goal::imp {
void checkpoint() {
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);
}