mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-06 16:01:55 +00:00
Code Activity
9335 commits 28 branches 52 tags 171 MiB
Commit graph

583 commits

Author SHA1 Message Date
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
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
Christoph M. Wintersteiger
596652ed36 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-31 18:35:52 +01:00
Christoph M. Wintersteiger
a7d5bb7b36 Tabs 2017-05-31 12:18:00 +01:00
Nikolaj Bjorner
7d245be4e1 enable exposing internal solver state on interrupted solvers 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-30 17:33:27 -07:00
Nikolaj Bjorner
e0a86ccc1a add lrb/chb and experiment with them 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-28 10:48:31 -07:00
Nikolaj Bjorner
1086eaaa1f debugging nra 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-24 21:46:19 -07:00
Nikolaj Bjorner
edb164587f get rid of a simplifier dependency 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 10:12:32 -07:00
Nikolaj Bjorner
77b2a015a2 rewrite pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-22 17:47:46 -07:00
Nikolaj Bjorner
f9f0b2221d bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-22 14:27:34 -07:00
Nikolaj Bjorner
f698efa403 Merge branch 'master' of https://github.com/z3prover/z3 into opt 2017-05-22 12:59:36 -07:00
Nikolaj Bjorner
71eb7e81b5 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-22 12:52:53 -07:00
Nikolaj Bjorner
d1fec7c029 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-21 15:39:05 -07:00
Nikolaj Bjorner
79a8e9aab0 fix build break #1029 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-18 12:09:51 -07:00
Nikolaj Bjorner
ceec81de0b simplify code, issue #1028 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-16 08:32:08 -07:00
Nikolaj Bjorner
7fab670719 fix regression, issue #1028 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-16 08:21:32 -07:00
Nikolaj Bjorner
d1cfc53495 fix for #1015 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-10 19:40:00 -07:00
Nikolaj Bjorner
c49550ff2d enable pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 18:03:38 -07:00
Nikolaj Bjorner
b915f78281 merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 17:05:57 -07:00
Murphy Berzish
8029b6b889 Merge branch 'upstream-master' into develop 2017-05-05 14:44:29 -04:00
Nikolaj Bjorner
7e1fae418a fix #1005, disable expansion of regular expression range to union as it degrades performance significantly 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-05 10:59:47 -04:00
Murphy Berzish
ab4fbe40b6 cleanup 2017-05-03 17:45:56 -04:00
Murphy Berzish
d2ae94935e Merge branch 'upstream-master' into develop 
Conflicts:
	src/ast/rewriter/seq_rewriter.cpp
	src/ast/seq_decl_plugin.h
 2017-04-28 13:43:14 -04:00
Nikolaj Bjorner
8205b45839 initial integration of opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-27 19:13:00 -07:00
Nikolaj Bjorner
aedabfff7a disable newer pb encoding 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-27 11:24:30 -07:00
Murphy Berzish
46ac718790 theory_str frontend changes 2017-04-26 17:24:05 -04:00
Murphy Berzish
06cd07e3c2 Merge branch 'theory-assumptions' into develop 
Conflicts:
	src/smt/smt_context.cpp
	src/smt/smt_context.h
	src/smt/smt_theory.h
 2017-04-22 13:31:43 -04:00
Nikolaj Bjorner
66e61b8a31 issues #963 #912 2017-04-17 03:06:38 -07:00
Nikolaj Bjorner
41e1b9f3fe gt encoding of pb constraints 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-16 12:07:16 +09:00
Nikolaj Bjorner
48638c6f1e fix for #975, add mask to ensure character encoding is unique within range of bits used for encoding 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-15 09:34:13 +07:00
Christoph M. Wintersteiger
b67c1c5501 Fixed valgrind warning. Fixes #972 2017-04-10 16:28:41 +01:00
Christoph M. Wintersteiger
27a1758857 Added rewriter.ignore_patterns_on_ground_qbody option to disable simplification of quantifiers that have their universals appear only in patterns, but otherwise have a ground body. 2017-04-07 21:19:20 +01:00
Murphy Berzish
a8935e99bc Merge branch 'upstream-master' into develop 2017-04-04 16:47:30 -04:00
Nikolaj Bjorner
582880346e add index option to 'eval' command for box objectives. Issue #955 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-31 09:22:56 -07:00
Christoph M. Wintersteiger
d10dec2218 Removed unused variable 2017-03-24 14:31:06 +00:00
Murphy Berzish
82d472a227 Merge remote-tracking branch 'upstream/master' into develop 2017-03-23 13:35:58 -04: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
ca4ae171ea remove unsound simplification in prefix #949 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-21 07:40:35 -06:00
Murphy Berzish
8021d63539 remove legacy str_decl_plugin and str_rewriter classes; these have been unified with sequence-compatible equivalents 2017-03-15 15:25:48 -04: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
9659f08322 Merge branch 'str-extract-semantics' into develop 2017-03-14 14:14:53 -04:00
Murphy Berzish
34717a7b6e str.extract semantics fix 2017-03-14 14:14:46 -04:00
Murphy Berzish
94d5f242b8 Merge branch 'str-at-semantics' into develop 2017-03-13 14:40:40 -04: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
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
Murphy Berzish
c198bc5863 fix re.range rewrite for theory_str 2017-03-10 13:13:45 -05:00
Nikolaj Bjorner
05c5b3b07b merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-09 22:45:52 +01:00
Nikolaj Bjorner
5f5819f029 fix xor handling, and defaults for cardinality 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-09 22:44:41 +01:00