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
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
2de80b5ce9
add pb built in ops for logic ALL #1045
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-29 10:08:50 -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
622d8c951c
remove redundant data-type function declarations from pretty-printed output. #1034
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-22 14:40:42 -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
911b24784a
merge LRA
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-09 10:46:11 -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
0862949e66
Merge branch 'upstream-master' into develop
...
Conflicts:
src/smt/params/smt_params.cpp
src/smt/params/smt_params.h
src/smt/smt_context.cpp
src/smt/smt_context.h
2017-05-01 21:33:23 -04:00
Nikolaj Bjorner
d14f2af5ae
deal with subtraction that manages to sneak in. Issue #996
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-01 15:22:06 -07:00
Murphy Berzish
88147f7047
theory_str static features and cmd_context
2017-04-28 14:14:28 -04:00
Murphy Berzish
d51ebac10a
remove references to str_fid
2017-04-28 14:01:44 -04:00
Murphy Berzish
f1cee803e8
fixup
2017-04-28 13:44:48 -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
Murphy Berzish
05958193ab
revert change to String sort declaration
2017-04-27 22:30:02 -04:00
Murphy Berzish
12dd6d786b
remove redundant is_seq() check
2017-04-27 21:24:40 -04:00
Murphy Berzish
7811a91bad
fix is_string_term()
2017-04-27 13:59:02 -04:00
Murphy Berzish
334677a7eb
fix is_string_term()
2017-04-27 13:58:36 -04:00
Murphy Berzish
46ac718790
theory_str frontend changes
2017-04-26 17:24:05 -04:00
Murphy Berzish
54e28a4fe7
string/sequence static features test
2017-04-24 21:02:22 -04:00
Murphy Berzish
3fe49137d0
fix trace typos
2017-04-24 19:25:35 -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
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
Nikolaj Bjorner
4140afa4cb
add regular expression membership for range of int.to.str functions. Issue #957
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-11 10:49:42 +08: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
eef2bbadad
remove obsolete PARAM_STRING from ast
2017-04-04 20:29:48 -04: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
0fb3161113
Updated declarations in decl_collector
2017-03-31 12:10:51 +01:00
Christoph M. Wintersteiger
ef3d340c85
Improved decl_collector for uninterpreted sorts in :print_benchmark output
2017-03-31 12:04:46 +01:00
Christoph M. Wintersteiger
041520f727
SMT2 compliancy fix; NRA includes conversion of Int numerals
2017-03-28 18:17:22 +01:00
Nikolaj Bjorner
0c4b792dac
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-03-25 19:32:17 +01:00
Nikolaj Bjorner
3a9857940e
add missing axioms for str.at. Issue #953
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-25 19:31:01 +01: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
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
ca4ae171ea
remove unsound simplification in prefix #949
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-21 07:40:35 -06: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
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