3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-26 13:06:05 +00:00

fix build

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-06-03 15:12:08 -07:00
parent d50fc6976b
commit f986ae97bd
5 changed files with 12 additions and 12 deletions

View file

@ -128,7 +128,8 @@ namespace datalog {
func_decl * pred = r->get_decl(); func_decl * pred = r->get_decl();
if (engine.get_fact(pred).is_reachable()) { if (engine.get_fact(pred).is_reachable()) {
res->add_rule(r); res->add_rule(r);
} else if (m_context.get_model_converter()) { }
else if (m_context.get_model_converter()) {
pruned_preds.insert(pred); pruned_preds.insert(pred);
} }
} }

View file

@ -608,7 +608,8 @@ namespace datalog {
TRACE("dl", TRACE("dl",
source.display(tout); source.display(tout);
res->display(tout);); res->display(tout););
} else { }
else {
res = nullptr; res = nullptr;
} }
return res.detach(); return res.detach();

View file

@ -335,7 +335,7 @@ namespace datalog {
rule_set * mk_subsumption_checker::operator()(rule_set const & source) { rule_set * mk_subsumption_checker::operator()(rule_set const & source) {
// TODO mc // TODO mc
if (!m_context.get_params ().xform_subsumption_checker()) if (!m_context.get_params ().xform_subsumption_checker())
return nullptr; return nullptr;
m_have_new_total_rule = false; m_have_new_total_rule = false;
collect_ground_unconditional_rule_heads(source); collect_ground_unconditional_rule_heads(source);
@ -356,8 +356,7 @@ namespace datalog {
SASSERT(m_new_total_relation_discovery_during_transformation || !m_have_new_total_rule); SASSERT(m_new_total_relation_discovery_during_transformation || !m_have_new_total_rule);
while (m_have_new_total_rule) { while (m_have_new_total_rule) {
m_have_new_total_rule = false; m_have_new_total_rule = false;
scoped_ptr<rule_set> old = res.detach();
scoped_ptr<rule_set> old = res;
res = alloc(rule_set, m_context); res = alloc(rule_set, m_context);
transform_rules(*old, *res); transform_rules(*old, *res);
} }

View file

@ -387,7 +387,7 @@ namespace datalog {
} }
} }
rule_set * result = static_cast<rule_set *>(nullptr); scoped_ptr<rule_set> result;
if (m_modified) { if (m_modified) {
result = alloc(rule_set, m_context); result = alloc(rule_set, m_context);
unsigned fin_rule_cnt = m_rules.size(); unsigned fin_rule_cnt = m_rules.size();
@ -397,7 +397,7 @@ namespace datalog {
result->inherit_predicates(source); result->inherit_predicates(source);
} }
reset(); reset();
return result; return result.detach();
} }

View file

@ -51,13 +51,12 @@ namespace datalog {
} }
rule_set * mk_unfold::operator()(rule_set const & source) { rule_set * mk_unfold::operator()(rule_set const & source) {
rule_set* rules = alloc(rule_set, m_ctx); scoped_ptr<rule_set> rules = alloc(rule_set, m_ctx);
rule_set::iterator it = source.begin(), end = source.end(); for (rule* r : source) {
for (; it != end; ++it) { expand_tail(*r, 0, source, *rules);
expand_tail(**it, 0, source, *rules);
} }
rules->inherit_predicates(source); rules->inherit_predicates(source);
return rules; return rules.detach();
} }
}; };