70c03f9 · streamly · git.iko.soy

git.iko.soy/streamly

Move Streams/StreamK* to Internal/Data/Stream

commit70c03f97bfe95e1bc7a12d1b39ee75dab6cee9e6 authoradithyaov <adi.obilisetty@gmail.com> dateMon 9 Dec 2019, 15:14 (7 years ago) parent59796f1

32 files changed+54−54

compare with master

unifiedsplit

benchmark/NanoBenchmarks.hs+1−1

@@ -15,7 +15,7 @@ import qualified Streamly.Internal.FileSystem.Handle as IFH

1515import qualified Streamly.Data.Fold as FL

1616import qualified Streamly.Internal.Prelude as Internal

1717import qualified Streamly.Prelude as S

18−import qualified Streamly.Streams.StreamK as K

18+import qualified Streamly.Internal.Data.Stream.StreamK as K

1919

2020import Data.Char (ord)

2121import Gauge

benchmark/StreamKOps.hs+1−1

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

1919import qualified Prelude as P

2020import qualified Data.List as List

2121

22−import qualified Streamly.Streams.StreamK as S

22+import qualified Streamly.Internal.Data.Stream.StreamK as S

2323import qualified Streamly.Streams.Prelude as SP

2424import qualified Streamly.Internal.Data.SVar as S

2525

design/inlining.md+1−1

@@ -13,7 +13,7 @@ i.e. phase 0, 1 and 2. We have defined them as follows in `inline.h`:

1313## Low Level `fromStreamD/toStreamD` Fusion

1414

1515The combinators in `Streamly.Prelude` are defined in terms of combinators in

16−`Streamly.Internal.Data.Stream.StreamD` (Direct style streams) or `Streamly.Streams.StreamK`

16+`Streamly.Internal.Data.Stream.StreamD` (Direct style streams) or `Streamly.Internal.Data.Stream.StreamK`

1717(CPS style streams). We convert the stream from `StreamD` to `StreamK`

1818representation or vice versa in some cases.

1919

src/Streamly.hs+2−2

@@ -229,12 +229,12 @@ import Streamly.Streams.Async

229229import Streamly.Streams.Combinators

230230import Streamly.Streams.Parallel

231231import Streamly.Streams.Serial

232−import Streamly.Streams.StreamK hiding (serial)

232+import Streamly.Internal.Data.Stream.StreamK hiding (serial)

233233import Streamly.Streams.Zip

234234

235235import qualified Streamly.Prelude as P

236236import qualified Streamly.Internal.Prelude as IP

237−import qualified Streamly.Streams.StreamK as K

237+import qualified Streamly.Internal.Data.Stream.StreamK as K

238238

239239-- XXX provide good succinct examples of pipelining, merging, splitting etc.

240240-- below.

src/Streamly/FileSystem/FD.hs+1−1

@@ -138,7 +138,7 @@ import qualified GHC.IO.Device as RawIO

138138

139139import Streamly.Internal.Memory.Array.Types (Array(..), byteLength, defaultChunkSize)

140140import Streamly.Streams.Serial (SerialT)

141−import Streamly.Streams.StreamK.Type (IsStream, mkStream)

141+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream)

142142

143143#if !defined(mingw32_HOST_OS)

144144import Streamly.Internal.Memory.Array.Types (groupIOVecsOf)

src/Streamly/Internal/Data/Array.hs+1−1

@@ -58,7 +58,7 @@ import qualified GHC.Exts as Exts

5858

5959import Streamly.Internal.Data.Unfold.Types (Unfold(..))

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

61−import Streamly.Streams.StreamK.Type (IsStream)

61+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

6262import Streamly.Streams.Serial (SerialT)

6363

6464import qualified Streamly.Internal.Data.Stream.StreamD as D

src/Streamly/Internal/Data/List.hs+1−1

@@ -88,7 +88,7 @@ import Streamly.Streams.Serial (SerialT)

8888import Streamly.Streams.Zip (ZipSerialM)

8989

9090import qualified Streamly.Streams.Prelude as P

91−import qualified Streamly.Streams.StreamK as K

91+import qualified Streamly.Internal.Data.Stream.StreamK as K

9292

9393-- We implement list as a newtype instead of a type synonym to make type

9494-- inference easier when using -XOverloadedLists and -XOverloadedStrings. When

src/Streamly/Internal/Data/Pipe.hs+2−2

@@ -258,7 +258,7 @@ import Streamly.Internal.Data.Pipe.Types

258258-- import Streamly.Internal.Memory.Array.Types (Array)

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

260260-- import Streamly.Streams.Serial (SerialT)

261−-- import Streamly.Streams.StreamK (IsStream())

261+-- import Streamly.Internal.Data.Stream.StreamK (IsStream())

262262-- import Streamly.Internal.Data.Time.Units

263263-- (AbsTime, MilliSecond64(..), addToAbsTime, diffAbsTime, toRelTime,

264264-- toAbsTime)

@@ -268,7 +268,7 @@ import Streamly.Internal.Data.Pipe.Types

268268-- import qualified Streamly.Internal.Memory.Array.Types as A

269269-- import qualified Streamly.Prelude as S

270270-- import qualified Streamly.Internal.Data.Stream.StreamD as D

271−-- import qualified Streamly.Streams.StreamK as K

271+-- import qualified Streamly.Internal.Data.Stream.StreamK as K

272272-- import qualified Streamly.Streams.Prelude as P

273273

274274------------------------------------------------------------------------------

src/Streamly/Internal/Data/Stream/StreamD.hs+1−1

@@ -360,7 +360,7 @@ import qualified Streamly.Internal.Data.Pipe.Types as Pipe

360360import qualified Streamly.Internal.Memory.Array.Types as A

361361import qualified Streamly.Internal.Data.Fold as FL

362362import qualified Streamly.Memory.Ring as RB

363−import qualified Streamly.Streams.StreamK as K

363+import qualified Streamly.Internal.Data.Stream.StreamK as K

364364

365365import Foreign.Ptr (plusPtr)

366366import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

src/Streamly/Internal/Data/Stream/StreamD/Type.hs+1−1

@@ -79,7 +79,7 @@ import Prelude hiding (map, mapM, foldr, take, concatMap)

7979import Streamly.Internal.Data.SVar (State(..), adaptState, defState)

8080import Streamly.Internal.Data.Fold.Types (Fold(..), Fold2(..))

8181

82−import qualified Streamly.Streams.StreamK as K

82+import qualified Streamly.Internal.Data.Stream.StreamK as K

8383

8484------------------------------------------------------------------------------

8585-- The direct style stream type

src/Streamly/Streams/StreamK.hs → src/Streamly/Internal/Data/Stream/StreamK.hsrenamed+4−4

@@ -12,7 +12,7 @@

1212#include "inline.hs"

1313

1414-- |

15−-- Module : Streamly.Streams.StreamK

15+-- Module : Streamly.Internal.Data.Stream.StreamK

1717--

1818-- License : BSD3

@@ -25,10 +25,10 @@

2525-- denotes a function as well as a Kontinuation.

2626--

2727-- @

28−-- import qualified Streamly.Streams.StreamK as K

28+-- import qualified Streamly.Internal.Data.Stream.StreamK as K

2929-- @

3030--

31−module Streamly.Streams.StreamK

31+module Streamly.Internal.Data.Stream.StreamK

3232 (

3333 -- * A class for streams

3434 IsStream (..)

@@ -198,7 +198,7 @@ import Prelude

198198import qualified Prelude

199199

200200import Streamly.Internal.Data.SVar

201−import Streamly.Streams.StreamK.Type

201+import Streamly.Internal.Data.Stream.StreamK.Type

202202

203203-------------------------------------------------------------------------------

204204-- Deconstruction

src/Streamly/Streams/StreamK/Type.hs → src/Streamly/Internal/Data/Stream/StreamK/Type.hsrenamed+3−3

@@ -14,10 +14,10 @@

1414{-# LANGUAGE RankNTypes #-}

1515{-# LANGUAGE UndecidableInstances #-} -- XXX

1616

17−#include "../inline.hs"

17+#include "inline.hs"

1818

1919-- |

20−-- Module : Streamly.Streams.StreamK.Type

20+-- Module : Streamly.Internal.Data.Stream.StreamK.Type

2222--

2323-- License : BSD3

@@ -29,7 +29,7 @@

2929-- Continuation passing style (CPS) stream implementation. The symbol 'K' below

3030-- denotes a function as well as a Kontinuation.

3131--

32−module Streamly.Streams.StreamK.Type

32+module Streamly.Internal.Data.Stream.StreamK.Type

3333 (

3434 -- * A class for streams

3535 IsStream (..)

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

@@ -139,7 +139,7 @@ import Control.Monad.Catch (MonadCatch)

139139import qualified Prelude

140140import qualified Control.Monad.Catch as MC

141141import qualified Data.Tuple as Tuple

142−import qualified Streamly.Streams.StreamK as K

142+import qualified Streamly.Internal.Data.Stream.StreamK as K

143143import qualified Streamly.Internal.Data.Stream.StreamD as D

144144

145145-------------------------------------------------------------------------------

src/Streamly/Internal/FileSystem/Dir.hs+1−1

@@ -74,7 +74,7 @@ import Streamly.Internal.Data.Unfold.Types (Unfold(..))

7474-- (Array(..), writeNUnsafe, defaultChunkSize, shrinkToFit,

7575-- lpackArraysChunksOf)

7676-- import Streamly.Streams.Serial (SerialT)

77−import Streamly.Streams.StreamK.Type (IsStream)

77+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

7878-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

7979

8080-- import qualified Streamly.Data.Fold as FL

src/Streamly/Internal/FileSystem/File.hs+1−1

@@ -108,7 +108,7 @@ import Streamly.Internal.Data.Unfold.Types (Unfold(..))

108108import Streamly.Internal.Memory.Array.Types

109109 (Array(..), defaultChunkSize, writeNUnsafe)

110110import Streamly.Streams.Serial (SerialT)

111−import Streamly.Streams.StreamK.Type (IsStream)

111+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

112112import Streamly.Internal.Data.SVar (MonadAsync)

113113-- import Streamly.Data.Fold (Fold)

114114-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

src/Streamly/Internal/FileSystem/Handle.hs+1−1

@@ -125,7 +125,7 @@ import Streamly.Internal.Memory.Array.Types

125125 (Array(..), writeNUnsafe, defaultChunkSize, shrinkToFit,

126126 lpackArraysChunksOf)

127127import Streamly.Streams.Serial (SerialT)

128−import Streamly.Streams.StreamK.Type (IsStream, mkStream)

128+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream)

129129-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

130130

131131import qualified Streamly.Data.Fold as FL

src/Streamly/Internal/Memory/Array.hs+2−2

@@ -143,13 +143,13 @@ import Streamly.Internal.Data.Fold.Types (Fold(..))

143143import Streamly.Internal.Data.Unfold.Types (Unfold(..))

144144import Streamly.Internal.Memory.Array.Types (Array(..), length)

145145import Streamly.Streams.Serial (SerialT)

146−import Streamly.Streams.StreamK.Type (IsStream)

146+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

147147

148148import qualified Streamly.Internal.Memory.Array.Types as A

149149import qualified Streamly.Streams.Prelude as P

150150import qualified Streamly.Streams.Serial as Serial

151151import qualified Streamly.Internal.Data.Stream.StreamD as D

152−import qualified Streamly.Streams.StreamK as K

152+import qualified Streamly.Internal.Data.Stream.StreamK as K

153153

154154-------------------------------------------------------------------------------

155155-- Construction

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

@@ -121,7 +121,7 @@ import Streamly.FileSystem.FDIO (IOVec(..))

121121

122122import qualified Streamly.Memory.Malloc as Malloc

123123import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

124−import qualified Streamly.Streams.StreamK as K

124+import qualified Streamly.Internal.Data.Stream.StreamK as K

125125import qualified GHC.Exts as Exts

126126

127127#ifdef DEVBUILD

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

@@ -51,7 +51,7 @@ import Prelude hiding (length, null, last, map, (!!), read, concat)

5151

5252import Streamly.Internal.Memory.Array.Types (Array(..), length)

5353import Streamly.Streams.Serial (SerialT)

54−import Streamly.Streams.StreamK.Type (IsStream)

54+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

5555

5656import qualified Streamly.Internal.Memory.Array as A

5757import qualified Streamly.Internal.Memory.Array.Types as A

src/Streamly/Internal/Network/Inet/TCP.hs+1−1

@@ -114,7 +114,7 @@ import Streamly.Internal.Data.Unfold.Types (Unfold(..))

114114import Streamly.Internal.Network.Socket (SockSpec(..), accept, connections)

115115import Streamly.Streams.Serial (SerialT)

116116import Streamly.Internal.Memory.Array.Types (Array(..), defaultChunkSize, writeNUnsafe)

117−import Streamly.Streams.StreamK.Type (IsStream)

117+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

118118

119119import qualified Control.Monad.Catch as MC

120120import qualified Network.Socket as Net

src/Streamly/Internal/Network/Socket.hs+1−1

@@ -96,7 +96,7 @@ import Streamly (MonadAsync)

9696import Streamly.Internal.Data.Unfold.Types (Unfold(..))

9797import Streamly.Internal.Memory.Array.Types (Array(..))

9898import Streamly.Streams.Serial (SerialT)

99−import Streamly.Streams.StreamK.Type (IsStream, mkStream)

99+import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream)

100100import Streamly.Data.Fold (Fold)

101101-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

102102

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

@@ -452,7 +452,7 @@ import Streamly.Streams.Combinators (inspectMode, maxYields)

452452import Streamly.Streams.Prelude

453453 (fromStreamS, toStreamS, foldWith, foldMapWith, forEachWith)

454454import Streamly.Internal.Data.Stream.StreamD (fromStreamD, toStreamD)

455−import Streamly.Streams.StreamK (IsStream((|:), consM))

455+import Streamly.Internal.Data.Stream.StreamK (IsStream((|:), consM))

456456import Streamly.Streams.Serial (SerialT)

457457import Streamly.Internal.Data.Pipe.Types (Pipe (..))

458458import Streamly.Internal.Data.Time.Units

@@ -465,11 +465,11 @@ import qualified Streamly.Internal.Memory.Array as A

465465import qualified Streamly.Data.Fold as FL

466466import qualified Streamly.Internal.Data.Fold.Types as FL

467467import qualified Streamly.Streams.Prelude as P

468−import qualified Streamly.Streams.StreamK as K

468+import qualified Streamly.Internal.Data.Stream.StreamK as K

469469import qualified Streamly.Internal.Data.Stream.StreamD as D

470470

471471#ifdef USE_STREAMK_ONLY

472−import qualified Streamly.Streams.StreamK as S

472+import qualified Streamly.Internal.Data.Stream.StreamK as S

473473#else

474474import qualified Streamly.Internal.Data.Stream.StreamD as S

475475#endif

src/Streamly/Streams/Ahead.hs+2−2

@@ -49,10 +49,10 @@ import qualified Data.Heap as H

4949import Streamly.Streams.SVar (fromSVar)

5050import Streamly.Streams.Serial (map)

5151import Streamly.Internal.Data.SVar

52−import Streamly.Streams.StreamK

52+import Streamly.Internal.Data.Stream.StreamK

5353 (IsStream(..), Stream, mkStream, foldStream, foldStreamShared,

5454 foldStreamSVar)

55−import qualified Streamly.Streams.StreamK as K

55+import qualified Streamly.Internal.Data.Stream.StreamK as K

5656

5757import Prelude hiding (map)

5858

src/Streamly/Streams/Async.hs+2−2

@@ -60,10 +60,10 @@ import Streamly.Internal.Data.Atomics (atomicModifyIORefCAS)

6060import Streamly.Streams.SVar (fromSVar)

6161import Streamly.Streams.Serial (map)

6262import Streamly.Internal.Data.SVar

63−import Streamly.Streams.StreamK

63+import Streamly.Internal.Data.Stream.StreamK

6464 (IsStream(..), Stream, mkStream, foldStream, adapt, foldStreamShared,

6565 foldStreamSVar)

66−import qualified Streamly.Streams.StreamK as K

66+import qualified Streamly.Internal.Data.Stream.StreamK as K

6767

6868#include "Instances.hs"

6969

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

@@ -30,7 +30,7 @@ import Control.Monad.IO.Class (MonadIO(liftIO))

3030import Data.Int (Int64)

3131

3232import Streamly.Internal.Data.SVar

33−import Streamly.Streams.StreamK

33+import Streamly.Internal.Data.Stream.StreamK

3434import Streamly.Streams.Serial (SerialT)

3535

3636-------------------------------------------------------------------------------

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

@@ -63,7 +63,7 @@ import Numeric.Natural

6363import Data.Functor.Identity (Identity(..))

6464

6565import Streamly.Internal.Data.Stream.StreamD (fromStreamD)

66−import Streamly.Streams.StreamK (IsStream(..))

66+import Streamly.Internal.Data.Stream.StreamK (IsStream(..))

6767

6868import qualified Streamly.Internal.Data.Stream.StreamD as D

6969import qualified Streamly.Streams.Serial as Serial

src/Streamly/Streams/Parallel.hs+2−2

@@ -56,12 +56,12 @@ import qualified Data.Set as Set

5656

5757import Streamly.Streams.SVar (fromSVar, fromStreamVar)

5858import Streamly.Streams.Serial (map)

59−import Streamly.Streams.StreamK (IsStream(..), Stream, mkStream, foldStream,

59+import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream, mkStream, foldStream,

6060 foldStreamShared, adapt)

6161

6262import Streamly.Internal.Data.SVar hiding (handleChildException)

6363

64−import qualified Streamly.Streams.StreamK as K

64+import qualified Streamly.Internal.Data.Stream.StreamK as K

6565import qualified Streamly.Internal.Data.Stream.StreamD as D

6666

6767#include "Instances.hs"

src/Streamly/Streams/Prelude.hs+3−3

@@ -70,13 +70,13 @@ import qualified Prelude

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

7171

7272#ifdef USE_STREAMK_ONLY

73−import qualified Streamly.Streams.StreamK as S

73+import qualified Streamly.Internal.Data.Stream.StreamK as S

7474#else

7575import qualified Streamly.Internal.Data.Stream.StreamD as S

7676#endif

7777

78−import Streamly.Streams.StreamK (IsStream(..))

79−import qualified Streamly.Streams.StreamK as K

78+import Streamly.Internal.Data.Stream.StreamK (IsStream(..))

79+import qualified Streamly.Internal.Data.Stream.StreamK as K

8080import qualified Streamly.Internal.Data.Stream.StreamD as D

8181

8282------------------------------------------------------------------------------

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

@@ -28,7 +28,7 @@ import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)

2828import System.Mem (performMajorGC)

2929

3030import Streamly.Internal.Data.SVar

31−import Streamly.Streams.StreamK hiding (reverse)

31+import Streamly.Internal.Data.Stream.StreamK hiding (reverse)

3232

3333-- | Pull a stream from an SVar.

3434{-# NOINLINE fromStreamVar #-}

src/Streamly/Streams/Serial.hs+2−2

@@ -67,10 +67,10 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec, readPrec, readListPrec,

6767 readListPrecDefault)

6868import Prelude hiding (map, mapM)

6969

70−import Streamly.Streams.StreamK (IsStream(..), adapt, Stream, mkStream,

70+import Streamly.Internal.Data.Stream.StreamK (IsStream(..), adapt, Stream, mkStream,

7171 foldStream)

7272import qualified Streamly.Streams.Prelude as P

73−import qualified Streamly.Streams.StreamK as K

73+import qualified Streamly.Internal.Data.Stream.StreamK as K

7474import qualified Streamly.Internal.Data.Stream.StreamD as D

7575

7676#include "Instances.hs"

src/Streamly/Streams/Zip.hs+2−2

@@ -48,13 +48,13 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec, readPrec, readListPrec,

4848 readListPrecDefault)

4949import Prelude hiding (map, repeat, zipWith)

5050

51−import Streamly.Streams.StreamK (IsStream(..), Stream)

51+import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream)

5252import Streamly.Streams.Serial (map)

5353import Streamly.Internal.Data.SVar (MonadAsync)

5454import Streamly.Internal.Prelude (zipWith, zipAsyncWith)

5555

5656import qualified Streamly.Streams.Prelude as P

57−import qualified Streamly.Streams.StreamK as K

57+import qualified Streamly.Internal.Data.Stream.StreamK as K

5858

5959#include "Instances.hs"

6060

streamly.cabal+6−6

@@ -278,8 +278,8 @@ library

278278 , Streamly.Memory.Ring

279279

280280 -- Base streams

281− , Streamly.Streams.StreamK.Type

282− , Streamly.Streams.StreamK

281+ , Streamly.Internal.Data.Stream.StreamK.Type

282+ , Streamly.Internal.Data.Stream.StreamK

283283 , Streamly.Streams.StreamDK.Type

284284 , Streamly.Streams.StreamDK

285285 , Streamly.Internal.Data.Stream.StreamD

@@ -726,8 +726,8 @@ benchmark base

726726 , Streamly.Internal.Data.Time.Clock

727727 , Streamly.Streams.StreamDK.Type

728728 , Streamly.Streams.StreamDK

729− , Streamly.Streams.StreamK.Type

730− , Streamly.Streams.StreamK

729+ , Streamly.Internal.Data.Stream.StreamK.Type

730+ , Streamly.Internal.Data.Stream.StreamK

731731 , Streamly.Internal.Data.Stream.StreamD

732732 , Streamly.Streams.Prelude

733733 , Streamly.FileSystem.IOVec

@@ -779,8 +779,8 @@ executable nano-bench

779779 , Streamly.Internal.Data.SVar

780780 , Streamly.Internal.Data.Time.Units

781781 , Streamly.Internal.Data.Time.Clock

782− , Streamly.Streams.StreamK.Type

783− , Streamly.Streams.StreamK

782+ , Streamly.Internal.Data.Stream.StreamK.Type

783+ , Streamly.Internal.Data.Stream.StreamK

784784 , Streamly.FileSystem.IOVec

785785 , Streamly.Internal.Data.Stream.StreamD

786786 if flag(dev)