mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-27 19:05:51 +00:00
Code Activity

refactor get_sort

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-02-02 04:45:54 -08:00
parent 4455f6caf8
commit 3ae4c6e9de
129 changed files with 362 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/muz/rel/dl_compiler.cpp
View file

@ -902,7 +902,7 @@ namespace datalog {
expr* e = it->m_value;
if (!pos_vars.contains(v)) {
single_res_expr.push_back(e);
make_add_unbound_column(r, v, pred, single_res, m.get_sort(e), single_res, dealloc, acc);
make_add_unbound_column(r, v, pred, single_res, e->get_sort(), single_res, dealloc, acc);
TRACE("dl", tout << "Adding unbound column: " << mk_pp(e, m) << "\n";);
}
}

2
src/muz/rel/dl_interval_relation.cpp
View file

@ -326,7 +326,7 @@ namespace datalog {
for (unsigned i = 0; i < f.size(); ++i) {
app_ref eq(m);
expr* e = f[i];
eq = m.mk_eq(m.mk_var(i, m.get_sort(e)), e);
eq = m.mk_eq(m.mk_var(i, e->get_sort()), e);
r.filter_interpreted(eq.get());
}
mk_union(r, nullptr, false);

6
src/muz/rel/dl_mk_simple_joins.cpp
View file

@ -162,7 +162,7 @@ namespace datalog {
for (expr* arg : *t) {
unsigned var_idx = to_var(arg)->get_idx();
if (!result.get(res_ofs - var_idx)) {
result[res_ofs - var_idx] = m.mk_var(next_var++, m.get_sort(arg));
result[res_ofs - var_idx] = m.mk_var(next_var++, arg->get_sort());
}
}
}
@ -335,7 +335,7 @@ namespace datalog {
var * v = to_var(arg);
if (v->get_idx() == var_idx) {
args.push_back(v);
domain.push_back(m.get_sort(v));
domain.push_back(v->get_sort());
return true;
}
}
@ -594,7 +594,7 @@ namespace datalog {
cost get_domain_size(expr* e) const {
return get_domain_size(m.get_sort(e));
return get_domain_size(e->get_sort());
}
cost get_domain_size(sort* s) const {

2
src/muz/rel/udoc_relation.cpp
View file

@ -263,7 +263,7 @@ namespace datalog {
}
uint64_t n, sz;
ast_manager& m = get_ast_manager();
if (dl.is_numeral(e, n) && dl.try_get_size(m.get_sort(e), sz)) {
if (dl.is_numeral(e, n) && dl.try_get_size(e->get_sort(), sz)) {
num_bits = 0;
while (sz > 0) ++num_bits, sz = sz/2;
r = rational(n, rational::ui64());