0ebc19f · patch · git.iko.soy

src/Data/Patch/DMapWithMove.hs+2−2

compare with develop

unifiedsplit

@@ -220,8 +220,8 @@ moveDMapKey src dst = case src `geq` dst of

220-- @

221-- let aMay = DMap.lookup a dmap

222-- bMay = DMap.lookup b dmap

223−-- in maybe id (DMap.insert a) (bMay `mplus` aMay)

223+-- in maybe id (DMap.insert a) (bMay <> aMay)

224−-- . maybe id (DMap.insert b) (aMay `mplus` bMay)

224+-- . maybe id (DMap.insert b) (aMay <> bMay)

225-- . DMap.delete a . DMap.delete b $ dmap

226-- @

227swapDMapKey :: GCompare k => k a -> k a -> PatchDMapWithMove k v

src/Data/Patch/MapWithMove.hs+2−2

@@ -156,8 +156,8 @@ moveMapKey src dst = PatchMapWithMove' $ PM.moveMapKey src dst

156-- @

157-- let aMay = Map.lookup a map

158-- bMay = Map.lookup b map

159−-- in maybe id (Map.insert a) (bMay `mplus` aMay)

159+-- in maybe id (Map.insert a) (bMay <> aMay)

160−-- . maybe id (Map.insert b) (aMay `mplus` bMay)

160+-- . maybe id (Map.insert b) (aMay <> bMay)

161-- . Map.delete a . Map.delete b $ map

162-- @

163swapMapKey :: Ord k => k -> k -> PatchMapWithMove k v

src/Data/Patch/MapWithPatchingMove.hs+6−2

@@ -136,8 +136,8 @@ moveMapKey src dst

136-- @

137-- let aMay = Map.lookup a map

138-- bMay = Map.lookup b map

139−-- in maybe id (Map.insert a) (bMay `mplus` aMay)

139+-- in maybe id (Map.insert a) (bMay <> aMay)

140−-- . maybe id (Map.insert b) (aMay `mplus` bMay)

140+-- . maybe id (Map.insert b) (aMay <> bMay)

141-- . Map.delete a . Map.delete b $ map

142-- @

143swapMapKey

@@ -281,6 +281,8 @@ deriving instance (Read k, Read p, Read (PatchTarget p)) => Read (NodeInfo k p)

281deriving instance (Eq k, Eq p, Eq (PatchTarget p)) => Eq (NodeInfo k p)

282deriving instance (Ord k, Ord p, Ord (PatchTarget p)) => Ord (NodeInfo k p)

283

284+-- | Traverse the 'NodeInfo' over the key, patch, and patch target. Because of

285+-- the type families here, this doesn't it any bi- or tri-traversal class.

284bitraverseNodeInfo

286bitraverseNodeInfo

285 :: Applicative f

287 :: Applicative f

286 => (k0 -> f k1)

288 => (k0 -> f k1)

@@ -322,6 +324,8 @@ deriving instance (Read k, Read p, Read (PatchTarget p)) => Read (From k p)

322deriving instance (Eq k, Eq p, Eq (PatchTarget p)) => Eq (From k p)

324deriving instance (Eq k, Eq p, Eq (PatchTarget p)) => Eq (From k p)

323deriving instance (Ord k, Ord p, Ord (PatchTarget p)) => Ord (From k p)

325deriving instance (Ord k, Ord p, Ord (PatchTarget p)) => Ord (From k p)

324

326

327+-- | Traverse the 'From' over the key, patch, and patch target. Because of

328+-- the type families here, this doesn't it any bi- or tri-traversal class.

325bitraverseFrom

329bitraverseFrom

326 :: Applicative f

330 :: Applicative f

327 => (k0 -> f k1)

331 => (k0 -> f k1)