714efd3 · typeable/ordered-containers

git.iko.soy/typeable/ordered-containers

on master help sign in

Merge pull request #13 from RyanGlScott/fix-build

714efd3Daniel Wagner8 years ago

Data/Map/Ordered.hs+8−3

compare with master

unifiedsplit

@@ -41,9 +41,13 @@ import Data.Foldable (Foldable, foldl', foldMap)

41import Data.Function (on)

42import Data.Map (Map)

43import Data.Map.Util

44−import Data.Monoid

44+import Data.Monoid (Monoid(..))

45#if MIN_VERSION_base(4,9,0)

46−import Data.Semigroup

46+import Data.Semigroup (Semigroup(..))

47+#endif

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

49+import Control.Applicative ((<$>))

50+import Data.Traversable

47#endif

51#endif

48import Prelude hiding (filter, lookup, null)

52import Prelude hiding (filter, lookup, null)

49import qualified Data.Map as M

53import qualified Data.Map as M

@@ -67,7 +71,8 @@ instance (Data k, Data a, Ord k) => Data (OMap k a) where

67 1 -> k (z fromList)

71 1 -> k (z fromList)

68 _ -> error "gunfold"

72 _ -> error "gunfold"

69 dataTypeOf _ = oMapDataType

73 dataTypeOf _ = oMapDataType

74+ -- dataCast2 /must/ be eta-expanded in order to build on GHC 7.8.

70− dataCast2 = gcast2

75+ dataCast2 f = gcast2 f

72fromListConstr :: Constr

77fromListConstr :: Constr

73fromListConstr = mkConstr oMapDataType "fromList" [] Prefix

78fromListConstr = mkConstr oMapDataType "fromList" [] Prefix

Data/Set/Ordered.hs+4−3

@@ -36,9 +36,9 @@ import Data.Foldable (Foldable, foldl', foldMap, foldr, toList)

36import Data.Function (on)

37import Data.Map (Map)

38import Data.Map.Util

39−import Data.Monoid

39+import Data.Monoid (Monoid(..))

40#if MIN_VERSION_base(4,9,0)

41−import Data.Semigroup

41+import Data.Semigroup (Semigroup(..))

42#endif

43import Data.Set (Set) -- so the haddocks link to the right place

44import Prelude hiding (filter, foldr, lookup, null)

@@ -63,7 +63,8 @@ instance (Data a, Ord a) => Data (OSet a) where

63 1 -> k (z fromList)

64 _ -> error "gunfold"

65 dataTypeOf _ = oSetDataType

66+ -- dataCast1 /must/ be eta-expanded in order to build on GHC 7.8.

66− dataCast1 = gcast1

67+ dataCast1 f = gcast1 f

68fromListConstr :: Constr

69fromListConstr :: Constr

69fromListConstr = mkConstr oSetDataType "fromList" [] Prefix

70fromListConstr = mkConstr oSetDataType "fromList" [] Prefix