Overhaul Predicate simplifier: Equals, v2 #2766
Merged
Conversation
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
4 tasks
|
|
JKTKops
approved these changes
Jul 28, 2021
Contributor
JKTKops
left a comment
JKTKops
left a comment
There was a problem hiding this comment.
Couple of minor comments, but looks good to me.
| _ -> simplifyPredicateTODO sideCondition predicate & MultiOr.observeAllT | ||
| where | ||
| _ :< predicateF = Recursive.project predicate | ||
| ~avoid = freeVariableNames sideCondition |
Contributor
There was a problem hiding this comment.
Aren't where bindings lazy by default? What is this ~ for?
This line wasn't changed, but asking anyway while we're here.
Contributor
Author
There was a problem hiding this comment.
We have Strict on by default, maybe this changes the behavior? I don't know for certain, though.
kore/src/Kore/Simplify/Predicate.hs
Outdated
| simplifier NormalForm | ||
| simplifyEquals sideCondition sort equals = | ||
| Equals.simplify sideCondition equals' | ||
| >>= return . MultiOr.map (from @(Condition _)) |
Contributor
There was a problem hiding this comment.
Why m >>= return . f instead of fmap f m?
|
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #2570
Completes all cases of
Predicate.simplify.I didn't add any tests for
simplifyEqualsbecause it only callsEquals.simplify, which we will need to modify for #2610.Review checklist
The author performs the actions on the checklist. The reviewer evaluates the work and checks the boxes as they are completed.