3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Commit graph

5674 commits

Author SHA1 Message Date
Christoph M. Wintersteiger 7b97688302 Whitespace, typo. 2017-06-20 14:36:40 +01:00
Nikolaj Bjorner 907899debe Merge branch 'master' of https://github.com/z3prover/z3 2017-06-19 18:24:45 -05:00
Nikolaj Bjorner f375016a11 disable tweak to seq until there are cycles to test further
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-19 18:23:27 -05:00
Nikolaj Bjorner 894c60bdf9 fix bug in qe-lite reported in #1086: bookkeeping of unconstrained variables only works for quantifier-free formulas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-19 18:22:30 -05:00
Dennis Yurichev 345c0c796b Merge branch 'master' of github.com:dennis714/z3 2017-06-19 13:56:52 +03:00
Dennis Yurichev e547000bcf typo 2017-06-19 13:52:30 +03:00
Nikolaj Bjorner 02161f2ff7 revert internalize logic for re until debugged
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-15 21:13:25 -07:00
Nikolaj Bjorner e67572ffa6 address issues raised in #998
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-15 20:47:59 -07:00
Nikolaj Bjorner 5be3e959ab address issues raised in #998
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-15 20:46:47 -07:00
Nikolaj Bjorner d3320f8b81 fix build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-14 21:48:19 -07:00
Nikolaj Bjorner f4214e1c71 Merge branch 'master' of https://github.com/z3prover/z3 2017-06-14 21:41:31 -07:00
Nikolaj Bjorner 8ac43c981a use less memory #1078 2017-06-14 21:41:24 -07:00
Christoph M. Wintersteiger d8a02bc040 Fixed AST translation functions in .NET and Java APIs. Fixes #1073. 2017-06-14 13:24:54 +01:00
KangJing Huang (Chaserhkj) e3f32ca3a8 Fix Z3_PRINT_SMTLIB_FULL not working as expected 2017-06-14 02:18:21 -04:00
Nikolaj Bjorner c980cfd783 add concat recognizer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-13 20:51:55 -07:00
Nikolaj Bjorner b978f78c21 add sequence recognizers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-13 20:35:35 -07:00
Nikolaj Bjorner 8b12cc0bdf fix build warning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-13 19:58:55 -07:00
Nikolaj Bjorner c2acbc2957 port FuncDecl copy to dotnet, continuation of #1073
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-13 19:11:28 -07:00
Nikolaj Bjorner 7023af4528 Merge branch 'master' of https://github.com/z3prover/z3 2017-06-13 19:03:45 -07:00
Nikolaj Bjorner a59ee8032c fix unsoundness bug in axiomatization of str.at. #1067
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-13 19:02:59 -07:00
Nikolaj Bjorner 5066bd01f7 Merge pull request #1070 from delcypher/cmake_file_move
[CMake] Move CMake files into their intended location
2017-06-13 13:27:25 -07:00
Nikolaj Bjorner 90a38c9a35 Merge pull request #1073 from chaserhkj/funcdecl-translate-java
Add translate method for FuncDecl in java api
2017-06-13 13:27:12 -07:00
KangJing Huang (Chaserhkj) 5799947183 Fix docstrings for FuncDecl.translate 2017-06-13 02:37:41 -04:00
KangJing Huang (Chaserhkj) 3a692fe33c Add translate method for FuncDecl in java api 2017-06-13 00:37:02 -04:00
Nikolaj Bjorner 6bce173248 properly quote symbols #1061
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-12 18:35:02 -07: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 f5b54f042c apply correction by ddcc #1069
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-11 11:40:39 -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 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
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
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 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 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 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
Nikolaj Bjorner 546d22e77a Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-30 11:18:43 -07:00
Nikolaj Bjorner 415824b600 put temporaries on trail
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-30 11:18:33 -07:00
Nikolaj Bjorner 870017e2ce Merge pull request #1049 from chaserhkj/java-api-update-fix
`Expr.update()` in java API should not return super class
2017-05-29 18:14:54 -07:00
KangJing Huang (Chaserhkj) 8092dd5aa3 Fix Expr.update in java API returning superclass 2017-05-29 20:51:42 -04:00
Nikolaj Bjorner 4cbf938cf3 enable get-unsat-assumptions command per request in #1048
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-29 16:26:22 -07: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 d95ac58bad remove throw in reason-unknown #1043
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-28 12:09:35 -07:00
Nikolaj Bjorner f80a622a8f add colon to assertion stack levels #1046
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-28 11:10:46 -07:00
Nikolaj Bjorner 1654ad7059 adding escape characters to reason-unknown #1043
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-27 14:56:38 -07:00
Nikolaj Bjorner f3a0b7e0cd change command-line experience for pareto fronts. It now requires multiple check-sat calls to loop over the fronts. This allows querying each model in turn. #1008 2017-05-23 20:05:10 -07:00
Nikolaj Bjorner 49faaaa8f1 allowing non-literal assumptions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 15:01:00 -07:00
Nikolaj Bjorner 6f2cd4817b ensure arith.reflect has default true
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 14:09:45 -07:00
Nikolaj Bjorner 3f89c1418b fix test build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 12:51:14 -07:00
Nikolaj Bjorner 23ff580a67 get rid of timeb dependencies, pull request #1040
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 12:16:43 -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 af4346f16a expose arith reflection, get rid of long m_manager attribute in asserted fromulas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 10:04:29 -07:00
Nikolaj Bjorner 2834fea9b3 fix x64 warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 08:58:21 -07:00
Nikolaj Bjorner 90af406338 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-23 08:51:38 -07:00
Nikolaj Bjorner 8e9739d3b0 work around crash #1039
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 08:51:26 -07:00
Nikolaj Bjorner 2cbeedec69 accept hereditarily finite sorts in datalog engine
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-22 19:32:43 -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 b782ec35cc avoid print statements from assertions when the assertion does not trigger. Stackoverflow question http://stackoverflow.com/questions/44094927/creating-formula-taking-too-much-time-in-z3py
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-21 10:35:59 -07:00
Ken McMillan bf7c6292bd removing FOCI2 interface from interp 2017-05-19 16:21:57 -07:00
Lev Nachmanson 1b62592015 change in a comment
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2017-05-18 13:44:00 -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 4069e76ab0 remove unused column function field, #1021
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-16 21:27:43 -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 d2ac59f238 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-14 14:10:01 -07:00
Nikolaj Bjorner 3290a933b5 remove spurious include file
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-14 14:09:42 -07:00
Nikolaj Bjorner 22386d3727 Merge pull request #1026 from Owlz/setup_bin_fix
Fixing z3 binary setup to data_files
2017-05-14 14:06:16 -07:00
Nikolaj Bjorner a0efdc21c3 add missing locks around mpz operations that access object allocator. Use internal skolem constant for theory assumption to hide it from models
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-14 14:04:00 -07:00
Owlz aad186f6a5 Fixing z3 binary setup to data_files 2017-05-14 15:25:17 -04:00
Murphy Berzish 3c692a37eb fix consistency check involving strings with escape characters 2017-05-13 16:13:32 -04:00
Murphy Berzish 14355a15c8 use correct operator for lower bound assignment
fixes #1022
2017-05-13 16:02:41 -04:00
Murphy Berzish bf147556a6 add counter to theory_str::mk_fresh_const() 2017-05-13 14:18:05 -04:00
Nikolaj Bjorner 169295c9ba fix build warnings for theory_str
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-12 08:06:24 -07:00
Nikolaj Bjorner 07474e4887 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-12 07:59:30 -07:00
Nikolaj Bjorner 64f3b3e316 remove lp_main from test branch to ensure test build only builds a single entry point
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-12 07:59:16 -07:00
Lev Nachmanson 07f2fd43bb Merge remote-tracking branch 'upstream/master' 2017-05-11 17:49:33 -07:00
Lev Nachmanson d0d71a0907 allow more failures in d_solver
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-05-11 17:49:27 -07:00
Nikolaj Bjorner a9e2a1204e add this qualifier for build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 16:58:29 -07:00
Nikolaj Bjorner 7b35eacf63 add this qualifier for build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 16:52:54 -07:00
Nikolaj Bjorner 2ab0f281f3 add this qualifier for build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 16:50:39 -07:00
Nikolaj Bjorner 29a49f4427 convert static random fields to non-static
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 16:46:07 -07:00
Lev Nachmanson cf8b35a6f3 fix init reorder warning
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-05-11 10:54:18 -07:00
Nikolaj Bjorner 431feab1bf fix build warnings part 8
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 09:37:01 -07:00
Nikolaj Bjorner eb8da3fb9d fixing setup for LRA, re-enable LRA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 09:34:07 -07:00
Nikolaj Bjorner 7e004fe331 fix build warnings part 7, disable LRA for regression t201.smt2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 09:28:59 -07:00