3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 05:18:44 +00:00
Commit graph

64 commits

Author SHA1 Message Date
Nikolaj Bjorner a0a8bc2a62 fixes to #1155 and partial introduction of SMTLIB 2.6 datatype format
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-24 09:12:43 -07:00
Christoph M. Wintersteiger 054e139c0d Whitespace 2017-06-20 14:37:26 +01: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
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 0693a413b6 augment #955 to handle hyphen
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-30 12:50:56 -07:00
Nikolaj Bjorner 86f3526110 update get-value to also respect parameter model_index, #955
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-30 11:48:06 -07:00
Murphy Berzish 725352234d refactoring theory_str 2017-02-27 13:22:56 -05:00
Murphy Berzish 235ea79043 Merge branch 'upstream-master' into release-1.0
Conflicts:
	src/cmd_context/check_logic.cpp
	src/cmd_context/cmd_context.cpp
	src/cmd_context/cmd_context.h
	src/smt/params/smt_params_helper.pyg
	src/smt/smt_context.cpp
2017-02-18 15:04:44 -05:00
Christoph M. Wintersteiger 090a331d79 Added filenames to error messages for when we have more than one file. 2017-01-16 15:43:13 +00:00
Nikolaj Bjorner a444a33c30 updated encodings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-22 17:45:21 -08:00
Murphy Berzish 11d8ffc4d4 escape characters in theory_str 2016-11-22 18:21:40 -05:00
Christoph M. Wintersteiger b03dc0af3b fixed memory leaks 2016-08-20 17:57:00 -04:00
Nikolaj Bjorner f3ef59b095 fix scanner bug at EOF
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-08-04 13:17:37 -07:00
Nikolaj Bjorner 8da0146318 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-06-14 08:10:21 -07:00
Nikolaj Bjorner 9253ca9d86 make use of warning_msg safe for formatting. Thanks to Scott McPeak for reporting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-06-14 08:10:10 -07:00
Christoph M. Wintersteiger 3ea71b4b25 Fixed SMT2 scanner to allow 0xFF characters.
Thanks to Santiago Zanella-Beguelin for reporting this issue.
2016-06-14 12:49:48 +01:00
Murphy Berzish b5fe473c3a fix compilation errors after merge 2016-06-01 17:50:45 -04:00
Murphy Berzish d79837eed0 Merge branch 'develop' into upstream-master
Conflicts:
	.gitignore
	README
	src/ast/ast_smt2_pp.h
	src/ast/ast_smt_pp.cpp
	src/ast/reg_decl_plugins.cpp
	src/cmd_context/cmd_context.cpp
	src/parsers/smt2/smt2parser.cpp
2016-06-01 17:40:52 -04:00
Nikolaj Bjorner 96e157e201 fix warnings for unused variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-17 13:54:22 -07:00
Nikolaj Bjorner 6f5785338a add line/pos information for pattern warnings. Issue #607
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-16 08:59:58 -07:00
Nikolaj Bjorner e29adbf304 fix issues #581: nested timeouts canceled each-other
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-04-30 11:18:34 -07:00
Nikolaj Bjorner d383fd851a move vector<std::string to std::vector<std::string
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-04-16 09:34:27 -07:00
Nikolaj Bjorner a021e51a9c make parse error a bit more informative
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-19 19:09:41 +01:00
Christoph M. Wintersteiger 99d2ab4e8e Undid previous update of SMT2 scanner to support the new SMT2.5 string escaping. 2016-01-17 14:24:02 +00:00
Christoph M. Wintersteiger 01cb20e098 Fix for escape sequences in SMT2 scanner 2016-01-16 13:53:29 +00:00
Nikolaj Bjorner 9909c056f0 add range / loop handling for re. Fix regression reading mixed numerals reported by Trentin
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-13 00:49:31 -08:00
Nikolaj Bjorner 131f9e2247 change queries to take function names instead of arbitrary predicates. This allows to bypass issues with having arbitrary query expressions compiled in arbitrary ways to auxiliary predicates where names of bound variables are reshuffled. See also Stackoverflow http://stackoverflow.com/questions/34693719/bug-in-z3-datalog
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-10 20:43:41 -08:00
Nikolaj Bjorner e10ecad5dc seq API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-02 22:52:28 -08:00
Nikolaj Bjorner 3c50508762 use ADT for strings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 20:46:28 -08:00
Nikolaj Bjorner 75359c580e add basic rewriting to strings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-05 12:02:33 -08:00
Nikolaj Bjorner a8e366aa24 add basic string factory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-04 15:24:29 -08:00
Nikolaj Bjorner 75c935a4cb add tokens to parse strings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-04 12:09:15 -08:00
Nikolaj Bjorner a4d9642cf2 parsing of SMT 2.5 style string literals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-03 09:46:18 -08:00
Nikolaj Bjorner e2565d8d82 add some of the SMT2.5 features
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-02 18:41:10 -08:00
Bernhard F. Brodowsky f880433a69 Fixed typo in warning message. 2015-11-14 15:47:47 +01:00
Nikolaj Bjorner ac3edbbaaa add line/position information to unsupported command reports per zeph pull request
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-30 19:23:31 -07:00
Nikolaj Bjorner 77c423b9aa annotate enode hash as signed character to address issue #210
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-09-29 14:14:29 -07:00
Christoph M. Wintersteiger 2e071e89b0 tabs 2015-09-17 13:16:35 +01:00
Nikolaj Bjorner 4be3926daa use signed character type declarations for cross platform compilation. Fixes issue #210
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-09-05 16:30:58 -07:00
Murphy Berzish 02345ee5f1 fix string constant representation in parser
spec1 loopback OK
2015-09-03 00:17:05 -04:00
Murphy Berzish e48ac4a97a create and register string theory plugin
the parser gets a little bit further now!
rejects input with "unexpected character"
2015-09-02 21:12:03 -04:00
Nikolaj Bjorner 655b44c07b make :weight understand both decimal and integral values, remove dweight, remove deprecated commands for optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-15 00:48:22 +02:00
Nikolaj Bjorner 4bc044c982 update header guards to be C++ style. Fixes issue #9
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-07-08 23:18:40 -07:00
Nikolaj Bjorner b08ccc7816 added missing Copyright forms
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-06-10 11:54:02 -07:00
Nikolaj Bjorner 3e0e9c7f3c parse also bit-vector constants with set-info. Reported by David Cok
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-19 20:30:58 -07:00
Nikolaj Bjorner a00a9fbdfd generate error on duplicated data-type accessors. Issue 85
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-02 17:10:48 -08:00
Nikolaj Bjorner 83add2bd9b fix bugs reported by Filip Konecny <filip.konecny@epfl.ch> in PDR
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-25 13:39:11 -07:00
Nuno Lopes 7ce88d4da9 fix a few compilation warnings
- remove unused variables and class fields
 - add support for gcc 4.5 & clang's __builtin_unreachable
 - fix 2 bugs related to strict aliasing
 - remove a few unused function parameters

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-21 14:36:39 -07:00
Leonardo de Moura 3a15db5244 Fix uninterpreted sort definition. There was a mismatch in the behavior of the API and SMT front-ends. The SMT front-ends were using user_sorts to be able to support parametric uninterpreted sorts. After this fix, the API also creates user_sorts.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-02-12 14:34:31 -08:00