mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-12 10:14:42 +00:00
Code Activity

integrate lambda expressions

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-06-26 07:23:04 -07:00
parent bf4edef761
commit 520ce9a5ee
139 changed files with 2243 additions and 1506 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/model/model_core.cpp
View file

@ -20,12 +20,12 @@ Revision History:
model_core::~model_core() {
for (auto & kv : m_interp) {
m_manager.dec_ref(kv.m_key);
m_manager.dec_ref(kv.m_value);
m.dec_ref(kv.m_key);
m.dec_ref(kv.m_value);
}
for (auto & kv : m_finterp) {
m_manager.dec_ref(kv.m_key);
m.dec_ref(kv.m_key);
dealloc(kv.m_value);
}
}
@ -47,32 +47,33 @@ bool model_core::eval(func_decl* f, expr_ref & r) const {
void model_core::register_decl(func_decl * d, expr * v) {
SASSERT(d->get_arity() == 0);
TRACE("model", tout << "register " << d->get_name() << "\n";);
decl2expr::obj_map_entry * entry = m_interp.insert_if_not_there2(d, nullptr);
if (entry->get_data().m_value == nullptr) {
// new entry
m_decls.push_back(d);
m_const_decls.push_back(d);
m_manager.inc_ref(d);
m_manager.inc_ref(v);
m.inc_ref(d);
m.inc_ref(v);
entry->get_data().m_value = v;
}
else {
// replacing entry
m_manager.inc_ref(v);
m_manager.dec_ref(entry->get_data().m_value);
m.inc_ref(v);
m.dec_ref(entry->get_data().m_value);
entry->get_data().m_value = v;
}
}
void model_core::register_decl(func_decl * d, func_interp * fi) {
SASSERT(d->get_arity() > 0);
SASSERT(&fi->m() == &m_manager);
SASSERT(&fi->m() == &m);
decl2finterp::obj_map_entry * entry = m_finterp.insert_if_not_there2(d, nullptr);
if (entry->get_data().m_value == nullptr) {
// new entry
m_decls.push_back(d);
m_func_decls.push_back(d);
m_manager.inc_ref(d);
m.inc_ref(d);
entry->get_data().m_value = fi;
}
else {
@ -85,23 +86,23 @@ void model_core::register_decl(func_decl * d, func_interp * fi) {
void model_core::unregister_decl(func_decl * d) {
decl2expr::obj_map_entry * ec = m_interp.find_core(d);
if (ec && ec->get_data().m_value != 0) {
if (ec) {
auto k = ec->get_data().m_key;
auto v = ec->get_data().m_value;
m_interp.remove(d);
m_const_decls.erase(d);
m_manager.dec_ref(k);
m_manager.dec_ref(v);
m.dec_ref(k);
m.dec_ref(v);
return;
}
decl2finterp::obj_map_entry * ef = m_finterp.find_core(d);
if (ef && ef->get_data().m_value != 0) {
if (ef) {
auto k = ef->get_data().m_key;
auto v = ef->get_data().m_value;
m_finterp.remove(d);
m_func_decls.erase(d);
m_manager.dec_ref(k);
m.dec_ref(k);
dealloc(v);
}
}