5427c27 · patch · git.iko.soy

git.iko.soy/patch

on develop help sign in

Unorphan MonoidalMap Group and Additive instances

5427c27Ali Abrar8 years ago

src/Data/AppendMap.hs−11

compare with develop

unifiedsplit

@@ -1,15 +1,10 @@

1{-# LANGUAGE CPP #-}

2−{-# LANGUAGE DeriveFunctor #-}

3−{-# LANGUAGE DeriveGeneric #-}

4−{-# LANGUAGE DeriveTraversable #-}

5{-# LANGUAGE FlexibleContexts #-}

2{-# LANGUAGE FlexibleContexts #-}

6{-# LANGUAGE FlexibleInstances #-}

3{-# LANGUAGE FlexibleInstances #-}

7−{-# LANGUAGE GeneralizedNewtypeDeriving #-}

8{-# LANGUAGE MultiParamTypeClasses #-}

4{-# LANGUAGE MultiParamTypeClasses #-}

9{-# LANGUAGE PatternSynonyms #-}

5{-# LANGUAGE PatternSynonyms #-}

10{-# LANGUAGE RoleAnnotations #-}

6{-# LANGUAGE RoleAnnotations #-}

11{-# LANGUAGE ScopedTypeVariables #-}

7{-# LANGUAGE ScopedTypeVariables #-}

12−{-# LANGUAGE StandaloneDeriving #-}

13{-# LANGUAGE TypeFamilies #-}

8{-# LANGUAGE TypeFamilies #-}

14{-# OPTIONS_GHC -fno-warn-orphans #-}

9{-# OPTIONS_GHC -fno-warn-orphans #-}

15-- | 'Data.Map' with a better 'Monoid' instance

10-- | 'Data.Map' with a better 'Monoid' instance

@@ -33,7 +28,6 @@ import qualified Data.Map as Map (showTree, showTreeWith)

33#endif

28#endif

34import Data.Map.Monoidal

29import Data.Map.Monoidal

35import Reflex.Class (FunctorMaybe (..))

30import Reflex.Class (FunctorMaybe (..))

36−import Reflex.Patch (Additive, Group (..))

38{-# DEPRECATED AppendMap "Use 'MonoidalMap' instead" #-}

32{-# DEPRECATED AppendMap "Use 'MonoidalMap' instead" #-}

39type AppendMap = MonoidalMap

33type AppendMap = MonoidalMap

@@ -66,11 +60,6 @@ mapMaybeNoNull f as =

66 else Just bs

60 else Just bs

68-- TODO: Move instances to `Reflex.Patch`

62-- TODO: Move instances to `Reflex.Patch`

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

70− negateG = map negateG

71−

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

73−

74showTree :: forall k a. (Show k, Show a) => MonoidalMap k a -> String

63showTree :: forall k a. (Show k, Show a) => MonoidalMap k a -> String

75showTree = coerce (Map.showTree :: Map k a -> String)

64showTree = coerce (Map.showTree :: Map k a -> String)

src/Reflex/Patch.hs+6

@@ -21,6 +21,7 @@ import Reflex.Patch.Map as X

21import Reflex.Patch.MapWithMove as X (PatchMapWithMove, patchMapWithMoveNewElements,

22 patchMapWithMoveNewElementsMap, unPatchMapWithMove,

23 unsafePatchMapWithMove)

24+import Data.Map.Monoidal (MonoidalMap)

24import Data.Semigroup (Semigroup (..), (<>))

25import Data.Semigroup (Semigroup (..), (<>))

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

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

@@ -38,3 +39,8 @@ newtype AdditivePatch p = AdditivePatch { unAdditivePatch :: p }

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

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

39 type PatchTarget (AdditivePatch p) = p

40 type PatchTarget (AdditivePatch p) = p

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

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

42+

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

44+ negateG = fmap negateG

45+

46+instance (Ord k, Additive q) => Additive (MonoidalMap k q)