Skip to content
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

Closed
wants to merge 134 commits into from
Closed

Conversation

dewert99
Copy link
Contributor

Adds asserting in expressions to also for assertions in expression position.

jyoo980 and others added 30 commits December 4, 2020 15:00
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
dewert99 and others added 24 commits June 1, 2022 16:54
…erly permissive causeing issue for tests that had "file" in there name
… the base carbon test suite with inlining on
# 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
Copy link
Contributor

@alexanderjsummers alexanderjsummers left a 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.

Copy link
Contributor

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?

Copy link
Contributor Author

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,

Copy link
Contributor

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?

@dewert99
Copy link
Contributor Author

see #663

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants