Skip to content

Apply Substitutions to ClaimPatterns When Simplifying #2764

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 9 commits into from
Jul 29, 2021
Merged

Apply Substitutions to ClaimPatterns When Simplifying #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
188f7ba
Potentially fix logic, but some tests fail
JKTKops Jul 21, 2021
785bb8a
Update tests, new integration test
JKTKops Jul 23, 2021
549ced4
Format with fourmolu
invalid-email-address Jul 23, 2021
77dd055
Merge branch 'master' into issue-2740
JKTKops Jul 23, 2021
39d414a
update integration tests that output affected configs
JKTKops Jul 26, 2021
6edc068
Merge branch 'master' into issue-2740
JKTKops Jul 26, 2021
96ee152
Merge branch 'master' into issue-2740
JKTKops Jul 26, 2021
4d10db3
simplify construction of Patterns in tests
JKTKops Jul 27, 2021
7b42849
Merge branch 'master' into issue-2740
rv-jenkins Jul 29, 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
11 changes: 9 additions & 2 deletions kore/src/Kore/Reachability/Claim.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,9 +590,16 @@ simplify' ::
Strategy.TransitionT (AppliedRule claim) m claim
simplify' lensClaimPattern claim = do
claim' <- simplifyLeftHandSide claim
let sideCondition = extractSideCondition claim'
simplifyRightHandSide lensClaimPattern sideCondition claim'
let claim'' = Lens.over lensClaimPattern applySubstOnRightHandSide claim'
sideCondition = extractSideCondition claim''
simplifyRightHandSide lensClaimPattern sideCondition claim''
where
applySubstOnRightHandSide claimPat =
let substitution = Pattern.substitution $ Lens.view (field @"left") claimPat
noLeftSubst = Lens.set (field @"left" . field @"substitution") mempty claimPat
appliedSubst = ClaimPattern.applySubstitution substitution noLeftSubst
in appliedSubst

extractSideCondition =
SideCondition.fromConditionWithReplacements
. Pattern.withoutTerm
Expand Down
4 changes: 1 addition & 3 deletions kore/test/Test/Kore/Reachability/OnePathStrategy.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,9 +808,7 @@ test_onePathStrategy =
)
)
left' =
Pattern.withCondition
Mock.a
(Condition.assign (inject Mock.x) Mock.a)
Pattern.fromTermLike Mock.a
right =
Pattern.withCondition
(TermLike.mkElemVar Mock.x)
Expand Down
4 changes: 1 addition & 3 deletions kore/test/Test/Kore/Reachability/Prove.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,9 +426,7 @@ test_proveClaims =
)
)
)
, Pattern.withCondition
Mock.b
(Condition.assign (inject Mock.x) Mock.a)
, Pattern.fromTermLike Mock.b
]
initialPattern =
Pattern.fromTermLike
Expand Down
37 changes: 7 additions & 30 deletions test/issue-2221/test-issue-2221.sh.out.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,10 @@
/* Created: Kore.Internal.OrPattern.toTermLike */
/* Spa */
\and{SortGeneratedTopCell{}}(
/* Fl Fn D Sfa */
Lbl'-LT-'generatedTop'-GT-'{}(
/* Fl Fn D Sfa Cl */ Lbl'-LT-'k'-GT-'{}(/* Fl Fn D Sfa Cl */ dotk{}()),
/* Fl Fn D Sfa */
Lbl'-LT-'generatedTop'-GT-'{}(
/* Fl Fn D Sfa Cl */ Lbl'-LT-'k'-GT-'{}(/* Fl Fn D Sfa Cl */ dotk{}()),
/* Fl Fn D Sfa */
Lbl'-LT-'generatedCounter'-GT-'{}(
/* Fl Fn D Sfa */ Var'Unds'DotVar1:SortInt{}
),
/* Fl Fn D Sfa Cl */
Lbl'-LT-'size'-GT-'{}(/* Fl Fn D Sfa Cl */ \dv{SortInt{}}("1"))
Lbl'-LT-'generatedCounter'-GT-'{}(
/* Fl Fn D Sfa */ Var'Unds'DotVar1:SortInt{}
),
/* Spa */
\and{SortGeneratedTopCell{}}(
/* Spa */
\equals{SortMyList{}, SortGeneratedTopCell{}}(
/* Fl Fn D Sfa */ Var'Unds'0:SortMyList{},
/* Fl Fn D Sfa */
Lbl'UndsUndsUnds'LIST-SIZER-SYNTAX'Unds'MyList'Unds'Int'Unds'MyList{}(
/* Fl Fn D Sfa */ Var'Unds'E:SortInt{},
/* Fl Fn D Sfa Cl */
Lbl'Stop'MyList'Unds'LIST-SIZER-SYNTAX'Unds'MyList{}()
)
),
/* Spa */
\equals{SortMyList{}, SortGeneratedTopCell{}}(
/* Fl Fn D Sfa */ VarL:SortMyList{},
/* Fl Fn D Sfa Cl */
Lbl'Stop'MyList'Unds'LIST-SIZER-SYNTAX'Unds'MyList{}()
)
)
/* Fl Fn D Sfa Cl */
Lbl'-LT-'size'-GT-'{}(/* Fl Fn D Sfa Cl */ \dv{SortInt{}}("1"))
)
Loading