3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Commit graph

5031 commits

Author SHA1 Message Date
Nikolaj Bjorner
e47e8c67c0 introducing scoped detacth/attach of clauses to enforce basic sat solver invariants. Part of investigating #939:
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-22 14:12:47 -07:00
Nikolaj Bjorner
25d839ed10 fix bug in simplifier of bv2int over concatentations exposed by #948
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-22 10:55:55 -07:00
Nikolaj Bjorner
e342b87921 Merge pull request #942 from mtrberzi/str-extract-semantics
alternate str.extract semantics in seq_rewriter
2017-03-21 10:48:06 -07:00
Murphy Berzish
6804c88b66 make seq.extract rewrite type-generic 2017-03-21 12:54:06 -04:00
Nikolaj Bjorner
6be4c9a5bb Merge branch 'master' of https://github.com/Z3Prover/z3 2017-03-21 07:40:40 -06:00
Nikolaj Bjorner
ca4ae171ea remove unsound simplification in prefix #949
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-21 07:40:35 -06:00
Nuno Lopes
8ac060c549 fix build with VS 2017 2017-03-20 09:12:41 +00:00
Nikolaj Bjorner
d58018841e remove code that causes infinite loop. Stackoverflow question from Dominik Wojtaszek
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-17 10:52:16 -07:00
Nikolaj Bjorner
d754aa2dc4 disable ackerman reduction when head contains a non-constant/non-variable. #947
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-17 10:12:32 -07:00
Nikolaj Bjorner
a0237ed2a6 fix crash reported in #946
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-16 18:56:43 -07:00
Nikolaj Bjorner
72651e2e98 fixing sources for double frees of clauses. #940
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-14 19:35:11 -07:00
Nikolaj Bjorner
05c267b8d8 make seq.at operations generic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-14 15:37:47 -07:00
Murphy Berzish
34717a7b6e str.extract semantics fix 2017-03-14 14:14:46 -04:00
Nikolaj Bjorner
0668ba5f6c add pb shorthands to C++. Issue #694
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-14 07:58:39 -07:00
Nikolaj Bjorner
7634f8b93e Merge branch 'master' of https://github.com/Z3Prover/z3 2017-03-14 07:47:51 -07:00
Nikolaj Bjorner
1dd2de61ec add sum shorthand to C++. Issue #694
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-14 07:43:26 -07:00
hume
0b1d564509 added no exception support to z3++.h 2017-03-14 18:11:00 +08:00
Murphy Berzish
5c9d7538a0 add alternate str.at semantics check in seq_rewriter
this rewrites to empty string if the index is negative or beyond the length of the string,
which is consistent with CVC4's semantics for this term
2017-03-13 14:39:12 -04:00
Dan Liew
2cb4223979 [CMake] Support including Git hash and description into the build.
CMake will automatically pick up changes in git's HEAD so that
the necessary code is rebuilt when the build system is invoked.

Two new options `INCLUDE_GIT_HASH` and `INCLUDE_GIT_DESCRIBE` have been
added that enable/disable including the git hash and the output of `git
describe` respectively. By default if the source tree is a git
repository both options are on, otherwise they are false by default.

To support the `Z3GITHASH` macro a different implementation is used from
the old build system. In that build system the define is passed on the
command line. This would not work well for CMake because CMake
conservatively (and correctly) rebuilds *everything* if the flags given
to the compiler change. This would result in the entire project being
rebuilt everytime git's `HEAD` changed.  Instead in this implementation
a CMake specific version of `version.h.in` (named `version.h.cmake.in`)
is added that uses the `#cmakedefine` feature of CMake's
`configure_file()` command to define `Z3GITHASH` if it is available and
not define it otherwise. This way only object files that depend on
`version.h` get re-built rather than the whole project.

It is unfortunate that the build systems now have different `version.h`
file templates. However they are very simple and I don't want to
modify how templates are handled in the python/Makefile build system.
2017-03-12 22:11:59 +00:00
Nikolaj Bjorner
1f4f4514bf Merge branch 'master' of https://github.com/Z3Prover/z3 2017-03-12 09:40:58 +01:00
Nikolaj Bjorner
8bec1e25a8 move restore relevancy until after literals have been replayed
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-12 08:32:06 +01:00
James Bornholt
559c5e5ae6 z3py: With tactical should not try to use context as a parameter 2017-03-11 16:09:25 -08:00
Nikolaj Bjorner
228111511c fixing build break, addressing #935
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-11 18:41:36 +01:00
Nikolaj Bjorner
509f7409ba adding fixedpoint object to C++ API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-10 23:01:43 +01:00
Nikolaj Bjorner
338193548b fixing build break, adding fixedpoint object to C++ API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-10 22:52:55 +01:00
Nikolaj Bjorner
fbf81c88a2 remove print breaking build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 11:13:38 +01:00
Nikolaj Bjorner
854bb2197f include recursive functions to models. Issue #898
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-08 21:41:24 -08:00
Nikolaj Bjorner
6f68355fbc Merge branch 'master' of https://github.com/Z3Prover/z3 2017-03-08 21:33:43 -08:00
Nikolaj Bjorner
29969648ba check that formulas are in lira before invoking qsat. Issue #919
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 05:52:46 +01:00
Nikolaj Bjorner
fcda4cee9f ensure evaluation of array equalities is enabled for external facing evaluator. Issue #917
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 05:29:56 +01:00
Nikolaj Bjorner
829519b837 fix bug for bit-vector optimization. Issue #928
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-08 10:19:35 +01:00
Nikolaj Bjorner
202ac0d1ee Merge branch 'master' of https://github.com/Z3Prover/z3
:wi
2017-03-08 10:08:54 +01:00
Nikolaj Bjorner
41e6fafc58 fix bug for bit-vector optimization. Issue #919
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-08 10:07:31 +01:00
Christoph M. Wintersteiger
b57764800c Merge branch 'master' of https://github.com/Z3Prover/z3 2017-03-07 18:10:31 +00:00
Christoph M. Wintersteiger
8f14cfadd2 Tabs, whitespace 2017-03-07 18:10:03 +00:00
Murphy Berzish
ad0766898c add boolean operators to zstring and fix ostream 2017-03-04 15:20:57 -05:00
Nikolaj Bjorner
4792229c2b Merge pull request #922 from mtrberzi/regex-unroll
add _re.unroll internal operator to seq_decl_plugin
2017-02-27 18:37:37 -08:00
George Karpenkov
be1e9918f0 Class Optimize#Handle should be static,
as it already includes an explicit reference to the Optimize class.
2017-02-27 18:49:02 +01:00
George Karpenkov
b3be83e7c5 Sane indentation + removing extra spaces for Optimize.java 2017-02-27 18:48:44 +01:00
George Karpenkov
d6c79facc7 Java API for getting the objective value as a triple
See #911 for the motivation,
and e02160c674 for the relevant change
in C API.
2017-02-27 18:42:44 +01:00
Nikolaj Bjorner
899843b7cd fix unhandled finite domain sort rewrite case. Issue #918
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-26 17:20:54 -08:00
Nikolaj Bjorner
996c0f0666 fix type on exception message
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-25 16:14:50 -08:00
Nikolaj Bjorner
c7591e3c99 remove unreferenced label
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:13:08 -08:00
Nikolaj Bjorner
183ee7e37d expose bounds as vector expressions instead of containing ad-hoc expressions. Issue #911
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:10:18 -08:00
Nikolaj Bjorner
e02160c674 expose bounds as vector expressions instead of containing ad-hoc expressions. Issue #911
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:07:40 -08:00
Nikolaj Bjorner
8437cb7132 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-02-24 07:54:25 -08:00
Murphy Berzish
0ebd93c8b5 add _re.unroll internal operator to seq_decl_plugin 2017-02-23 20:57:19 -05:00
Murphy Berzish
eb0ba26f90 C-style octal escapes, including 1- and 2-digit escapes 2017-02-23 18:33:10 -05:00
Murphy Berzish
61bbf8ba7e add octal escape to seq_decl_plugin 2017-02-23 18:24:08 -05:00
Nikolaj Bjorner
b0dd3f3238 add recursive function graphs to model, adapt rewriter to bypass branches whose evaluation is redundant
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-16 13:58:12 -08:00