mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-19 20:33:38 +00:00
Code Activity

Merge branch 'master' of https://github.com/Z3Prover/z3

Browse source
This commit is contained in:
Nikolaj Bjorner 2016-11-04 15:19:19 +00:00
commit e700460645
3 changed files with 55 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/mk_util.py
View file

@ -82,7 +82,7 @@ Z3PY_SRC_DIR=None
VS_PROJ = False VS_PROJ = False
TRACE = False TRACE = False
DOTNET_ENABLED=False DOTNET_ENABLED=False
DOTNET_KEY_FILE=None DOTNET_KEY_FILE=getenv("Z3_DOTNET_KEY_FILE", None)
JAVA_ENABLED=False JAVA_ENABLED=False
ML_ENABLED=False ML_ENABLED=False
PYTHON_INSTALL_ENABLED=False PYTHON_INSTALL_ENABLED=False
@ -1591,7 +1591,7 @@ class DotNetDLLComponent(Component):
elif os.path.isfile(os.path.join(self.src_dir, self.key_file)): elif os.path.isfile(os.path.join(self.src_dir, self.key_file)):
self.key_file = os.path.abspath(os.path.join(self.src_dir, self.key_file)) self.key_file = os.path.abspath(os.path.join(self.src_dir, self.key_file))
else: else:
print("Keyfile '%s' could not be found; %s.dll will be unsigned." % (self.dll_name, self.key_file)) print("Keyfile '%s' could not be found; %s.dll will be unsigned." % (self.key_file, self.dll_name))
self.key_file = None self.key_file = None
if not self.key_file is None: if not self.key_file is None:

2
src/ast/rewriter/bool_rewriter.cpp
View file

@ -594,6 +594,7 @@ br_status bool_rewriter::try_ite_value(app * ite, app * val, expr_ref & result)
} }
return BR_DONE; return BR_DONE;
} }
if (m_ite_extra_rules) {
if (m().is_value(t)) { if (m().is_value(t)) {
if (val == t) { if (val == t) {
result = m().mk_or(cond, m().mk_eq(val, e)); result = m().mk_or(cond, m().mk_eq(val, e));
@ -614,6 +615,7 @@ br_status bool_rewriter::try_ite_value(app * ite, app * val, expr_ref & result)
} }
return BR_REWRITE2; return BR_REWRITE2;
} }
}
expr* cond2, *t2, *e2; expr* cond2, *t2, *e2;
if (m().is_ite(t, cond2, t2, e2) && m().is_value(t2) && m().is_value(e2)) { if (m().is_ite(t, cond2, t2, e2) && m().is_value(t2) && m().is_value(e2)) {
try_ite_value(to_app(t), val, result); try_ite_value(to_app(t), val, result);

2
src/tactic/core/ctx_simplify_tactic.cpp
View file

@ -538,6 +538,8 @@ struct ctx_simplify_tactic::imp {
} }
pop(scope_level() - old_lvl); pop(scope_level() - old_lvl);
m_occs(g);
// go backwards // go backwards
sz = g.size(); sz = g.size();
for (unsigned i = sz; !g.inconsistent() && i > 0; ) { for (unsigned i = sz; !g.inconsistent() && i > 0; ) {