mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 20:18:18 +00:00
Code Activity

fix #4951

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-01-20 02:21:42 -08:00
parent 3f2349f0f7
commit 48058e706f
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ast/static_features.cpp
View file

@ -18,6 +18,7 @@ Revision History:
--*/ --*/
#include "ast/static_features.h" #include "ast/static_features.h"
#include "ast/ast_pp.h" #include "ast/ast_pp.h"
#include "ast/for_each_expr.h"
static_features::static_features(ast_manager & m): static_features::static_features(ast_manager & m):
m(m), m(m),
@ -301,7 +302,6 @@ void static_features::update_core(expr * e) {
m_num_interpreted_constants++; m_num_interpreted_constants++;
} }
if (fid == m_afid) { if (fid == m_afid) {
// std::cout << mk_pp(e, m) << "\n";
switch (to_app(e)->get_decl_kind()) { switch (to_app(e)->get_decl_kind()) {
case OP_MUL: case OP_MUL:
if (!is_numeral(to_app(e)->get_arg(0)) || to_app(e)->get_num_args() > 2) { if (!is_numeral(to_app(e)->get_arg(0)) || to_app(e)->get_num_args() > 2) {
@ -405,12 +405,14 @@ 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)))
if (get_depth(arg) <= 3 || is_quantifier(arg))
process(arg, form_ctx, or_and_ctx, ite_ctx, stack_depth-10);
return; return;
} }
mark(e); mark(e);
update_core(e); update_core(e);
if (is_quantifier(e)) { if (is_quantifier(e)) {
expr * body = to_quantifier(e)->get_expr(); expr * body = to_quantifier(e)->get_expr();
process(body, false, false, false, stack_depth+1); process(body, false, false, false, stack_depth+1);
@ -444,11 +446,8 @@ void static_features::process(expr * e, bool form_ctx, bool or_and_ctx, bool ite
unsigned or_and_depth = 0; unsigned or_and_depth = 0;
unsigned ite_depth = 0; unsigned ite_depth = 0;
unsigned num_args = to_app(e)->get_num_args(); for (expr* arg : *to_app(e)) {
for (unsigned i = 0; i < num_args; i++) { m.is_not(arg, arg);
expr * arg = to_app(e)->get_arg(i);
if (m.is_not(arg))
arg = to_app(arg)->get_arg(0);
process(arg, form_ctx_new, or_and_ctx_new, ite_ctx_new, stack_depth+1); process(arg, form_ctx_new, or_and_ctx_new, ite_ctx_new, stack_depth+1);
depth = std::max(depth, get_depth(arg)); depth = std::max(depth, get_depth(arg));
if (form_ctx_new) if (form_ctx_new)