mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-13 01:16:15 +00:00
Code Activity

add missing simplification; handle nit #6952

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2023-10-25 09:59:54 -07:00
parent 0859be5649
commit 7b490543ca
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/ast/rewriter/seq_rewriter.cpp
View file

@ -1245,6 +1245,15 @@ br_status seq_rewriter::mk_seq_extract(expr* a, expr* b, expr* c, expr_ref& resu
result = str().mk_substr(a1, m_autil.mk_add(b1, b), m_autil.mk_sub(c1, b)); result = str().mk_substr(a1, m_autil.mk_add(b1, b), m_autil.mk_sub(c1, b));
return BR_REWRITE3; return BR_REWRITE3;
} }
rational r1, r2;
if (str().is_extract(a, a1, b1, c1) &&
m_autil.is_numeral(b1, r1) && r1.is_unsigned() &&
m_autil.is_numeral(c1, r2) && r2.is_unsigned() &&
constantPos && constantLen &&
r1 == 0 && r2 >= pos + len) {
result = str().mk_substr(a1, b, c);
return BR_REWRITE1;
}
if (str().is_extract(a, a1, b1, c1) && if (str().is_extract(a, a1, b1, c1) &&
is_prefix(a1, b1, c1) && is_prefix(a, b, c)) { is_prefix(a1, b1, c1) && is_prefix(a, b, c)) {

24
src/math/polynomial/rpolynomial.cpp
View file

@ -658,9 +658,7 @@ namespace rpolynomial {
void display(std::ostream & out, polynomial const * p, display_var_proc const & proc, bool use_star) { void display(std::ostream & out, polynomial const * p, display_var_proc const & proc, bool use_star) {
var x = p->max_var(); var x = p->max_var();
bool first = true; bool first = true;
unsigned i = p->size(); for (unsigned i = p->size(); i-- > 0; ) {
while (i > 0) {
--i;
poly_or_num * pn = p->arg(i); poly_or_num * pn = p->arg(i);
if (pn == nullptr) if (pn == nullptr)
continue; continue;
@ -697,23 +695,19 @@ namespace rpolynomial {
display(out, to_poly(pn), proc, use_star); display(out, to_poly(pn), proc, use_star);
} }
else { else {
bool add_paren = false; bool add_paren = !is_monomial(to_poly(pn));
if (i > 0)
add_paren = !is_monomial(to_poly(pn));
if (add_paren) if (add_paren)
out << "("; out << "(";
display(out, to_poly(pn), proc, use_star); display(out, to_poly(pn), proc, use_star);
if (add_paren) if (add_paren)
out << ")"; out << ")";
if (i > 0) { if (use_star)
if (use_star) out << "*";
out << "*"; else
else out << " ";
out << " "; proc(out, x);
proc(out, x); if (i > 1)
if (i > 1) out << "^" << i;
out << "^" << i;
}
} }
} }
} }