mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 10:52:02 +00:00
Code Activity

add n-ary disjunction and conjunction

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-07-01 08:15:50 -07:00
parent e518d4a5fe
commit 4c786c5f70
7 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/smt/smt_context.cpp
View file

@ -2996,6 +2996,8 @@ namespace smt {
// in a consistent context.
if (inconsistent())
return;
if (get_cancel_flag())
return;
push_scope();
for (unsigned i = 0; i < num_assumptions; i++) {
expr * curr_assumption = assumptions[i];
@ -3337,6 +3339,7 @@ namespace smt {
break;
}
if (cmr == quantifier_manager::UNKNOWN) {
IF_VERBOSE(1, verbose_stream() << "(smt.giveup quantifiers)\n";);
// giving up
m_last_search_failure = QUANTIFIERS;
status = l_undef;
@ -3487,6 +3490,7 @@ namespace smt {
}
if (resource_limits_exceeded() && !inconsistent()) {
m_last_search_failure = RESOURCE_LIMIT;
return l_undef;
}
}
@ -4109,7 +4113,7 @@ namespace smt {
m_fingerprints.display(tout);
);
failure fl = get_last_search_failure();
if (fl == MEMOUT || fl == CANCELED || fl == TIMEOUT || fl == NUM_CONFLICTS) {
if (fl == MEMOUT || fl == CANCELED || fl == TIMEOUT || fl == NUM_CONFLICTS || fl == RESOURCE_LIMIT) {
return;
}