Expand Laurel implementation, so that tests T2 (impure expressions) and T3 (dag control flow) pass as well#2
Draft
keyboardDrummer wants to merge 116 commits intomainfrom
Draft
Expand Laurel implementation, so that tests T2 (impure expressions) and T3 (dag control flow) pass as well#2keyboardDrummer wants to merge 116 commits intomainfrom
keyboardDrummer wants to merge 116 commits intomainfrom
Conversation
…a into laurelMoreStmtExpr
keyboardDrummer
added a commit
that referenced
this pull request
Feb 13, 2026
### Changes - Add a Python script in `Tools` that enables automatically updating the results of `#guard_msg` - Update formatting of applications in Core. A good way to see how the formatting has changed is to look at the updated tests in this PR. Before: ``` while (((~Int.Lt i) n)) (some ((~Int.Sub n) i)) (some ((~Bool.And ((~Int.Le i) n)) (((~Int.Div ((~Int.Mul i) ((~Int.Sub i) #1))) #2) == sum))) {sum := ((~Int.Add sum) i) i := ((~Int.Add i) #1)} ``` After: ``` while (~Int.Lt i n) (some (~Int.Sub n i)) (some (~Bool.And (~Int.Le i n) ((~Int.Div (~Int.Mul i (~Int.Sub i #1)) #2) == sum))) { sum := (~Int.Add sum i) i := (~Int.Add i #1) } ``` Applications in expressions require fewer parenthesis are are shown in a tree like fashion when they do not fit on a line: Before ``` /-- info: Annotated expression: ((((~List$Elim : (arrow (List (Tup int string)) (arrow int (arrow (arrow (Tup int string) (arrow (List (Tup int string)) (arrow int int))) int)))) (((~Cons : (arrow (Tup int string) (arrow (List (Tup int string)) (List (Tup int string))))) (((~Prod : (arrow int (arrow string (Tup int string)))) #3) #a)) (((~Cons : (arrow (Tup int string) (arrow (List (Tup int string)) (List (Tup int string))))) (((~Prod : (arrow int (arrow string (Tup int string)))) #4) #b)) (~Nil : (List (Tup int string)))))) #0) (λ (λ (λ (((~Int.Add : (arrow int (arrow int int))) (((~Tup$Elim : (arrow (Tup int string) (arrow (arrow int (arrow string int)) int))) %2) (λ (λ %1)))) ((((~List$Elim : (arrow (List (Tup int string)) (arrow int (arrow (arrow (Tup int string) (arrow (List (Tup int string)) (arrow int int))) int)))) %1) #1) (λ (λ (λ (((~Tup$Elim : (arrow (Tup int string) (arrow (arrow int (arrow string int)) int))) %2) (λ (λ %1)))))))))))) ``` After ``` /-- info: Annotated expression: ((~List$Elim : (arrow (List (Tup int string)) (arrow int (arrow (arrow (Tup int string) (arrow (List (Tup int string)) (arrow int int))) int)))) ((~Cons : (arrow (Tup int string) (arrow (List (Tup int string)) (List (Tup int string))))) ((~Prod : (arrow int (arrow string (Tup int string)))) #3 #a) ((~Cons : (arrow (Tup int string) (arrow (List (Tup int string)) (List (Tup int string))))) ((~Prod : (arrow int (arrow string (Tup int string)))) #4 #b) (~Nil : (List (Tup int string))))) #0 (λ (λ (λ ((~Int.Add : (arrow int (arrow int int))) ((~Tup$Elim : (arrow (Tup int string) (arrow (arrow int (arrow string int)) int))) %2 (λ (λ %1))) ((~List$Elim : (arrow (List (Tup int string)) (arrow int (arrow (arrow (Tup int string) (arrow (List (Tup int string)) (arrow int int))) int)))) %1 #1 (λ (λ (λ ((~Tup$Elim : (arrow (Tup int string) (arrow (arrow int (arrow string int)) int))) %2 (λ (λ %1)))))))))))) ``` ### Testing Updated tests --------- Co-authored-by: Andrew Wells <130512013+andrewmwells-amazon@users.noreply.github.com>
github-actions
Bot
added
the
Git conflicts
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
3 participants
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.
Changes
ToFormatinstance for the Laurel type to help with debuggingConcreteToAbstractTreeTranslatorandLaurelToBoogieTranslator, which perform 1-1 translations.LiftExpressionAssignments, which attempts to lift any assignments that occur in an expression position so they are done in the innermost enclosing statement block instead.Caveats
I think there are a lot of cases of impure expressions that aren't supported yet. It would be good to add explicit tests for those and to return not supported diagnostics in those cases. Created a GH issue to address something that's not supported: strata-org#282
Testing