3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 22:05:36 +00:00
Commit graph

7327 commits

Author SHA1 Message Date
Dan Liew 5c3b11f034 [CMake] Modify contrib/cmake/bootstrap.py to do nothing except
print a warning.

Now that the CMake files have been moved into their intended location
it is no longer necessary for this script to exist.

However we do not want to break out-of-tree scripts that build Z3 using
CMake to suddenly break. So the script has been modified to do nothing
except print a warning.

Eventually we should remove this script.
2017-06-12 11:59:39 +01:00
Dan Liew 5be503798f [CMake] Remove bootstrap check. Now that the CMake files are in
their correct location we don't need it anymore.
2017-06-12 11:59:38 +01:00
Dan Liew 4b517b96df [CMake] Move CMake files into their intended location so the
`contrib/cmake/bootstrap.py` script no longer needs to be executed.

The previous location of the CMake files was a compromise proposed
by @agurfinkel in #461. While this has served us well (allowing progress
to be made) over time limitations of this approach have appeared.

The main problem is that doing many git operations (e.g. pull, rebase)
means the CMake files don't get updated unless the user remembers to
run the script. This can lead to broken and confusing build system
behaviour.

This commit only does the file moving and necessary changes to
`.gitignore`. Other changes will be done in subsequent commits.
2017-06-12 11:59:00 +01:00
Nikolaj Bjorner f0fa439c48 escaping names in get-assignment #1061
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-11 17:17:47 -07:00
Nikolaj Bjorner af6ebbcd92 init search before returning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-11 13:08:05 -07:00
Nikolaj Bjorner f5b54f042c apply correction by ddcc #1069
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-11 11:40:39 -07:00
Nikolaj Bjorner 0700413f27 Merge pull request #1069 from delcypher/doxygen_z3_mk_solver
[Doxygen] Rewrite documentation of `Z3_mk_solver()` and `Z3_mk_simple_solver()`
2017-06-11 11:39:36 -07:00
Dan Liew c629dcc53f [Doxygen] Rewrite documentation of Z3_mk_solver() and
`Z3_mk_simple_solver()` to try to make it clearer what the differences
are between these APIs.

This an attempt to address issues noted in #1035.
2017-06-11 14:04:18 +01:00
Nikolaj Bjorner b266af3e08 atomic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-10 10:51:09 -07:00
Nikolaj Bjorner bc54197fb3 64 bit clause offset fix
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-10 10:46:51 -07:00
Nikolaj Bjorner f44a3e1bbc print_core as a function
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-10 10:18:07 -07:00
Nikolaj Bjorner 8acb37e734 revert change to 1065
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-10 09:45:18 -07:00
Nikolaj Bjorner 582a069c51 Merge branch 'master' of https://github.com/z3prover/z3 2017-06-10 09:31:02 -07:00
Nikolaj Bjorner b8e8e090ad filter assumptions by membership in initial list #1065
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-10 09:30:01 -07:00
Nikolaj Bjorner d5f646929e print success #1068
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-10 09:16:36 -07:00
Nikolaj Bjorner a55416351f lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-09 09:17:20 -07:00
Nikolaj Bjorner c870b77366 fixes to lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-08 17:25:06 -07:00
Nikolaj Bjorner ed0e06c7ac Merge pull request #1066 from delcypher/misc_doxygen_fixes
Misc doxygen fixes
2017-06-08 09:21:06 -07:00
Nikolaj Bjorner 964102726d lookahead on cardinality extension
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-07 18:24:58 -07:00
Nikolaj Bjorner f3b0ede6e8 update lookahead to include extensions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-07 16:35:35 -07:00
Dan Liew bcb3981c5f [Doxygen] Fixed mismatched @{ and @} declaration which prevented
the `capi` group from being declared properly. For example this
prevented from `Z3_mk_solver()` from appearing in the `capi` group.
2017-06-07 18:49:43 +01:00
Dan Liew 85c7f5d865 [Doxygen] Fix some Doxygen warnings for z3_optimization.h 2017-06-07 18:45:12 +01:00
Dan Liew 903709b9c1 [Doxygen] Fix bug where some header files were not being scanned. 2017-06-07 17:09:01 +01:00
Christoph M. Wintersteiger 0137104683 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-06-06 16:04:45 +01:00
Christoph M. Wintersteiger 83e9c40265 Added __deepcopy__ operators to ref-counted objects in the Python API 2017-06-06 16:04:38 +01:00
Nikolaj Bjorner af285d02c3 add documentation per #1058
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-05 08:38:28 -07:00
Nikolaj Bjorner 4f04301305 add documentation per #1058
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-05 07:55:32 -07:00
Nikolaj Bjorner 83635eb826 fix iz3parse for updated API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-04 16:05:14 -07:00
Nikolaj Bjorner c33dce1161 extract lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-04 14:12:55 -07:00
Nikolaj Bjorner 71b6f97fb1 fix lookahead code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-04 11:55:53 -07:00
Nikolaj Bjorner a8ff97c0f4 Merge branch 'master' of https://github.com/z3prover/z3 2017-06-04 11:05:21 -07:00
Nikolaj Bjorner 668bad6121 print success after reset assertions #1057
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-04 11:04:54 -07:00
Nikolaj Bjorner 181911463e Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-06-02 10:40:19 -07:00
Nikolaj Bjorner 19d4b0a97a resolve conflicts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-02 10:38:37 -07:00
Nikolaj Bjorner 3ce82ea8ce merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-02 10:37:22 -07:00
Nikolaj Bjorner efd5727676 add shorthand for enumerating constants in a model
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-02 10:35:09 -07:00
Nikolaj Bjorner 0ac80fc042 have parser produce ast-vector instead of single ast
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-01 21:21:05 -07:00
Nikolaj Bjorner e37a6dd809 add tracking for reason unknown
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-01 17:04:37 -07:00
Nikolaj Bjorner 833a910d57 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-06-01 15:03:55 -07:00
Nikolaj Bjorner 538411c67f remove dependencies on fd_tactic.h
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-01 15:03:34 -07:00
Nikolaj Bjorner 55ba1e9178 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-06-01 14:50:37 -07:00
Nikolaj Bjorner 4e65c13726 adding lookahead and lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-01 14:49:54 -07:00
Nikolaj Bjorner 2908ab4069 fix reference count issue with pinning to expr_ref
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-01 09:56:25 -07:00
Nikolaj Bjorner e9ed3af455 fix regression in str
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-01 09:35:35 -07:00
Nikolaj Bjorner fda59f5a24 expose operator kinds for internal functions using their sequence variants. Issue #1051
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-01 09:32:17 -07:00
Nikolaj Bjorner 1fa60f4893 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-06-01 09:11:09 -07:00
Nikolaj Bjorner 52e0f3b539 add string accessors to managed APIs #1051
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-01 09:10:49 -07:00
Christoph M. Wintersteiger 596652ed36 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-31 18:35:52 +01:00
Christoph M. Wintersteiger 4f0a87299c Fixed signed/unsigned comparison warnings 2017-05-31 18:35:06 +01:00
Christoph M. Wintersteiger a7d5bb7b36 Tabs 2017-05-31 12:18:00 +01:00