git.iko.soy/patch
on develop help sign in
swap
b6af86917 ahead, 0 behind
4 files changed+78−23
since splitsnapshots
unifiedsplit
ChangeLog.md+16−8 patch.cabal+5−1 src/Data/Patch.hs+3−14 src/Data/Semigroup/Additive.hs+54
ChangeLog.md+16−8
@@ -2,31 +2,39 @@
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+
513* Rewrite `PatchMapWithMove` in terms of `PatchMapWithPatchingMove`.
614 Care is taken to make this not a breaking change.
715 In particular, `PatchMapWithMove` is a newtype of `PatchMapWithPatchingMove`, as is the `NodeInfo` and `From` of `PatchMapWithPatchingMove`'s versions of those.
816 There are complete constructor and field patterns too, and everything is
917 exported under the newtype as real constructors and fields would be.
1018
11−## 0.0.4.0
19+## 0.0.4.0 - 2021-04-20
1220
1321* Enable PolyKinds
1422
15−## 0.0.3.2
23+## 0.0.3.2 - 2020-11-06
1624
1725* Update version bounds
1826
19−## 0.0.3.1
27+## 0.0.3.1 - 2020-02-05
2028
2129* Replace `fromJust` with something easier to debug.
2230
23−## 0.0.3.0
31+## 0.0.3.0 - 2020-02-05
2432
2533* Create `PatchMapWithPatchingMove` variant which supports moves with a patch.
2634
2735* Create `DecidablyEmpty` subclass of `Monoid`.
2836
29−## 0.0.2.0
37+## 0.0.2.0 - 2020-01-17
3038
3139* Consistently provide:
3240
@@ -38,16 +46,16 @@
3846
3947 for `PatchMap`, `PatchIntMap`, and `PatchMapWithMove`.
4048
41−## 0.0.1.0
49+## 0.0.1.0 - 2020-01-09
4250
4351* Support older GHCs with `split-these` flag.
4452
4553* Additional instances for the `Group` class for basic types.
4654
47−## 0.0.0.1
55+## 0.0.0.1 - 2020-01-08
4856
4957* Remove unneeded dependencies
5058
51−## 0.0.0.0
59+## 0.0.0.0 - 2020-01-08
5260
5361* Extract patching functionality from Reflex.
patch.cabal+5−1
@@ -1,5 +1,5 @@
11Name: patch
2−Version: 0.0.4.0
2+Version: 0.0.5.0
33Synopsis: Data structures for describing changes to other data structures.
44Description:
55 Data structures for describing changes to other data structures.
@@ -43,6 +43,9 @@ library
4343 , transformers >= 0.5.6.0 && < 0.6
4444 , witherable >= 0.3 && < 0.5
4545
46+ if impl(ghc < 8.6) -- really, if base < 8.12
47+ build-depends: base-orphans >= 0.8 && < 0.9
48+
4649 exposed-modules: Data.Functor.Misc
4750 , Data.Monoid.DecidablyEmpty
4851 , Data.Patch
@@ -53,6 +56,7 @@ library
5356 , Data.Patch.Map
5457 , Data.Patch.MapWithMove
5558 , Data.Patch.MapWithPatchingMove
59+ , Data.Semigroup.Additive
5660
5761 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs
5862 default-extensions: PolyKinds
src/Data/Patch.hs+3−14
@@ -23,6 +23,7 @@ import Data.Semigroup (Semigroup (..))
2323#endif
2424import GHC.Generics
2525
26+import Data.Semigroup.Additive as X
2627import Data.Patch.Class as X
2728import Data.Patch.DMap as X hiding (getDeletions)
2829import Data.Patch.DMapWithMove as X
@@ -45,9 +46,6 @@ class (Semigroup q, Monoid q) => Group q where
4546 (~~) :: q -> q -> q
4647 r ~~ s = r <> negateG s
4748
48−-- | An 'Additive' 'Semigroup' is one where (<>) is commutative
49−class Semigroup q => Additive q where
50−
5149-- | The elements of an 'Additive' 'Semigroup' can be considered as patches of their own type.
5250newtype AdditivePatch p = AdditivePatch { unAdditivePatch :: p }
5351
@@ -58,19 +56,15 @@ instance Additive p => Patch (AdditivePatch p) where
5856instance (Ord k, Group q) => Group (MonoidalMap k q) where
5957 negateG = fmap negateG
6058
61−instance (Ord k, Additive q) => Additive (MonoidalMap k q)
62−
6359-- | Trivial group.
6460instance Group () where
6561 negateG _ = ()
6662 _ ~~ _ = ()
67−instance Additive ()
6863
6964-- | Product group. A Pair of groups gives rise to a group
7065instance (Group a, Group b) => Group (a, b) where
7166 negateG (a, b) = (negateG a, negateG b)
7267 (a, b) ~~ (c, d) = (a ~~ c, b ~~ d)
73−instance (Additive a, Additive b) => Additive (a, b)
7468
7569-- See https://gitlab.haskell.org/ghc/ghc/issues/11135#note_111802 for the reason Compose is not also provided.
7670-- Base does not define Monoid (Compose f g a) so this is the best we can
@@ -78,29 +72,24 @@ instance (Additive a, Additive b) => Additive (a, b)
7872instance Group (f (g a)) => Group ((f :.: g) a) where
7973 negateG (Comp1 xs) = Comp1 (negateG xs)
8074 Comp1 xs ~~ Comp1 ys = Comp1 (xs ~~ ys)
81−instance Additive (f (g a)) => Additive ((f :.: g) a)
8275
8376-- | Product of groups, Functor style.
8477instance (Group (f a), Group (g a)) => Group ((f :*: g) a) where
8578 negateG (a :*: b) = negateG a :*: negateG b
8679 (a :*: b) ~~ (c :*: d) = (a ~~ c) :*: (b ~~ d)
87−instance (Additive (f a), Additive (g a)) => Additive ((f :*: g) a)
8880
8981-- | Trivial group, Functor style
9082instance Group (Proxy x) where
9183 negateG _ = Proxy
9284 _ ~~ _ = Proxy
93−instance Additive (Proxy x)
9485
9586-- | Const lifts groups into a functor.
9687deriving instance Group a => Group (Const a x)
97−instance Additive a => Additive (Const a x)
98−-- | Ideitnty lifts groups pointwise (at only one point)
88+
89+-- | Identity lifts groups pointwise (at only one point)
9990deriving instance Group a => Group (Identity a)
100−instance Additive a => Additive (Identity a)
10191
10292-- | Functions lift groups pointwise.
10393instance Group b => Group (a -> b) where
10494 negateG f = negateG . f
10595 (~~) = liftA2 (~~)
106−instance Additive b => Additive (a -> b)
src/Data/Semigroup/Additive.hsnew file+54
@@ -0,0 +1,54 @@
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)