mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

prepare for variable scoping and autarkies

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-12-13 20:11:16 -08:00
parent aeabdb4aae
commit a74d18a695
18 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/solver/combined_solver.cpp
View file

@ -275,8 +275,8 @@ public:
return m_solver1->get_num_assumptions() + m_solver2->get_num_assumptions();
}
virtual expr_ref_vector cube(unsigned backtrack_level) {
return m_solver1->cube(backtrack_level);
virtual expr_ref_vector cube(expr_ref_vector& vars, unsigned backtrack_level) {
return m_solver1->cube(vars, backtrack_level);
}
virtual expr * get_assumption(unsigned idx) const {

2
src/solver/solver.h
View file

@ -190,7 +190,7 @@ public:
\brief extract a lookahead candidates for branching.
*/
virtual expr_ref_vector cube(unsigned backtrack_level) = 0;
virtual expr_ref_vector cube(expr_ref_vector& vars, unsigned backtrack_level) = 0;
/**
\brief Display the content of this solver.

2
src/solver/solver_pool.cpp
View file

@ -223,7 +223,7 @@ public:
virtual void get_labels(svector<symbol> & r) { return m_base->get_labels(r); }
virtual void set_progress_callback(progress_callback * callback) { m_base->set_progress_callback(callback); }
virtual expr_ref_vector cube(unsigned ) { return expr_ref_vector(m); }
virtual expr_ref_vector cube(expr_ref_vector& vars, unsigned ) { return expr_ref_vector(m); }
virtual ast_manager& get_manager() const { return m_base->get_manager(); }

2
src/solver/tactic2solver.cpp
View file

@ -77,7 +77,7 @@ public:
virtual ast_manager& get_manager() const;
virtual expr_ref_vector cube(unsigned ) {
virtual expr_ref_vector cube(expr_ref_vector& vars, unsigned ) {
return expr_ref_vector(get_manager());
}