3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-11 03:33:35 +00:00

use op-cache for is-nullable

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-06-02 13:30:18 -07:00
parent e388055a33
commit bfb5c95b9a
3 changed files with 18 additions and 7 deletions

View file

@ -2151,6 +2151,15 @@ expr_ref seq_rewriter::re_predicate(expr* cond, sort* seq_sort) {
return re_and(cond, re_with_empty);
}
expr_ref seq_rewriter::is_nullable_rec(expr* r) {
expr_ref result(m_op_cache.find(_OP_RE_IS_NULLABLE, r, nullptr), m());
if (!result) {
result = is_nullable(r);
m_op_cache.insert(_OP_RE_IS_NULLABLE, r, nullptr, result);
}
return result;
}
expr_ref seq_rewriter::is_nullable(expr* r) {
SASSERT(m_util.is_re(r));
expr* r1 = nullptr, *r2 = nullptr, *cond = nullptr;
@ -2158,14 +2167,14 @@ expr_ref seq_rewriter::is_nullable(expr* r) {
expr_ref result(m());
if (re().is_concat(r, r1, r2) ||
re().is_intersection(r, r1, r2)) {
result = mk_and(m(), is_nullable(r1), is_nullable(r2));
result = mk_and(m(), is_nullable_rec(r1), is_nullable_rec(r2));
}
else if (re().is_union(r, r1, r2)) {
result = mk_or(m(), is_nullable(r1), is_nullable(r2));
result = mk_or(m(), is_nullable_rec(r1), is_nullable_rec(r2));
}
else if (re().is_diff(r, r1, r2)) {
result = mk_not(m(), is_nullable(r2));
result = mk_and(m(), is_nullable(r1), result);
result = mk_not(m(), is_nullable_rec(r2));
result = mk_and(m(), is_nullable_rec(r1), result);
}
else if (re().is_star(r) ||
re().is_opt(r) ||
@ -2184,10 +2193,10 @@ expr_ref seq_rewriter::is_nullable(expr* r) {
(re().is_loop(r, r1, lo) && lo > 0) ||
(re().is_loop(r, r1, lo, hi) && lo > 0) ||
(re().is_reverse(r, r1))) {
result = is_nullable(r1);
result = is_nullable_rec(r1);
}
else if (re().is_complement(r, r1)) {
result = mk_not(m(), is_nullable(r1));
result = mk_not(m(), is_nullable_rec(r1));
}
else if (re().is_to_re(r, r1)) {
sort* seq_sort = nullptr;
@ -2196,7 +2205,7 @@ expr_ref seq_rewriter::is_nullable(expr* r) {
result = m().mk_eq(emptystr, r1);
}
else if (m().is_ite(r, cond, r1, r2)) {
result = m().mk_ite(cond, is_nullable(r1), is_nullable(r2));
result = m().mk_ite(cond, is_nullable_rec(r1), is_nullable_rec(r2));
}
else {
sort* seq_sort = nullptr;

View file

@ -311,6 +311,7 @@ public:
void add_seqs(expr_ref_vector const& ls, expr_ref_vector const& rs, expr_ref_pair_vector& new_eqs);
expr_ref is_nullable(expr* r);
expr_ref is_nullable_rec(expr* r);
bool has_cofactor(expr* r, expr_ref& cond, expr_ref& th, expr_ref& el);

View file

@ -108,6 +108,7 @@ enum seq_op_kind {
_OP_STRING_STRIDOF,
_OP_REGEXP_EMPTY,
_OP_REGEXP_FULL_CHAR,
_OP_RE_IS_NULLABLE,
_OP_SEQ_SKOLEM,
LAST_SEQ_OP
};