@@ -2,7 +2,6 @@
22-- |
33-- Module : Streamly.Internal.Data.Array
44-- Copyright : (c) 2019 Composewell Technologies
5−--
65-- License : BSD3
76-- Maintainer : streamly@composewell.com
87-- Stability : experimental
@@ -27,21 +26,23 @@ module Streamly.Internal.Data.Array
2726 -- , (!!)
2827 , getIndex
2928 , getIndexRev
30− , last -- XXX getIndexLast?
31− , getIndices
32− , getIndicesFromThenTo
29+ , last -- XXX getLastIndex?
3330 -- , getIndicesFrom -- read from a given position to the end of file
3431 -- , getIndicesUpto -- read from beginning up to the given position
3532 -- , getIndicesFromTo
3633 -- , getIndicesFromRev -- read from a given position to the beginning of file
3734 -- , getIndicesUptoRev -- read from end to the given position in file
35+ , indexReader
36+ , indexReaderFromThenTo
3837
3938 -- * Size
4039 , null
4140
4241 -- * Search
4342 , binarySearch
44− , findIndicesOf -- see splitOn, rename to indicesOf
43+ , findIndicesOf
44+ -- getIndicesOf
45+ , indexFinder -- see splitOn
4546 -- , findIndexOf
4647 -- , find
4748
@@ -74,6 +75,7 @@ module Streamly.Internal.Data.Array
7475 -- * Deprecated
7576 , genSlicesFromLen
7677 , getSlicesFromLen
78+ , getIndices
7779 )
7880where
7981
@@ -226,19 +228,26 @@ binarySearch = undefined
226228-- compared to streams by using SIMD instructions.
227229-- We can also return a bit array instead.
228230
231+-- Can use SIMD.
232+
229233-- | Perform a linear search to find all the indices where a given element is
230234-- present in an array.
231235--
232236-- /Unimplemented/
233−findIndicesOf :: (a -> Bool) -> Unfold Identity (Array a) Int
234−findIndicesOf = undefined
237+indexFinder :: (a -> Bool) -> Unfold Identity (Array a) Int
238+indexFinder = undefined
239+
240+-- |
241+-- /Unimplemented/
242+findIndicesOf :: (a -> Bool) -> Array a -> Stream Identity Int
243+findIndicesOf p = Stream.unfold (indexFinder p)
235244
236245{-
237246findIndexOf :: (a -> Bool) -> Array a -> Maybe Int
238−findIndexOf p = Unfold.fold Fold.one . Stream.unfold (findIndicesOf p)
247+findIndexOf p = Unfold.fold Fold.one . Stream.unfold (indexFinder p)
239248
240249find :: (a -> Bool) -> Array a -> Bool
241−find = Unfold.fold Fold.null . Stream.unfold (findIndicesOf p)
250+find = Unfold.fold Fold.null . Stream.unfold (indexFinder p)
242251-}
243252
244253-------------------------------------------------------------------------------
@@ -346,20 +355,25 @@ getIndex i arr =
346355-- @
347356-- read =
348357-- let u = lmap (\arr -> (0, length arr - 1)) Unfold.enumerateFromTo
349−-- in Unfold.lmap f (getIndices arr)
358+-- in Unfold.lmap f (indexReader arr)
350359--
351360-- readRev =
352361-- let i = length arr - 1
353−-- in Unfold.lmap f (getIndicesFromThenTo i (i - 1) 0)
362+-- in Unfold.lmap f (indexReaderFromThenTo i (i - 1) 0)
354363-- @
355364--
356365-- /Pre-release/
357−{-# INLINE getIndices #-}
358−getIndices :: (Monad m, Unbox a) => Stream m Int -> Unfold m (Array a) a
359−getIndices m =
360− let unf = MA.getIndicesWith (return . unsafeInlineIO) m
366+{-# INLINE indexReader #-}
367+indexReader :: (Monad m, Unbox a) => Stream m Int -> Unfold m (Array a) a
368+indexReader m =
369+ let unf = MA.indexReaderWith (return . unsafeInlineIO) m
361370 in Unfold.lmap A.unsafeThaw unf
362371
372+-- XXX DO NOT REMOVE, change the signature to use Stream instead of unfold
373+{-# DEPRECATED getIndices "Please use getIndices instead." #-}
374+getIndices :: (Monad m, Unbox a) => Stream m Int -> Unfold m (Array a) a
375+getIndices = indexReader
376+
363377-- | Unfolds @(from, then, to, array)@ generating a finite stream whose first
364378-- element is the array value from the index @from@ and the successive elements
365379-- are from the indices in increments of @then@ up to @to@. Index enumeration
@@ -374,9 +388,9 @@ getIndices m =
374388-- @
375389--
376390-- /Unimplemented/
377−{-# INLINE getIndicesFromThenTo #-}
378−getIndicesFromThenTo :: Unfold m (Int, Int, Int, Array a) a
379−getIndicesFromThenTo = undefined
391+{-# INLINE indexReaderFromThenTo #-}
392+indexReaderFromThenTo :: Unfold m (Int, Int, Int, Array a) a
393+indexReaderFromThenTo = undefined
380394
381395-------------------------------------------------------------------------------
382396-- Transform via stream operations