on 4da27a8 help sign in
19 files changed+1173−198
since splitsnapshots
unifiedsplit
.github/workflows/haskell.yml+1−1 .travis.yml+171 ChangeLog.md+10−14 cabal.haskell-ci+14 patch.cabal+7−20 src/Control/Category/DecidablyEmpty.hs+9 src/Data/Functor/Misc.hs+28−5 src/Data/Patch.hs+27−8 src/Data/Patch/Class.hs+131−5 src/Data/Patch/DMap.hs+3−1 src/Data/Patch/DMapWithMove.hs+4−1 src/Data/Patch/DMapWithPatchingMove.hs+624 src/Data/Patch/DMapWithPatchingMove/By.hs+89 src/Data/Patch/IntMap.hs+3−1 src/Data/Patch/Map.hs+3−1 src/Data/Patch/MapWithMove.hs+11−8 src/Data/Patch/MapWithPatchingMove.hs+38−36 src/Data/Semigroup/Additive.hs−54 test/tests.hs−43
.github/workflows/haskell.yml+1−1
@@ -42,6 +42,6 @@ jobs:
4242 - name: Build
4343 run: cabal build --enable-tests --enable-benchmarks all
4444 - name: Run tests
45− run: cabal test --enable-tests all
45+ run: cabal test all
4646 - name: Build Docs
4747 run: cabal haddock
.travis.ymlnew file+171
@@ -0,0 +1,171 @@
1+# This Travis job script has been generated by a script via
2+#
3+# haskell-ci '--config=cabal.haskell-ci' 'cabal.project'
4+#
5+# For more information, see https://github.com/haskell-CI/haskell-ci
6+#
7+# version: 0.3.20190814
8+#
9+language: c
10+dist: xenial
11+sudo: required
12+git:
13+ # whether to recursively clone submodules
14+ submodules: false
15+cache:
16+ directories:
17+ - $HOME/.cabal/packages
18+ - $HOME/.cabal/store
19+before_cache:
20+ - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
21+ # remove files that are regenerated by 'cabal update'
22+ - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
23+ - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
24+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
25+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
26+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
27+ - rm -rfv $CABALHOME/packages/head.hackage
28+matrix:
29+ include:
30+ - compiler: ghcjs-8.4
31+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["cabal-install-3.0"]}}
32+ - compiler: ghc-8.8.1
33+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
34+ - compiler: ghc-8.6.5
35+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
36+ - compiler: ghc-8.4.4
37+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
38+ - compiler: ghc-8.2.2
39+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
40+ - compiler: ghc-8.0.2
41+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
42+before_install:
43+ - |
44+ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
45+ sudo add-apt-repository -y ppa:hvr/ghcjs;
46+ curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add -
47+ sudo apt-add-repository 'https://deb.nodesource.com/node_8.x xenial main'
48+ sudo apt-get update;
49+ sudo apt-get install $CC cabal-install-3.0 nodejs;
50+ fi
51+ - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
52+ - WITHCOMPILER="-w $HC"
53+ - |
54+ if echo $CC | grep -q ghcjs; then
55+ GHCJS=true
56+ HC=${HC}js
57+ WITHCOMPILER="--ghcjs ${WITHCOMPILER}js"
58+ else
59+ GHCJS=false;
60+ fi
61+ - if $GHCJS ; then sudo apt-get install -y ghc-8.4.4 ; fi
62+ - if $GHCJS ; then PATH="/opt/ghc/8.4.4/bin:$PATH" ; fi
63+ - HCPKG="$HC-pkg"
64+ - unset CC
65+ - CABAL=/opt/ghc/bin/cabal
66+ - CABALHOME=$HOME/.cabal
67+ - export PATH="$CABALHOME/bin:$PATH"
68+ - TOP=$(pwd)
69+ - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
70+ - echo $HCNUMVER
71+ - CABAL="$CABAL -vnormal+nowrap+markoutput"
72+ - set -o pipefail
73+ - |
74+ echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
75+ echo 'BEGIN { state = "output"; }' >> .colorful.awk
76+ echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
77+ echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
78+ echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
79+ echo ' if (state == "cabal") {' >> .colorful.awk
80+ echo ' print blue($0)' >> .colorful.awk
81+ echo ' } else {' >> .colorful.awk
82+ echo ' print $0' >> .colorful.awk
83+ echo ' }' >> .colorful.awk
84+ echo '}' >> .colorful.awk
85+ - cat .colorful.awk
86+ - |
87+ color_cabal_output () {
88+ awk -f $TOP/.colorful.awk
89+ }
90+ - echo text | color_cabal_output
91+install:
92+ - ${CABAL} --version
93+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
94+ - node --version
95+ - echo $GHCJS
96+ - TEST=--enable-tests
97+ - BENCH=--enable-benchmarks
98+ - BENCH=--disable-benchmarks
99+ - HEADHACKAGE=false
100+ - rm -f $CABALHOME/config
101+ - |
102+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
103+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config
104+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
105+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
106+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
107+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config
108+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
109+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
110+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
111+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
112+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
113+ echo "install-dirs user" >> $CABALHOME/config
114+ echo " prefix: $CABALHOME" >> $CABALHOME/config
115+ echo "repository hackage.haskell.org" >> $CABALHOME/config
116+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
117+ - cat $CABALHOME/config
118+ - rm -fv cabal.project cabal.project.local cabal.project.freeze
119+ - travis_retry ${CABAL} v2-update -v
120+ - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 happy) ; fi
121+ # Generate cabal.project
122+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
123+ - touch cabal.project
124+ - |
125+ echo "packages: ." >> cabal.project
126+ - |
127+ - cat cabal.project || true
128+ - cat cabal.project.local || true
129+ - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
130+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
131+ - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
132+ - rm cabal.project.freeze
133+script:
134+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
135+ # Packaging...
136+ - ${CABAL} v2-sdist all | color_cabal_output
137+ # Unpacking...
138+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
139+ - cd ${DISTDIR} || false
140+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
141+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
142+ - PKGDIR_patch="$(find . -maxdepth 1 -type d -regex '.*/patch-[0-9.]*')"
143+ # Generate cabal.project
144+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
145+ - touch cabal.project
146+ - |
147+ echo "packages: ${PKGDIR_patch}" >> cabal.project
148+ - |
149+ - cat cabal.project || true
150+ - cat cabal.project.local || true
151+ # Building...
152+ # this builds all libraries and executables (without tests/benchmarks)
153+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
154+ # Building with tests and benchmarks...
155+ # build & run tests, build benchmarks
156+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
157+ # Testing...
158+ - if ! $GHCJS ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
159+ # cabal check...
160+ - (cd ${PKGDIR_patch} && ${CABAL} -vnormal check)
161+ # haddock...
162+ - if ! $GHCJS ; then ${CABAL} v2-haddock $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
163+ # Constraint sets
164+ - rm -rf cabal.project.local
165+ # Constraint set old-these
166+ - if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='these <1' all | color_cabal_output ; fi
167+ # Constraint set old-witherable
168+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='witherable <0.3.2' all | color_cabal_output
169+
170+# REGENDATA ["--config=cabal.haskell-ci","cabal.project"]
171+# EOF
ChangeLog.md+10−14
@@ -2,13 +2,9 @@
22
33## Unreleased
44
5−* New dep of `data-orphans` for old GHC to get instances honestly instead of
6− via `monoidal-containers`.
5+* `PatchMapWithMove` supports moves with a patch.
76
8−## 0.0.5.0 - 2021-12-17
9−
10−* `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported
11− from `Data.Patch` for compatability.
7+* `PatchDMapWithMove` supports moves with a patch.
128
139* Rewrite `PatchMapWithMove` in terms of `PatchMapWithPatchingMove`.
1410 Care is taken to make this not a breaking change.
@@ -16,25 +12,25 @@
1612 There are complete constructor and field patterns too, and everything is
1713 exported under the newtype as real constructors and fields would be.
1814
19−## 0.0.4.0 - 2021-04-20
15+## 0.0.4.0
2016
2117* Enable PolyKinds
2218
23−## 0.0.3.2 - 2020-11-06
19+## 0.0.3.2
2420
2521* Update version bounds
2622
27−## 0.0.3.1 - 2020-02-05
23+## 0.0.3.1
2824
2925* Replace `fromJust` with something easier to debug.
3026
31−## 0.0.3.0 - 2020-02-05
27+## 0.0.3.0
3228
3329* Create `PatchMapWithPatchingMove` variant which supports moves with a patch.
3430
3531* Create `DecidablyEmpty` subclass of `Monoid`.
3632
37−## 0.0.2.0 - 2020-01-17
33+## 0.0.2.0
3834
3935* Consistently provide:
4036
@@ -46,16 +42,16 @@
4642
4743 for `PatchMap`, `PatchIntMap`, and `PatchMapWithMove`.
4844
49−## 0.0.1.0 - 2020-01-09
45+## 0.0.1.0
5046
5147* Support older GHCs with `split-these` flag.
5248
5349* Additional instances for the `Group` class for basic types.
5450
55−## 0.0.0.1 - 2020-01-08
51+## 0.0.0.1
5652
5753* Remove unneeded dependencies
5854
59−## 0.0.0.0 - 2020-01-08
55+## 0.0.0.0
6056
6157* Extract patching functionality from Reflex.
cabal.haskell-cinew file+14
@@ -0,0 +1,14 @@
1+distribution: xenial
2+benchmarks: False
3+unconstrained: False
4+installed: -all
5+
6+-- https://github.com/haskell/cabal/issues/6106
7+install-dependencies: False
8+
9+constraint-set old-these
10+ ghc: <8.8
11+ constraints: these <1
12+
13+constraint-set old-witherable
14+ constraints: witherable <0.3.2
patch.cabal+7−20
@@ -1,5 +1,5 @@
11Name: patch
2−Version: 0.0.5.0
2+Version: 0.0.4.0
33Synopsis: Data structures for describing changes to other data structures.
44Description:
55 Data structures for describing changes to other data structures.
@@ -41,47 +41,34 @@ library
4141 , lens >= 4.7 && < 5
4242 , semigroupoids >= 4.0 && < 6
4343 , transformers >= 0.5.6.0 && < 0.6
44− , witherable >= 0.3 && < 0.5
44+ , witherable >= 0.3 && < 0.4
4545
46− if impl(ghc < 8.6) -- really, if base < 8.12
47− build-depends: base-orphans >= 0.8 && < 0.9
48−
49− exposed-modules: Data.Functor.Misc
46+ exposed-modules: Control.Category.DecidablyEmpty
47+ , Data.Functor.Misc
5048 , Data.Monoid.DecidablyEmpty
5149 , Data.Patch
5250 , Data.Patch.Class
5351 , Data.Patch.DMap
5452 , Data.Patch.DMapWithMove
53+ , Data.Patch.DMapWithPatchingMove
54+ , Data.Patch.DMapWithPatchingMove.By
5555 , Data.Patch.IntMap
5656 , Data.Patch.Map
5757 , Data.Patch.MapWithMove
5858 , Data.Patch.MapWithPatchingMove
59− , Data.Semigroup.Additive
6059
6160 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs
6261 default-extensions: PolyKinds
6362
6463 if flag(split-these)
6564 build-depends: these >= 1 && <1.2
65+ , these-lens >= 1 && <1.1
6666 , semialign >=1 && <1.2
6767 , monoidal-containers >= 0.6 && < 0.7
6868 else
6969 build-depends: these >= 0.4 && <0.9
7070 , monoidal-containers == 0.4.0.0
7171
72−test-suite tests
73− default-language: Haskell2010
74− type: exitcode-stdio-1.0
75− main-is: tests.hs
76− hs-source-dirs: test
77− build-depends: base
78− , patch
79− , containers
80− , hedgehog
81− , HUnit
82− if impl(ghcjs)
83− buildable: False
84−
8572test-suite hlint
8673 default-language: Haskell2010
8774 type: exitcode-stdio-1.0
src/Control/Category/DecidablyEmpty.hsnew file+9
@@ -0,0 +1,9 @@
1+{-# LANGUAGE TypeOperators #-}
2+-- TODO upstream somwhere else?
3+module Control.Category.DecidablyEmpty where
4+
5+import Control.Category
6+import Data.Type.Equality
7+
8+class Category c => DecidablyEmpty c where
9+ isId :: c a b -> Maybe (a :~: b)
src/Data/Functor/Misc.hs+28−5
@@ -1,6 +1,6 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE DeriveDataTypeable #-}
3−{-# LANGUAGE DeriveFunctor #-}
3+{-# LANGUAGE DeriveTraversable #-}
44{-# LANGUAGE FlexibleContexts #-}
55{-# LANGUAGE FlexibleInstances #-}
66{-# LANGUAGE GADTs #-}
@@ -16,6 +16,8 @@
1616module Data.Functor.Misc
1717 ( -- * Const2
1818 Const2 (..)
19+ , Proxy3 (..)
20+ , First2 (..)
1921 , unConst2
2022 , dmapToMap
2123 , dmapToIntMap
@@ -36,6 +38,7 @@ module Data.Functor.Misc
3638 , ComposeMaybe (..)
3739 ) where
3840
41+import qualified Control.Category as Cat
3942import Control.Applicative ((<$>))
4043import Data.Dependent.Map (DMap)
4144import qualified Data.Dependent.Map as DMap
@@ -47,6 +50,7 @@ import Data.IntMap (IntMap)
4750import qualified Data.IntMap as IntMap
4851import Data.Map (Map)
4952import qualified Data.Map as Map
53+import qualified Data.Semigroupoid as Cat
5054import Data.Some (Some, mkSome)
5155import Data.These
5256import Data.Type.Equality ((:~:)(Refl))
@@ -62,15 +66,15 @@ data Const2 :: * -> x -> x -> * where
6266 Const2 :: k -> Const2 k v v
6367 deriving (Typeable)
6468
65−-- | Extract the value from a Const2
66−unConst2 :: Const2 k v v' -> k
67−unConst2 (Const2 k) = k
68−
6969deriving instance Eq k => Eq (Const2 k v v')
7070deriving instance Ord k => Ord (Const2 k v v')
7171deriving instance Show k => Show (Const2 k v v')
7272deriving instance Read k => Read (Const2 k v v)
7373
74+-- | Extract the value from a Const2
75+unConst2 :: Const2 k v v' -> k
76+unConst2 (Const2 k) = k
77+
7478instance Show k => GShow (Const2 k v) where
7579 gshowsPrec n x@(Const2 _) = showsPrec n x
7680
@@ -86,6 +90,25 @@ instance Ord k => GCompare (Const2 k v) where
8690 EQ -> GEQ
8791 GT -> GGT
8892
93+data Proxy3 :: x -> y -> z -> * where
94+ Proxy3 :: Proxy3 vx vy vz
95+ deriving ( Show, Read, Eq, Ord
96+ , Functor, Foldable, Traversable
97+ , Typeable
98+ )
99+
100+instance Cat.Category (Proxy3 x) where
101+ id = Proxy3
102+ ~Proxy3 . ~Proxy3 = Proxy3
103+
104+newtype First2 (t :: k -> *) (a :: k) (b :: k) = First2 (t b)
105+ deriving ( Show, Read, Eq, Ord
106+ , Functor, Foldable, Traversable
107+ )
108+
109+instance Cat.Semigroupoid (First2 x) where
110+ First2 x `o` ~(First2 _) = First2 x
111+
89112-- | Convert a 'DMap' to a regular 'Map'
90113dmapToMap :: DMap (Const2 k v) Identity -> Map k v
91114dmapToMap = Map.fromDistinctAscList . map (\(Const2 k :=> Identity v) -> (k, v)) . DMap.toAscList
src/Data/Patch.hs+27−8
@@ -23,7 +23,6 @@ import Data.Semigroup (Semigroup (..))
2323#endif
2424import GHC.Generics
2525
26−import Data.Semigroup.Additive as X
2726import Data.Patch.Class as X
2827import Data.Patch.DMap as X hiding (getDeletions)
2928import Data.Patch.DMapWithMove as X
@@ -32,6 +31,12 @@ import Data.Patch.DMapWithMove as X
3231 , traversePatchDMapWithMoveWithKey, unPatchDMapWithMove
3332 , unsafePatchDMapWithMove, weakenPatchDMapWithMoveWith
3433 )
34+import Data.Patch.DMapWithPatchingMove as X
35+ ( PatchDMapWithPatchingMove, const2PatchDMapWithPatchingMoveWith, mapPatchDMapWithPatchingMove
36+ , patchDMapWithPatchingMoveToPatchMapWithPatchingMoveWith
37+ , traversePatchDMapWithPatchingMoveWithKey, unPatchDMapWithPatchingMove
38+ , unsafePatchDMapWithPatchingMove, weakenPatchDMapWithPatchingMoveWith
39+ )
3540import Data.Patch.IntMap as X hiding (getDeletions)
3641import Data.Patch.Map as X
3742import Data.Patch.MapWithMove as X
@@ -46,25 +51,34 @@ class (Semigroup q, Monoid q) => Group q where
4651 (~~) :: q -> q -> q
4752 r ~~ s = r <> negateG s
4853
54+-- | An 'Additive' 'Semigroup' is one where (<>) is commutative
55+class Semigroup q => Additive q where
56+
4957-- | The elements of an 'Additive' 'Semigroup' can be considered as patches of their own type.
5058newtype AdditivePatch p = AdditivePatch { unAdditivePatch :: p }
5159
52−instance Additive p => Patch (AdditivePatch p) where
60+instance Additive p => PatchHet (AdditivePatch p) where
61+ type PatchSource (AdditivePatch p) = p
5362 type PatchTarget (AdditivePatch p) = p
63+instance Additive p => Patch (AdditivePatch p) where
5464 apply (AdditivePatch p) q = Just $ p <> q
5565
5666instance (Ord k, Group q) => Group (MonoidalMap k q) where
5767 negateG = fmap negateG
5868
69+instance (Ord k, Additive q) => Additive (MonoidalMap k q)
70+
5971-- | Trivial group.
6072instance Group () where
61− negateG _ = ()
62− _ ~~ _ = ()
73+ negateG ~() = ()
74+ ~() ~~ ~() = ()
75+instance Additive ()
6376
6477-- | Product group. A Pair of groups gives rise to a group
6578instance (Group a, Group b) => Group (a, b) where
6679 negateG (a, b) = (negateG a, negateG b)
6780 (a, b) ~~ (c, d) = (a ~~ c, b ~~ d)
81+instance (Additive a, Additive b) => Additive (a, b)
6882
6983-- See https://gitlab.haskell.org/ghc/ghc/issues/11135#note_111802 for the reason Compose is not also provided.
7084-- Base does not define Monoid (Compose f g a) so this is the best we can
@@ -72,24 +86,29 @@ instance (Group a, Group b) => Group (a, b) where
7286instance Group (f (g a)) => Group ((f :.: g) a) where
7387 negateG (Comp1 xs) = Comp1 (negateG xs)
7488 Comp1 xs ~~ Comp1 ys = Comp1 (xs ~~ ys)
89+instance Additive (f (g a)) => Additive ((f :.: g) a)
7590
7691-- | Product of groups, Functor style.
7792instance (Group (f a), Group (g a)) => Group ((f :*: g) a) where
7893 negateG (a :*: b) = negateG a :*: negateG b
7994 (a :*: b) ~~ (c :*: d) = (a ~~ c) :*: (b ~~ d)
95+instance (Additive (f a), Additive (g a)) => Additive ((f :*: g) a)
8096
8197-- | Trivial group, Functor style
8298instance Group (Proxy x) where
83− negateG _ = Proxy
84− _ ~~ _ = Proxy
99+ negateG ~Proxy = Proxy
100+ ~Proxy ~~ ~Proxy = Proxy
101+instance Additive (Proxy x)
85102
86103-- | Const lifts groups into a functor.
87104deriving instance Group a => Group (Const a x)
88−
89−-- | Identity lifts groups pointwise (at only one point)
105+instance Additive a => Additive (Const a x)
106+-- | Ideitnty lifts groups pointwise (at only one point)
90107deriving instance Group a => Group (Identity a)
108+instance Additive a => Additive (Identity a)
91109
92110-- | Functions lift groups pointwise.
93111instance Group b => Group (a -> b) where
94112 negateG f = negateG . f
95113 (~~) = liftA2 (~~)
114+instance Additive b => Additive (a -> b)
src/Data/Patch/Class.hs+131−5
@@ -1,23 +1,58 @@
11{-# LANGUAGE CPP #-}
2+{-# LANGUAGE DefaultSignatures #-}
3+{-# LANGUAGE DerivingStrategies #-}
4+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE MultiParamTypeClasses #-}
7+{-# LANGUAGE PolyKinds #-}
28{-# LANGUAGE ScopedTypeVariables #-}
39{-# LANGUAGE TypeFamilies #-}
10+{-# LANGUAGE TypeOperators #-}
411-- | The interface for types which represent changes made to other types
512module Data.Patch.Class where
613
14+import qualified Data.Semigroupoid as Cat
715import Data.Functor.Identity
16+import Data.Functor.Misc
817import Data.Kind (Type)
918import Data.Maybe
1019#if !MIN_VERSION_base(4,11,0)
1120import Data.Semigroup (Semigroup(..))
1221#endif
1322import Data.Proxy
23+import Data.Type.Equality ((:~:) (..))
24+
25+class PatchHet p where
26+ type PatchSource p :: Type
27+ type PatchTarget p :: Type
28+ -- | Apply the patch @p a@ to the value @a@. If no change is needed, return
29+ -- 'Nothing'.
30+ applyHet
31+ :: p
32+ -> PatchSource p
33+ -> Either (PatchSource p :~: PatchTarget p) (PatchTarget p)
34+ default applyHet
35+ :: Patch p
36+ => p
37+ -> PatchSource p
38+ -> Either (PatchSource p :~: PatchTarget p) (PatchTarget p)
39+ applyHet p a = case apply p a of
40+ Nothing -> Left Refl
41+ Just a' -> Right a'
42+
43+-- | Apply a 'PatchHet'; if it does nothing, return the original value
44+applyAlwaysHet :: PatchHet p => p -> PatchSource p -> PatchTarget p
45+applyAlwaysHet p t = case applyHet p t of
46+ Left Refl -> t
47+ Right t' -> t'
1448
1549-- | A 'Patch' type represents a kind of change made to a datastructure.
1650--
1751-- If an instance of 'Patch' is also an instance of 'Semigroup', it should obey
1852-- the law that @applyAlways (f <> g) == applyAlways f . applyAlways g@.
19−class Patch p where
20− type PatchTarget p :: Type
53+class ( PatchHet p
54+ , PatchSource p ~ PatchTarget p
55+ ) => Patch p where
2156 -- | Apply the patch @p a@ to the value @a@. If no change is needed, return
2257 -- 'Nothing'.
2358 apply :: p -> PatchTarget p -> Maybe (PatchTarget p)
@@ -27,19 +62,110 @@ applyAlways :: Patch p => p -> PatchTarget p -> PatchTarget p
2762applyAlways p t = fromMaybe t $ apply p t
2863
2964-- | 'Identity' can be used as a 'Patch' that always fully replaces the value
30−instance Patch (Identity a) where
65+instance PatchHet (Identity a) where
66+ type PatchSource (Identity a) = a
3167 type PatchTarget (Identity a) = a
68+instance Patch (Identity a) where
3269 apply (Identity a) _ = Just a
3370
3471-- | 'Proxy' can be used as a 'Patch' that does nothing.
35−instance forall (a :: Type). Patch (Proxy a) where
72+instance forall (a :: Type). PatchHet (Proxy a) where
73+ type PatchSource (Proxy a) = a
3674 type PatchTarget (Proxy a) = a
75+instance forall (a :: Type). Patch (Proxy a) where
3776 apply ~Proxy _ = Nothing
3877
3978-- | Like '(.)', but composes functions that return patches rather than
4079-- functions that return new values. The Semigroup instance for patches must
4180-- apply patches right-to-left, like '(.)'.
42−composePatchFunctions :: (Patch p, Semigroup p) => (PatchTarget p -> p) -> (PatchTarget p -> p) -> PatchTarget p -> p
81+composePatchFunctions
82+ :: (Patch p, Semigroup p)
83+ => (PatchTarget p -> p)
84+ -> (PatchTarget p -> p)
85+ -> PatchTarget p -> p
4386composePatchFunctions g f a =
4487 let fp = f a
4588 in g (applyAlways fp a) <> fp
89+
90+
91+class PatchHet2Base (p :: k -> k -> *) where
92+ type PatchSource1 p :: k -> *
93+ type PatchTarget1 p :: k -> *
94+
95+class ( PatchHet2Base p
96+ , PatchHet (p from to)
97+ , PatchSource1 p from ~ PatchSource (p from to)
98+ , PatchTarget1 p to ~ PatchTarget (p from to)
99+ ) => PatchHet2Locally (p :: k -> k -> *) from to where
100+instance ( PatchHet2Base p
101+ , PatchHet (p from to)
102+ , PatchSource1 p from ~ PatchSource (p from to)
103+ , PatchTarget1 p to ~ PatchTarget (p from to)
104+ ) => PatchHet2Locally (p :: k -> k -> *) from to where
105+
106+applyHet2Locally
107+ :: PatchHet2Locally p from to
108+ => p from to
109+ -> PatchSource1 p from
110+ -> Either (PatchSource1 p from :~: PatchTarget1 p to) (PatchTarget1 p to)
111+applyHet2Locally = applyHet
112+
113+applyAlwaysHet2Locally
114+ :: PatchHet2Locally p from to
115+ => p from to
116+ -> PatchSource1 p from
117+ -> PatchTarget1 p to
118+applyAlwaysHet2Locally = applyAlwaysHet
119+
120+-- TODO once we can use quantified constraints, perhaps combine PatchHet2Base and
121+-- PatchHet2Locally, or at least get rid of this.
122+class PatchHet2Base p => PatchHet2 (p :: k -> k -> *) where
123+ applyHet2
124+ :: p from to
125+ -> PatchSource1 p from
126+ -> Either (PatchSource1 p from :~: PatchTarget1 p to) (PatchTarget1 p to)
127+
128+applyAlwaysHet2
129+ :: PatchHet2 p
130+ => p from to
131+ -> PatchSource1 p from
132+ -> PatchTarget1 p to
133+applyAlwaysHet2 p t = case applyHet2 p t of
134+ Left Refl -> t
135+ Right t' -> t'
136+
137+-- | Connect the classes without quanitified constraints
138+newtype ProjectLocal p from to = ProjectLocal { unProjectLocal :: p from to }
139+ deriving newtype Cat.Semigroupoid
140+
141+instance PatchHet2 p => PatchHet (ProjectLocal p from to) where
142+ type PatchSource (ProjectLocal p from to) = PatchSource1 p from
143+ type PatchTarget (ProjectLocal p from to) = PatchTarget1 p to
144+ applyHet (ProjectLocal p) = applyHet2 p
145+
146+instance PatchHet2 p => PatchHet2Base (ProjectLocal p) where
147+ type PatchSource1 (ProjectLocal p) = PatchSource1 p
148+ type PatchTarget1 (ProjectLocal p) = PatchTarget1 p
149+
150+class ( PatchHet2Base p
151+ , PatchSource1 p ~ PatchTarget1 p
152+ ) => Patch2 p
153+instance ( PatchHet2Base p
154+ , PatchSource1 p ~ PatchTarget1 p
155+ ) => Patch2 p
156+
157+-- | 'First2' can be used as a 'Patch' that always fully replaces the value
158+instance PatchHet (First2 (t :: k -> *) (from :: k) (to :: k)) where
159+ type PatchSource (First2 t from to) = t from
160+ type PatchTarget (First2 t from to) = t to
161+ applyHet (First2 val) _ = Right val
162+
163+-- | 'Proxy3' can be used as a 'Patch' that always does nothing
164+instance PatchHet (Proxy3 (t :: k -> *) (a :: k) (a :: k)) where
165+ type PatchSource (Proxy3 t a a) = t a
166+ type PatchTarget (Proxy3 t a a) = t a
167+ applyHet ~Proxy3 _ = Left Refl
168+
169+instance PatchHet2Base (Proxy3 (t :: k -> *) :: k -> k -> *) where
170+ type PatchSource1 (Proxy3 t) = t
171+ type PatchTarget1 (Proxy3 t) = t
src/Data/Patch/DMap.hs+3−1
@@ -42,8 +42,10 @@ instance GCompare k => DecidablyEmpty (PatchDMap k v) where
4242 isEmpty (PatchDMap m) = DMap.null m
4343
4444-- | Apply the insertions or deletions to a given 'DMap'.
45−instance GCompare k => Patch (PatchDMap k v) where
45+instance GCompare k => PatchHet (PatchDMap k v) where
46+ type PatchSource (PatchDMap k v) = DMap k v
4647 type PatchTarget (PatchDMap k v) = DMap k v
48+instance GCompare k => Patch (PatchDMap k v) where
4749 apply (PatchDMap diff) old = Just $! insertions `DMap.union` (old `DMap.difference` deletions) --TODO: return Nothing sometimes --Note: the strict application here is critical to ensuring that incremental merges don't hold onto all their prerequisite events forever; can we make this more robust?
4850 where insertions = DMap.mapMaybeWithKey (const $ getComposeMaybe) diff
4951 deletions = DMap.mapMaybeWithKey (const $ nothingToJust . getComposeMaybe) diff
src/Data/Patch/DMapWithMove.hs+4−1
@@ -350,8 +350,11 @@ const2PatchDMapWithMoveWith f (PatchMapWithMove p) = PatchDMapWithMove $ DMap.fr
350350 }
351351
352352-- | Apply the insertions, deletions, and moves to a given 'DMap'.
353−instance GCompare k => Patch (PatchDMapWithMove k v) where
353+instance GCompare k => PatchHet (PatchDMapWithMove k v) where
354+ type PatchSource (PatchDMapWithMove k v) = DMap k v
354355 type PatchTarget (PatchDMapWithMove k v) = DMap k v
356+
357+instance GCompare k => Patch (PatchDMapWithMove k v) where
355358 apply (PatchDMapWithMove p) old = Just $! insertions `DMap.union` (old `DMap.difference` deletions) --TODO: return Nothing sometimes --Note: the strict application here is critical to ensuring that incremental merges don't hold onto all their prerequisite events forever; can we make this more robust?
356359 where insertions = DMap.mapMaybeWithKey insertFunc p
357360 insertFunc :: forall a. k a -> NodeInfo k v a -> Maybe (v a)
src/Data/Patch/DMapWithPatchingMove.hsnew file+624
@@ -0,0 +1,624 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE FlexibleInstances #-}
5+{-# LANGUAGE GADTs #-}
6+{-# LANGUAGE InstanceSigs #-}
7+{-# LANGUAGE LambdaCase #-}
8+{-# LANGUAGE MultiParamTypeClasses #-}
9+{-# LANGUAGE PatternGuards #-}
10+{-# LANGUAGE PolyKinds #-}
11+{-# LANGUAGE Rank2Types #-}
12+{-# LANGUAGE ScopedTypeVariables #-}
13+{-# LANGUAGE StandaloneDeriving #-}
14+{-# LANGUAGE TypeFamilies #-}
15+{-# LANGUAGE UndecidableInstances #-}
16+{-# LANGUAGE UndecidableSuperClasses #-}
17+
18+-- |Module containing @'PatchDMapWithPatchingMove' k v@ and associated functions, which represents a 'Patch' to a @'DMap' k v@ which can insert, update, delete, and
19+-- move values between keys.
20+module Data.Patch.DMapWithPatchingMove where
21+
22+import qualified Control.Category as Cat
23+--import qualified Control.Category.DecidablyEmpty as Cat
24+
25+import Data.Constraint.Extras (Has')
26+import Data.Dependent.Map (DMap)
27+import Data.Dependent.Sum (DSum (..))
28+import qualified Data.Dependent.Map as DMap
29+import Data.Functor.Constant (Constant (..))
30+import Data.Functor.Misc
31+ ( Const2 (..), Proxy3 (..)
32+ , weakenDMapWith
33+ , dmapToMapWith
34+ )
35+import Data.Functor.Const (Const (..))
36+import Data.Functor.Product (Product (..))
37+import Data.GADT.Compare (GEq (..), GCompare (..))
38+import Data.GADT.Show (GRead, GShow, gshow)
39+import qualified Data.Map as Map
40+import Data.Maybe
41+import Data.Monoid.DecidablyEmpty
42+import Data.Semigroupoid as Cat
43+#if !MIN_VERSION_base(4,11,0)
44+import Data.Semigroup (Semigroup (..), (<>))
45+#endif
46+import Data.Some (Some (Some), mkSome)
47+import Data.Proxy (Proxy (..))
48+import Data.These (These (..))
49+import Data.Type.Equality ((:~:)(..))
50+
51+import Data.Patch.Class
52+ ( Patch (..), PatchHet (..)
53+ , PatchHet2 (..), PatchSource1, PatchTarget1
54+ , applyAlwaysHet2
55+ )
56+import Data.Patch.MapWithPatchingMove (PatchMapWithPatchingMove (..))
57+import qualified Data.Patch.MapWithPatchingMove as MapWithPatchingMove
58+
59+-- | Like 'PatchMapWithPatchingMove', but for 'DMap'. Each key carries a 'NodeInfo'
60+-- which describes how it will be changed by the patch and connects move sources
61+-- and destinations.
62+--
63+-- Invariants:
64+--
65+-- * A key should not move to itself.
66+--
67+-- * A move should always be represented with both the destination key (as a
68+-- 'From_Move') and the source key (as a @'ComposeMaybe' ('Just'
69+-- destination)@)
70+newtype PatchDMapWithPatchingMove k v = PatchDMapWithPatchingMove (DMap k (NodeInfo k v))
71+
72+--deriving instance ( GShow k
73+-- , HasZip Show k p
74+-- , Has' Show k (PatchTarget1 p)
75+-- ) => Show (PatchDMapWithPatchingMove k p)
76+--deriving instance ( GRead k
77+-- , HasZip Read k p
78+-- , Has' Read k (PatchTarget1 p)
79+-- ) => Read (PatchDMapWithPatchingMove k p)
80+--deriving instance ( GEq k
81+-- , HasZip Eq k p
82+-- , Has' Eq k (PatchTarget1 p)
83+-- ) => Eq (PatchDMapWithPatchingMove k p)
84+--deriving instance ( GCompare k
85+-- , HasZip Ord k p
86+-- , Has' Ord k (PatchTarget1 p)
87+-- ) => Ord (PatchDMapWithPatchingMove k p)
88+
89+-- It won't let me derive for some reason
90+instance ( GCompare k
91+ , Cat.Semigroupoid v
92+ , PatchHet2 v
93+ , PatchSource1 v ~ PatchTarget1 v
94+ ) => DecidablyEmpty (PatchDMapWithPatchingMove k v) where
95+ isEmpty (PatchDMapWithPatchingMove m) = DMap.null m
96+
97+-- | Structure which represents what changes apply to a particular key.
98+-- @_nodeInfo_from@ specifies what happens to this key, and in particular what
99+-- other key the current key is moving from, while @_nodeInfo_to@ specifies what
100+-- key the current key is moving to if involved in a move.
101+data NodeInfo k p a = NodeInfo
102+ { _nodeInfo_from :: !(From k p a)
103+ -- ^ Change applying to the current key, be it an insert, move, or delete.
104+ , _nodeInfo_to :: !(To k)
105+ -- ^ Where this key is moving to, if involved in a move. Should only be
106+ -- @ComposeMaybe (Just k)@ when there is a corresponding 'From_Move'.
107+ }
108+
109+--deriving instance ( Show (k a)
110+-- , Show (p a a)
111+-- , Show (PatchTarget1 p a)
112+-- ) => Show (NodeInfo k p a)
113+--deriving instance ( Read (k a)
114+-- , Read (p a a)
115+-- , Read (PatchTarget1 p a)
116+-- ) => Read (NodeInfo k p a)
117+--deriving instance ( Eq (k a)
118+-- , Eq (p a a)
119+-- , Eq (PatchTarget1 p a)
120+-- ) => Eq (NodeInfo k p a)
121+--deriving instance ( Ord (k a)
122+-- , Ord (p a a)
123+-- , Ord (PatchTarget1 p a)
124+-- ) => Ord (NodeInfo k p a)
125+
126+-- | Structure describing a particular change to a key, be it inserting a new
127+-- key (@From_Insert@), updating an existing key (@From_Insert@ again), deleting
128+-- a key (@From_Delete@), or moving a key (@From_Move@).
129+--
130+-- This type isn't used directly as the from field patch, but is instead wrapped
131+-- in an existential. However, it is nice to be able to reason about this in
132+-- isolation as it is itself a @Semigroupoid@ when the underlying patch is.
133+data From (k :: a -> *) (p :: a -> a -> *) :: a -> * where
134+ -- | Insert a new or update an existing key with the given value @PatchTarget1
135+ -- p a@
136+ From_Insert :: PatchTarget1 p to -> From k p to
137+ -- | Delete the existing key
138+ From_Delete :: From k p to
139+ -- | Move the value from the given key @k a@ to this key. The source key
140+ -- should also have an entry in the patch giving the current key as
141+ -- @_nodeInfo_to@, usually but not necessarily with @From_Delete@.
142+ From_Move :: !(DSum k (Flip p to)) -> From k p to
143+
144+deriving instance ( Show (k a), GShow k
145+ , Has' Show k (Flip p a)
146+ , Show (PatchTarget1 p a)
147+ ) => Show (From k p a)
148+deriving instance ( Read (k a), GRead k
149+ , Has' Read k (Flip p a)
150+ , Read (PatchTarget1 p a)
151+ ) => Read (From k p a)
152+deriving instance ( GEq k
153+ , Has' Eq k (Flip p a)
154+ , Eq (PatchTarget1 p a)
155+ ) => Eq (From k p a)
156+deriving instance ( GCompare k
157+ , Has' Eq k (Flip p a) -- superclass bug
158+ , Has' Ord k (Flip p a)
159+ , Ord (PatchTarget1 p a)
160+ ) => Ord (From k p a)
161+
162+newtype Flip p to from = Flip (p from to)
163+
164+instance Cat.Category p => Cat.Category (Flip (p :: k -> k -> *)) where
165+ id = Flip Cat.id
166+ Flip y . Flip x = Flip $ x Cat.. y
167+
168+-- | The "to" part of a 'NodeInfo'. Rather than be built out of @From@ like @From@
169+-- is, we store just the information necessary to compose a @To@ and @From@ like
170+-- @oLocal@ composes two @From@s.
171+data To (k :: a -> *) where
172+ -- | Delete or leave in place
173+ To_NonMove :: To k
174+ -- | Move the value from the given key @k a@ to this key. The target key
175+ -- should also have an entry in the patch giving the current key in
176+ -- @_nodeInfo_from@, usually but not necessarily with @To_Delete@.
177+ To_Move :: !(Some k) -> To k
178+
179+deriving instance GShow k => Show (To k)
180+deriving instance GRead k => Read (To k)
181+deriving instance GEq k => Eq (To k)
182+deriving instance GCompare k => Ord (To k)
183+
184+-- |Test whether a 'PatchDMapWithPatchingMove' satisfies its invariants.
185+validPatchDMapWithPatchingMove
186+ :: forall k v
187+ . (GCompare k, GShow k)
188+ => DMap k (NodeInfo k v)
189+ -> Bool
190+validPatchDMapWithPatchingMove = not . null . validationErrorsForPatchDMapWithPatchingMove
191+
192+-- |Enumerate what reasons a 'PatchDMapWithPatchingMove' doesn't satisfy its invariants, returning @[]@ if it's valid.
193+validationErrorsForPatchDMapWithPatchingMove
194+ :: forall k v
195+ . (GCompare k, GShow k)
196+ => DMap k (NodeInfo k v)
197+ -> [String]
198+validationErrorsForPatchDMapWithPatchingMove m =
199+ noSelfMoves <> movesBalanced
200+ where
201+ noSelfMoves = mapMaybe selfMove . DMap.toAscList $ m
202+ selfMove (dst :=> NodeInfo (From_Move (src :=> _)) _)
203+ | Just _ <- dst `geq` src = Just $ "self move of key " <> gshow src <> " at destination side"
204+ selfMove (src :=> NodeInfo _ (To_Move (Some dst)))
205+ | Just _ <- src `geq` dst = Just $ "self move of key " <> gshow dst <> " at source side"
206+ selfMove _ = Nothing
207+ movesBalanced = mapMaybe unbalancedMove . DMap.toAscList $ m
208+ unbalancedMove (dst :=> NodeInfo (From_Move (src :=> _)) _) =
209+ case DMap.lookup src m of
210+ Nothing -> Just $ "unbalanced move at destination key " <> gshow dst <> " supposedly from " <> gshow src <> " but source key is not in the patch"
211+ Just (NodeInfo _ (To_Move (Some dst'))) ->
212+ if isNothing (dst' `geq` dst)
213+ then Just $ "unbalanced move at destination key " <> gshow dst <> " from " <> gshow src <> " is going to " <> gshow dst' <> " instead"
214+ else Nothing
215+ _ ->
216+ Just $ "unbalanced move at destination key " <> gshow dst <> " supposedly from " <> gshow src <> " but source key has no move to key"
217+ unbalancedMove (src :=> NodeInfo _ (To_Move (Some dst))) =
218+ case DMap.lookup dst m of
219+ Nothing -> Just $ " unbalanced move at source key " <> gshow src <> " supposedly going to " <> gshow dst <> " but destination key is not in the patch"
220+ Just (NodeInfo (From_Move (src' :=> _)) _) ->
221+ if isNothing (src' `geq` src)
222+ then Just $ "unbalanced move at source key " <> gshow src <> " to " <> gshow dst <> " is coming from " <> gshow src' <> " instead"
223+ else Nothing
224+
225+ _ ->
226+ Just $ "unbalanced move at source key " <> gshow src <> " supposedly going to " <> gshow dst <> " but destination key is not moving"
227+ unbalancedMove _ = Nothing
228+
229+
230+data ToFrom k p a = ToFrom (To k) (From k p a)
231+
232+-- | Helper data structure used for composing patches using the monoid instance.
233+data Fixup k p
234+ = Fixup_Delete
235+ | Fixup_Update (These (DSum k (From k p)) (To k))
236+
237+-- | Compose patches having the same effect as applying the patches in turn:
238+-- @'applyAlways' (p <> q) == 'applyAlways' p . 'applyAlways' q@
239+instance forall k p
240+ . ( GCompare k
241+ , Cat.Semigroupoid p
242+ -- , Cat.DecidablyEmpty p
243+ , PatchHet2 p
244+ , PatchSource1 p ~ PatchTarget1 p
245+ )
246+ => Semigroup (PatchDMapWithPatchingMove k p) where
247+ PatchDMapWithPatchingMove ma <> PatchDMapWithPatchingMove mb = PatchDMapWithPatchingMove m
248+ where
249+ connections :: [DSum k (ToFrom k p)]
250+ connections = DMap.toList $ DMap.intersectionWithKey
251+ (\_ a b -> ToFrom (_nodeInfo_to a) (_nodeInfo_from b))
252+ ma
253+ mb
254+ h :: DSum k (ToFrom k p) -> [DSum k (Const (Fixup k p))]
255+ h ((between :: k between) :=> ToFrom editAfter editBefore) = case (editAfter, editBefore) of
256+ (To_Move (Some (toAfter :: k after)), From_Move ((fromBefore :: k before) :=> Flip p) :: From k p between) ->
257+ --case toAfter `geq` fromBefore of
258+ -- Just Refl | Just Refl <- Cat.isId p0 ->
259+ -- [ toAfter :=> Fixup_Delete ]
260+ -- _ ->
261+ [ toAfter :=> Const (Fixup_Update $ This $ between :=> From_Move (fromBefore :=> Flip p))
262+ , fromBefore :=> Const (Fixup_Update $ That $ To_Move $ Some toAfter)
263+ ]
264+ (To_NonMove, From_Move (fromBefore :=> _)) ->
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), _) ->
273+ [toAfter :=> Const (Fixup_Update $ This $ between :=> editBefore)]
274+ (To_NonMove, _) ->
275+ []
276+ mergeFixups _ (Const Fixup_Delete) (Const Fixup_Delete) = Const $ Fixup_Delete
277+ mergeFixups _ (Const (Fixup_Update a)) (Const (Fixup_Update b))
278+ | This x <- a, That y <- b
279+ = Const $ Fixup_Update $ These x y
280+ | That y <- a, This x <- b
281+ = Const $ Fixup_Update $ These x y
282+ mergeFixups _ _ _ = error "PatchDMapWithPatchingMove: incompatible fixups"
283+ fixups = DMap.fromListWithKey mergeFixups $ concatMap h connections
284+ combineNodeInfos _ nia nib = NodeInfo
285+ { _nodeInfo_from = _nodeInfo_from nia
286+ , _nodeInfo_to = _nodeInfo_to nib
287+ }
288+ applyFixup :: k a -> NodeInfo k p a -> Const (Fixup k p) a -> Maybe (NodeInfo k p a)
289+ applyFixup _ ni (Const fixup) = case fixup of
290+ Fixup_Delete -> Nothing
291+ Fixup_Update u -> Just $ NodeInfo
292+ { _nodeInfo_from = case _nodeInfo_from ni of
293+ f@(From_Move ((between0 :: k between0) :=> Flip (p' :: p between0 a))) -> case getHere u of -- The `from` fixup comes from the "old" patch
294+ Nothing -> f -- If there's no `from` fixup, just use the "new" `from`
295+ Just ((between1 :: k between1) :=> frm) -> case geq between0 between1 of
296+ Nothing -> error "fixup joined-on key did not match"
297+ Just Refl -> case frm of
298+ From_Insert v -> From_Insert $ applyAlwaysHet2 p' v
299+ From_Delete -> From_Delete
300+ From_Move (oldKey :=> Flip (p :: p oldKey between1)) -> From_Move $ oldKey :=> Flip (p' `o` p :: p oldKey a)
301+ _ -> error "PatchMapWithPatchingMove: fixup for non-move From"
302+ , _nodeInfo_to = fromMaybe (_nodeInfo_to ni) $ getThere u
303+ }
304+ m = DMap.differenceWithKey applyFixup (DMap.unionWithKey combineNodeInfos ma mb) fixups
305+ getHere :: These a b -> Maybe a
306+ getHere = \case
307+ This a -> Just a
308+ These a _ -> Just a
309+ That _ -> Nothing
310+ getThere :: These a b -> Maybe b
311+ getThere = \case
312+ This _ -> Nothing
313+ These _ b -> Just b
314+ That b -> Just b
315+
316+-- | Compose patches having the same effect as applying the patches in turn:
317+-- @'applyAlways' (p <> q) == 'applyAlways' p . 'applyAlways' q@
318+instance ( GCompare k
319+ , Cat.Semigroupoid p
320+ -- , DecidablyEmpty p
321+ , PatchHet2 p
322+ , PatchSource1 p ~ PatchTarget1 p
323+ ) => Monoid (PatchDMapWithPatchingMove k p) where
324+ mempty = PatchDMapWithPatchingMove mempty
325+ mappend = (<>)
326+
327+{-
328+mappendPatchDMapWithPatchingMoveSlow :: forall k v. (ShowTag k v, GCompare k) => PatchDMapWithPatchingMove k v -> PatchDMapWithPatchingMove k v -> PatchDMapWithPatchingMove k v
329+PatchDMapWithPatchingMove dstAfter srcAfter `mappendPatchDMapWithPatchingMoveSlow` PatchDMapWithPatchingMove dstBefore srcBefore = PatchDMapWithPatchingMove dst src
330+ where
331+ getDstAction k m = fromMaybe (From_Move k) $ DMap.lookup k m -- Any key that isn't present is treated as that key moving to itself
332+ removeRedundantDst toKey (From_Move fromKey) | isJust (toKey `geq` fromKey) = Nothing
333+ removeRedundantDst _ a = Just a
334+ f :: forall a. k a -> From k v a -> Maybe (From k v a)
335+ f toKey _ = removeRedundantDst toKey $ case getDstAction toKey dstAfter of
336+ From_Move fromKey -> getDstAction fromKey dstBefore
337+ nonMove -> nonMove
338+ dst = DMap.mapMaybeWithKey f $ DMap.union dstAfter dstBefore
339+ getSrcAction k m = fromMaybe (ComposeMaybe $ Just k) $ DMap.lookup k m
340+ removeRedundantSrc fromKey (ComposeMaybe (Just toKey)) | isJust (fromKey `geq` toKey) = Nothing
341+ removeRedundantSrc _ a = Just a
342+ g :: forall a. k a -> ComposeMaybe k a -> Maybe (ComposeMaybe k a)
343+ g fromKey _ = removeRedundantSrc fromKey $ case getSrcAction fromKey srcBefore of
344+ ComposeMaybe Nothing -> ComposeMaybe Nothing
345+ ComposeMaybe (Just toKeyBefore) -> getSrcAction toKeyBefore srcAfter
346+ src = DMap.mapMaybeWithKey g $ DMap.union srcAfter srcBefore
347+-}
348+
349+-- | Make a @'PatchDMapWithPatchingMove' k v@ which has the effect of inserting or
350+-- updating a value @PatchTarget1 p a@ to the given key @k a@, like
351+-- 'DMap.insert'.
352+insertDMapKey :: k a -> PatchTarget1 p a -> PatchDMapWithPatchingMove k p
353+insertDMapKey k v =
354+ PatchDMapWithPatchingMove . DMap.singleton k $ NodeInfo (From_Insert v) To_NonMove
355+
356+-- | Make a @'PatchDMapWithPatchingMove' k v@ which has the effect of moving the value
357+-- from the first key @k a@ to the second key @k a@, equivalent to:
358+--
359+-- @
360+-- 'DMap.delete' src (maybe dmap ('DMap.insert' dst) (DMap.lookup src dmap))
361+-- @
362+moveDMapKey
363+ :: GCompare k
364+ => k a -> k a -> PatchDMapWithPatchingMove k (Proxy3 v)
365+moveDMapKey src dst = case src `geq` dst of
366+ Nothing -> PatchDMapWithPatchingMove $ DMap.fromList
367+ [ dst :=> NodeInfo (From_Move (src :=> Flip Proxy3)) To_NonMove
368+ , src :=> NodeInfo From_Delete (To_Move $ Some dst)
369+ ]
370+ Just _ -> PatchDMapWithPatchingMove DMap.empty
371+
372+-- | Make a @'PatchDMapWithPatchingMove' k v@ which has the effect of swapping two keys
373+-- in the mapping, equivalent to:
374+--
375+-- @
376+-- let aMay = DMap.lookup a dmap
377+-- bMay = DMap.lookup b dmap
378+-- in maybe id (DMap.insert a) (bMay <> aMay)
379+-- . maybe id (DMap.insert b) (aMay <> bMay)
380+-- . DMap.delete a . DMap.delete b $ dmap
381+-- @
382+swapDMapKey :: GCompare k => k a -> k a -> PatchDMapWithPatchingMove k (Proxy3 v)
383+swapDMapKey src dst = case src `geq` dst of
384+ Nothing -> PatchDMapWithPatchingMove $ DMap.fromList
385+ [ dst :=> NodeInfo (From_Move (src :=> Flip Proxy3)) (To_Move $ Some src)
386+ , src :=> NodeInfo (From_Move (dst :=> Flip Proxy3)) (To_Move $ Some dst)
387+ ]
388+ Just _ -> PatchDMapWithPatchingMove DMap.empty
389+
390+-- | Make a @'PatchDMapWithPatchingMove' k v@ which has the effect of deleting a key in
391+-- the mapping, equivalent to 'DMap.delete'.
392+deleteDMapKey :: k a -> PatchDMapWithPatchingMove k v
393+deleteDMapKey k = PatchDMapWithPatchingMove $ DMap.singleton k $ NodeInfo From_Delete To_NonMove
394+
395+{-
396+k1, k2 :: Const2 Int () ()
397+k1 = Const2 1
398+k2 = Const2 2
399+p1, p2 :: PatchDMapWithPatchingMove (Const2 Int ()) Identity
400+p1 = moveDMapKey k1 k2
401+p2 = moveDMapKey k2 k1
402+p12 = p1 <> p2
403+p21 = p2 <> p1
404+p12Slow = p1 `mappendPatchDMapWithPatchingMoveSlow` p2
405+p21Slow = p2 `mappendPatchDMapWithPatchingMoveSlow` p1
406+
407+testPatchDMapWithPatchingMove = do
408+ print p1
409+ print p2
410+ print $ p12 == deleteDMapKey k1
411+ print $ p21 == deleteDMapKey k2
412+ print $ p12Slow == deleteDMapKey k1
413+ print $ p21Slow == deleteDMapKey k2
414+
415+dst (PatchDMapWithPatchingMove x _) = x
416+src (PatchDMapWithPatchingMove _ x) = x
417+-}
418+
419+-- | Extract the 'DMap' representing the patch changes from the
420+-- 'PatchDMapWithPatchingMove'.
421+unPatchDMapWithPatchingMove :: PatchDMapWithPatchingMove k v -> DMap k (NodeInfo k v)
422+unPatchDMapWithPatchingMove (PatchDMapWithPatchingMove p) = p
423+
424+-- | Wrap a 'DMap' representing patch changes into a 'PatchDMapWithPatchingMove',
425+-- without checking any invariants.
426+--
427+-- __Warning:__ when using this function, you must ensure that the invariants of 'PatchDMapWithPatchingMove' are preserved; they will not be checked.
428+unsafePatchDMapWithPatchingMove :: DMap k (NodeInfo k v) -> PatchDMapWithPatchingMove k v
429+unsafePatchDMapWithPatchingMove = PatchDMapWithPatchingMove
430+
431+-- | Wrap a 'DMap' representing patch changes into a 'PatchDMapWithPatchingMove' while
432+-- checking invariants. If the invariants are satisfied, @Right p@ is returned
433+-- otherwise @Left errors@.
434+patchDMapWithPatchingMove :: (GCompare k, GShow k) => DMap k (NodeInfo k v) -> Either [String] (PatchDMapWithPatchingMove k v)
435+patchDMapWithPatchingMove dm =
436+ case validationErrorsForPatchDMapWithPatchingMove dm of
437+ [] -> Right $ unsafePatchDMapWithPatchingMove dm
438+ errs -> Left errs
439+
440+-- | Map a natural transform @v -> v'@ over the given patch, transforming
441+-- @'PatchDMapWithPatchingMove' k v@ into @'PatchDMapWithPatchingMove' k v'@.
442+mapPatchDMapWithPatchingMove
443+ :: forall k p p'
444+ . (forall a. PatchTarget1 p a -> PatchTarget1 p' a)
445+ -> (forall from to. p from to -> p' from to)
446+ -> PatchDMapWithPatchingMove k p
447+ -> PatchDMapWithPatchingMove k p'
448+mapPatchDMapWithPatchingMove f g (PatchDMapWithPatchingMove m) =
449+ PatchDMapWithPatchingMove $ DMap.map (\ni -> NodeInfo
450+ { _nodeInfo_from = h $ _nodeInfo_from ni
451+ , _nodeInfo_to = _nodeInfo_to ni
452+ }) m
453+ where h :: forall a. From k p a -> From k p' a
454+ h = \case
455+ From_Insert v -> From_Insert $ f v
456+ From_Delete -> From_Delete
457+ From_Move (k :=> Flip p) -> From_Move $ k :=> Flip (g p)
458+
459+-- | Traverse an effectful function @forall a. PatchTarget1 p a -> m (v ' a)@
460+-- over the given patch, transforming @'PatchDMapWithPatchingMove' k v@ into @m
461+-- ('PatchDMapWithPatchingMove' k v')@.
462+traversePatchDMapWithPatchingMove
463+ :: forall m k p p'
464+ . Applicative m
465+ => (forall a. PatchTarget1 p a -> m (PatchTarget1 p' a))
466+ -> (forall from to. p from to -> m (p' from to))
467+ -> PatchDMapWithPatchingMove k p
468+ -> m (PatchDMapWithPatchingMove k p')
469+traversePatchDMapWithPatchingMove f g = traversePatchDMapWithPatchingMoveWithKey
470+ (\_ -> f)
471+ (\_ _ -> g)
472+
473+-- | Map an effectful function @forall a. k a -> PatchTarget1 p a -> m (v ' a)@
474+-- over the given patch, transforming @'PatchDMapWithPatchingMove' k v@ into @m
475+-- ('PatchDMapWithPatchingMove' k v')@.
476+traversePatchDMapWithPatchingMoveWithKey
477+ :: forall m k p p'
478+ . Applicative m
479+ => (forall a. k a -> PatchTarget1 p a -> m (PatchTarget1 p' a))
480+ -> (forall from to. k from -> k to -> p from to -> m (p' from to))
481+ -> PatchDMapWithPatchingMove k p
482+ -> m (PatchDMapWithPatchingMove k p')
483+traversePatchDMapWithPatchingMoveWithKey f g (PatchDMapWithPatchingMove m) =
484+ PatchDMapWithPatchingMove <$> DMap.traverseWithKey (\k ni -> NodeInfo
485+ <$> h k (_nodeInfo_from ni)
486+ <*> pure (_nodeInfo_to ni)) m
487+ where h :: forall a. k a -> From k p a -> m (From k p' a)
488+ h k = \case
489+ From_Insert v -> From_Insert <$> f k v
490+ From_Delete -> pure From_Delete
491+ From_Move (fromKey :=> Flip p) -> From_Move . (fromKey :=>) . Flip <$> g fromKey k p
492+
493+-- | Map a function which transforms @'From k PatchTarget1 p a@ into a @'From k
494+-- PatchTarget1 p' a@ over a @'NodeInfo' k PatchTarget1 p a@.
495+nodeInfoMapFrom
496+ :: (From k p a -> From k p' a)
497+ -> (To k -> To k)
498+ -> NodeInfo k p a
499+ -> NodeInfo k p' a
500+nodeInfoMapFrom f g ni = NodeInfo
501+ { _nodeInfo_from = f $ _nodeInfo_from ni
502+ , _nodeInfo_to = g $ _nodeInfo_to ni
503+ }
504+
505+-- | Map an effectful function which transforms @'From k PatchTarget1 p a@ into
506+-- a @f ('From k PatchTarget1 p' a)@ over a @'NodeInfo' k PatchTarget1 p a@.
507+nodeInfoMapFromM
508+ :: Applicative f
509+ => (From k p a -> f (From k p' a))
510+ -> (To k -> f (To k))
511+ -> NodeInfo k p a
512+ -> f (NodeInfo k p' a)
513+nodeInfoMapFromM f g ni = NodeInfo
514+ <$> f (_nodeInfo_from ni)
515+ <*> g (_nodeInfo_to ni)
516+
517+-- | Weaken a 'PatchDMapWithPatchingMove' to a 'PatchMapWithPatchingMove' by weakening the keys
518+-- from @k a@ to @'Some' k@ and applying a given weakening function
519+-- @PatchTarget1 p a -> v'@ to values.
520+weakenPatchDMapWithPatchingMoveWith
521+ :: forall k p p'
522+ . (forall a. PatchTarget1 p a -> PatchTarget p')
523+ -> (forall from to. p from to -> p')
524+ -> PatchDMapWithPatchingMove k p
525+ -> PatchMapWithPatchingMove (Some k) p'
526+weakenPatchDMapWithPatchingMoveWith f g (PatchDMapWithPatchingMove m) =
527+ PatchMapWithPatchingMove $ weakenDMapWith h m
528+ where h :: forall a. NodeInfo k p a -> MapWithPatchingMove.NodeInfo (Some k) p'
529+ h ni = MapWithPatchingMove.NodeInfo
530+ { MapWithPatchingMove._nodeInfo_from = case _nodeInfo_from ni of
531+ From_Insert v -> MapWithPatchingMove.From_Insert $ f v
532+ From_Delete -> MapWithPatchingMove.From_Delete
533+ From_Move (k :=> Flip p) -> MapWithPatchingMove.From_Move (mkSome k) $ g p
534+ , MapWithPatchingMove._nodeInfo_to = case _nodeInfo_to ni of
535+ To_NonMove -> Nothing
536+ To_Move (Some k) -> Just (mkSome k)
537+ }
538+
539+-- | "Weaken" a @'PatchDMapWithPatchingMove' (Const2 k a) v@ to a @'PatchMapWithPatchingMove' k
540+-- v'@. Weaken is in scare quotes because the 'Const2' has already disabled any
541+-- dependency in the typing and all points are already @a@, hence the function
542+-- to map each value to @v'@ is not higher rank.
543+patchDMapWithPatchingMoveToPatchMapWithPatchingMoveWith
544+ :: forall k p p' a
545+ . (PatchTarget1 p a -> PatchTarget p')
546+ -> (p a a -> p')
547+ -> PatchDMapWithPatchingMove (Const2 k a) p
548+ -> PatchMapWithPatchingMove k p'
549+patchDMapWithPatchingMoveToPatchMapWithPatchingMoveWith f g (PatchDMapWithPatchingMove m) =
550+ PatchMapWithPatchingMove $ dmapToMapWith h m
551+ where h :: NodeInfo (Const2 k a) p a -> MapWithPatchingMove.NodeInfo k p'
552+ h ni = MapWithPatchingMove.NodeInfo
553+ { MapWithPatchingMove._nodeInfo_from = case _nodeInfo_from ni of
554+ From_Insert v -> MapWithPatchingMove.From_Insert $ f v
555+ From_Delete -> MapWithPatchingMove.From_Delete
556+ From_Move (Const2 k :=> Flip p) -> MapWithPatchingMove.From_Move k $ g p
557+ , MapWithPatchingMove._nodeInfo_to = case _nodeInfo_to ni of
558+ To_NonMove -> Nothing
559+ To_Move (Some (Const2 k)) -> Just k
560+ }
561+
562+-- | "Strengthen" a @'PatchMapWithPatchingMove' k v@ into a @'PatchDMapWithPatchingMove
563+-- ('Const2' k a)@; that is, turn a non-dependently-typed patch into a
564+-- dependently typed one but which always has a constant key type represented by
565+-- 'Const2'. Apply the given function to each @v@ to produce a @PatchTarget1 p'
566+-- a@. Completemented by 'patchDMapWithPatchingMoveToPatchMapWithPatchingMoveWith'
567+const2PatchDMapWithPatchingMoveWith
568+ :: forall k v v' a
569+ . (v -> v' a)
570+ -> PatchMapWithPatchingMove k (Proxy v)
571+ -> PatchDMapWithPatchingMove (Const2 k a) (Proxy3 v')
572+const2PatchDMapWithPatchingMoveWith f (PatchMapWithPatchingMove p) =
573+ PatchDMapWithPatchingMove $ DMap.fromDistinctAscList $ g <$> Map.toAscList p
574+ where g :: (k, MapWithPatchingMove.NodeInfo k (Proxy v))
575+ -> DSum (Const2 k a) (NodeInfo (Const2 k a) (Proxy3 v'))
576+ g (k, ni) = Const2 k :=> NodeInfo
577+ { _nodeInfo_from = case MapWithPatchingMove._nodeInfo_from ni of
578+ MapWithPatchingMove.From_Insert v -> From_Insert $ f v
579+ MapWithPatchingMove.From_Delete -> From_Delete
580+ MapWithPatchingMove.From_Move fromKey Proxy -> From_Move $ Const2 fromKey :=> Flip Proxy3
581+ , _nodeInfo_to = case MapWithPatchingMove._nodeInfo_to ni of
582+ Nothing -> To_NonMove
583+ Just toKey -> To_Move $ Some (Const2 toKey)
584+ }
585+
586+-- | Apply the insertions, deletions, and moves to a given 'DMap'.
587+instance ( GCompare k
588+ , PatchHet2 p
589+ , PatchSource1 p ~ PatchTarget1 p
590+ ) => PatchHet (PatchDMapWithPatchingMove k p) where
591+ type PatchSource (PatchDMapWithPatchingMove k p) = DMap k (PatchSource1 p)
592+ type PatchTarget (PatchDMapWithPatchingMove k p) = DMap k (PatchTarget1 p)
593+
594+instance ( GCompare k
595+ , PatchHet2 p
596+ , PatchSource1 p ~ PatchTarget1 p
597+ ) => Patch (PatchDMapWithPatchingMove k p) where
598+ apply (PatchDMapWithPatchingMove m) old = Just $! insertions `DMap.union` (old `DMap.difference` deletions)
599+ -- TODO: return Nothing sometimes --Note: the strict application here is
600+ -- critical to ensuring that incremental merges don't hold onto all their
601+ -- prerequisite events forever; can we make this more robust?
602+ where insertions = DMap.mapMaybeWithKey insertFunc m
603+ insertFunc :: forall a. k a -> NodeInfo k p a -> Maybe (PatchTarget1 p a)
604+ insertFunc _ ni = case _nodeInfo_from ni of
605+ From_Insert v -> Just v
606+ From_Move (k :=> Flip p) -> applyAlwaysHet2 p <$> DMap.lookup k old
607+ From_Delete -> Nothing
608+ deletions = DMap.mapMaybeWithKey deleteFunc m
609+ deleteFunc :: forall a. k a -> NodeInfo k p a -> Maybe (Constant () a)
610+ deleteFunc _ ni = case _nodeInfo_from ni of
611+ From_Delete -> Just $ Constant ()
612+ _ -> Nothing
613+
614+-- | Get the values that will be replaced, deleted, or moved if the given patch
615+-- is applied to the given 'DMap'.
616+getDeletionsAndMoves
617+ :: ( GCompare k
618+ , PatchSource1 p ~ PatchTarget1 p
619+ )
620+ => PatchDMapWithPatchingMove k p
621+ -> DMap k (PatchSource1 p)
622+ -> DMap k (Product (PatchTarget1 p) (Const (To k)))
623+getDeletionsAndMoves (PatchDMapWithPatchingMove p) m = DMap.intersectionWithKey f m p
624+ where f _ v ni = Pair v $ Const $ _nodeInfo_to ni
src/Data/Patch/DMapWithPatchingMove/By.hsnew file+89
@@ -0,0 +1,89 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE FlexibleInstances #-}
5+{-# LANGUAGE GADTs #-}
6+{-# LANGUAGE InstanceSigs #-}
7+{-# LANGUAGE LambdaCase #-}
8+{-# LANGUAGE MultiParamTypeClasses #-}
9+{-# LANGUAGE PolyKinds #-}
10+{-# LANGUAGE Rank2Types #-}
11+{-# LANGUAGE ScopedTypeVariables #-}
12+{-# LANGUAGE StandaloneDeriving #-}
13+{-# LANGUAGE TypeFamilies #-}
14+{-# LANGUAGE UndecidableInstances #-}
15+{-# LANGUAGE UndecidableSuperClasses #-}
16+
17+module Data.Patch.DMapWithPatchingMove.By where
18+
19+import Data.Semigroupoid as Cat
20+
21+import Data.Patch.Class
22+
23+-- | Structure describing a particular change to a key, be it inserting a new
24+-- key (@By_Insert@), updating an existing key (@By_Insert@ again), deleting
25+-- a key (@By_Delete@), or moving a key (@By_Move@).
26+--
27+-- This type isn't used directly as the from field patch, but is instead wrapped
28+-- in an existential. However, it is nice to be able to reason about this in
29+-- isolation as it is itself a @Semigroupoid@ when the underlying patch is.
30+data By (k :: a -> *) (p :: a -> a -> *) :: a -> a -> * where
31+ -- | Insert a new or update an existing key with the given value @PatchTarget1
32+ -- p a@
33+ By_Insert :: PatchTarget1 p to -> By k p from to
34+ -- | Delete the existing key
35+ By_Delete :: By k p from to
36+ -- | Move the value from the given key @k a@ to this key. The source key
37+ -- should also have an entry in the patch giving the current key as
38+ -- @_nodeInfo_to@, usually but not necessarily with @By_Delete@.
39+ By_Move :: !(k from) -> p from to -> By k p from to
40+
41+deriving instance ( Show (k from), Show (k to)
42+ , Show (p from to)
43+ , Show (PatchTarget1 p to)
44+ ) => Show (By k p from to)
45+deriving instance ( Read (k from), Read (k to)
46+ , Read (p from to)
47+ , Read (PatchTarget1 p to)
48+ ) => Read (By k p from to)
49+deriving instance ( Eq (k from), Eq (k to)
50+ , Eq (p from to)
51+ , Eq (PatchTarget1 p to)
52+ ) => Eq (By k p from to)
53+deriving instance ( Ord (k from), Ord (k to)
54+ , Ord (p from to)
55+ , Ord (PatchTarget1 p to)
56+ ) => Ord (By k p from to)
57+
58+mapByPatch
59+ :: PatchTarget1 p0 ~ PatchTarget1 p1
60+ => (p0 from to -> p1 from to)
61+ -> By k p0 from to
62+ -> By k p1 from to
63+mapByPatch f = \case
64+ By_Insert v -> By_Insert v
65+ By_Delete -> By_Delete
66+ By_Move k p -> By_Move k $ f p
67+
68+-- | Compose patches having the same effect as applying the patches in turn:
69+-- @'applyAlways' (p <> q) == 'applyAlways' p . 'applyAlways' q@
70+instance ( PatchSource1 p ~ PatchTarget1 p
71+ , Cat.Semigroupoid p
72+ , PatchHet2 p
73+ ) => Cat.Semigroupoid (By k p) where
74+ o p0 p1 = mapByPatch unProjectLocal $
75+ oLocal (mapByPatch ProjectLocal p0) (mapByPatch ProjectLocal p1)
76+
77+oLocal
78+ :: ( PatchSource1 p ~ PatchTarget1 p
79+ , PatchHet2Locally p between after
80+ , Cat.Semigroupoid p
81+ )
82+ => By k p between after
83+ -> By k p before between
84+ -> By k p before after
85+By_Insert new `oLocal` _ = By_Insert new
86+By_Delete `oLocal` _ = By_Delete
87+By_Move _ x `oLocal` By_Insert y = By_Insert $ applyAlwaysHet2Locally x y
88+By_Move _ x `oLocal` By_Move src y = By_Move src $ x `o` y
89+By_Move _ _ `oLocal` By_Delete = By_Delete
src/Data/Patch/IntMap.hs+3−1
@@ -38,8 +38,10 @@ deriving instance Semigroup (PatchIntMap v)
3838makeWrapped ''PatchIntMap
3939
4040-- | Apply the insertions or deletions to a given 'IntMap'.
41−instance Patch (PatchIntMap a) where
41+instance PatchHet (PatchIntMap a) where
42+ type PatchSource (PatchIntMap a) = IntMap a
4243 type PatchTarget (PatchIntMap a) = IntMap a
44+instance Patch (PatchIntMap a) where
4345 apply (PatchIntMap p) v = if IntMap.null p then Nothing else Just $
4446 let removes = IntMap.filter isNothing p
4547 adds = IntMap.mapMaybe id p
src/Data/Patch/Map.hs+3−1
@@ -45,8 +45,10 @@ instance Ord k => Semigroup (PatchMap k v) where
4545 stimes = stimesIdempotentMonoid
4646
4747-- | Apply the insertions or deletions to a given 'Map'.
48−instance Ord k => Patch (PatchMap k v) where
48+instance Ord k => PatchHet (PatchMap k v) where
49+ type PatchSource (PatchMap k v) = Map k v
4950 type PatchTarget (PatchMap k v) = Map k v
51+instance Ord k => Patch (PatchMap k v) where
5052 {-# INLINABLE apply #-}
5153 apply (PatchMap p) old = Just $! insertions `Map.union` (old `Map.difference` deletions) --TODO: return Nothing sometimes --Note: the strict application here is critical to ensuring that incremental merges don't hold onto all their prerequisite events forever; can we make this more robust?
5254 where insertions = Map.mapMaybeWithKey (const id) p
src/Data/Patch/MapWithMove.hs+11−8
@@ -137,7 +137,7 @@ instance TraversableWithIndex k (PatchMapWithMove k) where
137137
138138-- | Create a 'PatchMapWithMove', validating it
139139patchMapWithMove :: Ord k => Map k (NodeInfo k v) -> Maybe (PatchMapWithMove k v)
140−patchMapWithMove = fmap PatchMapWithMove' . PM.patchMapWithPatchingMove . coerce
140+patchMapWithMove = fmap coerce . PM.patchMapWithPatchingMove . coerce
141141
142142-- | Create a 'PatchMapWithMove' that inserts everything in the given 'Map'
143143patchMapWithMoveInsertAll :: Map k v -> PatchMapWithMove k v
@@ -175,11 +175,14 @@ deleteMapKey = PatchMapWithMove' . PM.deleteMapKey
175175--
176176-- __Warning:__ when using this function, you must ensure that the invariants of 'PatchMapWithMove' are preserved; they will not be checked.
177177unsafePatchMapWithMove :: Map k (NodeInfo k v) -> PatchMapWithMove k v
178−unsafePatchMapWithMove = coerce PM.unsafePatchMapWithPatchingMove
178+unsafePatchMapWithMove = PatchMapWithMove' . PM.unsafePatchMapWithPatchingMove . coerce
179179
180180-- | Apply the insertions, deletions, and moves to a given 'Map'
181−instance Ord k => Patch (PatchMapWithMove k v) where
181+instance Ord k => PatchHet (PatchMapWithMove k v) where
182+ type PatchSource (PatchMapWithMove k v) = Map k v
182183 type PatchTarget (PatchMapWithMove k v) = Map k v
184+
185+instance Ord k => Patch (PatchMapWithMove k v) where
183186 apply (PatchMapWithMove' p) = apply p
184187
185188-- | Returns all the new elements that will be added to the 'Map'.
@@ -199,7 +202,7 @@ patchThatSortsMapWith cmp = PatchMapWithMove' . PM.patchThatSortsMapWith cmp
199202-- | Create a 'PatchMapWithMove' that, if applied to the first 'Map' provided,
200203-- will produce a 'Map' with the same values as the second 'Map' but with the
201204-- values sorted with the given ordering function.
202−patchThatChangesAndSortsMapWith :: (Ord k, Ord v) => (v -> v -> Ordering) -> Map k v -> Map k v -> PatchMapWithMove k v
205+patchThatChangesAndSortsMapWith :: forall k v. (Ord k, Ord v) => (v -> v -> Ordering) -> Map k v -> Map k v -> PatchMapWithMove k v
203206patchThatChangesAndSortsMapWith cmp oldByIndex newByIndexUnsorted = patchThatChangesMap oldByIndex newByIndex
204207 where newList = Map.toList newByIndexUnsorted
205208 newByIndex = Map.fromList $ zip (fst <$> newList) $ sortBy cmp $ snd <$> newList
@@ -255,13 +258,13 @@ bitraverseNodeInfo
255258 => (k0 -> f k1)
256259 -> (v0 -> f v1)
257260 -> NodeInfo k0 v0 -> f (NodeInfo k1 v1)
258−bitraverseNodeInfo fk fv = fmap NodeInfo'
261+bitraverseNodeInfo fk fv = fmap coerce
259262 . PM.bitraverseNodeInfo fk (\ ~Proxy -> pure Proxy) fv
260263 . coerce
261264
262265-- | Change the 'From' value of a 'NodeInfo'
263266nodeInfoMapFrom :: (From k v -> From k v) -> NodeInfo k v -> NodeInfo k v
264−nodeInfoMapFrom f = coerce $ PM.nodeInfoMapFrom (unFrom' . f . From')
267+nodeInfoMapFrom f = coerce . PM.nodeInfoMapFrom (unFrom' . f . From') . coerce
265268
266269-- | Change the 'From' value of a 'NodeInfo', using a 'Functor' (or
267270-- 'Applicative', 'Monad', etc.) action to get the new value
@@ -269,7 +272,7 @@ nodeInfoMapMFrom
269272 :: Functor f
270273 => (From k v -> f (From k v))
271274 -> NodeInfo k v -> f (NodeInfo k v)
272−nodeInfoMapMFrom f = fmap NodeInfo'
275+nodeInfoMapMFrom f = fmap coerce
273276 . PM.nodeInfoMapMFrom (fmap unFrom' . f . From')
274277 . coerce
275278
@@ -303,7 +306,7 @@ bitraverseFrom
303306 => (k0 -> f k1)
304307 -> (v0 -> f v1)
305308 -> From k0 v0 -> f (From k1 v1)
306−bitraverseFrom fk fv = fmap From'
309+bitraverseFrom fk fv = fmap coerce
307310 . PM.bitraverseFrom fk (\ ~Proxy -> pure Proxy) fv
308311 . coerce
309312
src/Data/Patch/MapWithPatchingMove.hs+38−36
@@ -48,10 +48,10 @@ module Data.Patch.MapWithPatchingMove
4848
4949import Data.Patch.Class
5050
51−import Control.Lens hiding (from, to)
51+import Control.Arrow
5252import Control.Lens.TH (makeWrapped)
53−import Data.Align (align)
54−import Data.Foldable (toList)
53+import Control.Monad.Trans.State
54+import Data.Foldable
5555import Data.Function
5656import Data.List
5757import Data.Map (Map)
@@ -61,9 +61,9 @@ import Data.Maybe
6161import Data.Semigroup (Semigroup (..))
6262#endif
6363import Data.Monoid.DecidablyEmpty
64−import Data.Set (Set)
6564import qualified Data.Set as Set
6665import Data.These (These (..))
66+import Data.Tuple
6767
6868-- | Patch a Map with additions, deletions, and moves. Invariant: If key @k1@
6969-- is coming from @From_Move k2@, then key @k2@ should be going to @Just k1@,
@@ -170,8 +170,11 @@ unsafePatchMapWithPatchingMove
170170unsafePatchMapWithPatchingMove = PatchMapWithPatchingMove
171171
172172-- | Apply the insertions, deletions, and moves to a given 'Map'
173−instance (Ord k, Patch p) => Patch (PatchMapWithPatchingMove k p) where
173+instance (Ord k, Patch p) => PatchHet (PatchMapWithPatchingMove k p) where
174+ type PatchSource (PatchMapWithPatchingMove k p) = Map k (PatchSource p)
174175 type PatchTarget (PatchMapWithPatchingMove k p) = Map k (PatchTarget p)
176+
177+instance (Ord k, Patch p) => Patch (PatchMapWithPatchingMove k p) where
175178 -- TODO: return Nothing sometimes
176179 -- Note: the strict application here is critical to ensuring that incremental
177180 -- merges don't hold onto all their prerequisite events forever; can we make
@@ -229,40 +232,39 @@ patchThatChangesAndSortsMapWith cmp oldByIndex newByIndexUnsorted = patchThatCha
229232
230233-- | Create a 'PatchMapWithPatchingMove' that, if applied to the first 'Map' provided,
231234-- will produce the second 'Map'.
232−-- Note: this will never produce a patch on a value.
233235patchThatChangesMap
234− :: forall k p
235− . (Ord k, Ord (PatchTarget p), Monoid p)
236+ :: (Ord k, Ord (PatchTarget p), Monoid p)
236237 => Map k (PatchTarget p) -> Map k (PatchTarget p) -> PatchMapWithPatchingMove k p
237238patchThatChangesMap oldByIndex newByIndex = patch
238− where invert :: Map k (PatchTarget p) -> Map (PatchTarget p) (Set k)
239− invert = Map.fromListWith (<>) . fmap (\(k, v) -> (v, Set.singleton k)) . Map.toList
240− -- In the places where we use unionDistinct, a non-distinct key indicates a bug in this function
241− unionDistinct :: forall k' v'. Ord k' => Map k' v' -> Map k' v' -> Map k' v'
242− unionDistinct = Map.unionWith (error "patchThatChangesMap: non-distinct keys")
243− unionPairDistinct :: (Map k (From k v), Map k (To k)) -> (Map k (From k v), Map k (To k)) -> (Map k (From k v), Map k (To k))
244− unionPairDistinct (oldFroms, oldTos) (newFroms, newTos) = (unionDistinct oldFroms newFroms, unionDistinct oldTos newTos)
245− -- Generate patch info for a single value
246− -- Keys that are found in both the old and new sets will not be patched
247− -- Keys that are found in only the old set will be moved to a new position if any are available; otherwise they will be deleted
248− -- Keys that are found in only the new set will be populated by moving an old key if any are available; otherwise they will be inserted
249− patchSingleValue :: PatchTarget p -> Set k -> Set k -> (Map k (From k p), Map k (To k))
250− patchSingleValue v oldKeys newKeys = foldl' unionPairDistinct mempty $ align (toList $ oldKeys `Set.difference` newKeys) (toList $ newKeys `Set.difference` oldKeys) <&> \case
251− This oldK -> (mempty, Map.singleton oldK Nothing) -- There's nowhere for this value to go, so we know we are deleting it
252− That newK -> (Map.singleton newK $ From_Insert v, mempty) -- There's nowhere fo this value to come from, so we know we are inserting it
253− These oldK newK -> (Map.singleton newK $ From_Move oldK mempty, Map.singleton oldK $ Just newK)
254− -- Run patchSingleValue on a These. Missing old or new sets are considered empty
255− patchSingleValueThese :: PatchTarget p -> These (Set k) (Set k) -> (Map k (From k p), Map k (To k))
256− patchSingleValueThese v = \case
257− This oldKeys -> patchSingleValue v oldKeys mempty
258− That newKeys -> patchSingleValue v mempty newKeys
259− These oldKeys newKeys -> patchSingleValue v oldKeys newKeys
260− -- Generate froms and tos for all values, then merge them together
261− (froms, tos) = foldl' unionPairDistinct mempty $ Map.mapWithKey patchSingleValueThese $ align (invert oldByIndex) (invert newByIndex)
262− patch = unsafePatchMapWithPatchingMove $ align froms tos <&> \case
263− This from -> NodeInfo from Nothing -- Since we don't have a 'to' record for this key, that must mean it isn't being moved anywhere, so it should be deleted.
264− That to -> NodeInfo From_Delete to -- Since we don't have a 'from' record for this key, it must be getting deleted
265− These from to -> NodeInfo from to
239+ where oldByValue = Map.fromListWith Set.union $ swap . first Set.singleton <$> Map.toList oldByIndex
240+ (insertsAndMoves, unusedValuesByValue) = flip runState oldByValue $ do
241+ let f k v = do
242+ remainingValues <- get
243+ let putRemainingKeys remainingKeys = put $ if Set.null remainingKeys
244+ then Map.delete v remainingValues
245+ else Map.insert v remainingKeys remainingValues
246+ case Map.lookup v remainingValues of
247+ Nothing -> return $ NodeInfo (From_Insert v) $ Just undefined -- There's no existing value we can take
248+ Just fromKs ->
249+ if k `Set.member` fromKs
250+ then do
251+ putRemainingKeys $ Set.delete k fromKs
252+ return $ NodeInfo (From_Move k mempty) $ Just undefined -- There's an existing value, and it's here, so no patch necessary
253+ else do
254+ (fromK, remainingKeys) <- return $
255+ fromMaybe (error "PatchMapWithPatchingMove.patchThatChangesMap: impossible: fromKs was empty") $
256+ Set.minView fromKs -- There's an existing value, but it's not here; move it here
257+ putRemainingKeys remainingKeys
258+ return $ NodeInfo (From_Move fromK mempty) $ Just undefined
259+ Map.traverseWithKey f newByIndex
260+ unusedOldKeys = fold unusedValuesByValue
261+ pointlessMove k = \case
262+ From_Move k' _ | k == k' -> True
263+ _ -> False
264+ keyWasMoved k = if k `Map.member` oldByIndex && not (k `Set.member` unusedOldKeys)
265+ then Just undefined
266+ else Nothing
267+ patch = unsafePatchMapWithPatchingMove $ Map.filterWithKey (\k -> not . pointlessMove k . _nodeInfo_from) $ Map.mergeWithKey (\k a _ -> Just $ nodeInfoSetTo (keyWasMoved k) a) (Map.mapWithKey $ \k -> nodeInfoSetTo $ keyWasMoved k) (Map.mapWithKey $ \k _ -> NodeInfo From_Delete $ keyWasMoved k) insertsAndMoves oldByIndex
266268
267269--
268270-- NodeInfo
src/Data/Semigroup/Additive.hsdeleted−54
@@ -1,54 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE TypeOperators #-}
3−{-# LANGUAGE TypeFamilies #-}
4−-- |
5−-- Module:
6−-- Data.Semigroup.Additive
7−-- Description:
8−-- This module defines a class for commutative semigroups, until it is moved
9−-- to another library.
10−module Data.Semigroup.Additive
11− ( Additive
12− ) where
13−
14−import Data.Functor.Const (Const (..))
15−import Data.Functor.Identity
16−import Data.Proxy
17−#if !MIN_VERSION_base(4,12,0)
18−-- for :*: and :.: semigroup instances
19−import Data.Orphans ()
20−#endif
21−#if !MIN_VERSION_base(4,11,0)
22−import Data.Semigroup (Semigroup (..))
23−#endif
24−import GHC.Generics
25−
26−-- | An 'Additive' 'Semigroup' is one where (<>) is commutative
27−class Semigroup q => Additive q where
28−
29−-- | Trivial additive semigroup.
30−instance Additive ()
31−
32−-- | Product additive semigroup.
33−-- A Pair of additive semigroups gives rise to a additive semigroup
34−instance (Additive a, Additive b) => Additive (a, b)
35−
36−-- See https://gitlab.haskell.org/ghc/ghc/issues/11135#note_111802 for the reason Compose is not also provided.
37−-- Base does not define Monoid (Compose f g a) so this is the best we can
38−-- really do for functor composition.
39−instance Additive (f (g a)) => Additive ((f :.: g) a)
40−
41−-- | Product of additive semigroups, Functor style.
42−instance (Additive (f a), Additive (g a)) => Additive ((f :*: g) a)
43−
44−-- | Trivial additive semigroup, Functor style
45−instance Additive (Proxy x)
46−
47−-- | Const lifts additive semigroups into a functor.
48−instance Additive a => Additive (Const a x)
49−
50−-- | Identity lifts additive semigroups pointwise (at only one point)
51−instance Additive a => Additive (Identity a)
52−
53−-- | Functions lift additive semigroups pointwise.
54−instance Additive b => Additive (a -> b)
test/tests.hsdeleted−43
@@ -1,43 +0,0 @@
1−{-# LANGUAGE TemplateHaskell #-}
2−module Main where
3−
4−import Test.HUnit (runTestTT, (~:), assertEqual, errors, failures, test)
5−import Data.Patch ( Patch(apply) )
6−import Data.Patch.MapWithMove ( patchThatChangesMap )
7−import Data.Map as Map ( Map, fromList, singleton )
8−import Hedgehog (checkParallel, discover, Property, property, forAll, PropertyT, (===))
9−import Hedgehog.Gen as Gen ( int )
10−import Hedgehog.Range as Range ( linear )
11−import Control.Monad (replicateM)
12−import System.Exit (exitFailure, exitSuccess)
13−import Data.Sequence as Seq ( foldMapWithIndex, replicateM )
14−
15−main :: IO ()
16−main = do
17− counts <- runTestTT $ test [
18− "Simple Move" ~: (do
19− let mapBefore = Map.fromList [(0,1)]
20− mapAfter = Map.fromList [(0,0),(1,1)]
21− patch = patchThatChangesMap mapBefore mapAfter
22− afterPatch = apply patch mapBefore
23− assertEqual "Patch creates the same Map" (Just mapAfter) afterPatch),
24− "Property Checks" ~: propertyChecks
25− ]
26− if errors counts + failures counts == 0 then exitSuccess else exitFailure
27−
28−propertyChecks :: IO Bool
29−propertyChecks = checkParallel $$(discover)
30−
31−prop_patchThatChangesMap :: Property
32−prop_patchThatChangesMap = property $ do
33− mapBefore <- makeRandomIntMap
34− mapAfter <- makeRandomIntMap
35− let patch = patchThatChangesMap mapBefore mapAfter
36− Just mapAfter === apply patch mapBefore
37−
38−makeRandomIntMap :: Monad m => PropertyT m (Map Int Int)
39−makeRandomIntMap = do
40− let genNum = Gen.int (Range.linear 0 100)
41− length <- forAll genNum
42− listOfNumbers <- forAll $ Seq.replicateM length genNum
43− pure $ Seq.foldMapWithIndex Map.singleton listOfNumbers