6e1b903..develop · patch

git.iko.soy/patch

on develop help sign in

ChangeLog.md+16−8

since splitsnapshots

unifiedsplit

@@ -2,31 +2,39 @@

3## Unreleased

5+* New dep of `data-orphans` for old GHC to get instances honestly instead of

6+ via `monoidal-containers`.

8+## 0.0.5.0 - 2021-12-17

10+* `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported

11+ from `Data.Patch` for compatability.

12+

5* Rewrite `PatchMapWithMove` in terms of `PatchMapWithPatchingMove`.

13* Rewrite `PatchMapWithMove` in terms of `PatchMapWithPatchingMove`.

6 Care is taken to make this not a breaking change.

14 Care is taken to make this not a breaking change.

7 In particular, `PatchMapWithMove` is a newtype of `PatchMapWithPatchingMove`, as is the `NodeInfo` and `From` of `PatchMapWithPatchingMove`'s versions of those.

15 In particular, `PatchMapWithMove` is a newtype of `PatchMapWithPatchingMove`, as is the `NodeInfo` and `From` of `PatchMapWithPatchingMove`'s versions of those.

8 There are complete constructor and field patterns too, and everything is

16 There are complete constructor and field patterns too, and everything is

9 exported under the newtype as real constructors and fields would be.

17 exported under the newtype as real constructors and fields would be.

11−## 0.0.4.0

19+## 0.0.4.0 - 2021-04-20

13* Enable PolyKinds

21* Enable PolyKinds

15−## 0.0.3.2

23+## 0.0.3.2 - 2020-11-06

17* Update version bounds

25* Update version bounds

19−## 0.0.3.1

27+## 0.0.3.1 - 2020-02-05

21* Replace `fromJust` with something easier to debug.

29* Replace `fromJust` with something easier to debug.

23−## 0.0.3.0

31+## 0.0.3.0 - 2020-02-05

25* Create `PatchMapWithPatchingMove` variant which supports moves with a patch.

33* Create `PatchMapWithPatchingMove` variant which supports moves with a patch.

27* Create `DecidablyEmpty` subclass of `Monoid`.

35* Create `DecidablyEmpty` subclass of `Monoid`.

29−## 0.0.2.0

37+## 0.0.2.0 - 2020-01-17

31* Consistently provide:

39* Consistently provide:

@@ -38,16 +46,16 @@

39 for `PatchMap`, `PatchIntMap`, and `PatchMapWithMove`.

47 for `PatchMap`, `PatchIntMap`, and `PatchMapWithMove`.

41−## 0.0.1.0

49+## 0.0.1.0 - 2020-01-09

43* Support older GHCs with `split-these` flag.

51* Support older GHCs with `split-these` flag.

45* Additional instances for the `Group` class for basic types.

53* Additional instances for the `Group` class for basic types.

47−## 0.0.0.1

55+## 0.0.0.1 - 2020-01-08

49* Remove unneeded dependencies

57* Remove unneeded dependencies

51−## 0.0.0.0

59+## 0.0.0.0 - 2020-01-08

53* Extract patching functionality from Reflex.

61* Extract patching functionality from Reflex.

patch.cabal+6−2

@@ -1,5 +1,5 @@

1Name: patch

2−Version: 0.0.4.0

2+Version: 0.0.5.0

3Synopsis: Data structures for describing changes to other data structures.

4Description:

5 Data structures for describing changes to other data structures.

@@ -41,7 +41,10 @@ library

41 , lens >= 4.7 && < 5

42 , semigroupoids >= 4.0 && < 6

43 , transformers >= 0.5.6.0 && < 0.6

44− , witherable >= 0.3 && < 0.4

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

46 exposed-modules: Data.Functor.Misc

49 exposed-modules: Data.Functor.Misc

47 , Data.Monoid.DecidablyEmpty

50 , Data.Monoid.DecidablyEmpty

@@ -53,6 +56,7 @@ library

53 , Data.Patch.Map

56 , Data.Patch.Map

54 , Data.Patch.MapWithMove

57 , Data.Patch.MapWithMove

55 , Data.Patch.MapWithPatchingMove

58 , Data.Patch.MapWithPatchingMove

59+ , Data.Semigroup.Additive

57 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs

61 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs

58 default-extensions: PolyKinds

62 default-extensions: PolyKinds

src/Data/Patch.hs+3−14

@@ -23,6 +23,7 @@ import Data.Semigroup (Semigroup (..))

23#endif

24import GHC.Generics

26+import Data.Semigroup.Additive as X

26import Data.Patch.Class as X

27import Data.Patch.Class as X

27import Data.Patch.DMap as X hiding (getDeletions)

28import Data.Patch.DMap as X hiding (getDeletions)

28import Data.Patch.DMapWithMove as X

29import Data.Patch.DMapWithMove as X

@@ -45,9 +46,6 @@ class (Semigroup q, Monoid q) => Group q where

45 (~~) :: q -> q -> q

46 (~~) :: q -> q -> q

46 r ~~ s = r <> negateG s

47 r ~~ s = r <> negateG s

48−-- | An 'Additive' 'Semigroup' is one where (<>) is commutative

49−class Semigroup q => Additive q where

50−

51-- | The elements of an 'Additive' 'Semigroup' can be considered as patches of their own type.

49-- | The elements of an 'Additive' 'Semigroup' can be considered as patches of their own type.

52newtype AdditivePatch p = AdditivePatch { unAdditivePatch :: p }

50newtype AdditivePatch p = AdditivePatch { unAdditivePatch :: p }

@@ -58,19 +56,15 @@ instance Additive p => Patch (AdditivePatch p) where

58instance (Ord k, Group q) => Group (MonoidalMap k q) where

56instance (Ord k, Group q) => Group (MonoidalMap k q) where

59 negateG = fmap negateG

57 negateG = fmap negateG

61−instance (Ord k, Additive q) => Additive (MonoidalMap k q)

62−

63-- | Trivial group.

59-- | Trivial group.

64instance Group () where

60instance Group () where

65 negateG _ = ()

61 negateG _ = ()

66 _ ~~ _ = ()

62 _ ~~ _ = ()

67−instance Additive ()

69-- | Product group. A Pair of groups gives rise to a group

64-- | Product group. A Pair of groups gives rise to a group

70instance (Group a, Group b) => Group (a, b) where

65instance (Group a, Group b) => Group (a, b) where

71 negateG (a, b) = (negateG a, negateG b)

66 negateG (a, b) = (negateG a, negateG b)

72 (a, b) ~~ (c, d) = (a ~~ c, b ~~ d)

67 (a, b) ~~ (c, d) = (a ~~ c, b ~~ d)

73−instance (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.

69-- 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

70-- 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)

78instance Group (f (g a)) => Group ((f :.: g) a) where

72instance Group (f (g a)) => Group ((f :.: g) a) where

79 negateG (Comp1 xs) = Comp1 (negateG xs)

73 negateG (Comp1 xs) = Comp1 (negateG xs)

80 Comp1 xs ~~ Comp1 ys = Comp1 (xs ~~ ys)

74 Comp1 xs ~~ Comp1 ys = Comp1 (xs ~~ ys)

81−instance Additive (f (g a)) => Additive ((f :.: g) a)

83-- | Product of groups, Functor style.

76-- | Product of groups, Functor style.

84instance (Group (f a), Group (g a)) => Group ((f :*: g) a) where

77instance (Group (f a), Group (g a)) => Group ((f :*: g) a) where

85 negateG (a :*: b) = negateG a :*: negateG b

78 negateG (a :*: b) = negateG a :*: negateG b

86 (a :*: b) ~~ (c :*: d) = (a ~~ c) :*: (b ~~ d)

79 (a :*: b) ~~ (c :*: d) = (a ~~ c) :*: (b ~~ d)

87−instance (Additive (f a), Additive (g a)) => Additive ((f :*: g) a)

89-- | Trivial group, Functor style

81-- | Trivial group, Functor style

90instance Group (Proxy x) where

82instance Group (Proxy x) where

91 negateG _ = Proxy

83 negateG _ = Proxy

92 _ ~~ _ = Proxy

84 _ ~~ _ = Proxy

93−instance Additive (Proxy x)

95-- | Const lifts groups into a functor.

86-- | Const lifts groups into a functor.

96deriving instance Group a => Group (Const a x)

87deriving instance Group a => Group (Const a x)

97−instance Additive a => Additive (Const a x)

88+

98−-- | Ideitnty lifts groups pointwise (at only one point)

89+-- | Identity lifts groups pointwise (at only one point)

99deriving instance Group a => Group (Identity a)

90deriving instance Group a => Group (Identity a)

100−instance Additive a => Additive (Identity a)

101

102-- | Functions lift groups pointwise.

92-- | Functions lift groups pointwise.

103instance Group b => Group (a -> b) where

93instance Group b => Group (a -> b) where

104 negateG f = negateG . f

94 negateG f = negateG . f

105 (~~) = liftA2 (~~)

95 (~~) = 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)