composewell/streamly
1
1
Fork 0
mirror of https://github.com/composewell/streamly.git synced 2024-09-20 07:58:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
adithyaov 2019-12-09 14:56:10 +05:30
parent 879d159ff2
commit 59796f1d14
18 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/StreamDOps.hs
View File

@ -18,7 +18,7 @@ import Prelude
maxBound, fmap, odd, (==), flip, (<$>), (<*>), round, (/), (**), (<))
import qualified Prelude as P
import qualified Streamly.Streams.StreamD as S
import qualified Streamly.Internal.Data.Stream.StreamD as S
import qualified Streamly.Internal.Data.Unfold as UF
-- We try to keep the total number of iterations same irrespective of nesting

2
design/inlining.md
View File

@ -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.Streams.StreamD` (Direct style streams) or `Streamly.Streams.StreamK`
`Streamly.Internal.Data.Stream.StreamD` (Direct style streams) or `Streamly.Streams.StreamK`
(CPS style streams). We convert the stream from `StreamD` to `StreamK`
representation or vice versa in some cases.

2
src/Streamly/FileSystem/FD.hs
View File

@ -142,7 +142,7 @@ import Streamly.Streams.StreamK.Type (IsStream, mkStream)
#if !defined(mingw32_HOST_OS)
import Streamly.Internal.Memory.Array.Types (groupIOVecsOf)
import Streamly.Streams.StreamD (toStreamD)
import Streamly.Internal.Data.Stream.StreamD (toStreamD)
import Streamly.Internal.Data.Stream.StreamD.Type (fromStreamD)
import qualified Streamly.FileSystem.FDIO as RawIO hiding (write)
#endif

2
src/Streamly/Internal/Benchmark/FileIO/Stream.hs
View File

@ -82,7 +82,7 @@ import qualified Streamly.Internal.Data.Unicode.Stream as IUS
import qualified Streamly.Internal.Memory.Unicode.Array as IUA
import qualified Streamly.Internal.Data.Unfold as IUF
import qualified Streamly.Internal.Prelude as IP
import qualified Streamly.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
#ifdef INSPECTION
import Foreign.Storable (Storable)

2
src/Streamly/Internal/Benchmark/Prelude.hs
View File

@ -41,7 +41,7 @@ import qualified GHC.Exts as GHC
#ifdef INSPECTION
import Test.Inspection
import qualified Streamly.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
#endif
import qualified Streamly as S hiding (runStream)

2
src/Streamly/Internal/Data/Array.hs
View File

@ -61,7 +61,7 @@ import Streamly.Internal.Data.Fold.Types (Fold(..))
import Streamly.Streams.StreamK.Type (IsStream)
import Streamly.Streams.Serial (SerialT)
import qualified Streamly.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
{-# NOINLINE bottomElement #-}
bottomElement :: a

2
src/Streamly/Internal/Data/Pipe.hs
View File

@ -267,7 +267,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.Streams.StreamD as D
-- import qualified Streamly.Internal.Data.Stream.StreamD as D
-- import qualified Streamly.Streams.StreamK as K
-- import qualified Streamly.Streams.Prelude as P

20
src/Streamly/Streams/StreamD.hs → src/Streamly/Internal/Data/Stream/StreamD.hs
View File

@ -19,7 +19,7 @@
#include "inline.hs"
-- |
-- Module : Streamly.Streams.StreamD
-- Module : Streamly.Internal.Data.Stream.StreamD
-- Copyright : (c) 2018 Harendra Kumar
-- Copyright : (c) Roman Leshchinskiy 2008-2010
-- Copyright : (c) The University of Glasgow, 2009
@ -36,13 +36,13 @@
-- CPS implementation.
--
-- @
-- import qualified Streamly.Streams.StreamD as D
-- import qualified Streamly.Internal.Data.Stream.StreamD as D
-- @
-- Some of the functions in this file have been adapted from the vector
-- library, https://hackage.haskell.org/package/vector.
module Streamly.Streams.StreamD
module Streamly.Internal.Data.Stream.StreamD
(
-- * The stream type
Step (..)
@ -3826,7 +3826,7 @@ decodeUtf8With cfm (Stream step state) =
inputUnderflow =
case cfm of
ErrorOnCodingFailure ->
error "Streamly.Streams.StreamD.decodeUtf8With: Input Underflow"
error "Streamly.Internal.Data.Stream.StreamD.decodeUtf8With: Input Underflow"
TransliterateCodingFailure -> YieldAndContinue replacementChar Done
{-# INLINE_LATE step' #-}
step' _ gst (FreshPointDecodeInit st) = do
@ -3860,7 +3860,7 @@ decodeUtf8With cfm (Stream step state) =
12 ->
Skip $
transliterateOrError
"Streamly.Streams.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"
"Streamly.Internal.Data.Stream.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"
(FreshPointDecodeInit st)
0 -> error "unreachable state"
_ -> Skip (FreshPointDecoding st sv cp)
@ -3879,7 +3879,7 @@ decodeUtf8With cfm (Stream step state) =
12 ->
Skip $
transliterateOrError
"Streamly.Streams.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"
"Streamly.Internal.Data.Stream.StreamD.decodeUtf8With: Invalid UTF8 codepoint encountered"
(FreshPointDecodeInit1 s x)
_ -> Skip (FreshPointDecoding s sv cp)
Skip s -> return $ Skip (FreshPointDecoding s statePtr codepointPtr)
@ -4012,7 +4012,7 @@ decodeUtf8ArraysWith cfm (Stream step state) =
case cfm of
ErrorOnCodingFailure ->
error
"Streamly.Streams.StreamD.decodeUtf8ArraysWith: Input Underflow"
"Streamly.Internal.Data.Stream.StreamD.decodeUtf8ArraysWith: Input Underflow"
TransliterateCodingFailure -> YAndC replacementChar D
{-# INLINE_LATE step' #-}
step' _ gst (OuterLoop st Nothing) = do
@ -4061,7 +4061,7 @@ decodeUtf8ArraysWith cfm (Stream step state) =
12 ->
Skip $
transliterateOrError
"Streamly.Streams.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"
"Streamly.Internal.Data.Stream.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"
(InnerLoopDecodeInit st startf (p `plusPtr` 1) end)
0 -> error "unreachable state"
_ -> Skip (InnerLoopDecoding st startf (p `plusPtr` 1) end sv cp)
@ -4082,7 +4082,7 @@ decodeUtf8ArraysWith cfm (Stream step state) =
12 ->
Skip $
transliterateOrError
"Streamly.Streams.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"
"Streamly.Internal.Data.Stream.StreamD.decodeUtf8ArraysWith: Invalid UTF8 codepoint encountered"
(InnerLoopDecodeInit st startf (p `plusPtr` 1) end)
_ -> Skip (InnerLoopDecoding st startf (p `plusPtr` 1) end sv cp)
step' _ _ (YAndC c s) = return $ Yield c s
@ -4128,7 +4128,7 @@ encodeUtf8 (Stream step state) = Stream step' (EncodeState state WNil)
| x <= 0xFFFF ->
if isSurrogate c
then error
"Streamly.Streams.StreamD.encodeUtf8: Encountered a surrogate"
"Streamly.Internal.Data.Stream.StreamD.encodeUtf8: Encountered a surrogate"
else Skip (EncodeState s (ord3 c))
| otherwise -> Skip (EncodeState s (ord4 c))
Skip s -> Skip (EncodeState s WNil)

2
src/Streamly/Internal/Data/Unfold.hs
View File

@ -140,7 +140,7 @@ 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.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
-------------------------------------------------------------------------------
-- Input operations

2
src/Streamly/Internal/Data/Unicode/Stream.hs
View File

@ -53,7 +53,7 @@ import Streamly.Memory.Array (Array)
import Streamly.Internal.Data.Unfold (Unfold)
import qualified Streamly.Internal.Prelude as S
import qualified Streamly.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
-------------------------------------------------------------------------------
-- Encoding/Decoding Unicode Characters

2
src/Streamly/Internal/Memory/Array.hs
View File

@ -148,7 +148,7 @@ import Streamly.Streams.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.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
import qualified Streamly.Streams.StreamK as K
-------------------------------------------------------------------------------

2
src/Streamly/Internal/Memory/ArrayStream.hs
View File

@ -56,7 +56,7 @@ import Streamly.Streams.StreamK.Type (IsStream)
import qualified Streamly.Internal.Memory.Array as A
import qualified Streamly.Internal.Memory.Array.Types as A
import qualified Streamly.Internal.Prelude as S
import qualified Streamly.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
import qualified Streamly.Streams.Prelude as P
-- XXX efficiently compare two streams of arrays. Two streams can have chunks

6
src/Streamly/Internal/Prelude.hs
View File

@ -451,7 +451,7 @@ import Streamly.Streams.Async (mkAsync')
import Streamly.Streams.Combinators (inspectMode, maxYields)
import Streamly.Streams.Prelude
(fromStreamS, toStreamS, foldWith, foldMapWith, forEachWith)
import Streamly.Streams.StreamD (fromStreamD, toStreamD)
import Streamly.Internal.Data.Stream.StreamD (fromStreamD, toStreamD)
import Streamly.Streams.StreamK (IsStream((|:), consM))
import Streamly.Streams.Serial (SerialT)
import Streamly.Internal.Data.Pipe.Types (Pipe (..))
@ -466,12 +466,12 @@ 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.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
#ifdef USE_STREAMK_ONLY
import qualified Streamly.Streams.StreamK as S
#else
import qualified Streamly.Streams.StreamD as S
import qualified Streamly.Internal.Data.Stream.StreamD as S
#endif
import qualified Streamly.Streams.Serial as Serial

4
src/Streamly/Streams/Enumeration.hs
View File

@ -62,10 +62,10 @@ import Data.Word
import Numeric.Natural
import Data.Functor.Identity (Identity(..))
import Streamly.Streams.StreamD (fromStreamD)
import Streamly.Internal.Data.Stream.StreamD (fromStreamD)
import Streamly.Streams.StreamK (IsStream(..))
import qualified Streamly.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
import qualified Streamly.Streams.Serial as Serial
-------------------------------------------------------------------------------

2
src/Streamly/Streams/Parallel.hs
View File

@ -62,7 +62,7 @@ import Streamly.Streams.StreamK (IsStream(..), Stream, mkStream, foldStream,
import Streamly.Internal.Data.SVar hiding (handleChildException)
import qualified Streamly.Streams.StreamK as K
import qualified Streamly.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
#include "Instances.hs"

4
src/Streamly/Streams/Prelude.hs
View File

@ -72,12 +72,12 @@ import Streamly.Internal.Data.Fold.Types (Fold (..))
#ifdef USE_STREAMK_ONLY
import qualified Streamly.Streams.StreamK as S
#else
import qualified Streamly.Streams.StreamD as S
import qualified Streamly.Internal.Data.Stream.StreamD as S
#endif
import Streamly.Streams.StreamK (IsStream(..))
import qualified Streamly.Streams.StreamK as K
import qualified Streamly.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
------------------------------------------------------------------------------
-- Conversion to and from direct style stream

2
src/Streamly/Streams/Serial.hs
View File

@ -71,7 +71,7 @@ import Streamly.Streams.StreamK (IsStream(..), adapt, Stream, mkStream,
foldStream)
import qualified Streamly.Streams.Prelude as P
import qualified Streamly.Streams.StreamK as K
import qualified Streamly.Streams.StreamD as D
import qualified Streamly.Internal.Data.Stream.StreamD as D
#include "Instances.hs"
#include "inline.hs"

6
streamly.cabal
View File

@ -282,7 +282,7 @@ library
, Streamly.Streams.StreamK
, Streamly.Streams.StreamDK.Type
, Streamly.Streams.StreamDK
, Streamly.Streams.StreamD
, Streamly.Internal.Data.Stream.StreamD
, Streamly.Streams.Enumeration
, Streamly.Streams.Prelude
@ -728,7 +728,7 @@ benchmark base
, Streamly.Streams.StreamDK
, Streamly.Streams.StreamK.Type
, Streamly.Streams.StreamK
, Streamly.Streams.StreamD
, Streamly.Internal.Data.Stream.StreamD
, Streamly.Streams.Prelude
, Streamly.FileSystem.IOVec
@ -782,7 +782,7 @@ executable nano-bench
, Streamly.Streams.StreamK.Type
, Streamly.Streams.StreamK
, Streamly.FileSystem.IOVec
, Streamly.Streams.StreamD
, Streamly.Internal.Data.Stream.StreamD
if flag(dev)
buildable: True
build-depends: