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

more graceful behavior of seq.validate #3885

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-04-09 11:59:11 -07:00
parent 5d3b00b5ea
commit e14bca2ebf
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/smt/theory_seq.cpp
View file

@ -4585,10 +4585,6 @@ expr_ref theory_seq::elim_skolem(expr* e) {
todo.pop_back();
continue;
}
else if (m_util.is_skolem(a)) {
IF_VERBOSE(0, verbose_stream() << "unhandled skolem " << mk_pp(a, m) << "\n");
return expr_ref(m.mk_false(), m);
}
args.reset();
for (expr* arg : *to_app(a)) {
@ -4599,12 +4595,19 @@ expr_ref theory_seq::elim_skolem(expr* e) {
todo.push_back(arg);
}
}
if (args.size() == to_app(a)->get_num_args()) {
todo.pop_back();
result = m.mk_app(to_app(a)->get_decl(), args.size(), args.c_ptr());
trail.push_back(result);
cache.insert(a, result);
}
if (args.size() < to_app(a)->get_num_args()) {
continue;
}
if (m_util.is_skolem(a)) {
IF_VERBOSE(0, verbose_stream() << "unhandled skolem " << mk_pp(a, m) << "\n");
return expr_ref(m.mk_false(), m);
}
todo.pop_back();
result = m.mk_app(to_app(a)->get_decl(), args.size(), args.c_ptr());
trail.push_back(result);
cache.insert(a, result);
}
return expr_ref(cache[e], m);
}
@ -4672,7 +4675,7 @@ void theory_seq::validate_fmls(enode_pair_vector const& eqs, literal_vector cons
k.assert_expr(f);
}
lbool r = k.check();
if (r != l_false) {
if (r != l_false && !m.limit().get_cancel_flag()) {
model_ref mdl;
k.get_model(mdl);
IF_VERBOSE(0,