mirror of
https://github.com/Z3Prover/z3
synced 2026-06-29 20:08:52 +00:00
Merge branch 'master' into c3
This commit is contained in:
commit
043c6c0ad1
259 changed files with 18907 additions and 3725 deletions
|
|
@ -105,7 +105,7 @@ namespace smt {
|
|||
proc = alloc(expr_wrapper_proc, m.mk_false());
|
||||
}
|
||||
else if (m.is_model_value(r->get_expr()))
|
||||
proc = alloc(expr_wrapper_proc, r->get_expr());
|
||||
proc = alloc(expr_wrapper_proc, r->get_app());
|
||||
else {
|
||||
family_id fid = s->get_family_id();
|
||||
theory * th = m_context->get_theory(fid);
|
||||
|
|
@ -386,7 +386,7 @@ namespace smt {
|
|||
// send model
|
||||
for (enode * n : m_context->enodes()) {
|
||||
if (is_uninterp_const(n->get_expr()) && m_context->is_relevant(n)) {
|
||||
func_decl * d = n->get_expr()->get_decl();
|
||||
func_decl * d = n->get_decl();
|
||||
TRACE(mg_top_sort, tout << d->get_name() << " " << (m_hidden_ufs.contains(d)?"hidden":"visible") << "\n";);
|
||||
if (m_hidden_ufs.contains(d)) continue;
|
||||
expr * val = get_value(n);
|
||||
|
|
@ -430,6 +430,8 @@ namespace smt {
|
|||
if (!m_context->is_relevant(t))
|
||||
continue;
|
||||
enode * n = m_context->get_enode(t);
|
||||
if (!n->is_app())
|
||||
continue;
|
||||
unsigned num_args = n->get_num_args();
|
||||
func_decl * f = n->get_decl();
|
||||
if (num_args == 0 && include_func_interp(f)) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue