feat(laurel): short-circuit AndThen/OrElse, eager And/Or, forLoop, javaGen improvements#590
Merged
keyboardDrummer merged 5 commits intostrata-org:mainfrom Mar 19, 2026
Conversation
keyboardDrummer
approved these changes
Mar 17, 2026
Contributor
|
Curious what made you decide to support generating based on the preloaded Laurel grammar - a nice addition btw. |
keyboardDrummer
approved these changes
Mar 17, 2026
keyboardDrummer
requested changes
Mar 17, 2026
Contributor
keyboardDrummer
left a comment
keyboardDrummer
left a comment
There was a problem hiding this comment.
To prevent accidental unsoundness due to Laurel consumers misinterpreting the meaning of And/Or/Implies, please rename them to make the laziness clear, and please add tests to confirm the laziness. To do the equivalent of an assert false in the assert false branches, you can call a function with requires false as a precondition.
fabiomadge
force-pushed
the
feat/laurel-short-circuit-and-javagen-improvements
branch
4 times, most recently
from
64c1724 to
c39a7af
Compare
fabiomadge
changed the title
Contributor
Author
|
The preloading of Laurel in |
aqjune-aws
previously approved these changes
Mar 17, 2026
fabiomadge
force-pushed
the
feat/laurel-short-circuit-and-javagen-improvements
branch
3 times, most recently
from
fa1bf01 to
306194c
Compare
olivier-aws
requested changes
Mar 18, 2026
fabiomadge
force-pushed
the
feat/laurel-short-circuit-and-javagen-improvements
branch
2 times, most recently
from
3895a30 to
a95df0a
Compare
- Translate And, Or, Implies to short-circuit ite expressions in LaurelToCoreTranslator instead of non-short-circuit boolean ops - javaGen now accepts a dialect name (e.g. Laurel) in addition to a file path, with a helpful error when neither resolves - Add integration test for javaGen with preloaded dialects, with proper cleanup on all exit paths and failure on missing files - Add comments documenting why Laurel pipeline commands use z3
…, forLoop, tests - Add AndThen/OrElse operations (short-circuit via ite in Core) - Keep And/Or as eager (boolAndOp/boolOrOp), expose with & / | syntax - Grammar: && / || map to AndThen/OrElse, & / | map to And/Or - Add forLoop grammar op, desugars to Block[init, While(cond, inv, Block[body, step])] - Add short-circuit laziness tests (requires false, division by zero) - Add for loop test - Deduplicate solver config (laurelVerifyOptions) - Touch LaurelGrammar.lean to trigger grammar rebuild
On Windows, z3 outputs 'unsat\r\n'. String.extract produces a Substring, and trimAscii returns a Slice that doesn't match string literals in pattern matching. Adding .toString converts it to a String first.
fabiomadge
force-pushed
the
feat/laurel-short-circuit-and-javagen-improvements
branch
from
a95df0a to
83169fe
Compare
Add DesugarShortCircuit pass that rewrites AndThen/OrElse/Implies to IfThenElse when the second operand contains imperative calls. Called from the translate pipeline before LiftImperativeExpressions. Pure operands pass through unchanged and are handled by the Core translator. Tests cover both pure and imperative paths for all three operators.
fabiomadge
force-pushed
the
feat/laurel-short-circuit-and-javagen-improvements
branch
from
83169fe to
a88f294
Compare
Contributor
Interesting! Thanks |
keyboardDrummer
approved these changes
Mar 18, 2026
Contributor
keyboardDrummer
left a comment
keyboardDrummer
left a comment
There was a problem hiding this comment.
Looks great, thanks
olivier-aws
approved these changes
Mar 19, 2026
aqjune-aws
approved these changes
Mar 19, 2026
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
4 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
Short-circuit and eager boolean operators
AndThen/OrElseoperations (short-circuit viaitein Core)And/Oras eager (boolAndOp/boolOrOp)&&/||map toAndThen/OrElse,&/|map toAnd/OrImpliesuses short-circuit (ite a b true)AndThen/OrElse/ImpliestoIfThenElsebefore expression lifting when the second operand contains imperative calls, preserving short-circuit semanticsrequires false, division by zero) and imperative path (procedure withrequires false) for all three operatorsFor loop
forLoopgrammar op:for(init; cond; step) invariants bodyBlock[init, While(cond, invariants, Block[body, step])]in ConcreteToAbstractTreeTranslatorjavaGen CLI improvements
Laurel) in addition to a file pathSolver config
laurelVerifyOptionsto deduplicate z3 solver config across Laurel commandsWindows fix
\r\nline endingsparseVerdictnow calls.trimAscii.toString(regression from feat: Implement two-sided verification check with check modes #487 which dropped the.toString)