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

Merge branch 'unstable' of https://github.com/mschlaipfer/z3 into unstable

This commit is contained in:
Nuno Lopes 2015-05-18 16:38:19 +01:00
commit d8dc86f558
10 changed files with 28 additions and 29 deletions

View file

@ -682,11 +682,11 @@ namespace datalog {
svector<bool> tail_neg;
app_ref head(r->get_head(), m);
vctr.count_vars(m, head);
vctr.count_vars(head);
for (unsigned i = 0; i < ut_len; i++) {
app * t = r->get_tail(i);
vctr.count_vars(m, t);
vctr.count_vars(t);
tail.push_back(t);
tail_neg.push_back(r->is_neg_tail(i));
}

View file

@ -256,12 +256,12 @@ namespace datalog {
}
void rule_counter::count_rule_vars(ast_manager & m, const rule * r, int coef) {
void rule_counter::count_rule_vars(const rule * r, int coef) {
reset();
count_vars(m, r->get_head(), 1);
count_vars(r->get_head(), 1);
unsigned n = r->get_tail_size();
for (unsigned i = 0; i < n; i++) {
count_vars(m, r->get_tail(i), coef);
count_vars(r->get_tail(i), coef);
}
}

View file

@ -347,7 +347,7 @@ namespace datalog {
class rule_counter : public var_counter {
public:
rule_counter(){}
void count_rule_vars(ast_manager & m, const rule * r, int coef = 1);
void count_rule_vars(const rule * r, int coef = 1);
unsigned get_max_rule_var(const rule& r);
};