Skip to content

Commit 6112d23

Browse files
Rename foldBreakChunksK to foldBreak in Array module
1 parent 64a473f commit 6112d23

File tree

2 files changed

+8
-5
lines changed
  • benchmark/Streamly/Benchmark/Data/Array
  • core/src/Streamly/Internal/Data

2 files changed

+8
-5
lines changed

benchmark/Streamly/Benchmark/Data/Array/Stream.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ drainWhile p = Parser.takeWhile p Fold.drain
234234

235235
{-# INLINE fold #-}
236236
fold :: Stream IO (Array.Array Int) -> IO ()
237-
fold s = void $ Array.foldBreakChunksK Fold.drain $ StreamK.fromStream s
237+
fold s = void $ Array.foldBreak Fold.drain $ StreamK.fromStream s
238238

239239
{-# INLINE parse #-}
240240
parse :: Int -> Stream IO (Array.Array Int) -> IO ()
@@ -244,7 +244,7 @@ parse value s =
244244
{-# INLINE foldBreak #-}
245245
foldBreak :: StreamK IO (Array.Array Int) -> IO ()
246246
foldBreak s = do
247-
(r, s1) <- Array.foldBreakChunksK Fold.one s
247+
(r, s1) <- Array.foldBreak Fold.one s
248248
when (isJust r) $ foldBreak s1
249249

250250
{-# INLINE parseBreak #-}

core/src/Streamly/Internal/Data/Array.hs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ module Streamly.Internal.Data.Array
7373
-- * Parsing Stream of Arrays
7474
, foldBreakChunks -- Uses Stream, bad perf on break
7575
, foldChunks
76-
, foldBreakChunksK -- XXX rename to foldBreak
76+
, foldBreak
7777
, parseBreakChunksK -- XXX uses Parser. parseBreak is better?
7878
, parserK
7979
, parseBreak
@@ -105,6 +105,7 @@ module Streamly.Internal.Data.Array
105105
, compactOnByteSuffix
106106
, splitOn
107107
, fold
108+
, foldBreakChunksK
108109
)
109110
where
110111

@@ -721,14 +722,14 @@ foldChunks f s = fmap fst (foldBreakChunks f s)
721722
--
722723
-- We can compare perf and remove this one or define it in terms of that.
723724
--
724-
foldBreakChunksK :: forall m a b. (MonadIO m, Unbox a) =>
725+
foldBreak, foldBreakChunksK :: forall m a b. (MonadIO m, Unbox a) =>
725726
Fold m a b -> StreamK m (Array a) -> m (b, StreamK m (Array a))
726727
{-
727728
foldBreakChunksK f s =
728729
fmap (first (fromRight undefined))
729730
$ StreamK.parseBreakChunks (ParserK.adaptC (Parser.fromFold f)) s
730731
-}
731-
foldBreakChunksK (Fold fstep initial _ final) stream = do
732+
foldBreak (Fold fstep initial _ final) stream = do
732733
res <- initial
733734
case res of
734735
Fold.Partial fs -> go fs stream
@@ -758,6 +759,8 @@ foldBreakChunksK (Fold fstep initial _ final) stream = do
758759
return $! (b, StreamK.cons arr st)
759760
Fold.Partial fs1 -> goArray fs1 st fp next
760761

762+
RENAME(foldBreakChunksK,foldBreak)
763+
761764
{-
762765
-- This can be generalized to any type provided it can be unfolded to a stream
763766
-- and it can be combined using a semigroup operation.

0 commit comments

Comments
 (0)