59796f1 · streamly · git.iko.soy

git.iko.soy/streamly

Move Streams/StreamD.hs to Internal/Data/Stream/*

commit59796f1d147ee8ddc93606d21176f361160fddca authoradithyaov <adi.obilisetty@gmail.com> dateMon 9 Dec 2019, 14:56 (7 years ago) parent879d159

18 files changed+33−33

compare with master

unifiedsplit

benchmark/StreamDOps.hs+1−1

@@ -18,7 +18,7 @@ import Prelude

1818 maxBound, fmap, odd, (==), flip, (<$>), (<*>), round, (/), (**), (<))

1919import qualified Prelude as P

2020

21−import qualified Streamly.Streams.StreamD as S

21+import qualified Streamly.Internal.Data.Stream.StreamD as S

2222import qualified Streamly.Internal.Data.Unfold as UF

2323

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

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.Streams.StreamD` (Direct style streams) or `Streamly.Streams.StreamK`

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

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

1818representation or vice versa in some cases.

1919

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

@@ -142,7 +142,7 @@ import Streamly.Streams.StreamK.Type (IsStream, mkStream)

142142

143143#if !defined(mingw32_HOST_OS)

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

145−import Streamly.Streams.StreamD (toStreamD)

145+import Streamly.Internal.Data.Stream.StreamD (toStreamD)

146146import Streamly.Internal.Data.Stream.StreamD.Type (fromStreamD)

147147import qualified Streamly.FileSystem.FDIO as RawIO hiding (write)

148148#endif

src/Streamly/Internal/Benchmark/FileIO/Stream.hs+1−1

@@ -82,7 +82,7 @@ import qualified Streamly.Internal.Data.Unicode.Stream as IUS

8282import qualified Streamly.Internal.Memory.Unicode.Array as IUA

8383import qualified Streamly.Internal.Data.Unfold as IUF

8484import qualified Streamly.Internal.Prelude as IP

85−import qualified Streamly.Streams.StreamD as D

85+import qualified Streamly.Internal.Data.Stream.StreamD as D

8686

8787#ifdef INSPECTION

8888import Foreign.Storable (Storable)

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

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

4141#ifdef INSPECTION

4242import Test.Inspection

4343

44−import qualified Streamly.Streams.StreamD as D

44+import qualified Streamly.Internal.Data.Stream.StreamD as D

4545#endif

4646

4747import qualified Streamly as S hiding (runStream)

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

@@ -61,7 +61,7 @@ import Streamly.Internal.Data.Fold.Types (Fold(..))

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

6262import Streamly.Streams.Serial (SerialT)

6363

64−import qualified Streamly.Streams.StreamD as D

64+import qualified Streamly.Internal.Data.Stream.StreamD as D

6565

6666{-# NOINLINE bottomElement #-}

6767bottomElement :: a

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

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

267267

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

269269-- import qualified Streamly.Prelude as S

270−-- import qualified Streamly.Streams.StreamD as D

270+-- import qualified Streamly.Internal.Data.Stream.StreamD as D

271271-- import qualified Streamly.Streams.StreamK as K

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

273273

src/Streamly/Streams/StreamD.hs → src/Streamly/Internal/Data/Stream/StreamD.hsrenamed+10−10

@@ -19,7 +19,7 @@

1919#include "inline.hs"

2020

2121-- |

22−-- Module : Streamly.Streams.StreamD

22+-- Module : Streamly.Internal.Data.Stream.StreamD

2424-- Copyright : (c) Roman Leshchinskiy 2008-2010

2525-- Copyright : (c) The University of Glasgow, 2009

@@ -36,13 +36,13 @@

3636-- CPS implementation.

3737--

3838-- @

39−-- import qualified Streamly.Streams.StreamD as D

39+-- import qualified Streamly.Internal.Data.Stream.StreamD as D

4040-- @

4141

4242-- Some of the functions in this file have been adapted from the vector

4343-- library, https://hackage.haskell.org/package/vector.

4444

45−module Streamly.Streams.StreamD

45+module Streamly.Internal.Data.Stream.StreamD

4646 (

4747 -- * The stream type

4848 Step (..)

@@ -3826,7 +3826,7 @@ decodeUtf8With cfm (Stream step state) =

38263826 inputUnderflow =

38273827 case cfm of

38283828 ErrorOnCodingFailure ->

3829− error "Streamly.Streams.StreamD.decodeUtf8With: Input Underflow"

3829+ error "Streamly.Internal.Data.Stream.StreamD.decodeUtf8With: Input Underflow"

38303830 TransliterateCodingFailure -> YieldAndContinue replacementChar Done

38313831 {-# INLINE_LATE step' #-}

38323832 step' _ gst (FreshPointDecodeInit st) = do

@@ -3860,7 +3860,7 @@ decodeUtf8With cfm (Stream step state) =

38603860 12 ->

38613861 Skip $

38623862 transliterateOrError

3863− "Streamly.Streams.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"

3863+ "Streamly.Internal.Data.Stream.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"

38643864 (FreshPointDecodeInit st)

38653865 0 -> error "unreachable state"

38663866 _ -> Skip (FreshPointDecoding st sv cp)

@@ -3879,7 +3879,7 @@ decodeUtf8With cfm (Stream step state) =

38793879 12 ->

38803880 Skip $

38813881 transliterateOrError

3882− "Streamly.Streams.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"

3882+ "Streamly.Internal.Data.Stream.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"

38833883 (FreshPointDecodeInit1 s x)

38843884 _ -> Skip (FreshPointDecoding s sv cp)

38853885 Skip s -> return $ Skip (FreshPointDecoding s statePtr codepointPtr)

@@ -4012,7 +4012,7 @@ decodeUtf8ArraysWith cfm (Stream step state) =

40124012 case cfm of

40134013 ErrorOnCodingFailure ->

40144014 error

4015− "Streamly.Streams.StreamD.decodeUtf8ArraysWith: Input Underflow"

4015+ "Streamly.Internal.Data.Stream.StreamD.decodeUtf8ArraysWith: Input Underflow"

40164016 TransliterateCodingFailure -> YAndC replacementChar D

40174017 {-# INLINE_LATE step' #-}

40184018 step' _ gst (OuterLoop st Nothing) = do

@@ -4061,7 +4061,7 @@ decodeUtf8ArraysWith cfm (Stream step state) =

40614061 12 ->

40624062 Skip $

40634063 transliterateOrError

4064− "Streamly.Streams.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"

4064+ "Streamly.Internal.Data.Stream.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"

40654065 (InnerLoopDecodeInit st startf (p `plusPtr` 1) end)

40664066 0 -> error "unreachable state"

40674067 _ -> Skip (InnerLoopDecoding st startf (p `plusPtr` 1) end sv cp)

@@ -4082,7 +4082,7 @@ decodeUtf8ArraysWith cfm (Stream step state) =

40824082 12 ->

40834083 Skip $

40844084 transliterateOrError

4085− "Streamly.Streams.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"

4085+ "Streamly.Internal.Data.Stream.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"

40864086 (InnerLoopDecodeInit st startf (p `plusPtr` 1) end)

40874087 _ -> Skip (InnerLoopDecoding st startf (p `plusPtr` 1) end sv cp)

40884088 step' _ _ (YAndC c s) = return $ Yield c s

@@ -4128,7 +4128,7 @@ encodeUtf8 (Stream step state) = Stream step' (EncodeState state WNil)

41284128 | x <= 0xFFFF ->

41294129 if isSurrogate c

41304130 then error

4131− "Streamly.Streams.StreamD.encodeUtf8: Encountered a surrogate"

4131+ "Streamly.Internal.Data.Stream.StreamD.encodeUtf8: Encountered a surrogate"

41324132 else Skip (EncodeState s (ord3 c))

41334133 | otherwise -> Skip (EncodeState s (ord4 c))

41344134 Skip s -> Skip (EncodeState s WNil)

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

@@ -140,7 +140,7 @@ import qualified Prelude

140140import qualified Control.Monad.Catch as MC

141141import qualified Data.Tuple as Tuple

142142import qualified Streamly.Streams.StreamK as K

143−import qualified Streamly.Streams.StreamD as D

143+import qualified Streamly.Internal.Data.Stream.StreamD as D

144144

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

146146-- Input operations

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

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

5353import Streamly.Internal.Data.Unfold (Unfold)

5454

5555import qualified Streamly.Internal.Prelude as S

56−import qualified Streamly.Streams.StreamD as D

56+import qualified Streamly.Internal.Data.Stream.StreamD as D

5757

5858-------------------------------------------------------------------------------

5959-- Encoding/Decoding Unicode Characters

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

@@ -148,7 +148,7 @@ import Streamly.Streams.StreamK.Type (IsStream)

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

149149import qualified Streamly.Streams.Prelude as P

150150import qualified Streamly.Streams.Serial as Serial

151−import qualified Streamly.Streams.StreamD as D

151+import qualified Streamly.Internal.Data.Stream.StreamD as D

152152import qualified Streamly.Streams.StreamK as K

153153

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

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

@@ -56,7 +56,7 @@ import Streamly.Streams.StreamK.Type (IsStream)

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

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

5858import qualified Streamly.Internal.Prelude as S

59−import qualified Streamly.Streams.StreamD as D

59+import qualified Streamly.Internal.Data.Stream.StreamD as D

6060import qualified Streamly.Streams.Prelude as P

6161

6262-- XXX efficiently compare two streams of arrays. Two streams can have chunks

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

@@ -451,7 +451,7 @@ import Streamly.Streams.Async (mkAsync')

451451import Streamly.Streams.Combinators (inspectMode, maxYields)

452452import Streamly.Streams.Prelude

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

454−import Streamly.Streams.StreamD (fromStreamD, toStreamD)

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

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

456456import Streamly.Streams.Serial (SerialT)

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

@@ -466,12 +466,12 @@ import qualified Streamly.Data.Fold as FL

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

467467import qualified Streamly.Streams.Prelude as P

468468import qualified Streamly.Streams.StreamK as K

469−import qualified Streamly.Streams.StreamD as D

469+import qualified Streamly.Internal.Data.Stream.StreamD as D

470470

471471#ifdef USE_STREAMK_ONLY

472472import qualified Streamly.Streams.StreamK as S

473473#else

474−import qualified Streamly.Streams.StreamD as S

474+import qualified Streamly.Internal.Data.Stream.StreamD as S

475475#endif

476476

477477import qualified Streamly.Streams.Serial as Serial

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

@@ -62,10 +62,10 @@ import Data.Word

6262import Numeric.Natural

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

6464

65−import Streamly.Streams.StreamD (fromStreamD)

65+import Streamly.Internal.Data.Stream.StreamD (fromStreamD)

6666import Streamly.Streams.StreamK (IsStream(..))

6767

68−import qualified Streamly.Streams.StreamD as D

68+import qualified Streamly.Internal.Data.Stream.StreamD as D

6969import qualified Streamly.Streams.Serial as Serial

7070

7171-------------------------------------------------------------------------------

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

@@ -62,7 +62,7 @@ import Streamly.Streams.StreamK (IsStream(..), Stream, mkStream, foldStream,

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

6363

6464import qualified Streamly.Streams.StreamK as K

65−import qualified Streamly.Streams.StreamD as D

65+import qualified Streamly.Internal.Data.Stream.StreamD as D

6666

6767#include "Instances.hs"

6868

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

@@ -72,12 +72,12 @@ import Streamly.Internal.Data.Fold.Types (Fold (..))

7272#ifdef USE_STREAMK_ONLY

7373import qualified Streamly.Streams.StreamK as S

7474#else

75−import qualified Streamly.Streams.StreamD as S

75+import qualified Streamly.Internal.Data.Stream.StreamD as S

7676#endif

7777

7878import Streamly.Streams.StreamK (IsStream(..))

7979import qualified Streamly.Streams.StreamK as K

80−import qualified Streamly.Streams.StreamD as D

80+import qualified Streamly.Internal.Data.Stream.StreamD as D

8181

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

8383-- Conversion to and from direct style stream

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

@@ -71,7 +71,7 @@ import Streamly.Streams.StreamK (IsStream(..), adapt, Stream, mkStream,

7171 foldStream)

7272import qualified Streamly.Streams.Prelude as P

7373import qualified Streamly.Streams.StreamK as K

74−import qualified Streamly.Streams.StreamD as D

74+import qualified Streamly.Internal.Data.Stream.StreamD as D

7575

7676#include "Instances.hs"

7777#include "inline.hs"

streamly.cabal+3−3

@@ -282,7 +282,7 @@ library

282282 , Streamly.Streams.StreamK

283283 , Streamly.Streams.StreamDK.Type

284284 , Streamly.Streams.StreamDK

285− , Streamly.Streams.StreamD

285+ , Streamly.Internal.Data.Stream.StreamD

286286 , Streamly.Streams.Enumeration

287287 , Streamly.Streams.Prelude

288288

@@ -728,7 +728,7 @@ benchmark base

728728 , Streamly.Streams.StreamDK

729729 , Streamly.Streams.StreamK.Type

730730 , Streamly.Streams.StreamK

731− , Streamly.Streams.StreamD

731+ , Streamly.Internal.Data.Stream.StreamD

732732 , Streamly.Streams.Prelude

733733 , Streamly.FileSystem.IOVec

734734

@@ -782,7 +782,7 @@ executable nano-bench

782782 , Streamly.Streams.StreamK.Type

783783 , Streamly.Streams.StreamK

784784 , Streamly.FileSystem.IOVec

785− , Streamly.Streams.StreamD

785+ , Streamly.Internal.Data.Stream.StreamD

786786 if flag(dev)

787787 buildable: True

788788 build-depends: