git.iko.soy/typerep-map
on main help sign in
[#46] Improve Show instance, add keys (#49)
30686c7Veronika Romashkina
CHANGELOG.md+6
compare with main
unifiedsplit
@@ -4,6 +4,12 @@ Change log
4`typerep-map` uses [PVP Versioning][1].
4`typerep-map` uses [PVP Versioning][1].
5The change log is available [on GitHub][2].
5The change log is available [on GitHub][2].
6
6
7+# 0.3.0
8+
9+* [#43](https://github.com/kowainik/typerep-map/issues/43):
10+ Make `Show` instance for `TypeRepMap` show keys.
11+ Add `keys` function.
12+
7# 0.2.0
13# 0.2.0
8
14
9* [#43](https://github.com/kowainik/typerep-map/issues/43):
15* [#43](https://github.com/kowainik/typerep-map/issues/43):
src/Data/TMap.hs+7
@@ -39,6 +39,7 @@ module Data.TMap
39 , lookup
39 , lookup
40 , member
40 , member
41 , size
41 , size
42+ , keys
42 ) where
43 ) where
43
44
44import Prelude hiding (lookup, map)
45import Prelude hiding (lookup, map)
@@ -46,6 +47,7 @@ import Prelude hiding (lookup, map)
46import Data.Functor.Identity (Identity (..))
47import Data.Functor.Identity (Identity (..))
47import Data.Typeable (Typeable)
48import Data.Typeable (Typeable)
48import GHC.Exts (coerce)
49import GHC.Exts (coerce)
50+import Type.Reflection (SomeTypeRep)
49
51
50import qualified Data.TypeRepMap as F
52import qualified Data.TypeRepMap as F
51
53
@@ -148,6 +150,11 @@ size :: TMap -> Int
148size = F.size
150size = F.size
149{-# INLINE size #-}
151{-# INLINE size #-}
150
152
153+-- | Returns the list of 'SomeTypeRep's from keys.
154+keys :: TMap -> [SomeTypeRep]
155+keys = F.keys
156+{-# INLINE keys #-}
157+
151-- | Map a function over the values.
158-- | Map a function over the values.
152map :: (forall a. Typeable a => a -> a) -> TMap -> TMap
159map :: (forall a. Typeable a => a -> a) -> TMap -> TMap
153map f = F.hoistWithKey (fIdentity f)
160map f = F.hoistWithKey (fIdentity f)
src/Data/TypeRepMap.hs+1
@@ -61,6 +61,7 @@ module Data.TypeRepMap
61 , lookup
61 , lookup
62 , member
62 , member
63 , size
63 , size
64+ , keys
64
65
65 -- * 'IsList'
66 -- * 'IsList'
66 , WrapTypeable (..)
67 , WrapTypeable (..)
src/Data/TypeRepMap/Internal.hs+21−10
@@ -27,7 +27,7 @@ import Control.Monad.Zip (mzip)
27import Data.Function (on)
27import Data.Function (on)
28import Data.IntMap.Strict (IntMap)
28import Data.IntMap.Strict (IntMap)
29import Data.Kind (Type)
29import Data.Kind (Type)
30−import Data.List (nubBy)
30+import Data.List (intercalate, nubBy)
31import Data.Maybe (fromJust)
31import Data.Maybe (fromJust)
32import Data.Primitive.Array (Array, indexArray, mapArray')
32import Data.Primitive.Array (Array, indexArray, mapArray')
33import Data.Primitive.PrimArray (PrimArray, indexPrimArray, sizeofPrimArray)
33import Data.Primitive.PrimArray (PrimArray, indexPrimArray, sizeofPrimArray)
@@ -37,7 +37,7 @@ import GHC.Exts (IsList (..), inline, sortWith)
37import GHC.Fingerprint (Fingerprint (..))
37import GHC.Fingerprint (Fingerprint (..))
38import GHC.Prim (eqWord#, ltWord#)
38import GHC.Prim (eqWord#, ltWord#)
39import GHC.Word (Word64 (..))
39import GHC.Word (Word64 (..))
40−import Type.Reflection (TypeRep, Typeable, typeRep, withTypeable)
40+import Type.Reflection (SomeTypeRep (..), TypeRep, Typeable, typeRep, withTypeable)
41import Type.Reflection.Unsafe (typeRepFingerprint)
41import Type.Reflection.Unsafe (typeRepFingerprint)
42import Unsafe.Coerce (unsafeCoerce)
42import Unsafe.Coerce (unsafeCoerce)
43
43
@@ -70,14 +70,17 @@ data TypeRepMap (f :: k -> Type) =
70 TypeRepMap
70 TypeRepMap
71 { fingerprintAs :: {-# UNPACK #-} !(PrimArray Word64) -- ^ first components of key fingerprints
71 { fingerprintAs :: {-# UNPACK #-} !(PrimArray Word64) -- ^ first components of key fingerprints
72 , fingerprintBs :: {-# UNPACK #-} !(PrimArray Word64) -- ^ second components of key fingerprints
72 , fingerprintBs :: {-# UNPACK #-} !(PrimArray Word64) -- ^ second components of key fingerprints
73− , anys :: {-# UNPACK #-} !(Array Any) -- ^ values stored in the map
73+ , trAnys :: {-# UNPACK #-} !(Array Any) -- ^ values stored in the map
74− , keys :: {-# UNPACK #-} !(Array Any) -- ^ typerep keys
74+ , trKeys :: {-# UNPACK #-} !(Array Any) -- ^ typerep keys
75 }
75 }
76 -- ^ an unsafe constructor for 'TypeRepMap'
76 -- ^ an unsafe constructor for 'TypeRepMap'
77
77
78−-- | Shows only 'Fingerprint's.
78+-- | Shows only keys.
79instance Show (TypeRepMap f) where
79instance Show (TypeRepMap f) where
80− show = show . toFingerprints
80+ show TypeRepMap{..} = "TypeRepMap [" ++ showKeys ++ "]"
81+ where
82+ showKeys :: String
83+ showKeys = intercalate ", " $ toList $ mapArray' (show . anyToTypeRep) trKeys
81
84
82-- | Uses 'union' to combine 'TypeRepMap's.
85-- | Uses 'union' to combine 'TypeRepMap's.
83instance Semigroup (TypeRepMap f) where
86instance Semigroup (TypeRepMap f) where
@@ -237,7 +240,7 @@ Just (Identity 11)
237Nothing
240Nothing
238-}
241-}
239lookup :: forall a f . Typeable a => TypeRepMap f -> Maybe (f a)
242lookup :: forall a f . Typeable a => TypeRepMap f -> Maybe (f a)
240−lookup tVect = fromAny . (anys tVect `indexArray`)
243+lookup tVect = fromAny . (trAnys tVect `indexArray`)
241 <$> cachedBinarySearch (typeFp @a)
244 <$> cachedBinarySearch (typeFp @a)
242 (fingerprintAs tVect)
245 (fingerprintAs tVect)
243 (fingerprintBs tVect)
246 (fingerprintBs tVect)
@@ -248,6 +251,11 @@ size :: TypeRepMap f -> Int
248size = sizeofPrimArray . fingerprintAs
251size = sizeofPrimArray . fingerprintAs
249{-# INLINE size #-}
252{-# INLINE size #-}
250
253
254+-- | Return the list of 'SomeTypeRep' from the keys.
255+keys :: TypeRepMap f -> [SomeTypeRep]
256+keys TypeRepMap{..} = SomeTypeRep . anyToTypeRep <$> toList trKeys
257+{-# INLINE keys #-}
258+
251-- | Binary searched based on this article
259-- | Binary searched based on this article
252-- http://bannalia.blogspot.com/2015/06/cache-friendly-binary-search.html
260-- http://bannalia.blogspot.com/2015/06/cache-friendly-binary-search.html
253-- with modification for our two-vector search case.
261-- with modification for our two-vector search case.
@@ -281,12 +289,15 @@ toAny = unsafeCoerce
281fromAny :: Any -> f a
289fromAny :: Any -> f a
282fromAny = unsafeCoerce
290fromAny = unsafeCoerce
283
291
292+anyToTypeRep :: Any -> TypeRep f
293+anyToTypeRep = unsafeCoerce
294+
284typeFp :: forall a . Typeable a => Fingerprint
295typeFp :: forall a . Typeable a => Fingerprint
285typeFp = typeRepFingerprint $ typeRep @a
296typeFp = typeRepFingerprint $ typeRep @a
286{-# INLINE typeFp #-}
297{-# INLINE typeFp #-}
287
298
288toTriples :: TypeRepMap f -> [(Fingerprint, Any, Any)]
299toTriples :: TypeRepMap f -> [(Fingerprint, Any, Any)]
289−toTriples tm = zip3 (toFingerprints tm) (GHC.toList $ anys tm) (GHC.toList $ keys tm)
300+toTriples tm = zip3 (toFingerprints tm) (GHC.toList $ trAnys tm) (GHC.toList $ trKeys tm)
290
301
291deleteByFst :: Eq a => a -> [(a, b, c)] -> [(a, b, c)]
302deleteByFst :: Eq a => a -> [(a, b, c)] -> [(a, b, c)]
292deleteByFst x = filter ((/= x) . fst3)
303deleteByFst x = filter ((/= x) . fst3)
@@ -315,8 +326,8 @@ prop> fromList . toList == 'id'
315
326
316Creates 'TypeRepMap' from a list of 'WrapTypeable's.
327Creates 'TypeRepMap' from a list of 'WrapTypeable's.
317
328
318−>>> size $ fromList [WrapTypeable $ Identity True, WrapTypeable $ Identity 'a']
329+>>> show $ fromList [WrapTypeable $ Identity True, WrapTypeable $ Identity 'a']
319−2
330+TypeRepMap [Bool, Char]
320
331
321
332
322-}
333-}
typerep-map.cabal+1−1
@@ -1,5 +1,5 @@
1name: typerep-map
1name: typerep-map
2−version: 0.2.0
2+version: 0.3.0
3synopsis: Efficient implementation of a dependent map with types as keys
3synopsis: Efficient implementation of a dependent map with types as keys
4description:
4description:
5 A dependent map from type representations to values of these types.
5 A dependent map from type representations to values of these types.