mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-28 08:58:44 +00:00
Code Activity

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

Browse source 
Conflicts:
	src/ast/float_decl_plugin.h

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
This commit is contained in:
Christoph M. Wintersteiger 2014-07-31 17:37:43 +01:00
commit c508b66cf7
37 changed files with 502 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/smt/theory_fpa.h
View file

@ -51,9 +51,10 @@ namespace smt {
protected:
fpa2bv_converter m_converter;
fpa2bv_rewriter m_rw;
expr_map m_trans_map;
expr_map m_trans_map;
th_trail_stack m_trail_stack;
bool_var2atom m_bool_var2atom;
enode_vector m_temporaries;
virtual final_check_status final_check_eh() { return FC_DONE; }
virtual bool internalize_atom(app * atom, bool gate_ctx);
@ -71,6 +72,7 @@ namespace smt {
void assign_eh(bool_var v, bool is_true);
virtual void relevant_eh(app * n);
virtual void init_model(model_generator & m);
public:
theory_fpa(ast_manager& m);
@ -86,7 +88,7 @@ namespace smt {
}
void mk_bv_eq(expr * x, expr * y);
expr_ref mk_eq_bv_const(expr_ref const & e);
app_ref mk_eq_bv_const(expr_ref const & e);
};
};