git.iko.soy/typeable/ordered-containers
on d4fd56e help sign in
b9e4053
swap
0 ahead, 6 behind
7 files changed+3−39
since splitsnapshots
unifiedsplit
ChangeLog.md−5 Data/Map/Ordered.hs−2 Data/Map/Ordered/Internal.hs−6 Data/Map/Ordered/Strict.hs+2−4 Data/Map/Util.hs−13 Data/Set/Ordered.hs−8 ordered-containers.cabal+1−1
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−2
@@ -32,8 +32,6 @@ module Data.Map.Ordered
3232 , Index, findIndex, elemAt
3333 -- * List conversions
3434 , fromList, assocs, toAscList
35− -- * 'M.Map' conversion
36− , toMap
3735 ) where
3836
3937import qualified Data.Map as M ()
Data/Map/Ordered/Internal.hs−6
@@ -242,9 +242,3 @@ assocs (OMap _ kvs) = map snd $ M.toAscList kvs
242242-- | Return key-value pairs in order of increasing key.
243243toAscList :: OMap k v -> [(k, v)]
244244toAscList (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.hs+2−4
@@ -32,15 +32,13 @@ module Data.Map.Ordered.Strict
3232 , Index, findIndex, elemAt
3333 -- * List conversions
3434 , fromList, assocs, toAscList
35− -- * 'M.Map' conversion
36− , toMap
3735 ) where
3836
3937import Data.Foldable (foldl')
4038import qualified Data.Map.Strict as M
4139import Data.Map.Ordered.Internal
42− ( OMap(..), empty, (<>|), (|<>), delete, filter, (\\), (|/\), (/\|), null, size
43− , member, notMember, lookup, findIndex, elemAt, assocs, toAscList, fromTV, toMap )
40+ ( OMap(..), empty, (<>|), (|<>), delete, filter, (\\), (|/\), (/\|), null, size
41+ , member, notMember, lookup, findIndex, elemAt, assocs, toAscList, fromTV )
4442import Data.Map.Util
4543import Prelude hiding (filter, lookup, null)
4644
Data/Map/Util.hs−13
@@ -1,23 +1,12 @@
1−{-# LANGUAGE CPP #-}
21{-# LANGUAGE DataKinds #-}
3−{-# LANGUAGE DeriveDataTypeable #-}
4−{-# LANGUAGE DeriveFoldable #-}
5−{-# LANGUAGE DeriveFunctor #-}
6−{-# LANGUAGE DeriveTraversable #-}
72{-# LANGUAGE KindSignatures #-}
83
94module Data.Map.Util where
105
11−import Data.Data (Data, Typeable)
126import Data.Map (Map)
137import Data.Monoid -- so that the docs for Monoid link to the right place
148import qualified Data.Map as M
159
16−#if !(MIN_VERSION_base(4,8,0))
17−import Data.Foldable (Foldable)
18−import Data.Traversable (Traversable)
19−#endif
20−
2110-- | An internal index used to track ordering only -- its magnitude doesn't
2211-- matter. If you manage to see this documentation, the library author has made
2312-- a mistake!
@@ -49,8 +38,6 @@ readsPrecList fromList d = readParen (d > 10) $ \r -> do
4938-- tells whether 'mappend' will prefer the indices of its first or second
5039-- argument if there are shared elements in both.
5140newtype Bias (dir :: IndexPreference) a = Bias { unbiased :: a }
52− deriving (Data, Eq, Foldable, Functor, Ord, Read, Show, Traversable, Typeable)
5341data IndexPreference = L | R
54− deriving Typeable
5542type L = 'L
5643type 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+1−1
@@ -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