mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-11 13:40:52 +00:00
Code Activity

consolidate cancellation to context check_cancel_flag instead of calling in set_cancel()

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-12-11 09:51:43 -08:00
parent ee4ed1749a
commit 4e155887b2
7 changed files with 24 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/smt/smt_model_finder.h
View file

@ -85,7 +85,6 @@ namespace smt {
scoped_ptr<simple_macro_solver> m_sm_solver;
scoped_ptr<hint_solver> m_hint_solver;
scoped_ptr<non_auf_macro_solver> m_nm_solver;
bool m_cancel;
struct scope {
unsigned m_quantifiers_lim;
@ -104,12 +103,8 @@ namespace smt {
void process_non_auf_macros(ptr_vector<quantifier> & qs, ptr_vector<quantifier> & residue, proto_model * m);
void process_auf(ptr_vector<quantifier> const & qs, proto_model * m);
instantiation_set const * get_uvar_inst_set(quantifier * q, unsigned i) const;
void checkpoint();
void checkpoint() {
cooperate("model_finder");
if (m_cancel)
throw tactic_exception(TACTIC_CANCELED_MSG);
}
public:
model_finder(ast_manager & m, simplifier & s);
@ -129,7 +124,7 @@ namespace smt {
void restart_eh();
void set_cancel(bool f);
void checkpoint(char const* component);
};
};