From 70c03f97bfe95e1bc7a12d1b39ee75dab6cee9e6 Mon Sep 17 00:00:00 2001 From: adithyaov Date: Mon, 9 Dec 2019 15:14:05 +0530 Subject: [PATCH] Move Streams/StreamK* to Internal/Data/Stream --- benchmark/NanoBenchmarks.hs | 2 +- benchmark/StreamKOps.hs | 2 +- design/inlining.md | 2 +- src/Streamly.hs | 4 ++-- src/Streamly/FileSystem/FD.hs | 2 +- src/Streamly/Internal/Data/Array.hs | 2 +- src/Streamly/Internal/Data/List.hs | 2 +- src/Streamly/Internal/Data/Pipe.hs | 4 ++-- src/Streamly/Internal/Data/Stream/StreamD.hs | 2 +- src/Streamly/Internal/Data/Stream/StreamD/Type.hs | 2 +- .../{Streams => Internal/Data/Stream}/StreamK.hs | 8 ++++---- .../Data/Stream}/StreamK/Type.hs | 6 +++--- src/Streamly/Internal/Data/Unfold.hs | 2 +- src/Streamly/Internal/FileSystem/Dir.hs | 2 +- src/Streamly/Internal/FileSystem/File.hs | 2 +- src/Streamly/Internal/FileSystem/Handle.hs | 2 +- src/Streamly/Internal/Memory/Array.hs | 4 ++-- src/Streamly/Internal/Memory/Array/Types.hs | 2 +- src/Streamly/Internal/Memory/ArrayStream.hs | 2 +- src/Streamly/Internal/Network/Inet/TCP.hs | 2 +- src/Streamly/Internal/Network/Socket.hs | 2 +- src/Streamly/Internal/Prelude.hs | 6 +++--- src/Streamly/Streams/Ahead.hs | 4 ++-- src/Streamly/Streams/Async.hs | 4 ++-- src/Streamly/Streams/Combinators.hs | 2 +- src/Streamly/Streams/Enumeration.hs | 2 +- src/Streamly/Streams/Parallel.hs | 4 ++-- src/Streamly/Streams/Prelude.hs | 6 +++--- src/Streamly/Streams/SVar.hs | 2 +- src/Streamly/Streams/Serial.hs | 4 ++-- src/Streamly/Streams/Zip.hs | 4 ++-- streamly.cabal | 12 ++++++------ 32 files changed, 54 insertions(+), 54 deletions(-) rename src/Streamly/{Streams => Internal/Data/Stream}/StreamK.hs (99%) rename src/Streamly/{Streams => Internal/Data/Stream}/StreamK/Type.hs (99%) diff --git a/benchmark/NanoBenchmarks.hs b/benchmark/NanoBenchmarks.hs index 5c2616c69..89bc19454 100644 --- a/benchmark/NanoBenchmarks.hs +++ b/benchmark/NanoBenchmarks.hs @@ -15,7 +15,7 @@ import qualified Streamly.Internal.FileSystem.Handle as IFH import qualified Streamly.Data.Fold as FL import qualified Streamly.Internal.Prelude as Internal import qualified Streamly.Prelude as S -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K import Data.Char (ord) import Gauge diff --git a/benchmark/StreamKOps.hs b/benchmark/StreamKOps.hs index 6f878f4ee..8cbf12b26 100644 --- a/benchmark/StreamKOps.hs +++ b/benchmark/StreamKOps.hs @@ -19,7 +19,7 @@ import Prelude import qualified Prelude as P import qualified Data.List as List -import qualified Streamly.Streams.StreamK as S +import qualified Streamly.Internal.Data.Stream.StreamK as S import qualified Streamly.Streams.Prelude as SP import qualified Streamly.Internal.Data.SVar as S diff --git a/design/inlining.md b/design/inlining.md index b7fe6e7bc..3e36fd392 100644 --- a/design/inlining.md +++ b/design/inlining.md @@ -13,7 +13,7 @@ i.e. phase 0, 1 and 2. We have defined them as follows in `inline.h`: ## Low Level `fromStreamD/toStreamD` Fusion The combinators in `Streamly.Prelude` are defined in terms of combinators in -`Streamly.Internal.Data.Stream.StreamD` (Direct style streams) or `Streamly.Streams.StreamK` +`Streamly.Internal.Data.Stream.StreamD` (Direct style streams) or `Streamly.Internal.Data.Stream.StreamK` (CPS style streams). We convert the stream from `StreamD` to `StreamK` representation or vice versa in some cases. diff --git a/src/Streamly.hs b/src/Streamly.hs index 09989b066..162bc483d 100644 --- a/src/Streamly.hs +++ b/src/Streamly.hs @@ -229,12 +229,12 @@ import Streamly.Streams.Async import Streamly.Streams.Combinators import Streamly.Streams.Parallel import Streamly.Streams.Serial -import Streamly.Streams.StreamK hiding (serial) +import Streamly.Internal.Data.Stream.StreamK hiding (serial) import Streamly.Streams.Zip import qualified Streamly.Prelude as P import qualified Streamly.Internal.Prelude as IP -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K -- XXX provide good succinct examples of pipelining, merging, splitting etc. -- below. diff --git a/src/Streamly/FileSystem/FD.hs b/src/Streamly/FileSystem/FD.hs index 5c48e7cc2..521a058df 100644 --- a/src/Streamly/FileSystem/FD.hs +++ b/src/Streamly/FileSystem/FD.hs @@ -138,7 +138,7 @@ import qualified GHC.IO.Device as RawIO import Streamly.Internal.Memory.Array.Types (Array(..), byteLength, defaultChunkSize) import Streamly.Streams.Serial (SerialT) -import Streamly.Streams.StreamK.Type (IsStream, mkStream) +import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream) #if !defined(mingw32_HOST_OS) import Streamly.Internal.Memory.Array.Types (groupIOVecsOf) diff --git a/src/Streamly/Internal/Data/Array.hs b/src/Streamly/Internal/Data/Array.hs index ee329e4f5..1e9eeaf48 100644 --- a/src/Streamly/Internal/Data/Array.hs +++ b/src/Streamly/Internal/Data/Array.hs @@ -58,7 +58,7 @@ import qualified GHC.Exts as Exts import Streamly.Internal.Data.Unfold.Types (Unfold(..)) import Streamly.Internal.Data.Fold.Types (Fold(..)) -import Streamly.Streams.StreamK.Type (IsStream) +import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) import Streamly.Streams.Serial (SerialT) import qualified Streamly.Internal.Data.Stream.StreamD as D diff --git a/src/Streamly/Internal/Data/List.hs b/src/Streamly/Internal/Data/List.hs index 2f26c1c37..0b8399e38 100644 --- a/src/Streamly/Internal/Data/List.hs +++ b/src/Streamly/Internal/Data/List.hs @@ -88,7 +88,7 @@ import Streamly.Streams.Serial (SerialT) import Streamly.Streams.Zip (ZipSerialM) import qualified Streamly.Streams.Prelude as P -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K -- We implement list as a newtype instead of a type synonym to make type -- inference easier when using -XOverloadedLists and -XOverloadedStrings. When diff --git a/src/Streamly/Internal/Data/Pipe.hs b/src/Streamly/Internal/Data/Pipe.hs index d9178166e..1c3875e0a 100644 --- a/src/Streamly/Internal/Data/Pipe.hs +++ b/src/Streamly/Internal/Data/Pipe.hs @@ -258,7 +258,7 @@ import Streamly.Internal.Data.Pipe.Types -- import Streamly.Internal.Memory.Array.Types (Array) -- import Streamly.Memory.Ring (Ring) -- import Streamly.Streams.Serial (SerialT) --- import Streamly.Streams.StreamK (IsStream()) +-- import Streamly.Internal.Data.Stream.StreamK (IsStream()) -- import Streamly.Internal.Data.Time.Units -- (AbsTime, MilliSecond64(..), addToAbsTime, diffAbsTime, toRelTime, -- toAbsTime) @@ -268,7 +268,7 @@ import Streamly.Internal.Data.Pipe.Types -- import qualified Streamly.Internal.Memory.Array.Types as A -- import qualified Streamly.Prelude as S -- import qualified Streamly.Internal.Data.Stream.StreamD as D --- import qualified Streamly.Streams.StreamK as K +-- import qualified Streamly.Internal.Data.Stream.StreamK as K -- import qualified Streamly.Streams.Prelude as P ------------------------------------------------------------------------------ diff --git a/src/Streamly/Internal/Data/Stream/StreamD.hs b/src/Streamly/Internal/Data/Stream/StreamD.hs index b22429d19..e0234c51a 100644 --- a/src/Streamly/Internal/Data/Stream/StreamD.hs +++ b/src/Streamly/Internal/Data/Stream/StreamD.hs @@ -360,7 +360,7 @@ import qualified Streamly.Internal.Data.Pipe.Types as Pipe import qualified Streamly.Internal.Memory.Array.Types as A import qualified Streamly.Internal.Data.Fold as FL import qualified Streamly.Memory.Ring as RB -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K import Foreign.Ptr (plusPtr) import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr) diff --git a/src/Streamly/Internal/Data/Stream/StreamD/Type.hs b/src/Streamly/Internal/Data/Stream/StreamD/Type.hs index e23cc3203..3dde184ae 100644 --- a/src/Streamly/Internal/Data/Stream/StreamD/Type.hs +++ b/src/Streamly/Internal/Data/Stream/StreamD/Type.hs @@ -79,7 +79,7 @@ import Prelude hiding (map, mapM, foldr, take, concatMap) import Streamly.Internal.Data.SVar (State(..), adaptState, defState) import Streamly.Internal.Data.Fold.Types (Fold(..), Fold2(..)) -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K ------------------------------------------------------------------------------ -- The direct style stream type diff --git a/src/Streamly/Streams/StreamK.hs b/src/Streamly/Internal/Data/Stream/StreamK.hs similarity index 99% rename from src/Streamly/Streams/StreamK.hs rename to src/Streamly/Internal/Data/Stream/StreamK.hs index b446fde9f..008f95311 100644 --- a/src/Streamly/Streams/StreamK.hs +++ b/src/Streamly/Internal/Data/Stream/StreamK.hs @@ -12,7 +12,7 @@ #include "inline.hs" -- | --- Module : Streamly.Streams.StreamK +-- Module : Streamly.Internal.Data.Stream.StreamK -- Copyright : (c) 2017 Harendra Kumar -- -- License : BSD3 @@ -25,10 +25,10 @@ -- denotes a function as well as a Kontinuation. -- -- @ --- import qualified Streamly.Streams.StreamK as K +-- import qualified Streamly.Internal.Data.Stream.StreamK as K -- @ -- -module Streamly.Streams.StreamK +module Streamly.Internal.Data.Stream.StreamK ( -- * A class for streams IsStream (..) @@ -198,7 +198,7 @@ import Prelude import qualified Prelude import Streamly.Internal.Data.SVar -import Streamly.Streams.StreamK.Type +import Streamly.Internal.Data.Stream.StreamK.Type ------------------------------------------------------------------------------- -- Deconstruction diff --git a/src/Streamly/Streams/StreamK/Type.hs b/src/Streamly/Internal/Data/Stream/StreamK/Type.hs similarity index 99% rename from src/Streamly/Streams/StreamK/Type.hs rename to src/Streamly/Internal/Data/Stream/StreamK/Type.hs index 0f8e09b27..30a5c1a6d 100644 --- a/src/Streamly/Streams/StreamK/Type.hs +++ b/src/Streamly/Internal/Data/Stream/StreamK/Type.hs @@ -14,10 +14,10 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE UndecidableInstances #-} -- XXX -#include "../inline.hs" +#include "inline.hs" -- | --- Module : Streamly.Streams.StreamK.Type +-- Module : Streamly.Internal.Data.Stream.StreamK.Type -- Copyright : (c) 2017 Harendra Kumar -- -- License : BSD3 @@ -29,7 +29,7 @@ -- Continuation passing style (CPS) stream implementation. The symbol 'K' below -- denotes a function as well as a Kontinuation. -- -module Streamly.Streams.StreamK.Type +module Streamly.Internal.Data.Stream.StreamK.Type ( -- * A class for streams IsStream (..) diff --git a/src/Streamly/Internal/Data/Unfold.hs b/src/Streamly/Internal/Data/Unfold.hs index fb3b2d7ac..4685543d0 100644 --- a/src/Streamly/Internal/Data/Unfold.hs +++ b/src/Streamly/Internal/Data/Unfold.hs @@ -139,7 +139,7 @@ import Control.Monad.Catch (MonadCatch) import qualified Prelude import qualified Control.Monad.Catch as MC import qualified Data.Tuple as Tuple -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K import qualified Streamly.Internal.Data.Stream.StreamD as D ------------------------------------------------------------------------------- diff --git a/src/Streamly/Internal/FileSystem/Dir.hs b/src/Streamly/Internal/FileSystem/Dir.hs index 89a0b90f3..2d2a79928 100644 --- a/src/Streamly/Internal/FileSystem/Dir.hs +++ b/src/Streamly/Internal/FileSystem/Dir.hs @@ -74,7 +74,7 @@ import Streamly.Internal.Data.Unfold.Types (Unfold(..)) -- (Array(..), writeNUnsafe, defaultChunkSize, shrinkToFit, -- lpackArraysChunksOf) -- import Streamly.Streams.Serial (SerialT) -import Streamly.Streams.StreamK.Type (IsStream) +import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) -- import Streamly.String (encodeUtf8, decodeUtf8, foldLines) -- import qualified Streamly.Data.Fold as FL diff --git a/src/Streamly/Internal/FileSystem/File.hs b/src/Streamly/Internal/FileSystem/File.hs index 7d5547957..6a0b8c9e2 100644 --- a/src/Streamly/Internal/FileSystem/File.hs +++ b/src/Streamly/Internal/FileSystem/File.hs @@ -108,7 +108,7 @@ import Streamly.Internal.Data.Unfold.Types (Unfold(..)) import Streamly.Internal.Memory.Array.Types (Array(..), defaultChunkSize, writeNUnsafe) import Streamly.Streams.Serial (SerialT) -import Streamly.Streams.StreamK.Type (IsStream) +import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) import Streamly.Internal.Data.SVar (MonadAsync) -- import Streamly.Data.Fold (Fold) -- import Streamly.String (encodeUtf8, decodeUtf8, foldLines) diff --git a/src/Streamly/Internal/FileSystem/Handle.hs b/src/Streamly/Internal/FileSystem/Handle.hs index c801f619f..b9ae112e3 100644 --- a/src/Streamly/Internal/FileSystem/Handle.hs +++ b/src/Streamly/Internal/FileSystem/Handle.hs @@ -125,7 +125,7 @@ import Streamly.Internal.Memory.Array.Types (Array(..), writeNUnsafe, defaultChunkSize, shrinkToFit, lpackArraysChunksOf) import Streamly.Streams.Serial (SerialT) -import Streamly.Streams.StreamK.Type (IsStream, mkStream) +import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream) -- import Streamly.String (encodeUtf8, decodeUtf8, foldLines) import qualified Streamly.Data.Fold as FL diff --git a/src/Streamly/Internal/Memory/Array.hs b/src/Streamly/Internal/Memory/Array.hs index e8e561fbc..ffc135fac 100644 --- a/src/Streamly/Internal/Memory/Array.hs +++ b/src/Streamly/Internal/Memory/Array.hs @@ -143,13 +143,13 @@ import Streamly.Internal.Data.Fold.Types (Fold(..)) import Streamly.Internal.Data.Unfold.Types (Unfold(..)) import Streamly.Internal.Memory.Array.Types (Array(..), length) import Streamly.Streams.Serial (SerialT) -import Streamly.Streams.StreamK.Type (IsStream) +import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) import qualified Streamly.Internal.Memory.Array.Types as A import qualified Streamly.Streams.Prelude as P import qualified Streamly.Streams.Serial as Serial import qualified Streamly.Internal.Data.Stream.StreamD as D -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K ------------------------------------------------------------------------------- -- Construction diff --git a/src/Streamly/Internal/Memory/Array/Types.hs b/src/Streamly/Internal/Memory/Array/Types.hs index b802956fd..c3b40766f 100644 --- a/src/Streamly/Internal/Memory/Array/Types.hs +++ b/src/Streamly/Internal/Memory/Array/Types.hs @@ -121,7 +121,7 @@ import Streamly.FileSystem.FDIO (IOVec(..)) import qualified Streamly.Memory.Malloc as Malloc import qualified Streamly.Internal.Data.Stream.StreamD.Type as D -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K import qualified GHC.Exts as Exts #ifdef DEVBUILD diff --git a/src/Streamly/Internal/Memory/ArrayStream.hs b/src/Streamly/Internal/Memory/ArrayStream.hs index 0c763a284..354bcb3de 100644 --- a/src/Streamly/Internal/Memory/ArrayStream.hs +++ b/src/Streamly/Internal/Memory/ArrayStream.hs @@ -51,7 +51,7 @@ import Prelude hiding (length, null, last, map, (!!), read, concat) import Streamly.Internal.Memory.Array.Types (Array(..), length) import Streamly.Streams.Serial (SerialT) -import Streamly.Streams.StreamK.Type (IsStream) +import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) import qualified Streamly.Internal.Memory.Array as A import qualified Streamly.Internal.Memory.Array.Types as A diff --git a/src/Streamly/Internal/Network/Inet/TCP.hs b/src/Streamly/Internal/Network/Inet/TCP.hs index 3170c3a13..f7e64f958 100644 --- a/src/Streamly/Internal/Network/Inet/TCP.hs +++ b/src/Streamly/Internal/Network/Inet/TCP.hs @@ -114,7 +114,7 @@ import Streamly.Internal.Data.Unfold.Types (Unfold(..)) import Streamly.Internal.Network.Socket (SockSpec(..), accept, connections) import Streamly.Streams.Serial (SerialT) import Streamly.Internal.Memory.Array.Types (Array(..), defaultChunkSize, writeNUnsafe) -import Streamly.Streams.StreamK.Type (IsStream) +import Streamly.Internal.Data.Stream.StreamK.Type (IsStream) import qualified Control.Monad.Catch as MC import qualified Network.Socket as Net diff --git a/src/Streamly/Internal/Network/Socket.hs b/src/Streamly/Internal/Network/Socket.hs index 6a9b830ca..f6c0fd9ac 100644 --- a/src/Streamly/Internal/Network/Socket.hs +++ b/src/Streamly/Internal/Network/Socket.hs @@ -96,7 +96,7 @@ import Streamly (MonadAsync) import Streamly.Internal.Data.Unfold.Types (Unfold(..)) import Streamly.Internal.Memory.Array.Types (Array(..)) import Streamly.Streams.Serial (SerialT) -import Streamly.Streams.StreamK.Type (IsStream, mkStream) +import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream) import Streamly.Data.Fold (Fold) -- import Streamly.String (encodeUtf8, decodeUtf8, foldLines) diff --git a/src/Streamly/Internal/Prelude.hs b/src/Streamly/Internal/Prelude.hs index c21067b73..0657549bc 100644 --- a/src/Streamly/Internal/Prelude.hs +++ b/src/Streamly/Internal/Prelude.hs @@ -452,7 +452,7 @@ import Streamly.Streams.Combinators (inspectMode, maxYields) import Streamly.Streams.Prelude (fromStreamS, toStreamS, foldWith, foldMapWith, forEachWith) import Streamly.Internal.Data.Stream.StreamD (fromStreamD, toStreamD) -import Streamly.Streams.StreamK (IsStream((|:), consM)) +import Streamly.Internal.Data.Stream.StreamK (IsStream((|:), consM)) import Streamly.Streams.Serial (SerialT) import Streamly.Internal.Data.Pipe.Types (Pipe (..)) import Streamly.Internal.Data.Time.Units @@ -465,11 +465,11 @@ import qualified Streamly.Internal.Memory.Array as A import qualified Streamly.Data.Fold as FL import qualified Streamly.Internal.Data.Fold.Types as FL import qualified Streamly.Streams.Prelude as P -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K import qualified Streamly.Internal.Data.Stream.StreamD as D #ifdef USE_STREAMK_ONLY -import qualified Streamly.Streams.StreamK as S +import qualified Streamly.Internal.Data.Stream.StreamK as S #else import qualified Streamly.Internal.Data.Stream.StreamD as S #endif diff --git a/src/Streamly/Streams/Ahead.hs b/src/Streamly/Streams/Ahead.hs index 1286d2103..b1c256bc3 100644 --- a/src/Streamly/Streams/Ahead.hs +++ b/src/Streamly/Streams/Ahead.hs @@ -49,10 +49,10 @@ import qualified Data.Heap as H import Streamly.Streams.SVar (fromSVar) import Streamly.Streams.Serial (map) import Streamly.Internal.Data.SVar -import Streamly.Streams.StreamK +import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream, mkStream, foldStream, foldStreamShared, foldStreamSVar) -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K import Prelude hiding (map) diff --git a/src/Streamly/Streams/Async.hs b/src/Streamly/Streams/Async.hs index 2245dd191..c9d42e7a7 100644 --- a/src/Streamly/Streams/Async.hs +++ b/src/Streamly/Streams/Async.hs @@ -60,10 +60,10 @@ import Streamly.Internal.Data.Atomics (atomicModifyIORefCAS) import Streamly.Streams.SVar (fromSVar) import Streamly.Streams.Serial (map) import Streamly.Internal.Data.SVar -import Streamly.Streams.StreamK +import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream, mkStream, foldStream, adapt, foldStreamShared, foldStreamSVar) -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K #include "Instances.hs" diff --git a/src/Streamly/Streams/Combinators.hs b/src/Streamly/Streams/Combinators.hs index 0acc65e3e..8f77993b0 100644 --- a/src/Streamly/Streams/Combinators.hs +++ b/src/Streamly/Streams/Combinators.hs @@ -30,7 +30,7 @@ import Control.Monad.IO.Class (MonadIO(liftIO)) import Data.Int (Int64) import Streamly.Internal.Data.SVar -import Streamly.Streams.StreamK +import Streamly.Internal.Data.Stream.StreamK import Streamly.Streams.Serial (SerialT) ------------------------------------------------------------------------------- diff --git a/src/Streamly/Streams/Enumeration.hs b/src/Streamly/Streams/Enumeration.hs index f14277725..425663c8e 100644 --- a/src/Streamly/Streams/Enumeration.hs +++ b/src/Streamly/Streams/Enumeration.hs @@ -63,7 +63,7 @@ import Numeric.Natural import Data.Functor.Identity (Identity(..)) import Streamly.Internal.Data.Stream.StreamD (fromStreamD) -import Streamly.Streams.StreamK (IsStream(..)) +import Streamly.Internal.Data.Stream.StreamK (IsStream(..)) import qualified Streamly.Internal.Data.Stream.StreamD as D import qualified Streamly.Streams.Serial as Serial diff --git a/src/Streamly/Streams/Parallel.hs b/src/Streamly/Streams/Parallel.hs index 8b5af0130..25f6fbbb8 100644 --- a/src/Streamly/Streams/Parallel.hs +++ b/src/Streamly/Streams/Parallel.hs @@ -56,12 +56,12 @@ import qualified Data.Set as Set import Streamly.Streams.SVar (fromSVar, fromStreamVar) import Streamly.Streams.Serial (map) -import Streamly.Streams.StreamK (IsStream(..), Stream, mkStream, foldStream, +import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream, mkStream, foldStream, foldStreamShared, adapt) import Streamly.Internal.Data.SVar hiding (handleChildException) -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K import qualified Streamly.Internal.Data.Stream.StreamD as D #include "Instances.hs" diff --git a/src/Streamly/Streams/Prelude.hs b/src/Streamly/Streams/Prelude.hs index 4404042cf..5203138a1 100644 --- a/src/Streamly/Streams/Prelude.hs +++ b/src/Streamly/Streams/Prelude.hs @@ -70,13 +70,13 @@ import qualified Prelude import Streamly.Internal.Data.Fold.Types (Fold (..)) #ifdef USE_STREAMK_ONLY -import qualified Streamly.Streams.StreamK as S +import qualified Streamly.Internal.Data.Stream.StreamK as S #else import qualified Streamly.Internal.Data.Stream.StreamD as S #endif -import Streamly.Streams.StreamK (IsStream(..)) -import qualified Streamly.Streams.StreamK as K +import Streamly.Internal.Data.Stream.StreamK (IsStream(..)) +import qualified Streamly.Internal.Data.Stream.StreamK as K import qualified Streamly.Internal.Data.Stream.StreamD as D ------------------------------------------------------------------------------ diff --git a/src/Streamly/Streams/SVar.hs b/src/Streamly/Streams/SVar.hs index b7a4b786a..4f38e7bcf 100644 --- a/src/Streamly/Streams/SVar.hs +++ b/src/Streamly/Streams/SVar.hs @@ -28,7 +28,7 @@ import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime) import System.Mem (performMajorGC) import Streamly.Internal.Data.SVar -import Streamly.Streams.StreamK hiding (reverse) +import Streamly.Internal.Data.Stream.StreamK hiding (reverse) -- | Pull a stream from an SVar. {-# NOINLINE fromStreamVar #-} diff --git a/src/Streamly/Streams/Serial.hs b/src/Streamly/Streams/Serial.hs index 1aadb9b7c..6464e2b44 100644 --- a/src/Streamly/Streams/Serial.hs +++ b/src/Streamly/Streams/Serial.hs @@ -67,10 +67,10 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec, readPrec, readListPrec, readListPrecDefault) import Prelude hiding (map, mapM) -import Streamly.Streams.StreamK (IsStream(..), adapt, Stream, mkStream, +import Streamly.Internal.Data.Stream.StreamK (IsStream(..), adapt, Stream, mkStream, foldStream) import qualified Streamly.Streams.Prelude as P -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K import qualified Streamly.Internal.Data.Stream.StreamD as D #include "Instances.hs" diff --git a/src/Streamly/Streams/Zip.hs b/src/Streamly/Streams/Zip.hs index 59f77475c..253074b5c 100644 --- a/src/Streamly/Streams/Zip.hs +++ b/src/Streamly/Streams/Zip.hs @@ -48,13 +48,13 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec, readPrec, readListPrec, readListPrecDefault) import Prelude hiding (map, repeat, zipWith) -import Streamly.Streams.StreamK (IsStream(..), Stream) +import Streamly.Internal.Data.Stream.StreamK (IsStream(..), Stream) import Streamly.Streams.Serial (map) import Streamly.Internal.Data.SVar (MonadAsync) import Streamly.Internal.Prelude (zipWith, zipAsyncWith) import qualified Streamly.Streams.Prelude as P -import qualified Streamly.Streams.StreamK as K +import qualified Streamly.Internal.Data.Stream.StreamK as K #include "Instances.hs" diff --git a/streamly.cabal b/streamly.cabal index 6a0121da2..08f9d95c9 100644 --- a/streamly.cabal +++ b/streamly.cabal @@ -278,8 +278,8 @@ library , Streamly.Memory.Ring -- Base streams - , Streamly.Streams.StreamK.Type - , Streamly.Streams.StreamK + , Streamly.Internal.Data.Stream.StreamK.Type + , Streamly.Internal.Data.Stream.StreamK , Streamly.Streams.StreamDK.Type , Streamly.Streams.StreamDK , Streamly.Internal.Data.Stream.StreamD @@ -726,8 +726,8 @@ benchmark base , Streamly.Internal.Data.Time.Clock , Streamly.Streams.StreamDK.Type , Streamly.Streams.StreamDK - , Streamly.Streams.StreamK.Type - , Streamly.Streams.StreamK + , Streamly.Internal.Data.Stream.StreamK.Type + , Streamly.Internal.Data.Stream.StreamK , Streamly.Internal.Data.Stream.StreamD , Streamly.Streams.Prelude , Streamly.FileSystem.IOVec @@ -779,8 +779,8 @@ executable nano-bench , Streamly.Internal.Data.SVar , Streamly.Internal.Data.Time.Units , Streamly.Internal.Data.Time.Clock - , Streamly.Streams.StreamK.Type - , Streamly.Streams.StreamK + , Streamly.Internal.Data.Stream.StreamK.Type + , Streamly.Internal.Data.Stream.StreamK , Streamly.FileSystem.IOVec , Streamly.Internal.Data.Stream.StreamD if flag(dev)