-
Notifications
You must be signed in to change notification settings - Fork 29
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
Improvements in maps #676
Merged
Merged
Improvements in maps #676
Conversation
This file contains 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
Felalolf
approved these changes
Sep 22, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please do the changes, then you can merge
src/main/scala/viper/gobra/translator/encodings/combinators/TypeEncoding.scala
Outdated
Show resolved
Hide resolved
src/main/scala/viper/gobra/translator/encodings/defaults/DefaultTriggerExprEncoding.scala
Outdated
Show resolved
Hide resolved
src/main/scala/viper/gobra/translator/encodings/maps/MapEncoding.scala
Outdated
Show resolved
Hide resolved
Co-authored-by: Felix Wolf <60103963+Felalolf@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR extends the
TypeEncoding
with a methodtriggerExpr
that is now used to encode expressions that occur in triggers (instead of encoding them withexpression
). This allows us to select well-formed triggers whenever theexpression
encoding generates ill-formed triggers. With this, we solve a long-standing issue where triggers containing a a map (likem[i]
ori in range(m)
) are translated to invalid triggers at the Viper level.Besides, this PR introduces two quality of life improvements
key in m
, wherem
is a map, whereas before we would have had to writekey in domain(m)
. The previous idiom is still supported.assert
method inViperWriter
has been simplified to not generate a call toassert
whenever the condition isTrueLit
. Instead, it simplifies to the expression. This makes the resulting Viper code look much cleaner.In the future, we may re-organize the map encoding as done in #606.
TODO: