mirror of
https://github.com/Z3Prover/z3
synced 2025-04-12 12:08:18 +00:00
merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
3a572edb9c
commit
c5432dbd88
|
@ -65,7 +65,7 @@ bool has_skolem_functions(expr * n) {
|
||||||
}
|
}
|
||||||
|
|
||||||
subterms::subterms(expr_ref_vector const& es): m_es(es) {}
|
subterms::subterms(expr_ref_vector const& es): m_es(es) {}
|
||||||
subterms::subterms(const expr_ref& e) : m_es(e.m()) { m_es.push_back(e); }
|
subterms::subterms(expr_ref const& e) : m_es(e.m()) { m_es.push_back(e); }
|
||||||
subterms::iterator subterms::begin() { return iterator(*this, true); }
|
subterms::iterator subterms::begin() { return iterator(*this, true); }
|
||||||
subterms::iterator subterms::end() { return iterator(*this, false); }
|
subterms::iterator subterms::end() { return iterator(*this, false); }
|
||||||
subterms::iterator::iterator(subterms& f, bool start): m_es(f.m_es) {
|
subterms::iterator::iterator(subterms& f, bool start): m_es(f.m_es) {
|
||||||
|
|
|
@ -182,7 +182,7 @@ public:
|
||||||
bool operator!=(iterator const& other) const;
|
bool operator!=(iterator const& other) const;
|
||||||
};
|
};
|
||||||
subterms(expr_ref_vector const& es);
|
subterms(expr_ref_vector const& es);
|
||||||
subterms(const expr_ref& e);
|
subterms(expr_ref const& e);
|
||||||
iterator begin();
|
iterator begin();
|
||||||
iterator end();
|
iterator end();
|
||||||
};
|
};
|
||||||
|
|
|
@ -405,7 +405,7 @@ void static_features::process(expr * e, bool form_ctx, bool or_and_ctx, bool ite
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stack_depth > m_max_stack_depth) {
|
if (stack_depth > m_max_stack_depth) {
|
||||||
for (expr* arg : subterms(expr_ref(e, m)))
|
for (expr* arg : subterms(expr_ref(e, m)))
|
||||||
if (get_depth(arg) <= 3 || is_quantifier(arg))
|
if (get_depth(arg) <= 3 || is_quantifier(arg))
|
||||||
process(arg, form_ctx, or_and_ctx, ite_ctx, stack_depth-10);
|
process(arg, form_ctx, or_and_ctx, ite_ctx, stack_depth-10);
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in a new issue