git.iko.soy/patch
on 6e1b903 help sign in
b6af869
swap
0 ahead, 19 behind
4 files changed+24−79
since splitsnapshots
unifiedsplit
ChangeLog.md+8−16 patch.cabal+2−6 src/Data/Patch.hs+14−3 src/Data/Semigroup/Additive.hs−54
ChangeLog.md+8−16
@@ -2,39 +2,31 @@
22
33## Unreleased
44
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−
135* Rewrite `PatchMapWithMove` in terms of `PatchMapWithPatchingMove`.
146 Care is taken to make this not a breaking change.
157 In particular, `PatchMapWithMove` is a newtype of `PatchMapWithPatchingMove`, as is the `NodeInfo` and `From` of `PatchMapWithPatchingMove`'s versions of those.
168 There are complete constructor and field patterns too, and everything is
179 exported under the newtype as real constructors and fields would be.
1810
19−## 0.0.4.0 - 2021-04-20
11+## 0.0.4.0
2012
2113* Enable PolyKinds
2214
23−## 0.0.3.2 - 2020-11-06
15+## 0.0.3.2
2416
2517* Update version bounds
2618
27−## 0.0.3.1 - 2020-02-05
19+## 0.0.3.1
2820
2921* Replace `fromJust` with something easier to debug.
3022
31−## 0.0.3.0 - 2020-02-05
23+## 0.0.3.0
3224
3325* Create `PatchMapWithPatchingMove` variant which supports moves with a patch.
3426
3527* Create `DecidablyEmpty` subclass of `Monoid`.
3628
37−## 0.0.2.0 - 2020-01-17
29+## 0.0.2.0
3830
3931* Consistently provide:
4032
@@ -46,16 +38,16 @@
4638
4739 for `PatchMap`, `PatchIntMap`, and `PatchMapWithMove`.
4840
49−## 0.0.1.0 - 2020-01-09
41+## 0.0.1.0
5042
5143* Support older GHCs with `split-these` flag.
5244
5345* Additional instances for the `Group` class for basic types.
5446
55−## 0.0.0.1 - 2020-01-08
47+## 0.0.0.1
5648
5749* Remove unneeded dependencies
5850
59−## 0.0.0.0 - 2020-01-08
51+## 0.0.0.0
6052
6153* Extract patching functionality from Reflex.
patch.cabal+2−6
@@ -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,10 +41,7 @@ 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
45−
46− if impl(ghc < 8.6) -- really, if base < 8.12
47− build-depends: base-orphans >= 0.8 && < 0.9
44+ , witherable >= 0.3 && < 0.4
4845
4946 exposed-modules: Data.Functor.Misc
5047 , Data.Monoid.DecidablyEmpty
@@ -56,7 +53,6 @@ library
5653 , Data.Patch.Map
5754 , Data.Patch.MapWithMove
5855 , Data.Patch.MapWithPatchingMove
59− , Data.Semigroup.Additive
6056
6157 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs
6258 default-extensions: PolyKinds
src/Data/Patch.hs+14−3
@@ -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
@@ -46,6 +45,9 @@ class (Semigroup q, Monoid q) => Group q where
4645 (~~) :: q -> q -> q
4746 r ~~ s = r <> negateG s
4847
48+-- | An 'Additive' 'Semigroup' is one where (<>) is commutative
49+class Semigroup q => Additive q where
50+
4951-- | The elements of an 'Additive' 'Semigroup' can be considered as patches of their own type.
5052newtype AdditivePatch p = AdditivePatch { unAdditivePatch :: p }
5153
@@ -56,15 +58,19 @@ instance Additive p => Patch (AdditivePatch p) where
5658instance (Ord k, Group q) => Group (MonoidalMap k q) where
5759 negateG = fmap negateG
5860
61+instance (Ord k, Additive q) => Additive (MonoidalMap k q)
62+
5963-- | Trivial group.
6064instance Group () where
6165 negateG _ = ()
6266 _ ~~ _ = ()
67+instance Additive ()
6368
6469-- | Product group. A Pair of groups gives rise to a group
6570instance (Group a, Group b) => Group (a, b) where
6671 negateG (a, b) = (negateG a, negateG b)
6772 (a, b) ~~ (c, d) = (a ~~ c, b ~~ d)
73+instance (Additive a, Additive b) => Additive (a, b)
6874
6975-- See https://gitlab.haskell.org/ghc/ghc/issues/11135#note_111802 for the reason Compose is not also provided.
7076-- 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
7278instance Group (f (g a)) => Group ((f :.: g) a) where
7379 negateG (Comp1 xs) = Comp1 (negateG xs)
7480 Comp1 xs ~~ Comp1 ys = Comp1 (xs ~~ ys)
81+instance Additive (f (g a)) => Additive ((f :.: g) a)
7582
7683-- | Product of groups, Functor style.
7784instance (Group (f a), Group (g a)) => Group ((f :*: g) a) where
7885 negateG (a :*: b) = negateG a :*: negateG b
7986 (a :*: b) ~~ (c :*: d) = (a ~~ c) :*: (b ~~ d)
87+instance (Additive (f a), Additive (g a)) => Additive ((f :*: g) a)
8088
8189-- | Trivial group, Functor style
8290instance Group (Proxy x) where
8391 negateG _ = Proxy
8492 _ ~~ _ = Proxy
93+instance Additive (Proxy x)
8594
8695-- | Const lifts groups into a functor.
8796deriving instance Group a => Group (Const a x)
88−
89−-- | Identity lifts groups pointwise (at only one point)
97+instance Additive a => Additive (Const a x)
98+-- | Ideitnty lifts groups pointwise (at only one point)
9099deriving instance Group a => Group (Identity a)
100+instance Additive a => Additive (Identity a)
91101
92102-- | Functions lift groups pointwise.
93103instance Group b => Group (a -> b) where
94104 negateG f = negateG . f
95105 (~~) = 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)