@@ -1,8 +1,6 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
3−{-# LANGUAGE StandaloneDeriving #-}
4−{-# LANGUAGE TypeFamilies #-}
5{-# LANGUAGE TypeOperators #-}
2{-# LANGUAGE TypeOperators #-}
3+{-# LANGUAGE TypeFamilies #-}
8-- Data.Patch
6-- Data.Patch
@@ -13,10 +11,8 @@ module Data.Patch
13 , module X
11 , module X
16−import Control.Applicative
17import Data.Functor.Const (Const (..))
14import Data.Functor.Const (Const (..))
18import Data.Functor.Identity
15import Data.Functor.Identity
19−import Data.Map.Monoidal (MonoidalMap)
20import Data.Proxy
16import Data.Proxy
21#if !MIN_VERSION_base(4,11,0)
17#if !MIN_VERSION_base(4,11,0)
22import Data.Semigroup (Semigroup (..))
18import Data.Semigroup (Semigroup (..))
@@ -39,12 +35,6 @@ import Data.Patch.MapWithMove as X
39 , unsafePatchMapWithMove
35 , unsafePatchMapWithMove
42−-- | A 'Group' is a 'Monoid' where every element has an inverse.
43−class (Semigroup q, Monoid q) => Group q where
46− r ~~ s = r <> negateG s
48-- | An 'Additive' 'Semigroup' is one where (<>) is commutative
38-- | An 'Additive' 'Semigroup' is one where (<>) is commutative
49class Semigroup q => Additive q where
39class Semigroup q => Additive q where
@@ -55,52 +45,27 @@ instance Additive p => Patch (AdditivePatch p) where
55 type PatchTarget (AdditivePatch p) = p
45 type PatchTarget (AdditivePatch p) = p
56 apply (AdditivePatch p) q = Just $ p <> q
46 apply (AdditivePatch p) q = Just $ p <> q
58−instance (Ord k, Group q) => Group (MonoidalMap k q) where
59− negateG = fmap negateG
61−instance (Ord k, Additive q) => Additive (MonoidalMap k q)
63-- | Trivial group.
48-- | Trivial group.
64−instance Group () where
67instance Additive ()
49instance Additive ()
69-- | Product group. A Pair of groups gives rise to a group
51-- | Product group. A Pair of groups gives rise to a group
70−instance (Group a, Group b) => Group (a, b) where
71− negateG (a, b) = (negateG a, negateG b)
72− (a, b) ~~ (c, d) = (a ~~ c, b ~~ d)
73instance (Additive a, Additive b) => Additive (a, b)
52instance (Additive a, Additive b) => Additive (a, b)
75-- See https://gitlab.haskell.org/ghc/ghc/issues/11135#note_111802 for the reason Compose is not also provided.
54-- See https://gitlab.haskell.org/ghc/ghc/issues/11135#note_111802 for the reason Compose is not also provided.
76-- Base does not define Monoid (Compose f g a) so this is the best we can
55-- Base does not define Monoid (Compose f g a) so this is the best we can
77-- really do for functor composition.
56-- really do for functor composition.
78−instance Group (f (g a)) => Group ((f :.: g) a) where
79− negateG (Comp1 xs) = Comp1 (negateG xs)
80− Comp1 xs ~~ Comp1 ys = Comp1 (xs ~~ ys)
81instance Additive (f (g a)) => Additive ((f :.: g) a)
57instance Additive (f (g a)) => Additive ((f :.: g) a)
83-- | Product of groups, Functor style.
59-- | Product of groups, Functor style.
84−instance (Group (f a), Group (g a)) => Group ((f :*: g) a) where
85− negateG (a :*: b) = negateG a :*: negateG b
86− (a :*: b) ~~ (c :*: d) = (a ~~ c) :*: (b ~~ d)
87instance (Additive (f a), Additive (g a)) => Additive ((f :*: g) a)
60instance (Additive (f a), Additive (g a)) => Additive ((f :*: g) a)
89-- | Trivial group, Functor style
62-- | Trivial group, Functor style
90−instance Group (Proxy x) where
93instance Additive (Proxy x)
63instance Additive (Proxy x)
95-- | Const lifts groups into a functor.
65-- | Const lifts groups into a functor.
96−deriving instance Group a => Group (Const a x)
97instance Additive a => Additive (Const a x)
66instance Additive a => Additive (Const a x)
98-- | Ideitnty lifts groups pointwise (at only one point)
67-- | Ideitnty lifts groups pointwise (at only one point)
99−deriving instance Group a => Group (Identity a)
100instance Additive a => Additive (Identity a)
68instance Additive a => Additive (Identity a)
102-- | Functions lift groups pointwise.
70-- | Functions lift groups pointwise.
103−instance Group b => Group (a -> b) where
104− negateG f = negateG . f
106instance Additive b => Additive (a -> b)
71instance Additive b => Additive (a -> b)