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

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

Browse source
This commit is contained in:
Nikolaj Bjorner 2016-12-09 23:18:02 +01:00
commit 0ef14ffa08
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/mk_util.py
View file

@ -2086,12 +2086,12 @@ class CppExampleComponent(ExampleComponent):
exefile = '%s$(EXE_EXT)' % self.name exefile = '%s$(EXE_EXT)' % self.name
out.write('%s: %s %s\n' % (exefile, dll, objfiles)) out.write('%s: %s %s\n' % (exefile, dll, objfiles))
out.write('\t$(LINK) $(LINK_OUT_FLAG)%s $(LINK_FLAGS) %s ' % (exefile, objfiles)) out.write('\t$(SLINK) $(SLINK_OUT_FLAG)%s $(SLINK_FLAGS) %s ' % (exefile, objfiles))
if IS_WINDOWS: if IS_WINDOWS:
out.write('%s.lib' % dll_name) out.write('%s.lib' % dll_name)
else: else:
out.write(dll) out.write(dll)
out.write(' $(LINK_EXTRA_FLAGS)\n') out.write(' $(SLINK_EXTRA_FLAGS)\n')
out.write('_ex_%s: %s\n\n' % (self.name, exefile)) out.write('_ex_%s: %s\n\n' % (self.name, exefile))
class CExampleComponent(CppExampleComponent): class CExampleComponent(CppExampleComponent):

1
src/smt/smt_model_checker.cpp
View file

@ -295,7 +295,6 @@ namespace smt {
break; break;
model_ref cex; model_ref cex;
m_aux_context->get_model(cex); m_aux_context->get_model(cex);
TRACE("model_checker", tout << "[restricted] model-checker model cex:\n"; model_pp(tout, *cex););
if (!add_instance(q, cex.get(), sks, true)) { if (!add_instance(q, cex.get(), sks, true)) {
break; break;
} }

5
src/util/mpf.cpp
View file

@ -795,8 +795,9 @@ void mpf_manager::fma(mpf_rounding_mode rm, mpf const & x, mpf const & y, mpf co
set(o, z); set(o, z);
} }
else if (is_zero(x) || is_zero(y)) { else if (is_zero(x) || is_zero(y)) {
if (is_zero(z) && rm != MPF_ROUND_TOWARD_NEGATIVE) bool xy_sgn = is_neg(x) ^ is_neg(y);
mk_pzero(x.ebits, x.sbits, o); if (is_zero(z) && xy_sgn ^ is_neg(z))
mk_zero(x.ebits, x.sbits, rm != MPF_ROUND_TOWARD_NEGATIVE, o);
else else
set(o, z); set(o, z);
} }