git.iko.soy/patch
on e28525a help sign in
b6af869
swap
0 ahead, 39 behind
.github/workflows/haskell.yml+1−3
since splitsnapshots
unifiedsplit
@@ -42,6 +42,4 @@ jobs:
42 - name: Build
42 - name: Build
43 run: cabal build --enable-tests --enable-benchmarks all
43 run: cabal build --enable-tests --enable-benchmarks all
44 - name: Run tests
44 - name: Run tests
45− run: cabal test --enable-tests all
45+ run: cabal test all
46− - name: Build Docs
47− 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+8−16
@@ -2,39 +2,31 @@
2
2
3## Unreleased
3## Unreleased
4
4
5−* New dep of `data-orphans` for old GHC to get instances honestly instead of
6− via `monoidal-containers`.
7−
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.
12−
13* Rewrite `PatchMapWithMove` in terms of `PatchMapWithPatchingMove`.
5* Rewrite `PatchMapWithMove` in terms of `PatchMapWithPatchingMove`.
14 Care is taken to make this not a breaking change.
6 Care is taken to make this not a breaking change.
15 In particular, `PatchMapWithMove` is a newtype of `PatchMapWithPatchingMove`, as is the `NodeInfo` and `From` of `PatchMapWithPatchingMove`'s versions of those.
7 In particular, `PatchMapWithMove` is a newtype of `PatchMapWithPatchingMove`, as is the `NodeInfo` and `From` of `PatchMapWithPatchingMove`'s versions of those.
16 There are complete constructor and field patterns too, and everything is
8 There are complete constructor and field patterns too, and everything is
17 exported under the newtype as real constructors and fields would be.
9 exported under the newtype as real constructors and fields would be.
18
10
19−## 0.0.4.0 - 2021-04-20
11+## 0.0.4.0
20
12
21* Enable PolyKinds
13* Enable PolyKinds
22
14
23−## 0.0.3.2 - 2020-11-06
15+## 0.0.3.2
24
16
25* Update version bounds
17* Update version bounds
26
18
27−## 0.0.3.1 - 2020-02-05
19+## 0.0.3.1
28
20
29* Replace `fromJust` with something easier to debug.
21* Replace `fromJust` with something easier to debug.
30
22
31−## 0.0.3.0 - 2020-02-05
23+## 0.0.3.0
32
24
33* Create `PatchMapWithPatchingMove` variant which supports moves with a patch.
25* Create `PatchMapWithPatchingMove` variant which supports moves with a patch.
34
26
35* Create `DecidablyEmpty` subclass of `Monoid`.
27* Create `DecidablyEmpty` subclass of `Monoid`.
36
28
37−## 0.0.2.0 - 2020-01-17
29+## 0.0.2.0
38
30
39* Consistently provide:
31* Consistently provide:
40
32
@@ -46,16 +38,16 @@
46
38
47 for `PatchMap`, `PatchIntMap`, and `PatchMapWithMove`.
39 for `PatchMap`, `PatchIntMap`, and `PatchMapWithMove`.
48
40
49−## 0.0.1.0 - 2020-01-09
41+## 0.0.1.0
50
42
51* Support older GHCs with `split-these` flag.
43* Support older GHCs with `split-these` flag.
52
44
53* Additional instances for the `Group` class for basic types.
45* Additional instances for the `Group` class for basic types.
54
46
55−## 0.0.0.1 - 2020-01-08
47+## 0.0.0.1
56
48
57* Remove unneeded dependencies
49* Remove unneeded dependencies
58
50
59−## 0.0.0.0 - 2020-01-08
51+## 0.0.0.0
60
52
61* Extract patching functionality from Reflex.
53* 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+2−19
@@ -1,5 +1,5 @@
1Name: patch
1Name: patch
2−Version: 0.0.5.0
2+Version: 0.0.4.0
3Synopsis: Data structures for describing changes to other data structures.
3Synopsis: Data structures for describing changes to other data structures.
4Description:
4Description:
5 Data structures for describing changes to other data structures.
5 Data structures for describing changes to other data structures.
@@ -41,10 +41,7 @@ library
41 , lens >= 4.7 && < 5
41 , lens >= 4.7 && < 5
42 , semigroupoids >= 4.0 && < 6
42 , semigroupoids >= 4.0 && < 6
43 , transformers >= 0.5.6.0 && < 0.6
43 , transformers >= 0.5.6.0 && < 0.6
44− , witherable >= 0.3 && < 0.5
44+ , witherable >= 0.3 && < 0.4
45−
46− if impl(ghc < 8.6) -- really, if base < 8.12
47− build-depends: base-orphans >= 0.8 && < 0.9
48
45
49 exposed-modules: Data.Functor.Misc
46 exposed-modules: Data.Functor.Misc
50 , Data.Monoid.DecidablyEmpty
47 , Data.Monoid.DecidablyEmpty
@@ -56,7 +53,6 @@ library
56 , Data.Patch.Map
53 , Data.Patch.Map
57 , Data.Patch.MapWithMove
54 , Data.Patch.MapWithMove
58 , Data.Patch.MapWithPatchingMove
55 , Data.Patch.MapWithPatchingMove
59− , Data.Semigroup.Additive
60
56
61 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs
57 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs
62 default-extensions: PolyKinds
58 default-extensions: PolyKinds
@@ -69,19 +65,6 @@ library
69 build-depends: these >= 0.4 && <0.9
65 build-depends: these >= 0.4 && <0.9
70 , monoidal-containers == 0.4.0.0
66 , monoidal-containers == 0.4.0.0
71
67
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−
85test-suite hlint
68test-suite hlint
86 default-language: Haskell2010
69 default-language: Haskell2010
87 type: exitcode-stdio-1.0
70 type: exitcode-stdio-1.0
src/Data/Patch.hs+14−3
@@ -23,7 +23,6 @@ import Data.Semigroup (Semigroup (..))
23#endif
23#endif
24import GHC.Generics
24import GHC.Generics
25
25
26−import Data.Semigroup.Additive as X
27import Data.Patch.Class as X
26import Data.Patch.Class as X
28import Data.Patch.DMap as X hiding (getDeletions)
27import Data.Patch.DMap as X hiding (getDeletions)
29import Data.Patch.DMapWithMove as X
28import Data.Patch.DMapWithMove as X
@@ -46,6 +45,9 @@ class (Semigroup q, Monoid q) => Group q where
46 (~~) :: q -> q -> q
45 (~~) :: q -> q -> q
47 r ~~ s = r <> negateG s
46 r ~~ s = r <> negateG s
48
47
48+-- | An 'Additive' 'Semigroup' is one where (<>) is commutative
49+class Semigroup q => Additive q where
50+
49-- | The elements of an 'Additive' 'Semigroup' can be considered as patches of their own type.
51-- | The elements of an 'Additive' 'Semigroup' can be considered as patches of their own type.
50newtype AdditivePatch p = AdditivePatch { unAdditivePatch :: p }
52newtype AdditivePatch p = AdditivePatch { unAdditivePatch :: p }
51
53
@@ -56,15 +58,19 @@ instance Additive p => Patch (AdditivePatch p) where
56instance (Ord k, Group q) => Group (MonoidalMap k q) where
58instance (Ord k, Group q) => Group (MonoidalMap k q) where
57 negateG = fmap negateG
59 negateG = fmap negateG
58
60
61+instance (Ord k, Additive q) => Additive (MonoidalMap k q)
62+
59-- | Trivial group.
63-- | Trivial group.
60instance Group () where
64instance Group () where
61 negateG _ = ()
65 negateG _ = ()
62 _ ~~ _ = ()
66 _ ~~ _ = ()
67+instance Additive ()
63
68
64-- | Product group. A Pair of groups gives rise to a group
69-- | Product group. A Pair of groups gives rise to a group
65instance (Group a, Group b) => Group (a, b) where
70instance (Group a, Group b) => Group (a, b) where
66 negateG (a, b) = (negateG a, negateG b)
71 negateG (a, b) = (negateG a, negateG b)
67 (a, b) ~~ (c, d) = (a ~~ c, b ~~ d)
72 (a, b) ~~ (c, d) = (a ~~ c, b ~~ d)
73+instance (Additive a, Additive b) => Additive (a, b)
68
74
69-- See https://gitlab.haskell.org/ghc/ghc/issues/11135#note_111802 for the reason Compose is not also provided.
75-- See https://gitlab.haskell.org/ghc/ghc/issues/11135#note_111802 for the reason Compose is not also provided.
70-- Base does not define Monoid (Compose f g a) so this is the best we can
76-- Base does not define Monoid (Compose f g a) so this is the best we can
@@ -72,24 +78,29 @@ instance (Group a, Group b) => Group (a, b) where
72instance Group (f (g a)) => Group ((f :.: g) a) where
78instance Group (f (g a)) => Group ((f :.: g) a) where
73 negateG (Comp1 xs) = Comp1 (negateG xs)
79 negateG (Comp1 xs) = Comp1 (negateG xs)
74 Comp1 xs ~~ Comp1 ys = Comp1 (xs ~~ ys)
80 Comp1 xs ~~ Comp1 ys = Comp1 (xs ~~ ys)
81+instance Additive (f (g a)) => Additive ((f :.: g) a)
75
82
76-- | Product of groups, Functor style.
83-- | Product of groups, Functor style.
77instance (Group (f a), Group (g a)) => Group ((f :*: g) a) where
84instance (Group (f a), Group (g a)) => Group ((f :*: g) a) where
78 negateG (a :*: b) = negateG a :*: negateG b
85 negateG (a :*: b) = negateG a :*: negateG b
79 (a :*: b) ~~ (c :*: d) = (a ~~ c) :*: (b ~~ d)
86 (a :*: b) ~~ (c :*: d) = (a ~~ c) :*: (b ~~ d)
87+instance (Additive (f a), Additive (g a)) => Additive ((f :*: g) a)
80
88
81-- | Trivial group, Functor style
89-- | Trivial group, Functor style
82instance Group (Proxy x) where
90instance Group (Proxy x) where
83 negateG _ = Proxy
91 negateG _ = Proxy
84 _ ~~ _ = Proxy
92 _ ~~ _ = Proxy
93+instance Additive (Proxy x)
85
94
86-- | Const lifts groups into a functor.
95-- | Const lifts groups into a functor.
87deriving instance Group a => Group (Const a x)
96deriving instance Group a => Group (Const a x)
88−
97+instance Additive a => Additive (Const a x)
89−-- | Identity lifts groups pointwise (at only one point)
98+-- | Ideitnty lifts groups pointwise (at only one point)
90deriving instance Group a => Group (Identity a)
99deriving instance Group a => Group (Identity a)
100+instance Additive a => Additive (Identity a)
91
101
92-- | Functions lift groups pointwise.
102-- | Functions lift groups pointwise.
93instance Group b => Group (a -> b) where
103instance Group b => Group (a -> b) where
94 negateG f = negateG . f
104 negateG f = negateG . f
95 (~~) = liftA2 (~~)
105 (~~) = liftA2 (~~)
106+instance Additive b => Additive (a -> b)
src/Data/Patch/DMapWithMove.hs+2−2
@@ -220,8 +220,8 @@ moveDMapKey src dst = case src `geq` dst of
220-- @
220-- @
221-- let aMay = DMap.lookup a dmap
221-- let aMay = DMap.lookup a dmap
222-- bMay = DMap.lookup b dmap
222-- bMay = DMap.lookup b dmap
223−-- in maybe id (DMap.insert a) (bMay <> aMay)
223+-- in maybe id (DMap.insert a) (bMay `mplus` aMay)
224−-- . maybe id (DMap.insert b) (aMay <> bMay)
224+-- . maybe id (DMap.insert b) (aMay `mplus` bMay)
225-- . DMap.delete a . DMap.delete b $ dmap
225-- . DMap.delete a . DMap.delete b $ dmap
226-- @
226-- @
227swapDMapKey :: GCompare k => k a -> k a -> PatchDMapWithMove k v
227swapDMapKey :: GCompare k => k a -> k a -> PatchDMapWithMove k v
src/Data/Patch/MapWithMove.hs+19−20
@@ -19,7 +19,9 @@
19module Data.Patch.MapWithMove
19module Data.Patch.MapWithMove
20 ( PatchMapWithMove
20 ( PatchMapWithMove
21 ( PatchMapWithMove
21 ( PatchMapWithMove
22+ , -- | Extract the representation of the 'PatchMapWithMove' as a map of
23+ -- 'NodeInfo'.
22− , unPatchMapWithMove
24+ unPatchMapWithMove
23 , ..
25 , ..
24 )
26 )
25 , patchMapWithMove
27 , patchMapWithMove
@@ -66,7 +68,7 @@ import Data.Patch.Class
66import Data.Patch.MapWithPatchingMove (PatchMapWithPatchingMove(..), To)
68import Data.Patch.MapWithPatchingMove (PatchMapWithPatchingMove(..), To)
67import qualified Data.Patch.MapWithPatchingMove as PM -- already a transparent synonym
69import qualified Data.Patch.MapWithPatchingMove as PM -- already a transparent synonym
68
70
69−import Control.Lens
71+import Control.Lens hiding (from, to)
70import Data.List
72import Data.List
71import Data.Map (Map)
73import Data.Map (Map)
72import qualified Data.Map as Map
74import qualified Data.Map as Map
@@ -84,13 +86,9 @@ newtype PatchMapWithMove k (v :: Type) = PatchMapWithMove'
84 unPatchMapWithMove' :: PatchMapWithPatchingMove k (Proxy v)
86 unPatchMapWithMove' :: PatchMapWithPatchingMove k (Proxy v)
85 }
87 }
86 deriving ( Show, Read, Eq, Ord
88 deriving ( Show, Read, Eq, Ord
87−-- Haddock cannot handle documentation here before GHC 8.6
88− ,
89−#if __GLASGOW_HASKELL__ >= 806
90− -- | Compose patches having the same effect as applying the
89+ , -- | Compose patches having the same effect as applying the
91 -- patches in turn: @'applyAlways' (p <> q) == 'applyAlways' p .
90 -- patches in turn: @'applyAlways' (p <> q) == 'applyAlways' p .
92 -- 'applyAlways' q@
91 -- 'applyAlways' q@
93−#endif
94 Semigroup
92 Semigroup
95 , Monoid
93 , Monoid
96 )
94 )
@@ -101,8 +99,6 @@ pattern Coerce x <- (coerce -> x)
101
99
102{-# COMPLETE PatchMapWithMove #-}
100{-# COMPLETE PatchMapWithMove #-}
103pattern PatchMapWithMove :: Map k (NodeInfo k v) -> PatchMapWithMove k v
101pattern PatchMapWithMove :: Map k (NodeInfo k v) -> PatchMapWithMove k v
104−-- | Extract the representation of the 'PatchMapWithMove' as a map of
105−-- 'NodeInfo'.
106unPatchMapWithMove :: PatchMapWithMove k v -> Map k (NodeInfo k v)
102unPatchMapWithMove :: PatchMapWithMove k v -> Map k (NodeInfo k v)
107pattern PatchMapWithMove { unPatchMapWithMove } = PatchMapWithMove' (PatchMapWithPatchingMove (Coerce unPatchMapWithMove))
103pattern PatchMapWithMove { unPatchMapWithMove } = PatchMapWithMove' (PatchMapWithPatchingMove (Coerce unPatchMapWithMove))
108
104
@@ -137,7 +133,7 @@ instance TraversableWithIndex k (PatchMapWithMove k) where
137
133
138-- | Create a 'PatchMapWithMove', validating it
134-- | Create a 'PatchMapWithMove', validating it
139patchMapWithMove :: Ord k => Map k (NodeInfo k v) -> Maybe (PatchMapWithMove k v)
135patchMapWithMove :: Ord k => Map k (NodeInfo k v) -> Maybe (PatchMapWithMove k v)
140−patchMapWithMove = fmap PatchMapWithMove' . PM.patchMapWithPatchingMove . coerce
136+patchMapWithMove = fmap coerce . PM.patchMapWithPatchingMove . coerce
141
137
142-- | Create a 'PatchMapWithMove' that inserts everything in the given 'Map'
138-- | Create a 'PatchMapWithMove' that inserts everything in the given 'Map'
143patchMapWithMoveInsertAll :: Map k v -> PatchMapWithMove k v
139patchMapWithMoveInsertAll :: Map k v -> PatchMapWithMove k v
@@ -160,8 +156,8 @@ moveMapKey src dst = PatchMapWithMove' $ PM.moveMapKey src dst
160-- @
156-- @
161-- let aMay = Map.lookup a map
157-- let aMay = Map.lookup a map
162-- bMay = Map.lookup b map
158-- bMay = Map.lookup b map
163−-- in maybe id (Map.insert a) (bMay <> aMay)
159+-- in maybe id (Map.insert a) (bMay `mplus` aMay)
164−-- . maybe id (Map.insert b) (aMay <> bMay)
160+-- . maybe id (Map.insert b) (aMay `mplus` bMay)
165-- . Map.delete a . Map.delete b $ map
161-- . Map.delete a . Map.delete b $ map
166-- @
162-- @
167swapMapKey :: Ord k => k -> k -> PatchMapWithMove k v
163swapMapKey :: Ord k => k -> k -> PatchMapWithMove k v
@@ -175,7 +171,7 @@ deleteMapKey = PatchMapWithMove' . PM.deleteMapKey
175--
171--
176-- __Warning:__ when using this function, you must ensure that the invariants of 'PatchMapWithMove' are preserved; they will not be checked.
172-- __Warning:__ when using this function, you must ensure that the invariants of 'PatchMapWithMove' are preserved; they will not be checked.
177unsafePatchMapWithMove :: Map k (NodeInfo k v) -> PatchMapWithMove k v
173unsafePatchMapWithMove :: Map k (NodeInfo k v) -> PatchMapWithMove k v
178−unsafePatchMapWithMove = coerce PM.unsafePatchMapWithPatchingMove
174+unsafePatchMapWithMove = PatchMapWithMove' . PM.unsafePatchMapWithPatchingMove . coerce
179
175
180-- | Apply the insertions, deletions, and moves to a given 'Map'
176-- | Apply the insertions, deletions, and moves to a given 'Map'
181instance Ord k => Patch (PatchMapWithMove k v) where
177instance Ord k => Patch (PatchMapWithMove k v) where
@@ -199,7 +195,7 @@ patchThatSortsMapWith cmp = PatchMapWithMove' . PM.patchThatSortsMapWith cmp
199-- | Create a 'PatchMapWithMove' that, if applied to the first 'Map' provided,
195-- | Create a 'PatchMapWithMove' that, if applied to the first 'Map' provided,
200-- will produce a 'Map' with the same values as the second 'Map' but with the
196-- will produce a 'Map' with the same values as the second 'Map' but with the
201-- values sorted with the given ordering function.
197-- 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
198+patchThatChangesAndSortsMapWith :: forall k v. (Ord k, Ord v) => (v -> v -> Ordering) -> Map k v -> Map k v -> PatchMapWithMove k v
203patchThatChangesAndSortsMapWith cmp oldByIndex newByIndexUnsorted = patchThatChangesMap oldByIndex newByIndex
199patchThatChangesAndSortsMapWith cmp oldByIndex newByIndexUnsorted = patchThatChangesMap oldByIndex newByIndex
204 where newList = Map.toList newByIndexUnsorted
200 where newList = Map.toList newByIndexUnsorted
205 newByIndex = Map.fromList $ zip (fst <$> newList) $ sortBy cmp $ snd <$> newList
201 newByIndex = Map.fromList $ zip (fst <$> newList) $ sortBy cmp $ snd <$> newList
@@ -248,20 +244,24 @@ instance Foldable (NodeInfo k) where
248 foldMap = foldMapDefault
244 foldMap = foldMapDefault
249
245
250instance Traversable (NodeInfo k) where
246instance Traversable (NodeInfo k) where
247+ traverse = _NodeInfo . traverseNodeInfo
248+ where
249+ traverseNodeInfo
250+ :: Traversal (PM.NodeInfo k (Proxy a)) (PM.NodeInfo k (Proxy b)) a b
251− traverse = bitraverseNodeInfo pure
251+ traverseNodeInfo = PM.bitraverseNodeInfo pure (\ ~Proxy -> pure Proxy)
252
252
253bitraverseNodeInfo
253bitraverseNodeInfo
254 :: Applicative f
254 :: Applicative f
255 => (k0 -> f k1)
255 => (k0 -> f k1)
256 -> (v0 -> f v1)
256 -> (v0 -> f v1)
257 -> NodeInfo k0 v0 -> f (NodeInfo k1 v1)
257 -> NodeInfo k0 v0 -> f (NodeInfo k1 v1)
258−bitraverseNodeInfo fk fv = fmap NodeInfo'
258+bitraverseNodeInfo fk fv = fmap coerce
259 . PM.bitraverseNodeInfo fk (\ ~Proxy -> pure Proxy) fv
259 . PM.bitraverseNodeInfo fk (\ ~Proxy -> pure Proxy) fv
260 . coerce
260 . coerce
261
261
262-- | Change the 'From' value of a 'NodeInfo'
262-- | Change the 'From' value of a 'NodeInfo'
263nodeInfoMapFrom :: (From k v -> From k v) -> NodeInfo k v -> NodeInfo k v
263nodeInfoMapFrom :: (From k v -> From k v) -> NodeInfo k v -> NodeInfo k v
264−nodeInfoMapFrom f = coerce $ PM.nodeInfoMapFrom (unFrom' . f . From')
264+nodeInfoMapFrom f = coerce . PM.nodeInfoMapFrom (unFrom' . f . From') . coerce
265
265
266-- | Change the 'From' value of a 'NodeInfo', using a 'Functor' (or
266-- | Change the 'From' value of a 'NodeInfo', using a 'Functor' (or
267-- 'Applicative', 'Monad', etc.) action to get the new value
267-- 'Applicative', 'Monad', etc.) action to get the new value
@@ -269,7 +269,7 @@ nodeInfoMapMFrom
269 :: Functor f
269 :: Functor f
270 => (From k v -> f (From k v))
270 => (From k v -> f (From k v))
271 -> NodeInfo k v -> f (NodeInfo k v)
271 -> NodeInfo k v -> f (NodeInfo k v)
272−nodeInfoMapMFrom f = fmap NodeInfo'
272+nodeInfoMapMFrom f = fmap coerce
273 . PM.nodeInfoMapMFrom (fmap unFrom' . f . From')
273 . PM.nodeInfoMapMFrom (fmap unFrom' . f . From')
274 . coerce
274 . coerce
275
275
@@ -303,10 +303,9 @@ bitraverseFrom
303 => (k0 -> f k1)
303 => (k0 -> f k1)
304 -> (v0 -> f v1)
304 -> (v0 -> f v1)
305 -> From k0 v0 -> f (From k1 v1)
305 -> From k0 v0 -> f (From k1 v1)
306−bitraverseFrom fk fv = fmap From'
306+bitraverseFrom fk fv = fmap coerce
307 . PM.bitraverseFrom fk (\ ~Proxy -> pure Proxy) fv
307 . PM.bitraverseFrom fk (\ ~Proxy -> pure Proxy) fv
308 . coerce
308 . coerce
309
309
310makeWrapped ''PatchMapWithMove
310makeWrapped ''PatchMapWithMove
311makeWrapped ''NodeInfo
311makeWrapped ''NodeInfo
312−makeWrapped ''From
src/Data/Patch/MapWithPatchingMove.hs+36−41
@@ -48,10 +48,10 @@ module Data.Patch.MapWithPatchingMove
48
48
49import Data.Patch.Class
49import Data.Patch.Class
50
50
51−import Control.Lens hiding (from, to)
51+import Control.Arrow
52import Control.Lens.TH (makeWrapped)
52import Control.Lens.TH (makeWrapped)
53−import Data.Align (align)
53+import Control.Monad.Trans.State
54−import Data.Foldable (toList)
54+import Data.Foldable
55import Data.Function
55import Data.Function
56import Data.List
56import Data.List
57import Data.Map (Map)
57import Data.Map (Map)
@@ -61,9 +61,9 @@ import Data.Maybe
61import Data.Semigroup (Semigroup (..))
61import Data.Semigroup (Semigroup (..))
62#endif
62#endif
63import Data.Monoid.DecidablyEmpty
63import Data.Monoid.DecidablyEmpty
64−import Data.Set (Set)
65import qualified Data.Set as Set
64import qualified Data.Set as Set
66import Data.These (These (..))
65import Data.These (These (..))
66+import Data.Tuple
67
67
68-- | Patch a Map with additions, deletions, and moves. Invariant: If key @k1@
68-- | Patch a Map with additions, deletions, and moves. Invariant: If key @k1@
69-- is coming from @From_Move k2@, then key @k2@ should be going to @Just k1@,
69-- is coming from @From_Move k2@, then key @k2@ should be going to @Just k1@,
@@ -136,8 +136,8 @@ moveMapKey src dst
136-- @
136-- @
137-- let aMay = Map.lookup a map
137-- let aMay = Map.lookup a map
138-- bMay = Map.lookup b map
138-- bMay = Map.lookup b map
139−-- in maybe id (Map.insert a) (bMay <> aMay)
139+-- in maybe id (Map.insert a) (bMay `mplus` aMay)
140−-- . maybe id (Map.insert b) (aMay <> bMay)
140+-- . maybe id (Map.insert b) (aMay `mplus` bMay)
141-- . Map.delete a . Map.delete b $ map
141-- . Map.delete a . Map.delete b $ map
142-- @
142-- @
143swapMapKey
143swapMapKey
@@ -229,40 +229,39 @@ patchThatChangesAndSortsMapWith cmp oldByIndex newByIndexUnsorted = patchThatCha
229
229
230-- | Create a 'PatchMapWithPatchingMove' that, if applied to the first 'Map' provided,
230-- | Create a 'PatchMapWithPatchingMove' that, if applied to the first 'Map' provided,
231-- will produce the second 'Map'.
231-- will produce the second 'Map'.
232−-- Note: this will never produce a patch on a value.
233patchThatChangesMap
232patchThatChangesMap
234− :: forall k p
235− . (Ord k, Ord (PatchTarget p), Monoid p)
233+ :: (Ord k, Ord (PatchTarget p), Monoid p)
236 => Map k (PatchTarget p) -> Map k (PatchTarget p) -> PatchMapWithPatchingMove k p
234 => Map k (PatchTarget p) -> Map k (PatchTarget p) -> PatchMapWithPatchingMove k p
237patchThatChangesMap oldByIndex newByIndex = patch
235patchThatChangesMap oldByIndex newByIndex = patch
238− where invert :: Map k (PatchTarget p) -> Map (PatchTarget p) (Set k)
236+ where oldByValue = Map.fromListWith Set.union $ swap . first Set.singleton <$> Map.toList oldByIndex
239− invert = Map.fromListWith (<>) . fmap (\(k, v) -> (v, Set.singleton k)) . Map.toList
237+ (insertsAndMoves, unusedValuesByValue) = flip runState oldByValue $ do
240− -- In the places where we use unionDistinct, a non-distinct key indicates a bug in this function
238+ let f k v = do
241− unionDistinct :: forall k' v'. Ord k' => Map k' v' -> Map k' v' -> Map k' v'
239+ remainingValues <- get
242− unionDistinct = Map.unionWith (error "patchThatChangesMap: non-distinct keys")
240+ let putRemainingKeys remainingKeys = put $ if Set.null remainingKeys
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))
241+ then Map.delete v remainingValues
244− unionPairDistinct (oldFroms, oldTos) (newFroms, newTos) = (unionDistinct oldFroms newFroms, unionDistinct oldTos newTos)
242+ else Map.insert v remainingKeys remainingValues
245− -- Generate patch info for a single value
243+ case Map.lookup v remainingValues of
246− -- Keys that are found in both the old and new sets will not be patched
244+ Nothing -> return $ NodeInfo (From_Insert v) $ Just undefined -- There's no existing value we can take
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
245+ Just fromKs ->
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
246+ if k `Set.member` fromKs
249− patchSingleValue :: PatchTarget p -> Set k -> Set k -> (Map k (From k p), Map k (To k))
247+ then do
250− patchSingleValue v oldKeys newKeys = foldl' unionPairDistinct mempty $ align (toList $ oldKeys `Set.difference` newKeys) (toList $ newKeys `Set.difference` oldKeys) <&> \case
248+ putRemainingKeys $ Set.delete k fromKs
251− This oldK -> (mempty, Map.singleton oldK Nothing) -- There's nowhere for this value to go, so we know we are deleting it
249+ return $ NodeInfo (From_Move k mempty) $ Just undefined -- There's an existing value, and it's here, so no patch necessary
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
250+ else do
253− These oldK newK -> (Map.singleton newK $ From_Move oldK mempty, Map.singleton oldK $ Just newK)
251+ (fromK, remainingKeys) <- return $
254− -- Run patchSingleValue on a These. Missing old or new sets are considered empty
252+ fromMaybe (error "PatchMapWithPatchingMove.patchThatChangesMap: impossible: fromKs was empty") $
255− patchSingleValueThese :: PatchTarget p -> These (Set k) (Set k) -> (Map k (From k p), Map k (To k))
253+ Set.minView fromKs -- There's an existing value, but it's not here; move it here
256− patchSingleValueThese v = \case
254+ putRemainingKeys remainingKeys
257− This oldKeys -> patchSingleValue v oldKeys mempty
255+ return $ NodeInfo (From_Move fromK mempty) $ Just undefined
258− That newKeys -> patchSingleValue v mempty newKeys
256+ Map.traverseWithKey f newByIndex
259− These oldKeys newKeys -> patchSingleValue v oldKeys newKeys
257+ unusedOldKeys = fold unusedValuesByValue
260− -- Generate froms and tos for all values, then merge them together
258+ pointlessMove k = \case
261− (froms, tos) = foldl' unionPairDistinct mempty $ Map.mapWithKey patchSingleValueThese $ align (invert oldByIndex) (invert newByIndex)
259+ From_Move k' _ | k == k' -> True
262− patch = unsafePatchMapWithPatchingMove $ align froms tos <&> \case
260+ _ -> False
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.
261+ keyWasMoved k = if k `Map.member` oldByIndex && not (k `Set.member` unusedOldKeys)
264− That to -> NodeInfo From_Delete to -- Since we don't have a 'from' record for this key, it must be getting deleted
262+ then Just undefined
265− These from to -> NodeInfo from to
263+ else Nothing
264+ 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
266
265
267--
266--
268-- NodeInfo
267-- NodeInfo
@@ -282,8 +281,6 @@ deriving instance (Read k, Read p, Read (PatchTarget p)) => Read (NodeInfo k p)
282deriving instance (Eq k, Eq p, Eq (PatchTarget p)) => Eq (NodeInfo k p)
281deriving instance (Eq k, Eq p, Eq (PatchTarget p)) => Eq (NodeInfo k p)
283deriving instance (Ord k, Ord p, Ord (PatchTarget p)) => Ord (NodeInfo k p)
282deriving instance (Ord k, Ord p, Ord (PatchTarget p)) => Ord (NodeInfo k p)
284
283
285−-- | Traverse the 'NodeInfo' over the key, patch, and patch target. Because of
286−-- the type families here, this doesn't it any bi- or tri-traversal class.
287bitraverseNodeInfo
284bitraverseNodeInfo
288 :: Applicative f
285 :: Applicative f
289 => (k0 -> f k1)
286 => (k0 -> f k1)
@@ -325,8 +322,6 @@ deriving instance (Read k, Read p, Read (PatchTarget p)) => Read (From k p)
325deriving instance (Eq k, Eq p, Eq (PatchTarget p)) => Eq (From k p)
322deriving instance (Eq k, Eq p, Eq (PatchTarget p)) => Eq (From k p)
326deriving instance (Ord k, Ord p, Ord (PatchTarget p)) => Ord (From k p)
323deriving instance (Ord k, Ord p, Ord (PatchTarget p)) => Ord (From k p)
327
324
328−-- | Traverse the 'From' over the key, patch, and patch target. Because of
329−-- the type families here, this doesn't it any bi- or tri-traversal class.
330bitraverseFrom
325bitraverseFrom
331 :: Applicative f
326 :: Applicative f
332 => (k0 -> f k1)
327 => (k0 -> f k1)
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