Skip to content

Fix collections internalisation #3841

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
May 2, 2024
Merged

Fix collections internalisation #3841

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
f6cdd0b
Fix pattern synonyms to store e.g. {...REST} as just REST
goodlyrottenapple May 1, 2024
f9979d5
add unit tests
goodlyrottenapple May 2, 2024
cf15c49
Format with fourmolu
invalid-email-address May 2, 2024
08f8c8e
Merge branch 'master' into sam/collections-internalisation-fix
goodlyrottenapple May 2, 2024
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
77 changes: 43 additions & 34 deletions booster/library/Booster/Pattern/Base.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,17 +596,20 @@ pattern KMap def keyVals rest <- Term _ (KMapF def keyVals rest)
r -> ([], r)
newKeyVals = sortAndDeduplicate $ keyVals ++ keyVals'
newRest = rest'
in Term
argAttributes
{ hash =
Hashable.hash
( "KMap" :: ByteString
, def
, map (\(k, v) -> (hash $ getAttributes k, hash $ getAttributes v)) newKeyVals
, hash . getAttributes <$> newRest
)
}
$ KMapF def newKeyVals newRest
in case (newKeyVals, newRest) of
([], Just r) -> r
_ ->
Term
argAttributes
{ hash =
Hashable.hash
( "KMap" :: ByteString
, def
, map (\(k, v) -> (hash $ getAttributes k, hash $ getAttributes v)) newKeyVals
, hash . getAttributes <$> newRest
)
}
$ KMapF def newKeyVals newRest

pattern KList :: KListDefinition -> [Term] -> Maybe (Term, [Term]) -> Term
pattern KList def heads rest <- Term _ (KListF def heads rest)
Expand All @@ -630,18 +633,21 @@ pattern KList def heads rest <- Term _ (KListF def heads rest)
(\(m, ts) -> (heads <> heads', Just (m, ts <> tails)))
rest'
other -> (heads, other)
in Term
argAttributes
{ hash =
Hashable.hash
( "KList" :: ByteString
, def
, map (hash . getAttributes) newHeads
, fmap (hash . getAttributes . fst) newRest
, fmap (map (hash . getAttributes) . snd) newRest
)
}
$ KListF def newHeads newRest
in case (newHeads, newRest) of
([], Just (r, [])) -> r
_ ->
Term
argAttributes
{ hash =
Hashable.hash
( "KList" :: ByteString
, def
, map (hash . getAttributes) newHeads
, fmap (hash . getAttributes . fst) newRest
, fmap (map (hash . getAttributes) . snd) newRest
)
}
$ KListF def newHeads newRest

pattern KSet :: KSetDefinition -> [Term] -> Maybe Term -> Term
pattern KSet def elements rest <- Term _ (KSetF def elements rest)
Expand All @@ -662,17 +668,20 @@ pattern KSet def elements rest <- Term _ (KSetF def elements rest)
other -> ([], other)
newElements = sortAndDeduplicate $ elements <> elements'
newRest = rest'
in Term
argAttributes
{ hash =
Hashable.hash
( "KSet" :: ByteString
, def
, map (hash . getAttributes) newElements
, fmap (hash . getAttributes) newRest
)
}
$ KSetF def newElements newRest
in case (newElements, newRest) of
([], Just r) -> r
_ ->
Term
argAttributes
{ hash =
Hashable.hash
( "KSet" :: ByteString
, def
, map (hash . getAttributes) newElements
, fmap (hash . getAttributes) newRest
)
}
$ KSetF def newElements newRest
{-# COMPLETE AndTerm, SymbolApplication, DomainValue, Var, Injection, KMap, KList, KSet #-}

-- hard-wired injection symbol
Expand Down
8 changes: 8 additions & 0 deletions booster/unit-tests/Test/Booster/Pattern/InternalCollections.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ listInternalisation =
replicate 4 $
inList [trm| \dv{SomeSort{}}("after variable") |]
in testCase "mixing a list" $ internalise (listConcat before listAfter) @=? mixedList
, testCase "[...REST] normalises to REST" $
KList Fixture.testKListDef [] (Just ([trm| REST:SortTestList{} |], []))
@=? [trm| REST:SortTestList{} |]
]
where
internalise = internaliseKList Fixture.testKListDef
Expand Down Expand Up @@ -178,6 +181,8 @@ setInternalisation =
(Just $ SymbolApplication Fixture.setConcatSym [] [var1, var2])
in testCase "two variables and some concrete elements in set, concat pushed inwards" $
result @=? internalise twoVarsSet
, testCase "{...REST} normalises to REST" $
KSet Fixture.testKSetDef [] (Just [trm| REST:SortTestSet{} |]) @=? [trm| REST:SortTestSet{} |]
]
where
internalise = internaliseKSet Fixture.testKSetDef
Expand Down Expand Up @@ -270,6 +275,9 @@ mapSmartConstructors =
let input = makeKMapWithRest [1, 2, 3] (makeKMapWithRest [1, 2, 4] [trm| REST:SortTestMap{}|])
expected = makeKMapWithRest [1, 2, 3, 4] [trm| REST:SortTestMap{}|]
in input @=? expected
, testCase "{...REST} normalises to REST" $
KMap Fixture.testKMapDefinition [] (Just [trm| REST:SortTestMap{} |])
@=? [trm| REST:SortTestMap{} |]
]
where
-- produced a map of identities for all input ints: x1 |-> x1, x2 |-> x2 ...
Expand Down