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
24df976f95
fixup startswith/endswith to prefixof/suffixof
2017-03-13 17:03:36 -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
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
Murphy Berzish
b459d17624
fix int-to-str terms in theory_str not being picked up
2017-03-10 13:53:55 -05:00
Murphy Berzish
c198bc5863
fix re.range rewrite for theory_str
2017-03-10 13:13:45 -05: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
4d5c1dcfb6
fix model gen for regex terms in theory_str
2017-03-06 17:04:07 -05:00
Murphy Berzish
577cb19745
experimental rewrite of bitvector unit sequences to string constants
2017-03-06 13:58:03 -05:00
Murphy Berzish
82b1a61b25
fix string operator names
2017-03-04 16:30:36 -05:00
Murphy Berzish
ad0766898c
add boolean operators to zstring and fix ostream
2017-03-04 15:20:57 -05:00
Murphy Berzish
9f79015ee6
patches to theory_str for theory_seq compat
2017-03-01 22:18:18 -05:00
Murphy Berzish
d00723e7ea
add String name for string sort, SMTLIB2.5 compat
2017-03-01 18:23:48 -05:00
Murphy Berzish
ab71dea82d
theory_str refactoring
2017-02-28 17:47:55 -05:00
Murphy Berzish
8b077ebbe7
re-add regex NFA
2017-02-28 14:06:13 -05:00
Murphy Berzish
9ac0d098ac
Merge remote-tracking branch 'upstream/master' into release-1.0
2017-02-28 12:45:04 -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
Murphy Berzish
11000efbfe
fix zstring
2017-02-27 21:16:15 -05:00
Murphy Berzish
c62b55f9b1
fix npos semantics
2017-02-27 20:51:30 -05:00
Murphy Berzish
3f1ceedcb1
theory_str refactor pass 2
2017-02-27 20:48:55 -05:00
Murphy Berzish
725352234d
refactoring theory_str
2017-02-27 13:22:56 -05: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
7e3e434147
Merge branch 'upstream-master' into release-1.0
2017-02-23 19:18:58 -05:00