Skip to content
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

Fix for punionWith argument-flipping, issue #556 #558

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −26
Draft

Fix for punionWith argument-flipping, issue #556 #558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 30 additions & 26 deletions Plutarch/Api/V1/AssocMap.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ punionWith = phoistAcyclic $

data MapUnionCarrier k v s = MapUnionCarrier
{ merge :: Term s (PBuiltinListOfPairs k v :--> PBuiltinListOfPairs k v :--> PBuiltinListOfPairs k v)
, mergeInsert :: Term s (PBuiltinPair (PAsData k) (PAsData v) :--> PBuiltinListOfPairs k v :--> PBuiltinListOfPairs k v :--> PBuiltinListOfPairs k v)
, mergeInsert :: Term s (PBuiltinPair (PAsData k) (PAsData v) :--> PBuiltinPair (PAsData k) (PAsData v) :--> PBuiltinListOfPairs k v :--> PBuiltinListOfPairs k v :--> PBuiltinListOfPairs k v)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this extra pair for?

}
deriving stock (Generic)
deriving anyclass (PlutusType)
Expand All @@ -371,33 +371,37 @@ mapUnionCarrier = phoistAcyclic $ plam \combine self ->
MapUnionCarrier
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use QualifiedDo or TermCont to make this code cleaner?

{ merge = plam $ \xs ys -> pmatch xs $ \case
PNil -> ys
PCons x xs' -> mergeInsert # x # xs' # ys
, mergeInsert = plam $ \x xs ys ->
pmatch ys $ \case
PNil -> pcons # x # xs
PCons y1 ys' ->
plet y1 $ \y ->
plet (pfstBuiltin # x) $ \xk ->
plet (pfstBuiltin # y) $ \yk ->
pif
(xk #== yk)
( pcons
# (ppairDataBuiltin # xk #$ combine # (psndBuiltin # x) # (psndBuiltin # y))
#$ merge
# xs
# ys'
)
( pif
(pfromData xk #< pfromData yk)
( pcons
# x
# (mergeInsert # y # ys' # xs)
PCons x xs' -> pmatch ys $ \case
PNil -> xs
PCons y ys' -> mergeInsert # x # y # xs' # ys'
, mergeInsert = plam $ \x y xs ys ->
plet (pfstBuiltin # x) $ \xk ->
plet (pfstBuiltin # y) $ \yk ->
pif
(xk #== yk)
( pcons
# (ppairDataBuiltin # xk #$ combine # (psndBuiltin # x) # (psndBuiltin # y))
#$ merge
# xs
# ys
)
( pif
(pfromData xk #< pfromData yk)
( pcons
# x
# ( pmatch xs $ \case
PNil -> pcons # y # ys
PCons x' xs' -> mergeInsert # x' # y # xs' # ys
)
( pcons
# y
# (mergeInsert # x # xs # ys')
)
( pcons
# y
# ( pmatch ys $ \case
PNil -> pcons # x # xs
PCons y' ys' -> mergeInsert # x # y' # xs # ys'
)
)
)
)
}

mapUnion :: forall k v s. (POrd k, PIsData k) => Term s ((PAsData v :--> PAsData v :--> PAsData v) :--> MapUnionCarrier k v)
Expand Down