@@ -45,9 +45,9 @@ 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)
50−import Data.Primitive.PrimArray (writePrimArray, newPrimArray, unsafeFreezePrimArray, primArrayToList, MutablePrimArray, primArrayFromListN, PrimArray, indexPrimArray, sizeofPrimArray)
50+import Data.Primitive.PrimArray (PrimArray, indexPrimArray, sizeofPrimArray)
5151import Data.Semigroup (Semigroup (..), All(..))
5252import GHC.Base (Any, Int (..), Int#, (*#), (+#), (<#))
5353import GHC.Exts (IsList (..), inline, sortWith)
@@ -64,6 +64,7 @@ import Type.Reflection (SomeTypeRep (..), TypeRep, Typeable, typeRep, withTypeab
6464import Type.Reflection.Unsafe (typeRepFingerprint)
6565import Unsafe.Coerce (unsafeCoerce)
6666
67+import qualified Data.Map.Strict as Map
6768import qualified GHC.Exts as GHC (fromList, toList)
6869
6970{- |
@@ -169,49 +170,33 @@ prop> member @a (one (x :: f a)) == True
169170
170171-}
171172one :: forall a f . Typeable a => f a -> TypeRepMap f
172−one x = TypeRepMap (primArrayFromListN 1 [fa])
173− (primArrayFromListN 1 [fb])
174− (pure @Array v)
175− (pure @Array k)
176− where
177− (Fingerprint fa fb, v, k) = (calcFp @a, toAny x, unsafeCoerce $ typeRep @a)
173+one x = insert x empty
178174{-# INLINE one #-}
179175
180176{- |
181177
182178Insert a value into a 'TypeRepMap'.
183−TypeRepMap optimizes for fast reads rather than inserts, as a trade-off inserts are @O(n)@.
184179
185180prop> size (insert v tm) >= size tm
186181prop> member @a (insert (x :: f a) tm) == True
187182
188183-}
189184insert :: 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)}
185+insert x = fromTriples . addX . toTriples
195186 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
187+ tripleX :: (Fingerprint, Any, Any)
188+ tripleX@(fpX, _, _) = (calcFp @a, toAny x, unsafeCoerce $ typeRep @a)
189+
190+ addX :: [(Fingerprint, Any, Any)] -> [(Fingerprint, Any, Any)]
191+ addX l = tripleX : deleteByFst fpX l
202192{-# INLINE insert #-}
203193
204194-- Extract the kind of a type. We use it to work around lack of syntax for
205195-- inferred type variables (which are not subject to type applications).
206196type KindOf (a :: k) = k
207197
208−type ArgKindOf (f :: k -> l) = k
209−
210198{- | Delete a value from a 'TypeRepMap'.
211199
212−TypeRepMap optimizes for fast reads rather than modifications, as a trade-off deletes are
213−@O(n)@, with an @O(log(n))@ optimization for when the element is already missing.
214−
215200prop> size (delete @a tm) <= size tm
216201prop> member @a (delete @a tm) == False
217202
@@ -224,60 +209,30 @@ False
224209True
225210-}
226211delete :: forall a (f :: KindOf a -> Type) . Typeable a => TypeRepMap f -> TypeRepMap f
227−delete m
228− -- Lookups are fast, so check if we even have the element first.
229− | not (member @a m) = m
230− -- We know we have the element, If the map has exactly one element, we can return the empty map
231− | size m == 1 = empty
232− -- Otherwise, filter out the element in linear time.
233− | otherwise = fromSortedTriples . deleteFirst ((== typeFp @a) . fst3) . toSortedTriples $ m
212+delete = fromTriples . deleteByFst (typeFp @a) . toTriples
234213{-# INLINE delete #-}
235214
236−deleteFirst :: (a -> Bool) -> [a] -> [a]
237−deleteFirst _ [] = []
238−deleteFirst p (x : xs) = if p x then xs else x : deleteFirst p xs
239−
240215{- |
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.
216+Update a value at a specific key with the result of the provided function. When
217+the key is not a member of the map, the original map is returned.
243218
244219>>> trmap = fromList @(TypeRepMap Identity) [WrapTypeable $ Identity "a"]
245220>>> lookup @String $ adjust (fmap (++ "ww")) trmap
246221Just (Identity "aww")
247222-}
248223adjust :: 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)}
224+adjust fun tr = case cachedBinarySearch (typeFp @a) (fingerprintAs tr) (fingerprintBs tr) of
225+ Nothing -> tr
226+ Just i -> tr {trAnys = changeAnyArr i (trAnys tr)}
273227 where
274− replaceAnyAt :: Int -> Any -> Array Any -> Array Any
275− replaceAnyAt i v trAs = runST $ do
228+ changeAnyArr :: Int -> Array Any -> Array Any
229+ changeAnyArr i trAs = runST $ do
276230 let n = sizeofArray trAs
277231 mutArr <- thawArray trAs 0 n
278− writeArray mutArr i v
232+ a <- toAny . fun . fromAny <$> readArray mutArr i
233+ writeArray mutArr i a
279234 unsafeFreezeArray mutArr
280−{-# INLINE alter #-}
235+{-# INLINE adjust #-}
281236
282237{- | Map over the elements of a 'TypeRepMap'.
283238
@@ -311,89 +266,33 @@ hoistWithKey f (TypeRepMap as bs ans ks) = TypeRepMap as bs newAns ks
311266 withTr t = withTypeable t f
312267{-# INLINE hoistWithKey #-}
313268
314−-- | The union of two 'TypeRepMap's using a combining function for conflicting entries. @O(n + m)@
269+-- | The union of two 'TypeRepMap's using a combining function.
315270unionWith :: forall f. (forall x. Typeable x => f x -> f x -> f x) -> TypeRepMap f -> TypeRepMap f -> TypeRepMap f
316−unionWith f ma mb = do
317− fromSortedTriples $ mergeMaps (toSortedTriples ma) (toSortedTriples mb)
271+unionWith f m1 m2 = fromTriples
272+ $ toTripleList
273+ $ Map.unionWith combine
274+ (fromTripleList $ toTriples m1)
275+ (fromTripleList $ toTriples m2)
318276 where
319277 f' :: forall x. TypeRep x -> f x -> f x -> f x
320278 f' tr = withTypeable tr f
321279
322− combine :: (Fingerprint, Any, Any) -> (Fingerprint, Any, Any) -> (Fingerprint, Any, Any)
323− combine (fp, av, ak) (_, bv, _) = (fp, toAny $ f' (fromAny ak) (fromAny av) (fromAny bv), ak)
324−
325− -- Merges two typrepmaps into a sorted, dedup'd list of triples.
326− -- Using 'toSortedTriples' allows us to assume the triples are sorted by fingerprint,
327− -- Given O(n) performance from 'toSortedTriples', and given that we can merge-sort in
328− -- O(n + m) time, then can '.fromSortedTriples' back into cachedBinarySearch order in O(n + m)
329− -- that gives a total of O(n + m).
330− mergeMaps :: [(Fingerprint, Any, Any)] -> [(Fingerprint, Any, Any)] -> [(Fingerprint, Any, Any)]
331− -- We've addressed all elements from both maps
332− mergeMaps as [] = as
333− mergeMaps [] bs = bs
334− -- Merge
335− mergeMaps (a@(af, _, _) : as) (b@(bf, _, _) : bs) =
336− case compare af bf of
337− -- Fingerprints are equal, union the elements using our function
338− -- If the incoming maps were de-duped, there shouldn't be any other equivalent
339− -- fingerprints
340− EQ -> combine a b : mergeMaps as bs
341− -- First fingerprint must not be in the second map or we would have seen it by now
342− -- Add it to the result as-is
343− LT -> a : mergeMaps as (b : bs)
344− -- Second fingerprint must not be in the first map or we would have seen it by now
345− -- Add it to the result as-is
346− GT -> b : mergeMaps (a:as) bs
280+ combine :: (Any, Any) -> (Any, Any) -> (Any, Any)
281+ combine (av, ak) (bv, _) = (toAny $ f' (fromAny ak) (fromAny av) (fromAny bv), ak)
282+
283+ fromTripleList :: Ord a => [(a, b, c)] -> Map.Map a (b, c)
284+ fromTripleList = Map.fromList . map (\(a, b, c) -> (a, (b, c)))
285+
286+ toTripleList :: Map.Map a (b, c) -> [(a, b, c)]
287+ toTripleList = map (\(a, (b, c)) -> (a, b, c)) . Map.toList
347288{-# INLINE unionWith #-}
348289
349−-- | The (left-biased) union of two 'TypeRepMap's in @O(n + m)@. It prefers the first map when
290+-- | The (left-biased) union of two 'TypeRepMap's. It prefers the first map when
350291-- duplicate keys are encountered, i.e. @'union' == 'unionWith' const@.
351292union :: TypeRepMap f -> TypeRepMap f -> TypeRepMap f
352293union = unionWith const
353294{-# INLINE union #-}
354295
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−
397296{- | Check if a value of the given type is present in a 'TypeRepMap'.
398297
399298>>> member @Char $ one (Identity 'a')
@@ -429,22 +328,9 @@ size = sizeofPrimArray . fingerprintAs
429328
430329-- | Return the list of 'SomeTypeRep' from the keys.
431330keys :: TypeRepMap f -> [SomeTypeRep]
432−keys = keysWith SomeTypeRep
331+keys TypeRepMap{..} = SomeTypeRep . anyToTypeRep <$> toList trKeys
433332{-# INLINE keys #-}
434333
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−
448334-- | Binary searched based on this article
449335-- http://bannalia.blogspot.com/2015/06/cache-friendly-binary-search.html
450336-- with modification for our two-vector search case.
@@ -488,20 +374,8 @@ typeFp = typeRepFingerprint $ typeRep @a
488374toTriples :: TypeRepMap f -> [(Fingerprint, Any, Any)]
489375toTriples tm = zip3 (toFingerprints tm) (GHC.toList $ trAnys tm) (GHC.toList $ trKeys tm)
490376
491−-- | Efficiently get sorted triples from a map in O(n) time
492−--
493−-- We assume the incoming TypeRepMap is already sorted into 'cachedBinarySearch' order using fromSortedList.
494−-- Then we can construct the index mapping from the "cached" ordering into monotonically
495−-- increasing order using 'generateOrderMapping' with the length of the TRM. This takes @O(n).
496−-- We then pull those indexes from the source TRM to get the sorted triples in a total of @O(n).
497−toSortedTriples :: TypeRepMap f -> [(Fingerprint, Any, Any)]
498−toSortedTriples tm = trip <$> ordering
499− where
500− trip i = ( Fingerprint (indexPrimArray (fingerprintAs tm) i) (indexPrimArray (fingerprintBs tm) i)
501− , indexArray (trAnys tm) i
502− , indexArray (trKeys tm) i)
503− ordering :: [ Int ]
504− ordering = generateOrderMapping (size tm)
377+deleteByFst :: Eq a => a -> [(a, b, c)] -> [(a, b, c)]
378+deleteByFst x = filter ((/= x) . fst3)
505379
506380nubByFst :: (Eq a) => [(a, b, c)] -> [(a, b, c)]
507381nubByFst = nubBy ((==) `on` fst3)
@@ -521,6 +395,9 @@ data WrapTypeable f where
521395instance Show (WrapTypeable f) where
522396 show (WrapTypeable (_ :: f a)) = show $ calcFp @a
523397
398+wrapTypeable :: TypeRep a -> f a -> WrapTypeable f
399+wrapTypeable tr = withTypeable tr WrapTypeable
400+
524401{- |
525402
526403prop> fromList . toList == 'id'
@@ -548,19 +425,19 @@ instance IsList (TypeRepMap f) where
548425 k (WrapTypeable (_ :: f a)) = unsafeCoerce $ typeRep @a
549426
550427 toList :: TypeRepMap f -> [WrapTypeable f]
551− toList = toListWith WrapTypeable
428+ toList = map toWrapTypeable . toTriples
429+ where
430+ toWrapTypeable :: (Fingerprint, Any, Any) -> WrapTypeable f
431+ toWrapTypeable (_, an, k) = wrapTypeable (unsafeCoerce k) (fromAny an)
552432
553433calcFp :: forall a . Typeable a => Fingerprint
554434calcFp = typeRepFingerprint $ typeRep @a
555435
556436fromTriples :: [(Fingerprint, Any, Any)] -> TypeRepMap f
557−fromTriples = fromSortedTriples . sortWith fst3 . nubByFst
558−
559−fromSortedTriples :: [(Fingerprint, Any, Any)] -> TypeRepMap f
560−fromSortedTriples kvs = TypeRepMap (GHC.fromList fpAs) (GHC.fromList fpBs) (GHC.fromList ans) (GHC.fromList ks)
437+fromTriples kvs = TypeRepMap (GHC.fromList fpAs) (GHC.fromList fpBs) (GHC.fromList ans) (GHC.fromList ks)
561438 where
562439 (fpAs, fpBs) = unzip $ map (\(Fingerprint a b) -> (a, b)) fps
563− (fps, ans, ks) = unzip3 $ fromSortedList kvs
440+ (fps, ans, ks) = unzip3 $ fromSortedList $ sortWith fst3 $ nubByFst kvs
564441
565442----------------------------------------------------------------------------
566443-- Tree-like conversion
@@ -587,35 +464,11 @@ fromSortedList l = runST $ do
587464 writeArray result i (indexArray origin newFirst)
588465 loop (2 * i + 2) (newFirst + 1)
589466
590−-- Returns a list of indexes which represents the "sorted" order of an array generated by
591−-- fromSortedList of the provided length.
592−-- I.e. fmap (fromSortedList [1, 2, 3, 4, 5, 6] !!) (generateOrderMapping 6) == [1, 2, 3, 4, 5, 6]
593−--
594−-- >>> generateOrderMapping 6
595−-- [3,1,4,0,5,2]
596−--
597−-- >>> generateOrderMapping 8
598−-- [7,3,1,4,0,5,2,6]
599−generateOrderMapping :: Int -> [Int]
600−generateOrderMapping len = runST $ do
601− orderMappingArr <- newPrimArray len
602− _ <- loop orderMappingArr 0 0
603− primArrayToList <$> unsafeFreezePrimArray orderMappingArr
604− where
605− loop :: MutablePrimArray s Int -> Int -> Int -> ST s Int
606− loop result i first =
607− if i >= len
608− then pure first
609− else do
610− newFirst <- loop result (2 * i + 1) first
611− writePrimArray result newFirst i
612− loop result (2 * i + 2) (newFirst + 1)
613−
614467----------------------------------------------------------------------------
615468-- Helper functions.
616469----------------------------------------------------------------------------
617470
618−-- | Check that invariant of the structure holds.
471+-- | Check that invariant of the structure is hold.
619472-- The structure maintains the following invariant.
620473-- For each element @A@ at index @i@:
621474--