76f010e · patch · git.iko.soy

git.iko.soy/patch

on develop help sign in

Delete old code and format a bit

76f010eJohn Ericson5 years ago

src/Data/Patch/DMapWithPatchingMove.hs−4

compare with develop

unifiedsplit

@@ -265,10 +265,6 @@ instance forall k p

265 -- The item is destroyed in the second patch, so indicate that it is

266 -- destroyed in the source map

267 [fromBefore :=> Const ( Fixup_Update $ That To_NonMove)]

268− --(To_Move (Some toAfter), From_Insert val) ->

269− -- [toAfter :=> Fixup_Update (This $ From_Insert $ applyAlwaysHet2 p val)]

270− --(To_Move (Some toAfter), From_Delete) ->

271− -- [toAfter :=> Fixup_Update (This From_Delete)]

272 (To_Move (Some toAfter), _) ->

268 (To_Move (Some toAfter), _) ->

273 [toAfter :=> Const (Fixup_Update $ This $ between :=> editBefore)]

269 [toAfter :=> Const (Fixup_Update $ This $ between :=> editBefore)]

274 (To_NonMove, _) ->

270 (To_NonMove, _) ->

src/Data/Patch/MapWithPatchingMove.hs+4−1

@@ -379,7 +379,10 @@ instance ( Ord k

379 -> [ (toAfter, Fixup_Update (This editBefore))

380 , (fromBefore, Fixup_Update (That mToAfter))

381 ]

382+ (Nothing, From_Move fromBefore _) ->

382− (Nothing, From_Move fromBefore _) -> [(fromBefore, Fixup_Update (That mToAfter))] -- The item is destroyed in the second patch, so indicate that it is destroyed in the source map

383+ -- The item is destroyed in the second patch, so indicate that it is

384+ -- destroyed in the source map

385+ [(fromBefore, Fixup_Update (That mToAfter))]

383 (Just toAfter, _) -> [(toAfter, Fixup_Update (This editBefore))]

386 (Just toAfter, _) -> [(toAfter, Fixup_Update (This editBefore))]

384 (Nothing, _) -> []

387 (Nothing, _) -> []

385 mergeFixups _ Fixup_Delete Fixup_Delete = Fixup_Delete

388 mergeFixups _ Fixup_Delete Fixup_Delete = Fixup_Delete