mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-04 14:25:46 +00:00
Code Activity

Merge remote-tracking branch 'upstream/master' into lackr

Browse source
This commit is contained in:
Mikolas Janota 2016-01-25 13:04:46 +00:00
commit c2edf2c5bf
30 changed files with 420 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cmd_context/cmd_context.cpp
View file

@ -43,6 +43,8 @@ Notes:
#include"model_smt2_pp.h"
#include"model_v2_pp.h"
#include"model_params.hpp"
#include"th_rewriter.h"
#include"tactic_exception.h"
func_decls::func_decls(ast_manager & m, func_decl * f):
m_decls(TAG(func_decl*, f, 0)) {
@ -1462,7 +1464,8 @@ void cmd_context::check_sat(unsigned num_assumptions, expr * const * assumptions
throw ex;
}
catch (z3_exception & ex) {
throw cmd_exception(ex.msg());
m_solver->set_reason_unknown(ex.msg());
r = l_undef;
}
m_solver->set_status(r);
}
@ -1624,6 +1627,7 @@ void cmd_context::validate_model() {
TRACE("model_validate", tout << "checking\n" << mk_ismt2_pp(a, m()) << "\nresult:\n" << mk_ismt2_pp(r, m()) << "\n";);
if (m().is_true(r))
continue;
// The evaluator for array expressions is not complete
// If r contains as_array/store/map/const expressions, then we do not generate the error.
// TODO: improve evaluator for model expressions.