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

Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable

Browse source
This commit is contained in:
Nikolaj Bjorner 2013-04-21 18:17:56 -07:00
commit 4ceb228583
44 changed files with 97 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/smt/asserted_formulas.cpp
View file

@ -408,7 +408,7 @@ void asserted_formulas::apply_quasi_macros() {
TRACE("before_quasi_macros", display(tout););
expr_ref_vector new_exprs(m_manager);
proof_ref_vector new_prs(m_manager);
quasi_macros proc(m_manager, m_macro_manager, *m_bsimp, m_simplifier);
quasi_macros proc(m_manager, m_macro_manager, m_simplifier);
while (proc(m_asserted_formulas.size() - m_asserted_qhead,
m_asserted_formulas.c_ptr() + m_asserted_qhead,
m_asserted_formula_prs.c_ptr() + m_asserted_qhead,

2
src/smt/database.h
View file

@ -1,4 +1,4 @@
char const * g_pattern_database =
static char const * g_pattern_database =
"(benchmark patterns \n"
" :status unknown \n"
" :logic ALL \n"

2
src/smt/expr_context_simplifier.cpp
View file

@ -311,7 +311,7 @@ bool expr_context_simplifier::is_false(expr* e) const {
//
expr_strong_context_simplifier::expr_strong_context_simplifier(smt_params& p, ast_manager& m):
m_manager(m), m_params(p), m_arith(m), m_id(0), m_fn(0,m), m_solver(m, p) {
m_manager(m), m_arith(m), m_fn(0,m), m_solver(m, p) {
sort* i_sort = m_arith.mk_int();
m_fn = m.mk_func_decl(symbol(0xbeef101), i_sort, m.mk_bool_sort());
}

2
src/smt/expr_context_simplifier.h
View file

@ -57,9 +57,7 @@ private:
class expr_strong_context_simplifier {
ast_manager& m_manager;
smt_params & m_params;
arith_util m_arith;
unsigned m_id;
func_decl_ref m_fn;
smt::kernel m_solver;

2
src/smt/mam.cpp
View file

@ -1849,11 +1849,9 @@ namespace smt {
unsigned m_curr_max_generation; // temporary var used to store a copy of m_max_generation
unsigned m_num_args;
unsigned m_oreg;
unsigned m_ireg;
enode * m_n1;
enode * m_n2;
enode * m_app;
instruction * m_alt;
const bind * m_b;
ptr_vector<enode> m_used_enodes;
unsigned m_curr_used_enodes_size;

9
src/smt/theory_dl.cpp
View file

@ -68,14 +68,11 @@ namespace smt {
bv_util& b() { return m_bv; }
class dl_value_proc : public smt::model_value_proc {
smt::model_generator & m_mg;
theory_dl& m_th;
smt::enode* m_node;
public:
dl_value_proc(smt::model_generator & m, theory_dl& th, smt::enode* n):
m_mg(m), m_th(th), m_node(n)
{ }
dl_value_proc(theory_dl& th, smt::enode* n) : m_th(th), m_node(n) {}
virtual void get_dependencies(buffer<smt::model_value_dependency> & result) {}
@ -165,8 +162,8 @@ namespace smt {
m.register_factory(alloc(dl_factory, m_util, m.get_model()));
}
virtual smt::model_value_proc * mk_value(smt::enode * n, smt::model_generator & m) {
return alloc(dl_value_proc, m, *this, n);
virtual smt::model_value_proc * mk_value(smt::enode * n) {
return alloc(dl_value_proc, *this, n);
}
virtual void apply_sort_cnstr(enode * n, sort * s) {