mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-15 23:35:26 +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/smt/smt_model_finder.cpp
View file

@ -3318,7 +3318,7 @@ namespace smt {
void model_finder::checkpoint(char const* msg) {
cooperate(msg);
if (m_context && m_context->get_cancel_flag())
throw tactic_exception(TACTIC_CANCELED_MSG);
throw tactic_exception(m_context->get_manager().limit().get_cancel_msg());
}
mf::quantifier_info * model_finder::get_quantifier_info(quantifier * q) const {

2
src/smt/tactic/unit_subsumption_tactic.cpp
View file

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

7
src/smt/theory_seq.cpp
View file

@ -86,6 +86,13 @@ void theory_seq::solution_map::display(std::ostream& out) const {
}
}
bool theory_seq::exclusion_table::contains(expr* e, expr* r) const {
if (e->get_id() > r->get_id()) {
std::swap(e, r);
}
return m_table.contains(std::make_pair(e, r));
}
void theory_seq::exclusion_table::update(expr* e, expr* r) {
if (e->get_id() > r->get_id()) {
std::swap(e, r);

4
src/smt/theory_seq.h
View file

@ -81,9 +81,7 @@ namespace smt {
~exclusion_table() { }
bool empty() const { return m_table.empty(); }
void update(expr* e, expr* r);
bool contains(expr* e, expr* r) {
return m_table.contains(std::make_pair(e, r));
}
bool contains(expr* e, expr* r) const;
void push_scope() { m_limit.push_back(m_lhs.size()); }
void pop_scope(unsigned num_scopes);
void display(std::ostream& out) const;