3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-11 05:30:51 +00:00

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

This commit is contained in:
Nikolaj Bjorner 2013-03-29 08:53:50 -07:00
commit 0590101e6f
41 changed files with 61 additions and 74 deletions

View file

@ -553,7 +553,7 @@ namespace datalog {
m_hb.set_cancel(true);
}
rule_set * mk_karr_invariants::operator()(rule_set const & source, model_converter_ref& mc) {
rule_set * mk_karr_invariants::operator()(rule_set const & source) {
if (!m_ctx.get_params().karr()) {
return 0;
}
@ -623,7 +623,7 @@ namespace datalog {
for (; it != end; ++it) {
update_body(*rules, **it);
}
if (mc) {
if (m_ctx.get_model_converter()) {
add_invariant_model_converter* kmc = alloc(add_invariant_model_converter, m);
rule_set::decl2rules::iterator git = source.begin_grouped_rules();
rule_set::decl2rules::iterator gend = source.end_grouped_rules();
@ -634,7 +634,7 @@ namespace datalog {
kmc->add(p, *M);
}
}
mc = concat(mc.get(), kmc);
m_ctx.add_model_converter(kmc);
}
TRACE("dl", rules->display(tout););
return rules;