1475c2f · streamly · git.iko.soy

git.iko.soy/streamly

Move Streamly.Unfold to Streamly.Internal.Data.Unfold

commit1475c2fb7df1bb7f449907e7a5b6a1215b90821a authorHarendra Kumar <harendra.kumar@gmail.com> dateMon 23 Sep 2019, 00:32 (7 years ago) parent2af9c97

12 files changed+20−26

compare with master

unifiedsplit

benchmark/StreamDOps.hs+1−1 src/Streamly/Benchmark/FileIO/Stream.hs+3−2 src/Streamly/Benchmark/Prelude.hs+1−1 src/Streamly/Data/String.hs+2−2 src/Streamly/Internal.hs−6 src/Streamly/Internal/Data/Unfold.hs+3−3 src/Streamly/Internal/Data/Unfold/Types.hs+2−2 src/Streamly/Internal/Memory/ArrayStream.hs+1−1 src/Streamly/Internal/Prelude.hs+1−1 src/Streamly/Memory/Array/Types.hs+1−1 src/Streamly/Streams/StreamD.hs+1−1 streamly.cabal+4−5

benchmark/StreamDOps.hs+1−1

@@ -19,7 +19,7 @@ import Prelude

1919import qualified Prelude as P

2020

2121import qualified Streamly.Streams.StreamD as S

22−import qualified Streamly.Unfold as UF

22+import qualified Streamly.Internal.Data.Unfold as UF

2323

2424-- We try to keep the total number of iterations same irrespective of nesting

2525-- of the loops so that the overhead is easy to compare.

src/Streamly/Benchmark/FileIO/Stream.hs+3−2

@@ -63,6 +63,7 @@ import qualified Streamly.Prelude as S

6363import qualified Streamly.Data.Fold as FL

6464import qualified Streamly.Data.String as SS

6565import qualified Streamly.Internal as Internal

66+import qualified Streamly.Internal.Data.Unfold as IUF

6667import qualified Streamly.Internal.Prelude as IP

6768import qualified Streamly.Streams.StreamD as D

6869

@@ -344,7 +345,7 @@ isSp = isSpace . chr . fromIntegral

344345wordsUnwordsCopyWord8 :: Handle -> Handle -> IO ()

345346wordsUnwordsCopyWord8 inh outh =

346347 S.runFold (FH.write outh)

347− $ IP.concatMapU Internal.fromList

348+ $ IP.concatMapU IUF.fromList

348349 $ S.intersperse [32]

349350 $ S.wordsBy isSp FL.toList

350351 $ FH.read inh

@@ -361,7 +362,7 @@ wordsUnwordsCopy :: Handle -> Handle -> IO ()

361362wordsUnwordsCopy inh outh =

362363 S.runFold (FH.write outh)

363364 $ SS.encodeChar8

364− $ IP.concatMapU Internal.fromList

365+ $ IP.concatMapU IUF.fromList

365366 $ S.intersperse " "

366367 -- Array allocation is too expensive for such small strings. So just use

367368 -- lists instead.

src/Streamly/Benchmark/Prelude.hs+1−1

@@ -46,7 +46,7 @@ import qualified Streamly.Streams.StreamD as D

4646import qualified Streamly as S hiding (foldMapWith, runStream)

4747import qualified Streamly.Prelude as S

4848import qualified Streamly.Internal.Prelude as Internal

49−import qualified Streamly.Unfold as UF

49+import qualified Streamly.Internal.Data.Unfold as UF

5050-- import qualified Streamly.Pipe as Pipe

5151

5252value, maxValue, value2 :: Int

src/Streamly/Data/String.hs+2−2

@@ -91,14 +91,14 @@ import Streamly (IsStream, MonadAsync)

9191import Prelude hiding (String, lines, words, unlines, unwords)

9292import Streamly.Data.Fold (Fold)

9393import Streamly.Memory.Array (Array)

94−import Streamly.Unfold (Unfold)

94+import Streamly.Internal.Data.Unfold (Unfold)

9595

9696import qualified Streamly.Internal.Prelude as S

9797import qualified Streamly.Memory.Array as A

9898import qualified Streamly.Memory.Array.Types as A

9999import qualified Streamly.Internal.Memory.ArrayStream as AS

100100import qualified Streamly.Streams.StreamD as D

101−import qualified Streamly.Unfold as UF

101+import qualified Streamly.Internal.Data.Unfold as UF

102102

103103-- type String = List Char

104104

src/Streamly/Internal.hs−6

@@ -21,10 +21,6 @@ module Streamly.Internal

2121 -- * Diagnostics

2222 inspectMode

2323

24− -- * Streamly.Unfold Experimental Exports

25− , Unfold (..)

26− , fromList

27−

2824 -- * Streamly.Memory.Array

2925 , readU

3026 )

@@ -34,5 +30,3 @@ import Prelude hiding (break, span, splitAt)

3430

3531import Streamly.Memory.Array.Types (readU)

3632import Streamly.Streams.Combinators (inspectMode)

37−import Streamly.Unfold.Types (Unfold(..))

38−import Streamly.Unfold (fromList)

src/Streamly/Internal/Data/Unfold.hs+3−3

@@ -10,7 +10,7 @@

1010#include "inline.hs"

1111

1212-- |

13−-- Module : Streamly.Unfold

13+-- Module : Streamly.Internal.Data.Unfold

1515-- License : BSD3

1616-- Maintainer : harendra.kumar@gmail.com

@@ -45,7 +45,7 @@

4545-- representation. We can use that for composable folds in StreamK

4646-- representation.

4747--

48−module Streamly.Unfold

48+module Streamly.Internal.Data.Unfold

4949 (

5050 -- * Unfold Type

5151 -- |

@@ -67,7 +67,7 @@ import Streamly.Streams.StreamD.Type (Stream(..), Step(..))

6767#if __GLASGOW_HASKELL__ < 800

6868import Streamly.Streams.StreamD.Type (pattern Stream)

6969#endif

70−import Streamly.Unfold.Types (Unfold(..))

70+import Streamly.Internal.Data.Unfold.Types (Unfold(..))

7171

7272-------------------------------------------------------------------------------

7373-- Running unfolds

src/Streamly/Internal/Data/Unfold/Types.hs+2−2

@@ -3,14 +3,14 @@

33{-# LANGUAGE FlexibleContexts #-}

55-- |

6−-- Module : Streamly.Unfold.Types

6+-- Module : Streamly.Internal.Data.Unfold.Types

88-- License : BSD3

99-- Maintainer : harendra.kumar@gmail.com

1010-- Stability : experimental

1111-- Portability : GHC

1212

13−module Streamly.Unfold.Types

13+module Streamly.Internal.Data.Unfold.Types

1414 ( Unfold (..)

1515 )

1616where

src/Streamly/Internal/Memory/ArrayStream.hs+1−1

@@ -51,7 +51,7 @@ import Streamly.Memory.Array.Types (Array(..), length)

5151import Streamly.Streams.Serial (SerialT)

5252import Streamly.Streams.StreamK.Type (IsStream)

5353

54−import qualified Streamly.Unfold as UF

54+import qualified Streamly.Internal.Data.Unfold as UF

5555import qualified Streamly.Memory.Array.Types as A

5656import qualified Streamly.Internal.Prelude as S

5757import qualified Streamly.Streams.StreamD as D

src/Streamly/Internal/Prelude.hs+1−1

@@ -404,7 +404,7 @@ import qualified System.IO as IO

404404

405405import Streamly.Enumeration (Enumerable(..), enumerate, enumerateTo)

406406import Streamly.Internal.Data.Fold.Types (Fold (..))

407−import Streamly.Unfold.Types (Unfold)

407+import Streamly.Internal.Data.Unfold.Types (Unfold)

408408import Streamly.Memory.Array.Types (Array, writeNUnsafe)

409409-- import Streamly.Memory.Ring (Ring)

410410import Streamly.SVar (MonadAsync, defState)

src/Streamly/Memory/Array/Types.hs+1−1

@@ -111,7 +111,7 @@ import GHC.IO (IO(IO), unsafePerformIO)

111111import GHC.Ptr (Ptr(..))

112112

113113import Streamly.Internal.Data.Fold.Types (Fold(..))

114−import Streamly.Unfold.Types (Unfold(..))

114+import Streamly.Internal.Data.Unfold.Types (Unfold(..))

115115import Streamly.Strict (Tuple'(..))

116116import Streamly.SVar (adaptState)

117117

src/Streamly/Streams/StreamD.hs+1−1

@@ -302,7 +302,7 @@ import Streamly.Memory.Array.Types (Array(..))

302302import Streamly.Internal.Data.Fold.Types (Fold(..))

303303import Streamly.Pipe.Types (Pipe(..), PipeState(..))

304304import Streamly.SVar (MonadAsync, defState, adaptState)

305−import Streamly.Unfold.Types (Unfold(..))

305+import Streamly.Internal.Data.Unfold.Types (Unfold(..))

306306import Streamly.Strict (Tuple'(..))

307307

308308import Streamly.Streams.StreamD.Type

streamly.cabal+4−5

@@ -283,10 +283,6 @@ library

283283 -- Pure streams

284284 , Streamly.List

285285

286− -- Unfolds

287− , Streamly.Unfold.Types

288− , Streamly.Unfold

289−

290286 -- Folds

291287 , Streamly.Sink.Types

292288 , Streamly.Sink

@@ -318,8 +314,11 @@ library

318314 -- Internal modules

319315 , Streamly.Internal

320316 , Streamly.Internal.Memory.ArrayStream

321− , Streamly.Internal.Data.Fold

322317 , Streamly.Internal.Data.Fold.Types

318+ , Streamly.Internal.Data.Fold

319+ , Streamly.Internal.Data.Unfold.Types

320+ , Streamly.Internal.Data.Unfold

321+

323322 , Streamly.Internal.Prelude

324323 if !impl(ghcjs)

325324 exposed-modules: