on 758a2ae help sign in
7 files changed+40−80
since splitsnapshots
unifiedsplit
ChangeLog.md+18 dep/reflex-platform/default.nix+1−7 dep/reflex-platform/github.json+2−2 dep/reflex-platform/thunk.nix+9 patch.cabal+5−14 src/Data/Patch.hs+1−55 src/Data/Semigroup/Additive.hs+4−2
ChangeLog.md+18
@@ -2,6 +2,24 @@
22
33## Unreleased
44
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+* `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported
19+ from `Data.Patch` for compatability.
20+
21+## Unreleased
22+
523* `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported
624 from `Data.Patch` for compatability.
725
dep/reflex-platform/default.nix+1−7
@@ -1,8 +1,2 @@
11# 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−in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))
2+import (import ./thunk.nix)
dep/reflex-platform/github.json+2−2
@@ -3,6 +3,6 @@
33 "repo": "reflex-platform",
44 "branch": "master",
55 "private": false,
6− "rev": "c9d11db1b98855fe8ab24a3ff6a5dbe0ad902ad9",
7− "sha256": "0sfzkqdvyah5mwvmli0wq1nl0b8cvk2cmfgfy4rz57wv42x3099y"
6+ "rev": "efc6d923c633207d18bd4d8cae3e20110a377864",
7+ "sha256": "121rmnkx8nwiy96ipfyyv6vrgysv0zpr2br46y70zf4d0y1h1lz5"
88}
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+5−14
@@ -1,5 +1,5 @@
11Name: patch
2−Version: 0.0.4.0
2+Version: 0.1.0.0
33Synopsis: Data structures for describing changes to other data structures.
44Description:
55 Data structures for describing changes to other data structures.
@@ -25,11 +25,6 @@ tested-with:
2525 GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1
2626 GHCJS ==8.4
2727
28−flag split-these
29− description: Use split these/semialign packages
30− manual: False
31− default: True
32−
3328library
3429 hs-source-dirs: src
3530 default-language: Haskell2010
@@ -40,9 +35,13 @@ library
4035 , dependent-sum >= 0.6 && < 0.8
4136 , lens >= 4.7 && < 5
4237 , semigroupoids >= 4.0 && < 6
38+ , these >= 0.4 && < 1.2
4339 , transformers >= 0.5.6.0 && < 0.6
4440 , witherable >= 0.3 && < 0.4
4541
42+ if impl(ghc < 8.6) -- really, if base < 8.12
43+ build-depends: base-orphans >= 0.8 && < 0.9
44+
4645 exposed-modules: Data.Functor.Misc
4746 , Data.Monoid.DecidablyEmpty
4847 , Data.Patch
@@ -58,14 +57,6 @@ library
5857 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs
5958 default-extensions: PolyKinds
6059
61− if flag(split-these)
62− build-depends: these >= 1 && <1.2
63− , semialign >=1 && <1.2
64− , monoidal-containers >= 0.6 && < 0.7
65− else
66− build-depends: these >= 0.4 && <0.9
67− , monoidal-containers == 0.4.0.0
68−
6960test-suite tests
7061 default-language: Haskell2010
7162 type: exitcode-stdio-1.0
src/Data/Patch.hs+1−55
@@ -1,8 +1,6 @@
11{-# LANGUAGE CPP #-}
2−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
3−{-# LANGUAGE StandaloneDeriving #-}
4−{-# LANGUAGE TypeFamilies #-}
52{-# LANGUAGE TypeOperators #-}
3+{-# LANGUAGE TypeFamilies #-}
64-- |
75-- Module:
86-- Data.Patch
@@ -13,15 +11,9 @@ module Data.Patch
1311 , module X
1412 ) where
1513
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
2114#if !MIN_VERSION_base(4,11,0)
2215import Data.Semigroup (Semigroup (..))
2316#endif
24−import GHC.Generics
2517
2618import Data.Semigroup.Additive as X
2719import Data.Patch.Class as X
@@ -40,55 +32,9 @@ import Data.Patch.MapWithMove as X
4032 , unsafePatchMapWithMove
4133 )
4234
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−
4935-- | The elements of an 'Additive' 'Semigroup' can be considered as patches of their own type.
5036newtype AdditivePatch p = AdditivePatch { unAdditivePatch :: p }
5137
5238instance Additive p => Patch (AdditivePatch p) where
5339 type PatchTarget (AdditivePatch p) = p
5440 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−-- | Ideitnty lifts groups pointwise (at only one point)
89−deriving instance Group a => Group (Identity a)
90−
91−-- | Functions lift groups pointwise.
92−instance Group b => Group (a -> b) where
93− negateG f = negateG . f
94− (~~) = liftA2 (~~)
src/Data/Semigroup/Additive.hs+4−2
@@ -13,9 +13,11 @@ module Data.Semigroup.Additive
1313
1414import Data.Functor.Const (Const (..))
1515import Data.Functor.Identity
16−-- For base-orphans, TODO don't cheat.
17−import Data.Map.Monoidal ()
1816import Data.Proxy
17+#if !MIN_VERSION_base(4,12,0)
18+-- for :*: and :.: semigroup instances
19+import Data.Orphans ()
20+#endif
1921#if !MIN_VERSION_base(4,11,0)
2022import Data.Semigroup (Semigroup (..))
2123#endif