-
Notifications
You must be signed in to change notification settings - Fork 45
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
asserting in
expressions
#660
Conversation
expandPredicates can handle unfolding and quantifier exprs properly removeFoldUnfold no longer produces extraneous statements
(Flatten a Seq[Set[String]] into a Set[String])
I'll also try to separate out retrieving the prePred/postPredIds.
For the life of me I cannot figure out how to do this functionally with the Strategys
…erly permissive causeing issue for tests that had "file" in there name
… the base carbon test suite with inlining on
…r includes an inline pred
# Conflicts: # src/main/scala/viper/silver/plugin/standard/inline/InlineRewrite.scala
Fixed Transformer
# Conflicts: # src/main/scala/viper/silver/ast/pretty/PrettyPrinter.scala # src/main/scala/viper/silver/frontend/SilFrontEndConfig.scala # src/main/scala/viper/silver/frontend/SilFrontend.scala # src/main/scala/viper/silver/parser/FastParser.scala # src/main/scala/viper/silver/plugin/standard/termination/TerminationPlugin.scala # src/test/scala/PluginTests.scala
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.
Thanks for the PR! It seems as though there are many commits included that are not related to the changes (I'm not sure if they have been reverted); it would be good to avoid adding these to the history, I think.
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.
I'm not sure this is needed for the asserting in feature?
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.
I reverted the PredicateInline changes, I'm not sure how to fix the history without redoing all the merging again,
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.
Thanks, I see. Since the final diff is relatively few lines, in the worst case you could replay it by hand. But I think there is likely a better git way to do this and not leave the plugin changes out of sync or in the master history of silver. Maybe that's the cherry-pick route?
see #663 |
Adds
asserting in
expressions to also for assertions in expression position.