git.iko.soy/typeable/ordered-containers
on 68a87bf help sign in
7 files changed+242−388
since splitsnapshots
unifiedsplit
ChangeLog.md−5 Data/Map/Ordered.hs+237−6 Data/Map/Ordered/Internal.hs−250 Data/Map/Ordered/Strict.hs−114 Data/Map/Util.hs+2−2 Data/Set/Ordered.hs−8 ordered-containers.cabal+3−3
ChangeLog.md−5
@@ -1,10 +1,5 @@
11# Revision history for ordered-containers
22
3−## 0.2.2 -- 2019-07-05
4−
5−* Add `toMap` and `toSet`, which support efficient conversions from
6− `OMap`s/`OSet`s to `Map`s/`Set`s, respectively.
7−
83## 0.2.1 -- 2019-03-25
94
105* Compatibility fixes from Ryan Scott (thanks!)
Data/Map/Ordered.hs+237−6
@@ -3,9 +3,9 @@
33{-# LANGUAGE DeriveFunctor #-}
44{-# LANGUAGE FlexibleInstances #-}
55
6−-- | An 'OMap' behaves much like a 'M.Map', with mostly the same asymptotics, but
6+-- | An 'OMap' behaves much like a 'Map', with mostly the same asymptotics, but
77-- also remembers the order that keys were inserted. All operations whose
8−-- asymptotics are worse than 'M.Map' have documentation saying so.
8+-- asymptotics are worse than 'Map' have documentation saying so.
99module Data.Map.Ordered
1010 ( OMap
1111 -- * Trivial maps
@@ -32,11 +32,242 @@ module Data.Map.Ordered
3232 , Index, findIndex, elemAt
3333 -- * List conversions
3434 , fromList, assocs, toAscList
35− -- * 'M.Map' conversion
36− , toMap
3735 ) where
3836
39−import qualified Data.Map as M ()
40−import Data.Map.Ordered.Internal
37+import Control.Applicative ((<|>))
38+import Control.Monad (guard)
39+import Data.Data
40+import Data.Foldable (Foldable, foldl', foldMap)
41+import Data.Function (on)
42+import Data.Map (Map)
4143import Data.Map.Util
44+import Data.Monoid (Monoid(..))
45+#if MIN_VERSION_base(4,9,0)
46+import Data.Semigroup (Semigroup(..))
47+#endif
48+#if !(MIN_VERSION_base(4,8,0))
49+import Control.Applicative ((<$>))
50+import Data.Traversable
51+#endif
4252import Prelude hiding (filter, lookup, null)
53+import qualified Data.Map as M
54+
55+data OMap k v = OMap !(Map k (Tag, v)) !(Map Tag (k, v))
56+ deriving (Functor, Typeable)
57+
58+-- | Values are produced in insertion order, not key order.
59+instance Foldable (OMap k) where foldMap f (OMap _ kvs) = foldMap (f . snd) kvs
60+instance ( Eq k, Eq v) => Eq (OMap k v) where (==) = (==) `on` assocs
61+instance ( Ord k, Ord v) => Ord (OMap k v) where compare = compare `on` assocs
62+instance ( Show k, Show v) => Show (OMap k v) where showsPrec = showsPrecList assocs
63+instance (Ord k, Read k, Read v) => Read (OMap k v) where readsPrec = readsPrecList fromList
64+
65+-- This instance preserves data abstraction at the cost of inefficiency.
66+-- We provide limited reflection services for the sake of data abstraction.
67+instance (Data k, Data a, Ord k) => Data (OMap k a) where
68+ gfoldl f z m = z fromList `f` assocs m
69+ toConstr _ = fromListConstr
70+ gunfold k z c = case constrIndex c of
71+ 1 -> k (z fromList)
72+ _ -> error "gunfold"
73+ dataTypeOf _ = oMapDataType
74+ -- dataCast2 /must/ be eta-expanded in order to build on GHC 7.8.
75+ dataCast2 f = gcast2 f
76+
77+fromListConstr :: Constr
78+fromListConstr = mkConstr oMapDataType "fromList" [] Prefix
79+
80+oMapDataType :: DataType
81+oMapDataType = mkDataType "Data.Map.Ordered.Map" [fromListConstr]
82+
83+#if MIN_VERSION_base(4,9,0)
84+instance (Ord k, Semigroup v) => Semigroup (Bias L (OMap k v)) where
85+ Bias o <> Bias o' = Bias (unionWithL (const (<>)) o o')
86+instance (Ord k, Semigroup v) => Semigroup (Bias R (OMap k v)) where
87+ Bias o <> Bias o' = Bias (unionWithR (const (<>)) o o')
88+#endif
89+
90+-- | Empty maps and map union. When combining two sets that share elements, the
91+-- indices of the left argument are preferred, and the values are combined with
92+-- 'mappend'.
93+--
94+-- See the asymptotics of 'unionWithL'.
95+instance (Ord k, Monoid v) => Monoid (Bias L (OMap k v)) where
96+ mempty = Bias empty
97+ mappend (Bias o) (Bias o') = Bias (unionWithL (const mappend) o o')
98+
99+-- | Empty maps and map union. When combining two sets that share elements, the
100+-- indices of the right argument are preferred, and the values are combined
101+-- with 'mappend'.
102+--
103+-- See the asymptotics of 'unionWithR'.
104+instance (Ord k, Monoid v) => Monoid (Bias R (OMap k v)) where
105+ mempty = Bias empty
106+ mappend (Bias o) (Bias o') = Bias (unionWithR (const mappend) o o')
107+
108+-- | Values are traversed in insertion order, not key order.
109+--
110+-- /O(n*log(n))/ where /n/ is the size of the map.
111+instance Ord k => Traversable (OMap k) where
112+ traverse f (OMap tvs kvs) = fromKV <$> traverse (\(k,v) -> (,) k <$> f v) kvs
113+
114+infixr 5 <|, |< -- copy :
115+infixl 5 >|, |>
116+infixr 6 <>|, |<> -- copy <>
117+
118+(<|) , (|<) :: Ord k => (,) k v -> OMap k v -> OMap k v
119+(>|) , (|>) :: Ord k => OMap k v -> (,) k v -> OMap k v
120+
121+-- | When a key occurs in both maps, prefer the value from the first map.
122+--
123+-- See asymptotics of 'unionWithR'.
124+(<>|) :: Ord k => OMap k v -> OMap k v -> OMap k v
125+
126+-- | When a key occurs in both maps, prefer the value from the first map.
127+--
128+-- See asymptotics of 'unionWithL'.
129+(|<>) :: Ord k => OMap k v -> OMap k v -> OMap k v
130+
131+(k, v) <| OMap tvs kvs = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
132+ t = maybe (nextLowerTag kvs) fst (M.lookup k tvs)
133+
134+(k, v) |< o = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
135+ t = nextLowerTag kvs
136+ OMap tvs kvs = delete k o
137+
138+o >| (k, v) = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
139+ t = nextHigherTag kvs
140+ OMap tvs kvs = delete k o
141+
142+OMap tvs kvs |> (k, v) = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
143+ t = maybe (nextHigherTag kvs) fst (M.lookup k tvs)
144+
145+(<>|) = unionWithR (const const)
146+(|<>) = unionWithL (const const)
147+
148+-- | Take the union. The first 'OMap' \'s argument's indices are lower than the
149+-- second. If a key appears in both maps, the first argument's index takes
150+-- precedence, and the supplied function is used to combine the values.
151+--
152+-- /O(r*log(r))/ where /r/ is the size of the result
153+unionWithL :: Ord k => (k -> v -> v -> v) -> OMap k v -> OMap k v -> OMap k v
154+unionWithL = unionWithInternal (\t t' -> t )
155+
156+-- | Take the union. The first 'OMap' \'s argument's indices are lower than the
157+-- second. If a key appears in both maps, the second argument's index takes
158+-- precedence, and the supplied function is used to combine the values.
159+--
160+-- /O(r*log(r))/ where /r/ is the size of the result
161+unionWithR :: Ord k => (k -> v -> v -> v) -> OMap k v -> OMap k v -> OMap k v
162+unionWithR = unionWithInternal (\t t' -> t')
163+
164+unionWithInternal :: Ord k => (Tag -> Tag -> Tag) -> (k -> v -> v -> v) -> OMap k v -> OMap k v -> OMap k v
165+unionWithInternal fT fKV (OMap tvs kvs) (OMap tvs' kvs') = fromTV tvs'' where
166+ bump = case maxTag kvs of
167+ Nothing -> 0
168+ Just k -> -k-1
169+ bump' = case minTag kvs' of
170+ Nothing -> 0
171+ Just k -> -k
172+ tvs'' = M.unionWithKey (\k (t,v) (t',v') -> (fT t t', fKV k v v'))
173+ (fmap (\(t,v) -> (bump +t,v)) tvs )
174+ (fmap (\(t,v) -> (bump'+t,v)) tvs')
175+
176+-- | @m \\\\ n@ deletes all the keys that exist in @n@ from @m@
177+--
178+-- /O(m*log(n))/ where /m/ is the size of the smaller map and /n/ is the size
179+-- of the larger map.
180+(\\) :: Ord k => OMap k v -> OMap k v' -> OMap k v
181+o@(OMap tvs kvs) \\ o'@(OMap tvs' kvs') = if size o < size o'
182+ then filter (const . (`notMember` o')) o
183+ else foldr delete o (fmap fst (assocs o'))
184+
185+empty :: OMap k v
186+empty = OMap M.empty M.empty
187+
188+singleton :: (k, v) -> OMap k v
189+singleton kv@(k, v) = OMap (M.singleton k (0, v)) (M.singleton 0 kv)
190+
191+-- | If a key appears multiple times, the first occurrence is used for ordering
192+-- and the last occurrence is used for its value. The library author welcomes
193+-- comments on whether this default is sane.
194+fromList :: Ord k => [(k, v)] -> OMap k v
195+fromList = foldl' (|>) empty
196+
197+null :: OMap k v -> Bool
198+null (OMap tvs _) = M.null tvs
199+
200+size :: OMap k v -> Int
201+size (OMap tvs _) = M.size tvs
202+
203+member, notMember :: Ord k => k -> OMap k v -> Bool
204+member k (OMap tvs _) = M.member k tvs
205+notMember k (OMap tvs _) = M.notMember k tvs
206+
207+lookup :: Ord k => k -> OMap k v -> Maybe v
208+lookup k (OMap tvs _) = fmap snd (M.lookup k tvs)
209+
210+-- The Ord constraint is for compatibility with older (<0.5) versions of
211+-- containers.
212+-- | @filter f m@ contains exactly the key-value pairs of @m@ that satisfy @f@,
213+-- without changing the order they appear
214+filter :: Ord k => (k -> v -> Bool) -> OMap k v -> OMap k v
215+filter f (OMap tvs kvs) = OMap (M.filterWithKey (\k (t, v) -> f k v) tvs)
216+ (M.filterWithKey (\t (k, v) -> f k v) kvs)
217+
218+delete :: Ord k => k -> OMap k v -> OMap k v
219+delete k o@(OMap tvs kvs) = case M.lookup k tvs of
220+ Nothing -> o
221+ Just (t, _) -> OMap (M.delete k tvs) (M.delete t kvs)
222+
223+-- | Intersection. (The @/\\@ is intended to look a bit like the standard
224+-- mathematical notation for set intersection.)
225+--
226+-- See asymptotics of 'intersectionWith'.
227+(/\|) :: Ord k => OMap k v -> OMap k v' -> OMap k v
228+o /\| o' = intersectionWith (\k v' v -> v) o' o
229+
230+-- | Intersection. (The @/\\@ is intended to look a bit like the standard
231+-- mathematical notation for set intersection.)
232+--
233+-- See asymptotics of 'intersectionWith'.
234+(|/\) :: Ord k => OMap k v -> OMap k v' -> OMap k v
235+o |/\ o' = intersectionWith (\k v v' -> v) o o'
236+
237+-- | Take the intersection. The first 'OMap' \'s argument's indices are used for
238+-- the result.
239+--
240+-- /O(m*log(n\/(m+1)) + r*log(r))/ where /m/ is the size of the smaller map, /n/
241+-- is the size of the larger map, and /r/ is the size of the result.
242+intersectionWith ::
243+ Ord k =>
244+ (k -> v -> v' -> v'') ->
245+ OMap k v -> OMap k v' -> OMap k v''
246+intersectionWith f (OMap tvs kvs) (OMap tvs' kvs') = fromTV
247+ $ M.intersectionWithKey (\k (t,v) (t',v') -> (t, f k v v')) tvs tvs'
248+
249+fromTV :: Ord k => Map k (Tag, v) -> OMap k v
250+fromTV tvs = OMap tvs kvs where
251+ kvs = M.fromList [(t,(k,v)) | (k,(t,v)) <- M.toList tvs]
252+
253+fromKV :: Ord k => Map Tag (k, v) -> OMap k v
254+fromKV kvs = OMap tvs kvs where
255+ tvs = M.fromList [(k,(t,v)) | (t,(k,v)) <- M.toList kvs]
256+
257+findIndex :: Ord k => k -> OMap k v -> Maybe Index
258+findIndex k o@(OMap tvs kvs) = do
259+ (t, _) <- M.lookup k tvs
260+ M.lookupIndex t kvs
261+
262+elemAt :: OMap k v -> Index -> Maybe (k, v)
263+elemAt o@(OMap tvs kvs) i = do
264+ guard (0 <= i && i < M.size kvs)
265+ return . snd $ M.elemAt i kvs
266+
267+-- | Return key-value pairs in the order they were inserted.
268+assocs :: OMap k v -> [(k, v)]
269+assocs (OMap _ kvs) = map snd $ M.toAscList kvs
270+
271+-- | Return key-value pairs in order of increasing key.
272+toAscList :: OMap k v -> [(k, v)]
273+toAscList (OMap tvs kvs) = map (\(k, (t, v)) -> (k, v)) $ M.toAscList tvs
Data/Map/Ordered/Internal.hsdeleted−250
@@ -1,250 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DeriveDataTypeable #-}
3−{-# LANGUAGE DeriveFunctor #-}
4−{-# LANGUAGE FlexibleInstances #-}
5−
6−module Data.Map.Ordered.Internal where
7−
8−import Control.Applicative ((<|>))
9−import Control.Monad (guard)
10−import Data.Data
11−import Data.Foldable (Foldable, foldl', foldMap)
12−import Data.Function (on)
13−import Data.Map (Map)
14−import Data.Map.Util
15−import Data.Monoid (Monoid(..))
16−#if MIN_VERSION_base(4,9,0)
17−import Data.Semigroup (Semigroup(..))
18−#endif
19−#if !(MIN_VERSION_base(4,8,0))
20−import Control.Applicative ((<$>))
21−import Data.Traversable
22−#endif
23−import Prelude hiding (filter, lookup, null)
24−import qualified Data.Map as M
25−
26−data OMap k v = OMap !(Map k (Tag, v)) !(Map Tag (k, v))
27− deriving (Functor, Typeable)
28−
29−-- | Values are produced in insertion order, not key order.
30−instance Foldable (OMap k) where foldMap f (OMap _ kvs) = foldMap (f . snd) kvs
31−instance ( Eq k, Eq v) => Eq (OMap k v) where (==) = (==) `on` assocs
32−instance ( Ord k, Ord v) => Ord (OMap k v) where compare = compare `on` assocs
33−instance ( Show k, Show v) => Show (OMap k v) where showsPrec = showsPrecList assocs
34−instance (Ord k, Read k, Read v) => Read (OMap k v) where readsPrec = readsPrecList fromList
35−
36−-- This instance preserves data abstraction at the cost of inefficiency.
37−-- We provide limited reflection services for the sake of data abstraction.
38−instance (Data k, Data a, Ord k) => Data (OMap k a) where
39− gfoldl f z m = z fromList `f` assocs m
40− toConstr _ = fromListConstr
41− gunfold k z c = case constrIndex c of
42− 1 -> k (z fromList)
43− _ -> error "gunfold"
44− dataTypeOf _ = oMapDataType
45− -- dataCast2 /must/ be eta-expanded in order to build on GHC 7.8.
46− dataCast2 f = gcast2 f
47−
48−fromListConstr :: Constr
49−fromListConstr = mkConstr oMapDataType "fromList" [] Prefix
50−
51−oMapDataType :: DataType
52−oMapDataType = mkDataType "Data.Map.Ordered.Map" [fromListConstr]
53−
54−#if MIN_VERSION_base(4,9,0)
55−instance (Ord k, Semigroup v) => Semigroup (Bias L (OMap k v)) where
56− Bias o <> Bias o' = Bias (unionWithL (const (<>)) o o')
57−instance (Ord k, Semigroup v) => Semigroup (Bias R (OMap k v)) where
58− Bias o <> Bias o' = Bias (unionWithR (const (<>)) o o')
59−#endif
60−
61−-- | Empty maps and map union. When combining two sets that share elements, the
62−-- indices of the left argument are preferred, and the values are combined with
63−-- 'mappend'.
64−--
65−-- See the asymptotics of 'unionWithL'.
66−instance (Ord k, Monoid v) => Monoid (Bias L (OMap k v)) where
67− mempty = Bias empty
68− mappend (Bias o) (Bias o') = Bias (unionWithL (const mappend) o o')
69−
70−-- | Empty maps and map union. When combining two sets that share elements, the
71−-- indices of the right argument are preferred, and the values are combined
72−-- with 'mappend'.
73−--
74−-- See the asymptotics of 'unionWithR'.
75−instance (Ord k, Monoid v) => Monoid (Bias R (OMap k v)) where
76− mempty = Bias empty
77− mappend (Bias o) (Bias o') = Bias (unionWithR (const mappend) o o')
78−
79−-- | Values are traversed in insertion order, not key order.
80−--
81−-- /O(n*log(n))/ where /n/ is the size of the map.
82−instance Ord k => Traversable (OMap k) where
83− traverse f (OMap tvs kvs) = fromKV <$> traverse (\(k,v) -> (,) k <$> f v) kvs
84−
85−infixr 5 <|, |< -- copy :
86−infixl 5 >|, |>
87−infixr 6 <>|, |<> -- copy <>
88−
89−(<|) , (|<) :: Ord k => (,) k v -> OMap k v -> OMap k v
90−(>|) , (|>) :: Ord k => OMap k v -> (,) k v -> OMap k v
91−
92−-- | When a key occurs in both maps, prefer the value from the first map.
93−--
94−-- See asymptotics of 'unionWithR'.
95−(<>|) :: Ord k => OMap k v -> OMap k v -> OMap k v
96−
97−-- | When a key occurs in both maps, prefer the value from the first map.
98−--
99−-- See asymptotics of 'unionWithL'.
100−(|<>) :: Ord k => OMap k v -> OMap k v -> OMap k v
101−
102−(k, v) <| OMap tvs kvs = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
103− t = maybe (nextLowerTag kvs) fst (M.lookup k tvs)
104−
105−(k, v) |< o = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
106− t = nextLowerTag kvs
107− OMap tvs kvs = delete k o
108−
109−o >| (k, v) = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
110− t = nextHigherTag kvs
111− OMap tvs kvs = delete k o
112−
113−OMap tvs kvs |> (k, v) = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
114− t = maybe (nextHigherTag kvs) fst (M.lookup k tvs)
115−
116−(<>|) = unionWithR (const const)
117−(|<>) = unionWithL (const const)
118−
119−-- | Take the union. The first 'OMap' \'s argument's indices are lower than the
120−-- second. If a key appears in both maps, the first argument's index takes
121−-- precedence, and the supplied function is used to combine the values.
122−--
123−-- /O(r*log(r))/ where /r/ is the size of the result
124−unionWithL :: Ord k => (k -> v -> v -> v) -> OMap k v -> OMap k v -> OMap k v
125−unionWithL = unionWithInternal (\t t' -> t )
126−
127−-- | Take the union. The first 'OMap' \'s argument's indices are lower than the
128−-- second. If a key appears in both maps, the second argument's index takes
129−-- precedence, and the supplied function is used to combine the values.
130−--
131−-- /O(r*log(r))/ where /r/ is the size of the result
132−unionWithR :: Ord k => (k -> v -> v -> v) -> OMap k v -> OMap k v -> OMap k v
133−unionWithR = unionWithInternal (\t t' -> t')
134−
135−unionWithInternal :: Ord k => (Tag -> Tag -> Tag) -> (k -> v -> v -> v) -> OMap k v -> OMap k v -> OMap k v
136−unionWithInternal fT fKV (OMap tvs kvs) (OMap tvs' kvs') = fromTV tvs'' where
137− bump = case maxTag kvs of
138− Nothing -> 0
139− Just k -> -k-1
140− bump' = case minTag kvs' of
141− Nothing -> 0
142− Just k -> -k
143− tvs'' = M.unionWithKey (\k (t,v) (t',v') -> (fT t t', fKV k v v'))
144− (fmap (\(t,v) -> (bump +t,v)) tvs )
145− (fmap (\(t,v) -> (bump'+t,v)) tvs')
146−
147−-- | @m \\\\ n@ deletes all the keys that exist in @n@ from @m@
148−--
149−-- /O(m*log(n))/ where /m/ is the size of the smaller map and /n/ is the size
150−-- of the larger map.
151−(\\) :: Ord k => OMap k v -> OMap k v' -> OMap k v
152−o@(OMap tvs kvs) \\ o'@(OMap tvs' kvs') = if size o < size o'
153− then filter (const . (`notMember` o')) o
154− else foldr delete o (fmap fst (assocs o'))
155−
156−empty :: OMap k v
157−empty = OMap M.empty M.empty
158−
159−singleton :: (k, v) -> OMap k v
160−singleton kv@(k, v) = OMap (M.singleton k (0, v)) (M.singleton 0 kv)
161−
162−-- | If a key appears multiple times, the first occurrence is used for ordering
163−-- and the last occurrence is used for its value. The library author welcomes
164−-- comments on whether this default is sane.
165−fromList :: Ord k => [(k, v)] -> OMap k v
166−fromList = foldl' (|>) empty
167−
168−null :: OMap k v -> Bool
169−null (OMap tvs _) = M.null tvs
170−
171−size :: OMap k v -> Int
172−size (OMap tvs _) = M.size tvs
173−
174−member, notMember :: Ord k => k -> OMap k v -> Bool
175−member k (OMap tvs _) = M.member k tvs
176−notMember k (OMap tvs _) = M.notMember k tvs
177−
178−lookup :: Ord k => k -> OMap k v -> Maybe v
179−lookup k (OMap tvs _) = fmap snd (M.lookup k tvs)
180−
181−-- The Ord constraint is for compatibility with older (<0.5) versions of
182−-- containers.
183−-- | @filter f m@ contains exactly the key-value pairs of @m@ that satisfy @f@,
184−-- without changing the order they appear
185−filter :: Ord k => (k -> v -> Bool) -> OMap k v -> OMap k v
186−filter f (OMap tvs kvs) = OMap (M.filterWithKey (\k (t, v) -> f k v) tvs)
187− (M.filterWithKey (\t (k, v) -> f k v) kvs)
188−
189−delete :: Ord k => k -> OMap k v -> OMap k v
190−delete k o@(OMap tvs kvs) = case M.lookup k tvs of
191− Nothing -> o
192− Just (t, _) -> OMap (M.delete k tvs) (M.delete t kvs)
193−
194−-- | Intersection. (The @/\\@ is intended to look a bit like the standard
195−-- mathematical notation for set intersection.)
196−--
197−-- See asymptotics of 'intersectionWith'.
198−(/\|) :: Ord k => OMap k v -> OMap k v' -> OMap k v
199−o /\| o' = intersectionWith (\k v' v -> v) o' o
200−
201−-- | Intersection. (The @/\\@ is intended to look a bit like the standard
202−-- mathematical notation for set intersection.)
203−--
204−-- See asymptotics of 'intersectionWith'.
205−(|/\) :: Ord k => OMap k v -> OMap k v' -> OMap k v
206−o |/\ o' = intersectionWith (\k v v' -> v) o o'
207−
208−-- | Take the intersection. The first 'OMap' \'s argument's indices are used for
209−-- the result.
210−--
211−-- /O(m*log(n\/(m+1)) + r*log(r))/ where /m/ is the size of the smaller map, /n/
212−-- is the size of the larger map, and /r/ is the size of the result.
213−intersectionWith ::
214− Ord k =>
215− (k -> v -> v' -> v'') ->
216− OMap k v -> OMap k v' -> OMap k v''
217−intersectionWith f (OMap tvs kvs) (OMap tvs' kvs') = fromTV
218− $ M.intersectionWithKey (\k (t,v) (t',v') -> (t, f k v v')) tvs tvs'
219−
220−fromTV :: Ord k => Map k (Tag, v) -> OMap k v
221−fromTV tvs = OMap tvs kvs where
222− kvs = M.fromList [(t,(k,v)) | (k,(t,v)) <- M.toList tvs]
223−
224−fromKV :: Ord k => Map Tag (k, v) -> OMap k v
225−fromKV kvs = OMap tvs kvs where
226− tvs = M.fromList [(k,(t,v)) | (t,(k,v)) <- M.toList kvs]
227−
228−findIndex :: Ord k => k -> OMap k v -> Maybe Index
229−findIndex k o@(OMap tvs kvs) = do
230− (t, _) <- M.lookup k tvs
231− M.lookupIndex t kvs
232−
233−elemAt :: OMap k v -> Index -> Maybe (k, v)
234−elemAt o@(OMap tvs kvs) i = do
235− guard (0 <= i && i < M.size kvs)
236− return . snd $ M.elemAt i kvs
237−
238−-- | Return key-value pairs in the order they were inserted.
239−assocs :: OMap k v -> [(k, v)]
240−assocs (OMap _ kvs) = map snd $ M.toAscList kvs
241−
242−-- | Return key-value pairs in order of increasing key.
243−toAscList :: OMap k v -> [(k, v)]
244−toAscList (OMap tvs kvs) = map (\(k, (t, v)) -> (k, v)) $ M.toAscList tvs
245−
246−-- | Convert an 'OMap' to a 'Map'.
247−--
248−-- /O(n)/, where /n/ is the size of the 'OMap'.
249−toMap :: OMap k v -> Map k v
250−toMap (OMap tvs _) = fmap snd tvs
Data/Map/Ordered/Strict.hsdeleted−114
@@ -1,114 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DeriveDataTypeable #-}
3−{-# LANGUAGE DeriveFunctor #-}
4−{-# LANGUAGE FlexibleInstances #-}
5−
6−-- | An 'OMap' behaves much like a 'M.Map', with mostly the same asymptotics, but
7−-- also remembers the order that keys were inserted. All operations whose
8−-- asymptotics are worse than 'M.Map' have documentation saying so.
9−module Data.Map.Ordered.Strict
10− ( OMap
11− -- * Trivial maps
12− , empty, singleton
13− -- * Insertion
14− -- | Conventions:
15− --
16− -- * The open side of an angle bracket points to an 'OMap'
17− --
18− -- * The pipe appears on the side whose indices take precedence if both sides contain the same key
19− --
20− -- * The left argument's indices are lower than the right argument's indices
21− --
22− -- * If both sides contain the same key, the tuple's value wins
23− , (<|), (|<), (>|), (|>)
24− , (<>|), (|<>), unionWithL, unionWithR
25− , Bias(Bias, unbiased), L, R
26− -- * Deletion
27− , delete, filter, (\\)
28− , (|/\), (/\|), intersectionWith
29− -- * Query
30− , null, size, member, notMember, lookup
31− -- * Indexing
32− , Index, findIndex, elemAt
33− -- * List conversions
34− , fromList, assocs, toAscList
35− -- * 'M.Map' conversion
36− , toMap
37− ) where
38−
39−import Data.Foldable (foldl')
40−import qualified Data.Map.Strict as M
41−import Data.Map.Ordered.Internal
42− ( OMap(..), empty, (<>|), (|<>), delete, filter, (\\), (|/\), (/\|), null, size
43− , member, notMember, lookup, findIndex, elemAt, assocs, toAscList, fromTV, toMap )
44−import Data.Map.Util
45−import Prelude hiding (filter, lookup, null)
46−
47−infixr 5 <|, |< -- copy :
48−infixl 5 >|, |>
49−
50−(<|) , (|<) :: Ord k => (,) k v -> OMap k v -> OMap k v
51−(>|) , (|>) :: Ord k => OMap k v -> (,) k v -> OMap k v
52−
53−(k, v) <| OMap tvs kvs = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
54− t = maybe (nextLowerTag kvs) fst (M.lookup k tvs)
55−
56−(k, v) |< o = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
57− t = nextLowerTag kvs
58− OMap tvs kvs = delete k o
59−
60−o >| (k, v) = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
61− t = nextHigherTag kvs
62− OMap tvs kvs = delete k o
63−
64−OMap tvs kvs |> (k, v) = OMap (M.insert k (t, v) tvs) (M.insert t (k, v) kvs) where
65− t = maybe (nextHigherTag kvs) fst (M.lookup k tvs)
66−
67−-- | Take the union. The first 'OMap' \'s argument's indices are lower than the
68−-- second. If a key appears in both maps, the first argument's index takes
69−-- precedence, and the supplied function is used to combine the values.
70−--
71−-- /O(r*log(r))/ where /r/ is the size of the result
72−unionWithL :: Ord k => (k -> v -> v -> v) -> OMap k v -> OMap k v -> OMap k v
73−unionWithL = unionWithInternal (\t t' -> t )
74−
75−-- | Take the union. The first 'OMap' \'s argument's indices are lower than the
76−-- second. If a key appears in both maps, the second argument's index takes
77−-- precedence, and the supplied function is used to combine the values.
78−--
79−-- /O(r*log(r))/ where /r/ is the size of the result
80−unionWithR :: Ord k => (k -> v -> v -> v) -> OMap k v -> OMap k v -> OMap k v
81−unionWithR = unionWithInternal (\t t' -> t')
82−
83−unionWithInternal :: Ord k => (Tag -> Tag -> Tag) -> (k -> v -> v -> v) -> OMap k v -> OMap k v -> OMap k v
84−unionWithInternal fT fKV (OMap tvs kvs) (OMap tvs' kvs') = fromTV tvs'' where
85− bump = case maxTag kvs of
86− Nothing -> 0
87− Just k -> -k-1
88− bump' = case minTag kvs' of
89− Nothing -> 0
90− Just k -> -k
91− tvs'' = M.unionWithKey (\k (t,v) (t',v') -> (fT t t', fKV k v v'))
92− (fmap (\(t,v) -> (bump +t,v)) tvs )
93− (fmap (\(t,v) -> (bump'+t,v)) tvs')
94−
95−singleton :: (k, v) -> OMap k v
96−singleton kv@(k, v) = OMap (M.singleton k (0, v)) (M.singleton 0 kv)
97−
98−-- | If a key appears multiple times, the first occurrence is used for ordering
99−-- and the last occurrence is used for its value. The library author welcomes
100−-- comments on whether this default is sane.
101−fromList :: Ord k => [(k, v)] -> OMap k v
102−fromList = foldl' (|>) empty
103−
104−-- | Take the intersection. The first 'OMap' \'s argument's indices are used for
105−-- the result.
106−--
107−-- /O(m*log(n\/(m+1)) + r*log(r))/ where /m/ is the size of the smaller map, /n/
108−-- is the size of the larger map, and /r/ is the size of the result.
109−intersectionWith ::
110− Ord k =>
111− (k -> v -> v' -> v'') ->
112− OMap k v -> OMap k v' -> OMap k v''
113−intersectionWith f (OMap tvs kvs) (OMap tvs' kvs') = fromTV
114− $ M.intersectionWithKey (\k (t,v) (t',v') -> (t, f k v v')) tvs tvs'
Data/Map/Util.hs+2−2
@@ -49,8 +49,8 @@ readsPrecList fromList d = readParen (d > 10) $ \r -> do
4949-- tells whether 'mappend' will prefer the indices of its first or second
5050-- argument if there are shared elements in both.
5151newtype Bias (dir :: IndexPreference) a = Bias { unbiased :: a }
52− deriving (Data, Eq, Foldable, Functor, Ord, Read, Show, Traversable, Typeable)
52+ deriving (Data, Eq, Foldable, Functor, Ord, Read, Show, Traversable, Typeable)
5353data IndexPreference = L | R
54− deriving Typeable
54+ deriving Typeable
5555type L = 'L
5656type R = 'R
Data/Set/Ordered.hs−8
@@ -28,8 +28,6 @@ module Data.Set.Ordered
2828 , Index, findIndex, elemAt
2929 -- * List conversions
3030 , fromList, toAscList
31− -- * 'Set' conversion
32− , toSet
3331 ) where
3432
3533import Control.Monad (guard)
@@ -218,9 +216,3 @@ elemAt o@(OSet ts vs) i = do
218216-- insertion order.)
219217toAscList :: OSet a -> [a]
220218toAscList o@(OSet ts _) = fmap fst (M.toAscList ts)
221−
222−-- | Convert an 'OSet' to a 'Set'.
223−--
224−-- /O(n)/, where /n/ is the size of the 'OSet'.
225−toSet :: OSet a -> Set a
226−toSet (OSet ts _) = M.keysSet ts
ordered-containers.cabal+3−3
@@ -1,5 +1,5 @@
11name: ordered-containers
2−version: 0.2.2
2+version: 0.2.1
33synopsis: Set- and Map-like types that remember the order elements were inserted
44license: BSD3
55license-file: LICENSE
@@ -15,8 +15,8 @@ source-repository head
1515 location: https://github.com/dmwit/ordered-containers
1616
1717library
18− exposed-modules: Data.Map.Ordered, Data.Map.Ordered.Strict, Data.Set.Ordered
19− other-modules: Data.Map.Ordered.Internal, Data.Map.Util
18+ exposed-modules: Data.Map.Ordered, Data.Set.Ordered
19+ other-modules: Data.Map.Util
2020 build-depends: base >=4.7 && <5, containers >=0.1 && <0.7
2121 default-language: Haskell98
2222 ghc-options: -fno-warn-tabs