diff options
author | Andrew Cady <d@jerkface.net> | 2019-07-13 16:00:49 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2019-07-13 16:00:49 -0400 |
commit | 803d8a03e5c787d1d57b327cbc30a5beb9f1ec7a (patch) | |
tree | 7b0bb79eae3af88db6db47f22cdd10d12934e8b2 | |
parent | 9a7c8195e5330c868b0e2b9b25af915d5fd2bd7a (diff) |
make unused code compile
-rw-r--r-- | kiki.cabal | 6 | ||||
-rw-r--r-- | lib/IntMapClass.hs (renamed from IntMapClass.hs) | 11 |
2 files changed, 9 insertions, 8 deletions
@@ -73,7 +73,8 @@ library | |||
73 | SuperOrd, | 73 | SuperOrd, |
74 | FunctorToMaybe, | 74 | FunctorToMaybe, |
75 | GnuPGAgent, | 75 | GnuPGAgent, |
76 | ByteStringUtil | 76 | ByteStringUtil, |
77 | IntMapClass | ||
77 | other-modules: TimeUtil, | 78 | other-modules: TimeUtil, |
78 | ControlMaybe, | 79 | ControlMaybe, |
79 | Compat, | 80 | Compat, |
@@ -87,7 +88,8 @@ library | |||
87 | asn1-types, | 88 | asn1-types, |
88 | binary, | 89 | binary, |
89 | bytestring, | 90 | bytestring, |
90 | containers, | 91 | containers >= 0.5.3, |
92 | deepseq, | ||
91 | directory, | 93 | directory, |
92 | filepath, | 94 | filepath, |
93 | network, | 95 | network, |
diff --git a/IntMapClass.hs b/lib/IntMapClass.hs index 81382aa..c5e6a88 100644 --- a/IntMapClass.hs +++ b/lib/IntMapClass.hs | |||
@@ -28,6 +28,7 @@ newtype IMap k a = IMap { intmap :: IntMap a } | |||
28 | , Ord | 28 | , Ord |
29 | , Read | 29 | , Read |
30 | , Show | 30 | , Show |
31 | , Semigroup | ||
31 | , Monoid | 32 | , Monoid |
32 | , NFData | 33 | , NFData |
33 | ) | 34 | ) |
@@ -152,11 +153,11 @@ unionWith f = adaptm_m_m (IntMap.unionWith f) | |||
152 | unionWithKey :: Coercible Int k => (k -> a -> a -> a) -> IMap k a -> IMap k a -> IMap k a | 153 | unionWithKey :: Coercible Int k => (k -> a -> a -> a) -> IMap k a -> IMap k a -> IMap k a |
153 | unionWithKey f = adaptm_m_m (IntMap.unionWithKey $ f . coerce) | 154 | unionWithKey f = adaptm_m_m (IntMap.unionWithKey $ f . coerce) |
154 | 155 | ||
155 | unions :: Coercible [IMap k a] [IntMap a] => [IMap k a] -> IMap k a | 156 | -- unions :: Coercible [IMap k a] [IntMap a] => [IMap k a] -> IMap k a |
156 | unions ms = IMap $ IntMap.unions (coerce ms) | 157 | -- unions ms = IMap $ IntMap.unions (coerce ms) |
157 | 158 | ||
158 | unionsWith :: Coercible [IMap k a] [IntMap a] => (a->a->a) -> [IMap k a] -> IMap k a | 159 | -- unionsWith :: Coercible [IMap k a] [IntMap a] => (a->a->a) -> [IMap k a] -> IMap k a |
159 | unionsWith f ms = IMap $ IntMap.unionsWith f (coerce ms) | 160 | -- unionsWith f ms = IMap $ IntMap.unionsWith f (coerce ms) |
160 | 161 | ||
161 | difference = adaptm_m_m IntMap.difference | 162 | difference = adaptm_m_m IntMap.difference |
162 | 163 | ||
@@ -236,10 +237,8 @@ foldlWithKey :: | |||
236 | Coercible Int k => (x -> k -> a -> x) -> x -> IMap k a -> x | 237 | Coercible Int k => (x -> k -> a -> x) -> x -> IMap k a -> x |
237 | foldlWithKey f a = adapt_m (IntMap.foldlWithKey f' a) where f' a = f a . coerce | 238 | foldlWithKey f a = adapt_m (IntMap.foldlWithKey f' a) where f' a = f a . coerce |
238 | 239 | ||
239 | #if MIN_VERSION_containers(0,5,3) | ||
240 | foldMapWithKey :: (Monoid m, Coercible k Int) => (k -> a -> m) -> IMap k a -> m | 240 | foldMapWithKey :: (Monoid m, Coercible k Int) => (k -> a -> m) -> IMap k a -> m |
241 | foldMapWithKey f = adapt_m (IntMap.foldMapWithKey $ f . coerce) | 241 | foldMapWithKey f = adapt_m (IntMap.foldMapWithKey $ f . coerce) |
242 | #endif | ||
243 | 242 | ||
244 | foldr' :: (a -> x -> x) -> x -> IMap k a -> x | 243 | foldr' :: (a -> x -> x) -> x -> IMap k a -> x |
245 | foldr' f b = adapt_m (IntMap.foldr' f b) | 244 | foldr' f b = adapt_m (IntMap.foldr' f b) |