-
Notifications
You must be signed in to change notification settings - Fork 40
SMT-LIB 2.6 conformance, support for cvc5, and generalization for alternative SMT-solvers #609
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 10 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
7f22610
Update preamble to include explicit arities to conform to SMT-LIB 2.6
lfwa 7d1cf97
Prelim changes for cvc5
lfwa 7138589
Added support for cvc5
lfwa aed16cb
Removed outcommented line
lfwa a1badb1
Generalized last of Z3-specific options.
lfwa b7f61e7
Merge branch 'cvc5' into master
lfwa a10044f
Merge pull request #1 from lfwa/master
lfwa 68ea2eb
Redo lost changes from commit 7aa97f1879aa5bc7a43bc35b2c92a9124530023d
lfwa bf234e8
Merge branch 'viperproject:master' into cvc5
lfwa 494401d
Removed forwardArgumentsConverter
lfwa 60de520
Ensure :pattern ((f x)) instead of pattern (f x) since pattern must …
lfwa 6bc0d29
Removed non-cvc5-specifc keywords (duplicates).
lfwa 2924e00
Clarification for default timeout.
lfwa 56e4539
Clarified that the cvc5 solver is optional.
lfwa 37e3adb
Revert back to default timeout of 0 for all provers.
lfwa 6ab9858
Changed rawTimeout to timeout.
lfwa 4215b09
Added call for timeout after converting back to option.
lfwa d5b896c
Reverted back original timeout.
lfwa 115317d
Resolve conflicts
lfwa 9e5757c
Merge branch 'master' into cvc5
lfwa 84e97fc
Adapted code from upstream
0a8b718
IntelliJ suggestions
eaa1190
Code cosmetics
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| ; This Source Code Form is subject to the terms of the Mozilla Public | ||
| ; License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| ; file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
||
| ; Requires CVC5 >= 1.0.0 | ||
| (set-option :print-success true) | ||
|
|
||
| (set-logic ALL) | ||
| (set-option :seed 0) | ||
| (set-option :sat-random-seed 0) | ||
|
|
||
| ; default options as used by boogie | ||
| (set-option :incremental true) ; required for push and pop | ||
| (set-option :condense-function-values false) | ||
| (set-option :strict-parsing false) | ||
| (set-option :produce-models true) ; enabled to support proverStdIO. retrieveAndSaveModel | ||
|
|
||
| ; Translated from z3config | ||
| (set-option :global-declarations true) | ||
| (set-option :type-checking true) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.