ecc8511 · patch · git.iko.soy

src/Data/Patch.hs+1−1

compare with develop

unifiedsplit

@@ -18,7 +18,7 @@ import Data.Functor.Const (Const (..))

18import Data.Functor.Identity

19import Data.Map.Monoidal (MonoidalMap)

20import Data.Proxy

21−#if !MIN_VERSION_base(4,10,0)

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

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

23#endif

24import GHC.Generics

src/Data/Patch/Class.hs+3

@@ -1,10 +1,13 @@

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE TypeFamilies #-}

2{-# LANGUAGE TypeFamilies #-}

2-- | The interface for types which represent changes made to other types

3-- | The interface for types which represent changes made to other types

3module Data.Patch.Class where

4module Data.Patch.Class where

4

5

5import Data.Functor.Identity

6import Data.Functor.Identity

6import Data.Maybe

7import Data.Maybe

8+#if !MIN_VERSION_base(4,11,0)

7import Data.Semigroup (Semigroup(..))

9import Data.Semigroup (Semigroup(..))

10+#endif

8import Data.Proxy

11import Data.Proxy

9

12

10-- | A 'Patch' type represents a kind of change made to a datastructure.

13-- | A 'Patch' type represents a kind of change made to a datastructure.

src/Data/Patch/DMap.hs+3

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE GeneralizedNewtypeDeriving #-}

2{-# LANGUAGE GeneralizedNewtypeDeriving #-}

2{-# LANGUAGE LambdaCase #-}

3{-# LANGUAGE LambdaCase #-}

3{-# LANGUAGE PolyKinds #-}

4{-# LANGUAGE PolyKinds #-}

@@ -20,7 +21,9 @@ import Data.Functor.Misc

20import qualified Data.IntMap as IntMap

21import qualified Data.IntMap as IntMap

21import qualified Data.Map as Map

22import qualified Data.Map as Map

22import Data.Monoid.DecidablyEmpty

23import Data.Monoid.DecidablyEmpty

24+#if !MIN_VERSION_base(4,11,0)

23import Data.Semigroup (Semigroup (..))

25import Data.Semigroup (Semigroup (..))

26+#endif

24import Data.Some (Some)

27import Data.Some (Some)

25

28

26-- | A set of changes to a 'DMap'. Any element may be inserted/updated or deleted.

29-- | A set of changes to a 'DMap'. Any element may be inserted/updated or deleted.

src/Data/Patch/DMapWithMove.hs+3−1

@@ -30,7 +30,9 @@ import Data.GADT.Show (GShow, gshow)

30import qualified Data.Map as Map

31import Data.Maybe

32import Data.Monoid.DecidablyEmpty

33+#if !MIN_VERSION_base(4,11,0)

33−import Data.Semigroup (Semigroup (..), (<>))

34+import Data.Semigroup (Semigroup (..))

35+#endif

34import Data.Some (Some(Some))

36import Data.Some (Some(Some))

35import Data.These

37import Data.These

36

38

src/Data/Patch/IntMap.hs+1−1

@@ -16,7 +16,7 @@ import Data.IntMap.Strict (IntMap)

16import qualified Data.IntMap.Strict as IntMap

17import Data.Maybe

18import Data.Monoid.DecidablyEmpty

19−#if !MIN_VERSION_base(4,10,0)

19+#if !MIN_VERSION_base(4,11,0)

20import Data.Semigroup (Semigroup (..))

21#endif

22import Data.Patch.Class

src/Data/Patch/Map.hs+2−1

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DeriveTraversable #-}

2{-# LANGUAGE DeriveTraversable #-}

2{-# LANGUAGE FlexibleInstances #-}

3{-# LANGUAGE FlexibleInstances #-}

3{-# LANGUAGE GeneralizedNewtypeDeriving #-}

4{-# LANGUAGE GeneralizedNewtypeDeriving #-}

@@ -18,7 +19,7 @@ import Data.Map (Map)

18import qualified Data.Map as Map

19import qualified Data.Map as Map

19import Data.Maybe

20import Data.Maybe

20import Data.Monoid.DecidablyEmpty

21import Data.Monoid.DecidablyEmpty

21−import Data.Semigroup

22+import Data.Semigroup (Semigroup (..), stimesIdempotentMonoid)

22

23

23-- | A set of changes to a 'Map'. Any element may be inserted/updated or

24-- | A set of changes to a 'Map'. Any element may be inserted/updated or

24-- deleted. Insertions are represented as values wrapped in 'Just', while

25-- deleted. Insertions are represented as values wrapped in 'Just', while

src/Data/Patch/MapWithMove.hs+2−2

@@ -25,8 +25,8 @@ import Data.List

25import Data.Map (Map)

26import qualified Data.Map as Map

27import Data.Maybe

28−#if !MIN_VERSION_base(4,10,0)

28+#if !MIN_VERSION_base(4,11,0)

29−import Data.Semigroup (Semigroup (..), (<>))

29+import Data.Semigroup (Semigroup (..))

30#endif

31import qualified Data.Set as Set

32import Data.These (These(..))

src/Data/Patch/MapWithPatchingMove.hs+1−1

@@ -26,7 +26,7 @@ import Data.List

26import Data.Map (Map)

27import qualified Data.Map as Map

28import Data.Maybe

29−#if !MIN_VERSION_base(4,10,0)

29+#if !MIN_VERSION_base(4,11,0)

30import Data.Semigroup (Semigroup (..))

31#endif

32import Data.Monoid.DecidablyEmpty