@@ -45,7 +45,7 @@ import Data.Kind (Type)
4545import Data.Type.Equality ((:~:) (..), TestEquality (..))
4646import Data.List (intercalate, nubBy)
4747import Data.Maybe (fromMaybe)
48−import Data.Primitive.Array (Array, MutableArray, indexArray, mapArray', sizeofArray,
48+import Data.Primitive.Array (Array, MutableArray, indexArray, mapArray', readArray, sizeofArray,
4949 thawArray, unsafeFreezeArray, writeArray)
5050import Data.Primitive.PrimArray (writePrimArray, newPrimArray, unsafeFreezePrimArray, primArrayToList, MutablePrimArray, primArrayFromListN, PrimArray, indexPrimArray, sizeofPrimArray)
5151import Data.Semigroup (Semigroup (..), All(..))
@@ -187,26 +187,13 @@ prop> member @a (insert (x :: f a) tm) == True
187187
188188-}
189189insert :: forall a f . Typeable a => f a -> TypeRepMap f -> TypeRepMap f
190−insert x m
191− | size m == 0 = one x
192− | otherwise = case cachedBinarySearch (typeFp @a) (fingerprintAs m) (fingerprintBs m) of
193− Nothing -> union m $ one x
194− Just i -> m {trAnys = changeAnyArr i (trAnys m)}
195− where
196− changeAnyArr :: Int -> Array Any -> Array Any
197− changeAnyArr i trAs = runST $ do
198− let n = sizeofArray trAs
199− mutArr <- thawArray trAs 0 n
200− writeArray mutArr i $ toAny x
201− unsafeFreezeArray mutArr
190+insert = union . one
202191{-# INLINE insert #-}
203192
204193-- Extract the kind of a type. We use it to work around lack of syntax for
205194-- inferred type variables (which are not subject to type applications).
206195type KindOf (a :: k) = k
207196
208−type ArgKindOf (f :: k -> l) = k
209−
210197{- | Delete a value from a 'TypeRepMap'.
211198
212199TypeRepMap optimizes for fast reads rather than modifications, as a trade-off deletes are
@@ -238,46 +225,26 @@ deleteFirst _ [] = []
238225deleteFirst p (x : xs) = if p x then xs else x : deleteFirst p xs
239226
240227{- |
241−Update a value at a specific key with the result of the provided function.
242−When the key is not a member of the map, the original map is returned.
228+Update a value at a specific key with the result of the provided function. When
229+the key is not a member of the map, the original map is returned.
243230
244231>>> trmap = fromList @(TypeRepMap Identity) [WrapTypeable $ Identity "a"]
245232>>> lookup @String $ adjust (fmap (++ "ww")) trmap
246233Just (Identity "aww")
247234-}
248235adjust :: forall a f . Typeable a => (f a -> f a) -> TypeRepMap f -> TypeRepMap f
249−adjust fun = alter (fmap fun)
250−{-# INLINE adjust #-}
251−
252−{- |
253−Updates a value at a specific key, whether or not it exists.
254−This can be used to insert, delete, or update a value of a given type in the map.
255−
256−>>> func = (\case Nothing -> Just (Identity "new"); Just (Identity s) -> Just (Identity (reverse s)))
257−>>> lookup @String $ alter func empty
258−Just (Identity "new")
259−>>> trmap = fromList @(TypeRepMap Identity) [WrapTypeable $ Identity "helllo"]
260−>>> lookup @String $ alter func trmap
261−>>> Just (Identity "olleh")
262−-}
263−alter :: forall a f . Typeable a => (Maybe (f a) -> Maybe (f a)) -> TypeRepMap f -> TypeRepMap f
264−alter fun tr = case cachedBinarySearch (typeFp @a) (fingerprintAs tr) (fingerprintBs tr) of
265− Nothing ->
266− case (fun Nothing) of
267− Nothing -> tr
268− Just v -> insert v tr
269− Just i ->
270− case fun (Just . fromAny $ indexArray (trAnys tr) i) of
271− Nothing -> delete @a tr
272− Just v -> tr{trAnys = replaceAnyAt i (toAny v) (trAnys tr)}
236+adjust fun tr = case cachedBinarySearch (typeFp @a) (fingerprintAs tr) (fingerprintBs tr) of
237+ Nothing -> tr
238+ Just i -> tr {trAnys = changeAnyArr i (trAnys tr)}
273239 where
274− replaceAnyAt :: Int -> Any -> Array Any -> Array Any
275− replaceAnyAt i v trAs = runST $ do
240+ changeAnyArr :: Int -> Array Any -> Array Any
241+ changeAnyArr i trAs = runST $ do
276242 let n = sizeofArray trAs
277243 mutArr <- thawArray trAs 0 n
278− writeArray mutArr i v
244+ a <- toAny . fun . fromAny <$> readArray mutArr i
245+ writeArray mutArr i a
279246 unsafeFreezeArray mutArr
280−{-# INLINE alter #-}
247+{-# INLINE adjust #-}
281248
282249{- | Map over the elements of a 'TypeRepMap'.
283250
@@ -352,48 +319,6 @@ union :: TypeRepMap f -> TypeRepMap f -> TypeRepMap f
352319union = unionWith const
353320{-# INLINE union #-}
354321
355−-- | The 'intersection' of two 'TypeRepMap's using a combining function
356−--
357−-- @O(n + m)@
358−intersectionWith :: forall f. (forall x. Typeable x => f x -> f x -> f x) -> TypeRepMap f -> TypeRepMap f -> TypeRepMap f
359−intersectionWith f ma mb =
360− fromSortedTriples $ mergeMaps (toSortedTriples ma) (toSortedTriples mb)
361− where
362− f' :: forall x. TypeRep x -> f x -> f x -> f x
363− f' tr = withTypeable tr f
364−
365− combine :: (Fingerprint, Any, Any) -> (Fingerprint, Any, Any) -> (Fingerprint, Any, Any)
366− combine (fp, av, ak) (_, bv, _) = (fp, toAny $ f' (fromAny ak) (fromAny av) (fromAny bv), ak)
367−
368− -- Merges two typrepmaps into a sorted, dedup'd list of triples.
369− mergeMaps :: [(Fingerprint, Any, Any)] -> [(Fingerprint, Any, Any)] -> [(Fingerprint, Any, Any)]
370− -- If either list is empty, the intersection must be finished.
371− mergeMaps _ [] = []
372− mergeMaps [] _ = []
373− -- Merge the two maps considering one element at a time.
374− mergeMaps (a@(af, _, _) : as) (b@(bf, _, _) : bs) =
375− case compare af bf of
376− -- Fingerprints are equal, union the elements using our function
377− -- If the incoming maps were de-duped, there shouldn't be any other equivalent
378− -- fingerprints
379− EQ -> combine a b : mergeMaps as bs
380− -- First fingerprint must not be in the second map or we would have seen it by now
381− -- Skip it an move on
382− LT -> mergeMaps as (b : bs)
383− -- Second fingerprint must not be in the first map or we would have seen it by now
384− -- Skip it an move on
385− GT -> mergeMaps (a:as) bs
386−{-# INLINE intersectionWith #-}
387−
388−-- | The intersection of two 'TypeRepMap's.
389−-- It keeps all values from the first map whose keys are present in the second.
390−--
391−-- @O(n + m)@
392−intersection :: TypeRepMap f -> TypeRepMap f -> TypeRepMap f
393−intersection = intersectionWith const
394−{-# INLINE intersection #-}
395−
396−
397322{- | Check if a value of the given type is present in a 'TypeRepMap'.
398323
399324>>> member @Char $ one (Identity 'a')
@@ -429,22 +354,9 @@ size = sizeofPrimArray . fingerprintAs
429354
430355-- | Return the list of 'SomeTypeRep' from the keys.
431356keys :: TypeRepMap f -> [SomeTypeRep]
432−keys = keysWith SomeTypeRep
357+keys TypeRepMap{..} = SomeTypeRep . anyToTypeRep <$> toList trKeys
433358{-# INLINE keys #-}
434359
435−-- | Return the list of keys by wrapping them with a user-provided function.
436−keysWith :: (forall (a :: ArgKindOf f). TypeRep a -> r) -> TypeRepMap f -> [r]
437−keysWith f TypeRepMap{..} = f . anyToTypeRep <$> toList trKeys
438−{-# INLINE keysWith #-}
439−
440−-- | Return the list of key-value pairs by wrapping them with a user-provided function.
441−toListWith :: forall f r. (forall (a :: ArgKindOf f). Typeable a => f a -> r) -> TypeRepMap f -> [r]
442−toListWith f = map toF . toTriples
443− where
444− withTypeRep :: TypeRep a -> f a -> r
445− withTypeRep tr an = withTypeable tr $ f an
446− toF (_, an, k) = withTypeRep (unsafeCoerce k) (fromAny an)
447−
448360-- | Binary searched based on this article
449361-- http://bannalia.blogspot.com/2015/06/cache-friendly-binary-search.html
450362-- with modification for our two-vector search case.
@@ -521,6 +433,9 @@ data WrapTypeable f where
521433instance Show (WrapTypeable f) where
522434 show (WrapTypeable (_ :: f a)) = show $ calcFp @a
523435
436+wrapTypeable :: TypeRep a -> f a -> WrapTypeable f
437+wrapTypeable tr = withTypeable tr WrapTypeable
438+
524439{- |
525440
526441prop> fromList . toList == 'id'
@@ -548,7 +463,10 @@ instance IsList (TypeRepMap f) where
548463 k (WrapTypeable (_ :: f a)) = unsafeCoerce $ typeRep @a
549464
550465 toList :: TypeRepMap f -> [WrapTypeable f]
551− toList = toListWith WrapTypeable
466+ toList = map toWrapTypeable . toTriples
467+ where
468+ toWrapTypeable :: (Fingerprint, Any, Any) -> WrapTypeable f
469+ toWrapTypeable (_, an, k) = wrapTypeable (unsafeCoerce k) (fromAny an)
552470
553471calcFp :: forall a . Typeable a => Fingerprint
554472calcFp = typeRepFingerprint $ typeRep @a