3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-22 22:03:39 +00:00

fix subtraction

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-12-27 15:49:54 -08:00
parent dd07d21f6c
commit 1e99059a5d
3 changed files with 37 additions and 33 deletions

View file

@ -171,32 +171,24 @@ namespace dd {
}
break;
case pdd_sub_op:
if (is_val(p)) {
if (is_val(p) || (!is_val(q) && level_p < level_q)) {
// p - (ax + b) = -ax + (p - b)
push(apply_rec(p, lo(q), op));
r = make_node(level_q, read(1), hi(q));
npop = 1;
push(minus_rec(hi(q)));
r = make_node(level_q, read(2), read(1));
}
else if (is_val(q)) {
push(apply_rec(lo(p), q, op));
r = make_node(level_p, read(1), hi(p));
npop = 1;
}
else if (level_p == level_q) {
push(apply_rec(lo(p), lo(q), op));
push(apply_rec(hi(p), hi(q), op));
r = make_node(level_p, read(2), read(1));
}
else if (level_p > level_q) {
// x*hi(p) + (lo(p) - q)
else if (is_val(q) || (level_p > level_q)) {
// (ax + b) - k = ax + (b - k)
push(apply_rec(lo(p), q, op));
r = make_node(level_p, read(1), hi(p));
npop = 1;
}
else {
// x*hi(q) + (p - lo(q))
push(apply_rec(p, lo(q), op));
r = make_node(level_q, read(1), hi(q));
npop = 1;
SASSERT(level_p == level_q);
// (ax + b) - (cx + d) = (a - c)x + (b - d)
push(apply_rec(lo(p), lo(q), op));
push(apply_rec(hi(p), hi(q), op));
r = make_node(level_p, read(2), read(1));
}
break;
case pdd_mul_op: