Nikolaj Bjorner
809fc86ac7
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-03-07 16:42:39 -08:00
Nikolaj Bjorner
5994c5a948
fix partial model tracking over cancellation/exceptions, reported by August Shi. Fix regression test for fp-to-real, reset the pre-processor in inc_sat_solver on exceptions
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-07 16:42:29 -08:00
Christoph M. Wintersteiger
cef8c67cc0
Merge pull request #490 from delcypher/cmake_generate_files_comments
...
Try to improve some of the comments in ``scripts/update_api.py``
2016-03-07 18:51:44 +00:00
Dan Liew
589227235e
Try to improve some of the comments in `scripts/update_api.py
`
...
based on discussion in #461 .
2016-03-07 18:45:34 +00:00
Nikolaj Bjorner
49d0e28621
allow parameters to overwrite logic, fixes bug report by Nuno
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-07 10:44:06 -08:00
Nikolaj Bjorner
8c4d791f01
use std::vector per Nuno's analysis to fix #420
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-07 08:08:17 -08:00
Christoph M. Wintersteiger
26f27867bf
Merge pull request #487 from delcypher/cmake_missing_fpa2bv_rewriter
...
Add missing source file declarations to CMake build that were
2016-03-07 15:30:35 +00:00
Dan Liew
114f09cf4c
Add missing source file declarations to CMake build that were
...
added by 70f13ced33
2016-03-07 15:00:22 +00:00
Christoph M. Wintersteiger
3a9b4985e4
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-03-07 13:35:54 +00:00
Nuno Lopes
9c620376c2
simplify ast::are_equal(), since pointer equality is sufficient
2016-03-07 13:15:12 +00:00
Christoph M. Wintersteiger
3560be86ac
Merge branch 'delcypher-cmake_build_system4'
2016-03-07 13:12:16 +00:00
Christoph M. Wintersteiger
a9ffc258d0
Merge branch 'cmake_build_system4' of https://github.com/delcypher/z3-1 into delcypher-cmake_build_system4
2016-03-07 13:12:04 +00:00
Christoph M. Wintersteiger
4423447029
Merge pull request #486 from 4tXJ7f/patch-1
...
[Z3py] Add examples for fpToFP
2016-03-07 11:31:12 +00:00
Christoph M. Wintersteiger
eccf03aaac
build fix for non-windows platforms
2016-03-07 11:21:06 +00:00
Andres Nötzli
d6ece7e8a5
[Z3py] Add examples for fpToFP
2016-03-07 00:21:26 -08:00
Nikolaj Bjorner
4cd1efc50e
address unused variable warnings from OSX build log
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-05 15:33:33 -08:00
Nikolaj Bjorner
aa1ddd169a
fix bug in offset for shift amount for free bindings
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-05 15:25:14 -08:00
Nikolaj Bjorner
5c276d8bf1
Merge pull request #484 from NikolajBjorner/master
...
Replacing legacy evaluator from proto_model, fix scope-related bugs in rewriter
2016-03-05 10:36:52 -08:00
Nikolaj Bjorner
640308b546
make proto-model evaluation use model_evaluator instead of legacy evaluator
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-05 10:27:19 -08:00
Nikolaj Bjorner
70f13ced33
make proto-model evaluation use model_evaluator instead of legacy evaluator
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-05 10:14:15 -08:00
Christoph M. Wintersteiger
a2ecb19d03
Added hash-consing remarks to mk_context and mk_context_rc.
...
Fixes #452
2016-03-05 17:58:32 +00:00
Christoph M. Wintersteiger
8abedbf389
whitespace
2016-03-05 17:55:27 +00:00
Christoph M. Wintersteiger
03a8ef2795
Fixed non-Windows preprocessor options.
...
Fixes #463
2016-03-05 17:14:19 +00:00
Dan Liew
7fd5042ff3
Minor tweaks to `README-CMake.md
`.
2016-03-05 16:53:29 +00:00
Christoph M. Wintersteiger
f34e15f289
whitespace
2016-03-05 16:47:39 +00:00
Christoph M. Wintersteiger
9dfc2bc61e
Fixed memory leaks in fpa2bv converter.
...
Fixes #480
2016-03-05 16:47:08 +00:00
Christoph M. Wintersteiger
09832ca807
Fixed static Windows binary build.
2016-03-05 13:58:28 +00:00
Christoph M. Wintersteiger
fedc6d4754
Fixed memory leak in fpa2bv tactic.
2016-03-05 12:54:36 +00:00
Nikolaj Bjorner
f54c430756
Merge pull request #483 from zv/fix_arith_div
...
Bugfix for arith_rewriter single operand division
2016-03-04 18:51:14 -08:00
Zephyr Pellerin
b13db1e82e
Bugfix for arith_rewriter single operand division
2016-03-04 18:26:00 -08:00
Christoph M. Wintersteiger
40c5152075
Added --staticbin option.
...
Relates to #456
2016-03-04 18:32:45 +00:00
Dan Liew
1d9a7dcf47
Add missing shebang in `scripts/update_api.py
`. The script
...
was already marked as executable but it wasn't possible to execute
from a shell due to the missing shebang.
2016-03-04 15:31:56 +00:00
Dan Liew
a52d81ef3e
Document `z3_add_component()
`.
2016-03-04 15:26:09 +00:00
Dan Liew
29901e79e1
Fix how the list of linker flags `Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS
`
...
is applied to targets. The ``LINK_FLAGS`` property of a target is
a string and not a list and so if ``Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS``
contained more than one flag the linker line would end up being
``-flag1;flag2;flag3;...`` which would not work. Now we use a new
function ``z3_append_linker_flag_list_to_target()`` to iterate through
the list and update the ``LINK_FLAGS`` property of the specified target
correctly.
2016-03-04 15:26:09 +00:00
Dan Liew
a2cc6d256a
Emit an error message if building the Python bindings is enabled
...
but libz3 is built statically. This build combination doesn't
work because the Python bindings need a dynamic libz3.
2016-03-04 15:26:09 +00:00
Dan Liew
7033ebe6b5
Fix running the CMake bootstrap script under Python 2.7
2016-03-04 15:26:09 +00:00
Dan Liew
d12b558bea
Fix typo spotted by @arrowd
2016-03-04 15:26:09 +00:00
Dan Liew
017e9a2461
Try to fix the freebsd build by linking against the system's
...
threading library.
2016-03-04 15:26:09 +00:00
Dan Liew
786362a423
Fix bug in CMake bootstrap script when running under Windows.
2016-03-04 15:26:09 +00:00
Dan Liew
e67ed6be5d
Note in the README the experimental CMake build system.
2016-03-04 15:26:09 +00:00
Dan Liew
a5f8ceaa48
Add globbing patterns to `.gitignore
` so the files copied
...
over by the ``contrib/cmake/bootstrap.py`` script are ignored
and so don't get accidently commited.
2016-03-04 15:26:09 +00:00
Dan Liew
b76ce607b8
Provide a friendly error message if someone tries to use the CMake
...
build without invoking the ``contrib/cmake/boostrap.py`` script.
2016-03-04 15:26:09 +00:00
Dan Liew
875acfc210
Add bootstrap.py script to copy CMake files into their correct location
...
on a user's machine and add documentation for this. Also add a
``maintainers.txt`` file.
2016-03-04 15:26:09 +00:00
Dan Liew
a3e0eae9ec
Move CMakeLists.txt files (other than the one in the repository root)
...
and the cmake directory into a new directory ``contrib/cmake`` that
mirrors the directory structure of the root. This is a comprimise
between me and Christoph Wintersteiger that was suggested by Arie
Gurfinkel that allows the CMake build system to live in the Z3
repository but not impact the Z3 developers that want to avoid the CMake
build system. The build system will not work in its new location
and a bootstrap script will soon be provided that allows a developer
to copy the files back to their correct location.
2016-03-04 15:26:09 +00:00
Dan Liew
d54d6b50f0
Teach the Python build system to use the `version.h.in
` template file used
...
by the CMake build and use the existing ``configre_file()`` function
to generate the ``version.h`` file needed by the build.
2016-03-04 15:26:09 +00:00
Dan Liew
849c16c4fc
Don't try to remove the CMAKE_INSTALL_PREFIX from the
...
``python_install_dir``. The implementation was broken because
we would strip off ``/usr`` and then install into
``/lib/python-3.5/site-packages``. We could remove the leading slash
to make sure we install into the CMAKE_INSTALL_PREFIX but doing so
seems unnecessarily complicated given that DESTDIR still seems to
be respected even when given absolute paths to the CMake ``install()``.
2016-03-04 15:26:09 +00:00
Dan Liew
9b48b5ca83
When building with OpenMP make sure libz3 passes extra linker
...
flags. This is necessary for libz3 to be usable from the Python
bindings when libz3 is built with gcc or clang.
2016-03-04 15:26:09 +00:00
Dan Liew
fb449517e3
Teach the CMake build system to build and install the python bindings
...
The new ``BUILD_PYTHON_BINDINGS`` option (off by default) will enable
building the bindings and the new ``INSTALL_PYTHON_BINDINGS`` option
enables installing them.
2016-03-04 15:26:09 +00:00
Dan Liew
8bc7d319c7
Refactor `mk_z3consts_py()
` to that is usable externally via a new
...
function ``mk_z3consts_py_internal()`` which called by a new
``mk_consts_files.py`` script. This will script will allow the const
declarations for the different Z3 language bindings to be generated.
Right now only support for python is implemented but more can be added
in the future.
2016-03-04 15:26:09 +00:00
Dan Liew
f6e946443e
Made emission of the API module files `api_log_macros.h
`,
...
``api_log_macros.cpp`` and ``api_commands.cpp`` optional in
``update_api.py``. This is required to implement support for
building and installing Z3's API bindings with CMake.
2016-03-04 15:26:09 +00:00