Skip to content

Fix LiftImperativeExpression prepend ordering #41

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

Draft
keyboardDrummer-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix LiftImperativeExpression prepend ordering #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions Strata/Languages/Laurel/LiftImperativeExpressions.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,14 +274,21 @@ def transformExpr (expr : StmtExprMd) : LiftM StmtExprMd := do
if model.isFunction callee then
return seqCall
else
-- Imperative call in expression position: lift it like an assignment
-- Imperative call in expression position: lift to an assignment.
let previousPrependedStmts ← takePrepends
let outputs := match model.get callee with
| .staticProcedure proc => proc.outputs
| .instanceProcedure _ proc => proc.outputs
| _ => []
let callResultVar ← freshCondVar
let callResultType ← computeType expr
let callResultType ← match outputs with
| [single] => pure single.type
| _ => computeType expr
let liftedCall := [
⟨ (.Var (.Declare ⟨callResultVar, callResultType⟩)), source ⟩,
⟨.Assign [⟨ .Local callResultVar, source⟩] seqCall, source⟩
⟨.Var (.Declare ⟨callResultVar, callResultType⟩), source⟩,
⟨.Assign [⟨.Local callResultVar, source⟩] seqCall, source⟩
]
modify fun s => { s with prependedStmts := s.prependedStmts ++ liftedCall}
modify fun s => { s with prependedStmts := s.prependedStmts ++ liftedCall ++ previousPrependedStmts}
return bare (.Var (.Local callResultVar))

| .IfThenElse cond thenBranch elseBranch =>
Expand Down
Loading