git.iko.soy/patch
on 6453a35 help sign in
b6af869
swap
0 ahead, 17 behind
ChangeLog.md+8−16
since splitsnapshots
unifiedsplit
@@ -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.
patch.cabal+1−5
@@ -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.
@@ -43,9 +43,6 @@ library
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.5
45
45
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: Data.Functor.Misc
50 , Data.Monoid.DecidablyEmpty
47 , Data.Monoid.DecidablyEmpty
51 , Data.Patch
48 , Data.Patch
@@ -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
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/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)