develop..ab32f6a · patch

ChangeLog.md+24−9

since splitsnapshots

unifiedsplit

@@ -2,10 +2,25 @@

2

3## Unreleased

4

5+* Remove the `split-these` flag.

6+ We do not need it as we only use the `These` datatype which is provided in all versions.

7+

8+* Stop defining `Group`; `Group` from the `groups` package can be used instead.

9+

10+ Most of the instances are provided by `groups`, except the `Group

11+ MonoidalMap` instance, which is not lawful. `reflex` might provide it as an

12+ orphan for backwards compat, temporarily, but it should eventually be removed

13+ everywhere.

14+

15+* `Additive` is still defined, because the `Abelian` from `groups` has too

16+ stringent a constraint.

17+

18+## Unreleased

19+

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

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

6 via `monoidal-containers`.

21 via `monoidal-containers`.

7

22

8−## 0.0.5.0 - 2021-12-17

23+## Unreleased

9

24

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

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

11 from `Data.Patch` for compatability.

26 from `Data.Patch` for compatability.

@@ -16,25 +31,25 @@

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

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

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

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

18

33

19−## 0.0.4.0 - 2021-04-20

34+## 0.0.4.0

20

35

21* Enable PolyKinds

36* Enable PolyKinds

22

37

23−## 0.0.3.2 - 2020-11-06

38+## 0.0.3.2

24

39

25* Update version bounds

40* Update version bounds

26

41

27−## 0.0.3.1 - 2020-02-05

42+## 0.0.3.1

28

43

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

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

30

45

31−## 0.0.3.0 - 2020-02-05

46+## 0.0.3.0

32

47

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

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

34

49

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

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

36

51

37−## 0.0.2.0 - 2020-01-17

52+## 0.0.2.0

38

53

39* Consistently provide:

54* Consistently provide:

40

55

@@ -46,16 +61,16 @@

46

61

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

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

48

63

49−## 0.0.1.0 - 2020-01-09

64+## 0.0.1.0

50

65

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

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

52

67

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

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

54

69

55−## 0.0.0.1 - 2020-01-08

70+## 0.0.0.1

56

71

57* Remove unneeded dependencies

72* Remove unneeded dependencies

58

73

59−## 0.0.0.0 - 2020-01-08

74+## 0.0.0.0

60

75

61* Extract patching functionality from Reflex.

76* Extract patching functionality from Reflex.

dep/reflex-platform/default.nix+1−7

@@ -1,8 +1,2 @@

1# DO NOT HAND-EDIT THIS FILE

2−let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:

2+import (import ./thunk.nix)

3− if !fetchSubmodules && !private then builtins.fetchTarball {

4− url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;

5− } else (import <nixpkgs> {}).fetchFromGitHub {

6− inherit owner repo rev sha256 fetchSubmodules private;

7− };

8−in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))

dep/reflex-platform/github.json+2−2

@@ -3,6 +3,6 @@

3 "repo": "reflex-platform",

4 "branch": "master",

5 "private": false,

6− "rev": "c9d11db1b98855fe8ab24a3ff6a5dbe0ad902ad9",

6+ "rev": "efc6d923c633207d18bd4d8cae3e20110a377864",

7− "sha256": "0sfzkqdvyah5mwvmli0wq1nl0b8cvk2cmfgfy4rz57wv42x3099y"

7+ "sha256": "121rmnkx8nwiy96ipfyyv6vrgysv0zpr2br46y70zf4d0y1h1lz5"

8}

dep/reflex-platform/thunk.nixnew file+9

@@ -0,0 +1,9 @@

1+# DO NOT HAND-EDIT THIS FILE

2+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:

3+ if !fetchSubmodules && !private then builtins.fetchTarball {

4+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;

5+ } else (import <nixpkgs> {}).fetchFromGitHub {

6+ inherit owner repo rev sha256 fetchSubmodules private;

7+ };

8+ json = builtins.fromJSON (builtins.readFile ./github.json);

9+in fetch json

patch.cabal+2−14

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

1Name: patch

2−Version: 0.0.5.0

2+Version: 0.1.0.0

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

4Description:

5 Data structures for describing changes to other data structures.

@@ -25,11 +25,6 @@ tested-with:

25 GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1

26 GHCJS ==8.4

27

28−flag split-these

29− description: Use split these/semialign packages

30− manual: False

31− default: True

32−

33library

28library

34 hs-source-dirs: src

29 hs-source-dirs: src

35 default-language: Haskell2010

30 default-language: Haskell2010

@@ -40,6 +35,7 @@ library

40 , dependent-sum >= 0.6 && < 0.8

35 , dependent-sum >= 0.6 && < 0.8

41 , lens >= 4.7 && < 5

36 , lens >= 4.7 && < 5

42 , semigroupoids >= 4.0 && < 6

37 , semigroupoids >= 4.0 && < 6

38+ , these >= 0.4 && < 1.2

43 , transformers >= 0.5.6.0 && < 0.6

39 , transformers >= 0.5.6.0 && < 0.6

44 , witherable >= 0.3 && < 0.5

40 , witherable >= 0.3 && < 0.5

45

41

@@ -61,14 +57,6 @@ library

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

63

59

64− if flag(split-these)

65− build-depends: these >= 1 && <1.2

66− , semialign >=1 && <1.2

67− , monoidal-containers >= 0.6 && < 0.7

68− else

69− build-depends: these >= 0.4 && <0.9

70− , monoidal-containers == 0.4.0.0

71−

72test-suite tests

60test-suite tests

73 default-language: Haskell2010

61 default-language: Haskell2010

74 type: exitcode-stdio-1.0

62 type: exitcode-stdio-1.0

src/Data/Patch.hs+1−56

@@ -1,8 +1,6 @@

1{-# LANGUAGE CPP #-}

2−{-# LANGUAGE GeneralizedNewtypeDeriving #-}

3−{-# LANGUAGE StandaloneDeriving #-}

4−{-# LANGUAGE TypeFamilies #-}

5{-# LANGUAGE TypeOperators #-}

2{-# LANGUAGE TypeOperators #-}

3+{-# LANGUAGE TypeFamilies #-}

6-- |

4-- |

7-- Module:

5-- Module:

8-- Data.Patch

6-- Data.Patch

@@ -13,15 +11,9 @@ module Data.Patch

13 , module X

11 , module X

14 ) where

12 ) where

15

13

16−import Control.Applicative

17−import Data.Functor.Const (Const (..))

18−import Data.Functor.Identity

19−import Data.Map.Monoidal (MonoidalMap)

20−import Data.Proxy

21#if !MIN_VERSION_base(4,11,0)

14#if !MIN_VERSION_base(4,11,0)

22import Data.Semigroup (Semigroup (..))

15import Data.Semigroup (Semigroup (..))

23#endif

16#endif

24−import GHC.Generics

25

17

26import Data.Semigroup.Additive as X

18import Data.Semigroup.Additive as X

27import Data.Patch.Class as X

19import Data.Patch.Class as X

@@ -40,56 +32,9 @@ import Data.Patch.MapWithMove as X

40 , unsafePatchMapWithMove

32 , unsafePatchMapWithMove

41 )

33 )

42

34

43−-- | A 'Group' is a 'Monoid' where every element has an inverse.

44−class (Semigroup q, Monoid q) => Group q where

45− negateG :: q -> q

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

47− r ~~ s = r <> negateG s

48−

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

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

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

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

51

37

52instance Additive p => Patch (AdditivePatch p) where

38instance Additive p => Patch (AdditivePatch p) where

53 type PatchTarget (AdditivePatch p) = p

39 type PatchTarget (AdditivePatch p) = p

54 apply (AdditivePatch p) q = Just $ p <> q

40 apply (AdditivePatch p) q = Just $ p <> q

55−

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

57− negateG = fmap negateG

58−

59−-- | Trivial group.

60−instance Group () where

61− negateG _ = ()

62− _ ~~ _ = ()

63−

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

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

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

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

68−

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

71−-- really do for functor composition.

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

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

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

75−

76−-- | Product of groups, Functor style.

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

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

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

80−

81−-- | Trivial group, Functor style

82−instance Group (Proxy x) where

83− negateG _ = Proxy

84− _ ~~ _ = Proxy

85−

86−-- | Const lifts groups into a functor.

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

88−

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

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

91−

92−-- | Functions lift groups pointwise.

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

94− negateG f = negateG . f

95− (~~) = liftA2 (~~)