-
Notifications
You must be signed in to change notification settings - Fork 52
Extend Solver Independent SMTLib2 Parser/Generator #436
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
Draft
baierd
wants to merge
331
commits into
master
Choose a base branch
from
extend-solver-independent-smtlib2-parser-generator
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 250 commits
Commits
Show all changes
331 commits
Select commit
Hold shift + click to select a range
f7d8914
refactored ParserFormula
7248ad9
princess-all.jar with modified manifest added
a021e00
refactored
d877043
refactored
e33c7f0
refactored
ef0e3a6
first eval results
d832fdb
fixed bugs
7298d8a
Merge branch 'main' of github.com:KJanelle/java-smt into main
ec4f43e
xml file
2c3ae57
fixed usage of Generator
7ce18dd
Merge branch 'main' of github.com:KJanelle/java-smt into main
77d7a7c
fixed usage of Generator
b9ddfc9
fixed usage of Generator
0a4ca35
fixed usage of Generator
9f82157
fixed usage of Generator
568d607
evaluation tables
e8430eb
improved coverage of UnitTests
de862c2
improved coverage of UnitTests Parser
96da4b2
Added model tests
b1f260f
made keyword an ENUM
4579f7f
made methodToEvaluate in Generator "Optional"
8ef60d4
Bugfix
95af1b9
comments and test coverage
debbf48
final refactoring
fa5efe2
deleted princess_all-2023-06.jar
92d5d7a
Readd missing checkstyle config and remove Princess binary
8e6673d
Revert .idea and .gitignore to previous states
e2978b0
Fix idead Intellij JavaSMT setup (without local paths)
c0e0ab3
Merge branch 'solver-independent-smtlib2-parser-generator' into PR
daniel-raffler 3927dbe
Fixed merge issues.
daniel-raffler a1f23d2
Added missing override annotation in SolverStackTest
daniel-raffler d65c73a
Use ProcessBuilder to avoid checkstyle complaint. Runtime.exec() has …
daniel-raffler 99e1b91
Revert changes to the API. We need to find a better way of handling I…
daniel-raffler a243696
Restored idea files and build scripts.
daniel-raffler 58e6586
Cleaned up SMTLIB2ParserInterpreterTest and fixed the tests for OpenSMT.
daniel-raffler 72a8793
Rewrote BinaryModel. This fixes the remaining tests in SMTLIB2ParserI…
daniel-raffler 6314f65
Fixed option to enable SMTLIB2 script generation. All tests in Numera…
daniel-raffler 530f231
Fixed error message
daniel-raffler 8f5df34
Use the princess binary from lib/native/source/princess. This should …
daniel-raffler cb1c441
Use the princess binary from the ivy repository.
daniel-raffler 17ea745
Remove standalone binary of Rrincess from the repository.
daniel-raffler 8ccd242
Delete lib/native/source/princess/princess-bin-2023-06-19/testcases/a…
daniel-raffler f591709
Removed backup files that were left from the Princess standalone binary.
daniel-raffler ce9a614
Removed Princess from build-publish-solvers.xml
daniel-raffler e942df6
Removed ivy conf for Princess
daniel-raffler 58a2456
Removed unused file.
daniel-raffler 2c77df0
Make sure logging option is always set in generateContext()
daniel-raffler bec413b
Enabled two tests from SolverTheoriesTest that use bitvector arrays f…
daniel-raffler 5350d70
Cleaned up the commits.
daniel-raffler 08dd934
Added smtlib2 logging to the OpenSmt prover.
daniel-raffler 7d23fc6
Removed PRINCESS_BINARY from solver backends. Instead we now set the …
daniel-raffler f731a24
Temporarily enabled "binary mode" for all tests when Princess is used…
daniel-raffler b97482e
Formatting
daniel-raffler 92531f9
Disabled tests that use parsing while testing the binary backend for …
daniel-raffler 6dc2e94
Disabled tests that require quantifiers while testing the binary back…
daniel-raffler 3659a5b
Disabled more tests that require features not supported by the binary…
daniel-raffler 23746df
Partial fix for BinaryModel.
daniel-raffler 57e6d70
Applied refaster patch.
daniel-raffler 22003fb
Added missing license information.
daniel-raffler b682a70
Removed ANTLR intermediate files.
daniel-raffler a62e69d
Ignore autogenerated ANTLR files when running spotbugs.
daniel-raffler a1a31b9
Fixed Spotbug issue and made member variables in parserInterpreter.Vi…
daniel-raffler 295be44
Skip CheckStyle checks for autogenerated ANTLR files.
daniel-raffler 3a66546
Fixed remaining CheckStyle issues.
daniel-raffler 9d9b28e
Fixed CheckStyle issues for the tests.
daniel-raffler 8a51079
Fixed indentation.
daniel-raffler 1cb60fd
Removed the line from the last commit. Checksyle and format-source ca…
daniel-raffler fc416e0
ParserGenerator: Add "set-logic" command only when the SMTLIB2 string…
daniel-raffler 45a1e35
Add missing checks to make sure SMTLIB code is only generated when th…
daniel-raffler 6c94141
Added more todos
daniel-raffler 0987488
Moved comments to avoid formatting issues
daniel-raffler 8335b63
Enable SMTLIB generation for all solvers in generator tests
daniel-raffler 5390df5
Remove copy of SMT2_UF_and_Array.smt2 in the main folder
daniel-raffler 24fce73
Fixed parsing of large integer constants
daniel-raffler e18d297
Added/updated todos
daniel-raffler 5e4b086
Add missing cases for generator logging in AbstractEvaluator
daniel-raffler f63ba0c
Added missing assertion in AbstractEvaluator
daniel-raffler 9076150
[Unstable Floating Points not useable yet!]
DavidGalllob c2beaca
Revert "[Unstable Floating Points not useable yet!] as it should be o…
61ad6d0
Revert "Revert "[Unstable Floating Points not useable yet!] as it sho…
f153d36
-added FloatingPoint Conversions in smtlibv2.g4 (Bitvector and Floati…
DavidGalllob 05d2af1
Fix commit 5e4b086e6d9140629de7c37c708e2f848db8528a
daniel-raffler b02769b
Merge branch 'solver-independent-smtlib2-parser-generator' into exten…
5e68617
-added Floating Point Conversion functions in the grammar file
DavidGalllob b8a2c6d
-removed wrong declarations in grammar file (removed return types as …
DavidGalllob d358557
-added floating points to the identifiers in the grammar file, so now…
DavidGalllob 67922cf
-generated updated parser, lexer and Visitor classes using ANTLR
DavidGalllob 14c9da0
-fixed tiny mistakes in smtlibv2.g4 file
DavidGalllob 3a59c54
-added declaration of floating point constants in the Visitor.java
DavidGalllob 57e1ddf
-added almost all floating point operations to the visitor.java class…
DavidGalllob 8904824
-changed the Constructor of the Visitor.java class so that it now tak…
DavidGalllob 58fe220
-added parsing of Floating-Points which are in the Standard Format e.…
DavidGalllob 7859b6e
-Visitor.java should now be able to recognize all Floating Points def…
DavidGalllob cacc499
-removed entire FloatingPoint implementation in smtlibv2.g4 file as i…
DavidGalllob a3786f5
-created 2 small tests for Floating Points
DavidGalllob 7bef610
-created tests for Floating Point
DavidGalllob 2bf0519
-added parsing of Strings in the Visitor.java class. (Not Tested yet)
DavidGalllob 4b958c9
-introduced FloatingPoints and Strings as Sorts in the Generator.java
DavidGalllob 1b4ddfd
-readded recognizitaion for FloatingPoints in the grammer file
DavidGalllob 7838da3
-introduced FloatingPoints to the grammar again to allow whitespaces
DavidGalllob 3815c95
-created Tests for Strings and added more for FloatingPoints
DavidGalllob 1dda73b
-Strings now work in the Parser (tested)
DavidGalllob 766ee33
-created empty Generator classes for FloatingPoints and Strings
DavidGalllob 9667eeb
-added basic FloatingPoint Operations in the FloatingPointGenerator c…
DavidGalllob bfb9484
-added FloatingPoints and their operations to the Generator (NOT TESTED)
DavidGalllob cb92fff
-added missing StringOperations
DavidGalllob 893b5d2
-added missing logging Operations to the AbstractFloatingPointFormula…
DavidGalllob 65ad61d
-minor changes in the testclasses
DavidGalllob 99a3379
created "SolverLess"-Dummy empty Classes to be able to parse and gene…
DavidGalllob 19d7799
-added Dummy classes for Solving (contains errors) unstable
DavidGalllob 2c017fd
-added SolverLess FormulaManagers and dummytypes
DavidGalllob 13ad326
-added SolverLess FormulaManager (not working correctly yet)
DavidGalllob 4d7fb87
-added support for floatingPoints in the solverless Solver
DavidGalllob 896dc9b
-Fixed bugs where Arrays and Integers couldn't be created correctly
DavidGalllob f9a3d3a
- Bitvectors now can be parsed without a Solver.
DavidGalllob b16cf18
-changed formula creation and recognization in Formulacreator
DavidGalllob 5e0c515
-added UF Manager in Solverless Solver
DavidGalllob df52e4e
-added correct creation of nested arrays in the Solverless Solver
DavidGalllob a529138
Clean up registering of SMTLIB2 Int or Real number in the generator
c03a3f5
Add precondition and some simplifications to recursive evaluation of …
bd7cdd6
Call solvers only once when logging SMTLib2 generation independently
1924ffb
Solverless Sovler now works with all types (nearly correctly) except UFs
DavidGalllob 479a14d
Refactored Solverless Package name and created evaluation tests.
DavidGalllob f424513
-added small tests
DavidGalllob f74c2cd
-added FloatingPointTests
DavidGalllob 6cb380a
Created a test environment where a String will be put directly to Z3 …
DavidGalllob 3f627ef
fixed a problem where "makeString" would not work because they weren'…
DavidGalllob 948eacd
-added basic functions for UFManager
DavidGalllob 8c45e8c
-added support for Bitvectors in UFs
DavidGalllob 9f1b5cd
-added full Support for Uninterpreted Functions in Solverless Solver
DavidGalllob 6f72c82
bugfixes
DavidGalllob 0e12e7d
-Solverless now can work with Floating Point formulas but still can't…
DavidGalllob e4e981d
-Solveless now can correctly Generate FloatingPoints
DavidGalllob 1da6680
-Refactorings
DavidGalllob 7cd9f6f
Bring ivysettings in line with main branch
a44c8ec
Refactorings.
DavidGalllob c28fd49
minor refactorings
DavidGalllob bc9e8bc
minor refactorings
DavidGalllob 6f4a6a9
bugfixes
DavidGalllob 0651fc7
-fixed all Warnings
DavidGalllob ef745e3
-modified all tests which aren't focused on Parsing/Generating to ign…
DavidGalllob 0641132
Merge remote-tracking branch 'origin/extend-solver-independent-smtlib…
DavidGalllob b94eb6c
-added FloatingPoints and Strings to the ArrayGenerator
DavidGalllob 24dc558
Disable independent SMTLib2 generator per default
5b6239e
Disable independent SMTLib2 generator and binary usage for Princess i…
08a26d7
Update results of NumeralSMTLIB2GeneratorTests for the changed SMTLib…
6f7dd05
Format source code (including code by Janelle)
689a4a5
Switch ArrayList to List types in return types
bd64984
-fixed all checkstyle errors
DavidGalllob 97c170f
-fixed refaster warnings
DavidGalllob e6c307f
-removed unused variables
DavidGalllob 7ca99af
-refactorings
DavidGalllob af41ebb
Add Checkstyle exclusion of SMTLib2 parser/lexer components that are …
8d1ea0a
Fix typo in spotbugs exclusion of smtlib2 parser/lexer autogenerated …
1108da0
-checkstyle fixes
DavidGalllob 82b402f
-reformated source-code
DavidGalllob cbe3c3c
-reformated source-code
DavidGalllob 15150f1
-added licenses everywhere it is needed.
DavidGalllob 1692bcf
- refactorings
DavidGalllob 4efb0ff
-fixed a bug where the generator would use equals when it should use …
DavidGalllob 167b55e
-IMPORTANT: Excluded all mistakes from previous implementation from t…
DavidGalllob 2ac1ce3
-reformated
DavidGalllob cfc6691
-excluded all tests that fail because of internal errors and previous…
DavidGalllob 5e07da7
-reformated
DavidGalllob abe0781
-tiny ignores for internal errors
DavidGalllob 56999ec
-restored all failing tests
DavidGalllob 757f308
Merge 5.0.0 release into feature branch extend-solver-independent-smt…
b3a7bbf
-modified the code to fullfill code-review annotations.
DavidGalllob c54c7fb
Resolve merge errors and cleanup from merge of 5.0.0 release into fea…
3e23ef4
Merge new changes into merge of 5.0.0 release into feature branch ext…
dda2c8c
Format source
90e806b
- implemented missing overrides due to merge.
DavidGalllob 0440f1f
- reformated
DavidGalllob 9f2cd29
- excluded Solverless from the new merged tests.
DavidGalllob 28c30c9
-reformated and added unfinished EvaluationTest.java for Evaluation
DavidGalllob a57e410
tweaked floating Point handling in the parser
DavidGalllob a1c37a1
included new generated files
DavidGalllob 74acb02
- added missing parts of the FloatingPoint Support in the Visitor and…
DavidGalllob 503b1cb
- FloatingPoints and Strings are now fully implemented in the Parser/…
DavidGalllob b6fb669
- refactorings
DavidGalllob e566af1
- added NullChecks to all Classes in basicimpl package made by me and…
DavidGalllob 960910c
-removed unfinished file from tests
DavidGalllob 4996608
- refactored to ImmutableList to fulfill refaster requirements
DavidGalllob 1634df4
- refactored Tests
DavidGalllob 605b1d6
- gave BinaryModel more time to finish its process. Tests would fail …
DavidGalllob ab7c432
-tweaked Tests so Appveyor build won't fail as it can't execeute Bina…
DavidGalllob 168191d
added new option to set which Solver should SolverLess use when using…
DavidGalllob 5ef3e1a
bugfixes
DavidGalllob a97530d
-removed unused fields
DavidGalllob c22d99a
- fixed ProverEnvironment
DavidGalllob f1db0b4
- fixed ProverEnvironment
DavidGalllob 110b8d7
-refactorings
DavidGalllob a6cfb59
-fixed bug where solverContext would disable logging without a reason
DavidGalllob 512fc57
-bugfix and refactorings
DavidGalllob 428d446
-removed logging of push and pop as the parser can't support it.
DavidGalllob b80b7d0
- introduced a workaround for push and pop for the evaluation in Solv…
DavidGalllob 4c7d01a
- made the SolverLessProver more efficient.
DavidGalllob 38aca61
- added full support for Regex as datatype in SMTLIB2 in the parser a…
DavidGalllob 0ea597b
-refactorings
DavidGalllob e17c5ca
fixed a wrong test
DavidGalllob d88bf6b
added new tests
DavidGalllob e71de93
- introduced a ParseGenerateAndReparseTest class that provides the ma…
DavidGalllob 6612420
fixed local String Usage
DavidGalllob bac133b
excluded EvaluationFiles from Tests.
DavidGalllob 0c1269f
added javaclass for evaluation with benchexec.
DavidGalllob 933bf52
added javaclass for evaluation with benchexec.
DavidGalllob 325d186
added javaclass for evaluation with benchexec.
DavidGalllob 37f2e50
refactorings
DavidGalllob e743028
fixed bug
DavidGalllob 4dcd480
- fixed a Generator bug
DavidGalllob 3253291
- ParseGenerateAndReparse now makes sure that the exception wasn't ca…
DavidGalllob a6fe77f
- Better logging for Evaluation in the file
DavidGalllob b257f57
- removed outdated UFGenerator test
DavidGalllob 1b80695
-changed push/pop to UnsupportedOperationException
DavidGalllob 1badf47
-fixed tests
DavidGalllob d3b2bd5
Refactorings (to match CI requirements)
DavidGalllob b2224c0
-refactorings
DavidGalllob f58e415
-refactorings
DavidGalllob e598621
-refactorings
DavidGalllob ee631f3
-refactorings
DavidGalllob 82595ea
-fixed missing support for FloatingPoints who have other exponent and…
DavidGalllob f5dca4c
-fixed missing support for FloatingPoints who have other exponent and…
DavidGalllob 8449b06
- overhauled benchmark class.
DavidGalllob 4d47063
- overhauled benchmark class.
DavidGalllob 95b2d3e
- added scripts to run benchmark
DavidGalllob 48646f3
- modified gitignore to ignore scripts
DavidGalllob a6bd296
-fixed wrong Generating of some string functions.
DavidGalllob 2ba04eb
-fixed tests
DavidGalllob 785ccd1
-changed solvers to native for benchmark
DavidGalllob 9167122
- Benchmark now only supports Z3
DavidGalllob 9d97dd2
- Implemented support for Mathsat and Z3 in my Benchmark class
DavidGalllob f2d4b80
- implemented support for BITWUZLA in Benchmark
DavidGalllob bab58f1
- refactored
DavidGalllob 01732d2
- fixed wrong variable usage in benchmark class
DavidGalllob 40bea36
- updated unsupported Operation Exception in a visitor Method.
DavidGalllob 0c1c6c6
- updated unsupported Operation Exception in a visitor Method.
DavidGalllob ed2208f
-fixed tests
DavidGalllob a909475
-refactorings
DavidGalllob bf1cf27
-added a test and changed Generator to use Set-logic all. THIS MUST B…
DavidGalllob 4451895
- benchmark now compares the results.
DavidGalllob d72a024
- Implemented fp generating correctly and added new tests
DavidGalllob 0a8499b
- fixed some intense bugs
DavidGalllob 56baf31
-fixed wrong equation usage in fps
DavidGalllob 47801ba
-fixed a bug where wrong "" were set in regex
DavidGalllob 5fe98a8
-added new tests
DavidGalllob 9de0813
removed unsupported Test
DavidGalllob ce8e2b7
reformated
DavidGalllob 6b18557
fixed tests
DavidGalllob 4bf4133
fixed a crucial implementation mistake, where all numbers were handed…
DavidGalllob 4617374
fixed a crucial implementation mistake, where all numbers were handed…
DavidGalllob 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,24 @@ | ||
<?xml version="1.0"?> | ||
|
||
<!-- | ||
This file is part of CPAchecker, | ||
a tool for configurable software verification: | ||
https://cpachecker.sosy-lab.org | ||
|
||
SPDX-FileCopyrightText: 2007-2025 Dirk Beyer <https://www.sosy-lab.org> | ||
|
||
SPDX-License-Identifier: Apache-2.0 | ||
--> | ||
|
||
<!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd"> | ||
|
||
<suppressions> | ||
<!-- Generated code gets excluded --> | ||
<suppress files="src/org/sosy_lab/java_smt/basicimpl/parserInterpreter/Visitor.java" checks=".*"/> | ||
<suppress files="src/org/sosy_lab/java_smt/basicimpl/parserInterpreter/Smtlibv2Listener.java" checks=".*"/> | ||
<suppress files="src/org/sosy_lab/java_smt/basicimpl/parserInterpreter/Smtlibv2Visitor.java" checks=".*"/> | ||
<suppress files="src/org/sosy_lab/java_smt/basicimpl/parserInterpreter/Smtlibv2Lexer.java" checks=".*"/> | ||
<suppress files="src/org/sosy_lab/java_smt/basicimpl/parserInterpreter/Smtlibv2Parser.java" checks=".*"/> | ||
<suppress files="src/org/sosy_lab/java_smt/basicimpl/parserInterpreter/Smtlibv2BaseListener.java" checks=".*"/> | ||
<suppress files="src/org/sosy_lab/java_smt/basicimpl/parserInterpreter/Smtlibv2BaseVisitor.java" checks=".*"/> | ||
</suppressions> |
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
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.