Skip to content

Overhaul Predicate simplifier: In simplifier #2758

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
merged 4 commits into from
Jul 26, 2021
Merged

Overhaul Predicate simplifier: In simplifier #2758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdcb21a
Overhaul Predicate simplifier: In simplifier
ana-pantilie Jul 21, 2021
4417303
Format with fourmolu
invalid-email-address Jul 21, 2021
2abc1c4
Retrigger workflows
ana-pantilie Jul 23, 2021
bfa4978
Merge branch 'master' into overhaul-predicate-in
ehildenb Jul 26, 2021
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
12 changes: 12 additions & 0 deletions kore/src/Kore/Simplify/Predicate.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import Kore.Rewrite.RewritingVariable (
RewritingVariableName,
)
import qualified Kore.Simplify.Ceil as Ceil
import qualified Kore.Simplify.In as In
import qualified Kore.Simplify.Not as Not
import Kore.Simplify.Simplify
import Kore.Substitute
Expand All @@ -68,6 +69,7 @@ import Kore.Syntax (
Forall (Forall),
Iff (..),
Implies (..),
In (..),
Not (..),
Or (..),
SomeVariableName,
Expand Down Expand Up @@ -178,6 +180,8 @@ simplify sideCondition original =
ForallF forallF ->
traverse worker (Forall.refreshForall avoid forallF)
>>= simplifyForall sideCondition
InF inF ->
simplifyIn sideCondition =<< traverse simplifyTerm inF
_ -> simplifyPredicateTODO sideCondition predicate & MultiOr.observeAllT
where
_ :< predicateF = Recursive.project predicate
Expand Down Expand Up @@ -522,3 +526,11 @@ extractFirstAssignment someVariableName predicates =
guard (TermLike.isFunctionPattern termLike)
(guard . not) (someVariableName `occursIn` termLike)
pure termLike

simplifyIn ::
MonadSimplify simplifier =>
SideCondition RewritingVariableName ->
In sort (OrPattern RewritingVariableName) ->
simplifier NormalForm
simplifyIn sideCondition =
In.simplify sideCondition >=> return . MultiOr.map (from @(Condition _))
29 changes: 29 additions & 0 deletions kore/test/Test/Kore/Simplify/Predicate.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import Kore.Internal.TermLike (
TermLike,
mkAnd,
mkBottom,
mkCeil,
mkElemVar,
mkEquals,
mkNot,
Expand Down Expand Up @@ -328,6 +329,34 @@ test_simplify =
(fromEquals_ (mkElemVar x) (mkElemVar y))
[[fromEquals_ (mkElemVar x) (mkElemVar y)]]
]
, testGroup
"\\in"
[ test
"\\top"
(fromIn_ Mock.a Mock.a)
[[]]
, test
"\\bottom"
(fromIn_ Mock.a Mock.b)
[]
, test
"\\ceil"
(fromIn_ fa fa)
[[faCeil]]
, test
"\\or"
(fromIn_ (mkElemVar Mock.xConfig) (mkOr fa fb))
[ [faCeil, fromEquals_ (mkElemVar Mock.xConfig) fa]
, [fbCeil, fromEquals_ (mkElemVar Mock.xConfig) fb]
]
, test
"Predicates"
( fromIn_
(mkEquals Mock.testSort (mkElemVar Mock.xConfig) fb)
(mkCeil Mock.testSort fa)
)
[[fromEquals_ (mkElemVar Mock.xConfig) fb, faCeil, fbCeil]]
]
, testGroup
"Other"
[ test
Expand Down