git.iko.soy/streamly
on master help sign in
Deprecate internal funcs toStreamD, toStreamDRev
844da7dHarendra Kumar
core/src/Streamly/Internal/Data/Array.hs+1−1
compare with master
unifiedsplit
@@ -331,7 +331,7 @@ splitOn :: (Monad m, Unbox a) =>
331 (a -> Bool) -> Array a -> Stream m (Array a)
331 (a -> Bool) -> Array a -> Stream m (Array a)
332splitOn predicate arr =
332splitOn predicate arr =
333 fmap (\(i, len) -> getSliceUnsafe i len arr)
333 fmap (\(i, len) -> getSliceUnsafe i len arr)
334− $ D.indexOnSuffix predicate (A.toStreamD arr)
334+ $ D.indexOnSuffix predicate (A.read arr)
335
335
336{-# INLINE sliceIndexerFromLen #-}
336{-# INLINE sliceIndexerFromLen #-}
337sliceIndexerFromLen :: forall m a. (Monad m, Unbox a)
337sliceIndexerFromLen :: forall m a. (Monad m, Unbox a)
core/src/Streamly/Internal/Data/Array/Type.hs+10−9
@@ -63,12 +63,8 @@ module Streamly.Internal.Data.Array.Type
63 , foldr
63 , foldr
64 , splitAt
64 , splitAt
65
65
66− , toStreamD
67− , toStreamDRev
68 , toStreamK
66 , toStreamK
69 , toStreamKRev
67 , toStreamKRev
70− , toStream
71− , toStreamRev
72 , read
68 , read
73 , readRev
69 , readRev
74 , readerRev
70 , readerRev
@@ -103,6 +99,10 @@ module Streamly.Internal.Data.Array.Type
103 , fromArrayStreamK
99 , fromArrayStreamK
104 , fromStreamDN
100 , fromStreamDN
105 , fromStreamD
101 , fromStreamD
102+ , toStreamD
103+ , toStreamDRev
104+ , toStream
105+ , toStreamRev
106 )
106 )
107where
107where
108
108
@@ -494,18 +494,19 @@ length arr = MA.length (unsafeThaw arr)
494readerRev :: forall m a. (Monad m, Unbox a) => Unfold m (Array a) a
494readerRev :: forall m a. (Monad m, Unbox a) => Unfold m (Array a) a
495readerRev = Unfold.lmap unsafeThaw $ MA.readerRevWith (return . unsafeInlineIO)
495readerRev = Unfold.lmap unsafeThaw $ MA.readerRevWith (return . unsafeInlineIO)
496
496
497+{-# DEPRECATED toStreamD "Please use 'read' instead." #-}
497{-# INLINE_NORMAL toStreamD #-}
498{-# INLINE_NORMAL toStreamD #-}
498toStreamD :: forall m a. (Monad m, Unbox a) => Array a -> D.Stream m a
499toStreamD :: forall m a. (Monad m, Unbox a) => Array a -> D.Stream m a
499−toStreamD arr = MA.toStreamDWith (return . unsafeInlineIO) (unsafeThaw arr)
500+toStreamD = read
500
501
501{-# INLINE toStreamK #-}
502{-# INLINE toStreamK #-}
502toStreamK :: forall m a. (Monad m, Unbox a) => Array a -> K.StreamK m a
503toStreamK :: forall m a. (Monad m, Unbox a) => Array a -> K.StreamK m a
503toStreamK arr = MA.toStreamKWith (return . unsafeInlineIO) (unsafeThaw arr)
504toStreamK arr = MA.toStreamKWith (return . unsafeInlineIO) (unsafeThaw arr)
504
505
506+{-# DEPRECATED toStreamDRev "Please use 'readRev' instead." #-}
505{-# INLINE_NORMAL toStreamDRev #-}
507{-# INLINE_NORMAL toStreamDRev #-}
506toStreamDRev :: forall m a. (Monad m, Unbox a) => Array a -> D.Stream m a
508toStreamDRev :: forall m a. (Monad m, Unbox a) => Array a -> D.Stream m a
507−toStreamDRev arr =
509+toStreamDRev = readRev
508− MA.toStreamDRevWith (return . unsafeInlineIO) (unsafeThaw arr)
509
510
510{-# INLINE toStreamKRev #-}
511{-# INLINE toStreamKRev #-}
511toStreamKRev :: forall m a. (Monad m, Unbox a) => Array a -> K.StreamK m a
512toStreamKRev :: forall m a. (Monad m, Unbox a) => Array a -> K.StreamK m a
@@ -517,7 +518,7 @@ toStreamKRev arr =
517-- /Pre-release/
518-- /Pre-release/
518{-# INLINE_EARLY read #-}
519{-# INLINE_EARLY read #-}
519read :: (Monad m, Unbox a) => Array a -> Stream m a
520read :: (Monad m, Unbox a) => Array a -> Stream m a
520−read = toStreamD
521+read arr = MA.toStreamWith (return . unsafeInlineIO) (unsafeThaw arr)
521
522
522-- | Same as 'read'
523-- | Same as 'read'
523--
524--
@@ -534,7 +535,7 @@ toStream = read
534-- /Pre-release/
535-- /Pre-release/
535{-# INLINE_EARLY readRev #-}
536{-# INLINE_EARLY readRev #-}
536readRev :: (Monad m, Unbox a) => Array a -> Stream m a
537readRev :: (Monad m, Unbox a) => Array a -> Stream m a
537−readRev = toStreamDRev
538+readRev arr = MA.toStreamRevWith (return . unsafeInlineIO) (unsafeThaw arr)
538
539
539-- | Same as 'readRev'
540-- | Same as 'readRev'
540--
541--
core/src/Streamly/Internal/Data/MutArray/Type.hs+10−10
@@ -122,8 +122,8 @@ module Streamly.Internal.Data.MutArray.Type
122 , readerRev
122 , readerRev
123
123
124 -- *** To containers
124 -- *** To containers
125− , toStreamDWith
125+ , toStreamWith
126− , toStreamDRevWith
126+ , toStreamRevWith
127 , toStreamKWith
127 , toStreamKWith
128 , toStreamKRevWith
128 , toStreamKRevWith
129 , read
129 , read
@@ -1609,11 +1609,11 @@ toList MutArray{..} = liftIO $ go arrStart
1609 x <- peekAt p arrContents
1609 x <- peekAt p arrContents
1610 (:) x <$> go (INDEX_NEXT(p,a))
1610 (:) x <$> go (INDEX_NEXT(p,a))
1611
1611
1612−{-# INLINE_NORMAL toStreamDWith #-}
1612+{-# INLINE_NORMAL toStreamWith #-}
1613−toStreamDWith ::
1613+toStreamWith ::
1614 forall m a. (Monad m, Unbox a)
1614 forall m a. (Monad m, Unbox a)
1615 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1615 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1616−toStreamDWith liftio MutArray{..} = D.Stream step arrStart
1616+toStreamWith liftio MutArray{..} = D.Stream step arrStart
1617
1617
1618 where
1618 where
1619
1619
@@ -1629,7 +1629,7 @@ toStreamDWith liftio MutArray{..} = D.Stream step arrStart
1629--
1629--
1630{-# INLINE_NORMAL read #-}
1630{-# INLINE_NORMAL read #-}
1631read :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1631read :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1632−read = toStreamDWith liftIO
1632+read = toStreamWith liftIO
1633
1633
1634{-# INLINE toStreamKWith #-}
1634{-# INLINE toStreamKWith #-}
1635toStreamKWith ::
1635toStreamKWith ::
@@ -1648,11 +1648,11 @@ toStreamKWith liftio MutArray{..} = go arrStart
1648toStreamK :: forall m a. (MonadIO m, Unbox a) => MutArray a -> StreamK m a
1648toStreamK :: forall m a. (MonadIO m, Unbox a) => MutArray a -> StreamK m a
1649toStreamK = toStreamKWith liftIO
1649toStreamK = toStreamKWith liftIO
1650
1650
1651−{-# INLINE_NORMAL toStreamDRevWith #-}
1651+{-# INLINE_NORMAL toStreamRevWith #-}
1652−toStreamDRevWith ::
1652+toStreamRevWith ::
1653 forall m a. (Monad m, Unbox a)
1653 forall m a. (Monad m, Unbox a)
1654 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1654 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1655−toStreamDRevWith liftio MutArray{..} =
1655+toStreamRevWith liftio MutArray{..} =
1656 let p = INDEX_PREV(arrEnd,a)
1656 let p = INDEX_PREV(arrEnd,a)
1657 in D.Stream step p
1657 in D.Stream step p
1658
1658
@@ -1670,7 +1670,7 @@ toStreamDRevWith liftio MutArray{..} =
1670--
1670--
1671{-# INLINE_NORMAL readRev #-}
1671{-# INLINE_NORMAL readRev #-}
1672readRev :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1672readRev :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1673−readRev = toStreamDRevWith liftIO
1673+readRev = toStreamRevWith liftIO
1674
1674
1675{-# INLINE toStreamKRevWith #-}
1675{-# INLINE toStreamKRevWith #-}
1676toStreamKRevWith ::
1676toStreamKRevWith ::