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

fix build, refactor

This commit is contained in:
Nikolaj Bjorner 2021-02-02 05:26:57 -08:00
parent 3ae4c6e9de
commit 937b61fc88
53 changed files with 145 additions and 127 deletions

View file

@ -327,7 +327,7 @@ bool cmd_context::macros_find(symbol const& s, unsigned n, expr*const* args, exp
bool eq = true;
coerced_args.reset();
for (unsigned i = 0; eq && i < n; ++i) {
if (d.m_domain[i] == m().get_sort(args[i])) {
if (d.m_domain[i] == args[i]->get_sort()) {
coerced_args.push_back(args[i]);
continue;
}
@ -1132,7 +1132,7 @@ void cmd_context::mk_app(symbol const & s, unsigned num_args, expr * const * arg
bool first = true;
for (unsigned i = 0; i < num_args; ++i, first = false) {
if (!first) buffer << " ";
buffer << mk_pp(m().get_sort(args[i]), m());
buffer << mk_pp(args[i]->get_sort(), m());
}
buffer << ") ";
if (range) buffer << mk_pp(range, m()) << " ";

View file

@ -293,7 +293,7 @@ public:
throw cmd_exception("invalid command, mismatch between the number of quantified variables and the number of arguments.");
unsigned i = num;
while (i-- > 0) {
sort * s = ctx.m().get_sort(ts[i]);
sort * s = ts[i]->get_sort();
if (s != m_q->get_decl_sort(i)) {
std::ostringstream buffer;
buffer << "invalid command, sort mismatch at position " << i;