mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-20 03:12:03 +00:00
Code Activity

Merge branch 'master' of https://github.com/Z3Prover/z3

Browse source
This commit is contained in:
Nikolaj Bjorner 2016-01-19 19:10:08 +01:00
commit 099e572a26
2 changed files with 2 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/api/api_context.cpp
View file

@ -76,7 +76,6 @@ namespace api {
m_sutil(m()), m_sutil(m()),
m_last_result(m()), m_last_result(m()),
m_ast_trail(m()), m_ast_trail(m()),
m_replay_stack(),
m_pmanager(m_limit) { m_pmanager(m_limit) {
m_error_code = Z3_OK; m_error_code = Z3_OK;
@ -101,22 +100,11 @@ namespace api {
m_seq_fid = m().mk_family_id("seq"); m_seq_fid = m().mk_family_id("seq");
m_dt_plugin = static_cast<datatype_decl_plugin*>(m().get_plugin(m_dt_fid)); m_dt_plugin = static_cast<datatype_decl_plugin*>(m().get_plugin(m_dt_fid));
if (!m_user_ref_count) {
m_replay_stack.push_back(0);
}
install_tactics(*this); install_tactics(*this);
} }
context::~context() { context::~context() {
m_last_obj = 0;
if (!m_user_ref_count) {
for (unsigned i = 0; i < m_replay_stack.size(); ++i) {
dealloc(m_replay_stack[i]);
}
m_ast_trail.reset();
}
reset_parser(); reset_parser();
} }

8
src/api/api_context.h
View file

@ -58,7 +58,7 @@ namespace api {
bv_util m_bv_util; bv_util m_bv_util;
datalog::dl_decl_util m_datalog_util; datalog::dl_decl_util m_datalog_util;
fpa_util m_fpa_util; fpa_util m_fpa_util;
datatype_util m_dtutil; datatype_util m_dtutil;
seq_util m_sutil; seq_util m_sutil;
// Support for old solver API // Support for old solver API
@ -67,8 +67,6 @@ namespace api {
ast_ref_vector m_last_result; //!< used when m_user_ref_count == true ast_ref_vector m_last_result; //!< used when m_user_ref_count == true
ast_ref_vector m_ast_trail; //!< used when m_user_ref_count == false ast_ref_vector m_ast_trail; //!< used when m_user_ref_count == false
unsigned_vector m_ast_lim;
ptr_vector<ast_ref_vector> m_replay_stack;
ref<api::object> m_last_obj; //!< reference to the last API object returned by the APIs ref<api::object> m_last_obj; //!< reference to the last API object returned by the APIs
@ -123,7 +121,7 @@ namespace api {
bv_util & bvutil() { return m_bv_util; } bv_util & bvutil() { return m_bv_util; }
datalog::dl_decl_util & datalog_util() { return m_datalog_util; } datalog::dl_decl_util & datalog_util() { return m_datalog_util; }
fpa_util & fpautil() { return m_fpa_util; } fpa_util & fpautil() { return m_fpa_util; }
datatype_util& dtutil() { return m_dtutil; } datatype_util& dtutil() { return m_dtutil; }
seq_util& sutil() { return m_sutil; } seq_util& sutil() { return m_sutil; }
family_id get_basic_fid() const { return m_basic_fid; } family_id get_basic_fid() const { return m_basic_fid; }
family_id get_array_fid() const { return m_array_fid; } family_id get_array_fid() const { return m_array_fid; }
@ -182,8 +180,6 @@ namespace api {
void invoke_error_handler(Z3_error_code c); void invoke_error_handler(Z3_error_code c);
static void out_of_memory_handler(void * _ctx);
void check_sorts(ast * n); void check_sorts(ast * n);
// ------------------------ // ------------------------