Conversation
Felalolf
approved these changes
Sep 22, 2023
Contributor
Felalolf
left a comment
There was a problem hiding this comment.
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>
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
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
TypeEncodingwith a methodtriggerExprthat is now used to encode expressions that occur in triggers (instead of encoding them withexpression). This allows us to select well-formed triggers whenever theexpressionencoding 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, wheremis a map, whereas before we would have had to writekey in domain(m). The previous idiom is still supported.assertmethod inViperWriterhas been simplified to not generate a call toassertwhenever 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: