Skip to content

Avoiding folds in the encoding of unfolding expressions #773

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.

Sign up for GitHub

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

Merged
jcp19 merged 6 commits into from
Feb 19, 2024
Merged

Avoiding folds in the encoding of unfolding expressions #773

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0659fca
Avoiding folds in the encoding of unfolding expressions
marcoeilers Feb 15, 2024
b6a43e2
Removed outdated comment
marcoeilers Feb 15, 2024
8da2c7d
Merge branch 'master' into meilers_termination_simpler_unfolding
marcoeilers Feb 15, 2024
d3d1efa
Fixed missing variable declaration
marcoeilers Feb 15, 2024
9fe868f
Merge branch 'meilers_termination_simpler_unfolding' of https://githu…
marcoeilers Feb 15, 2024
046c3cc
Merge branch 'master' into meilers_termination_simpler_unfolding
jcp19 Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/main/scala/viper/silver/plugin/standard/termination/transformation/ExpTransformer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,12 @@ trait ExpTransformer extends ProgramManager with ErrorReporter {
case Unfolding(acc, unfBody) =>
val permCheck = transformExp(acc.perm, c, false)
val unfoldBody = transformExp(unfBody, c, inhaleExp)
// only unfold and fold if body contains something
val (unfold, fold) = (Unfold(acc)(), Fold(acc)())

val stmts = Seq(permCheck, unfold, unfoldBody, fold)
Seqn(stmts, Nil)()
val unfold = Unfold(acc)()
val nonDetVarDecl = LocalVarDecl(uniqueName("b"), Bool)(e.pos, e.info, e.errT)
val assumeFalse = Inhale(FalseLit()())()
val thenBranch = Seqn(Seq(permCheck, unfold, unfoldBody, assumeFalse), Nil)()
val elseBranch = if (inhaleExp) Seqn(Seq(Inhale(e)(e.pos, e.info)), Nil)() else EmptyStmt
Seqn(Seq(If(nonDetVarDecl.localVar, thenBranch, elseBranch)()), Seq(nonDetVarDecl))()
case Applying(wand, body) =>
// note that this case is untested -- it's not possible to write a function with an `applying` expression
val nonDetVarDecl = LocalVarDecl(uniqueName("b"), Bool)(e.pos, e.info, e.errT)
Expand Down
⚡