on master help sign in
move file SVar.hs to Internal/Data
631cc24Harendra Kumar
benchmark/NanoBenchmarks.hs+1−1
@@ -7,7 +7,7 @@
7{-# LANGUAGE ScopedTypeVariables #-}
7{-# LANGUAGE ScopedTypeVariables #-}
8
8
9import Streamly (SerialT)
9import Streamly (SerialT)
10−import Streamly.SVar (MonadAsync)
10+import Streamly.Internal.Data.SVar (MonadAsync)
11
11
12import qualified Streamly.Memory.Array as A
12import qualified Streamly.Memory.Array as A
13import qualified Streamly.FileSystem.Handle as FH
13import qualified Streamly.FileSystem.Handle as FH
benchmark/StreamDKOps.hs+1−1
@@ -21,7 +21,7 @@ import qualified Prelude as P
21
21
22import qualified Streamly.Streams.StreamDK as S
22import qualified Streamly.Streams.StreamDK as S
23-- import qualified Streamly.Streams.Prelude as SP
23-- import qualified Streamly.Streams.Prelude as SP
24−-- import qualified Streamly.SVar as S
24+-- import qualified Streamly.Internal.Data.SVar as S
25
25
26value, value2, value3, value16, maxValue :: Int
26value, value2, value3, value16, maxValue :: Int
27value = 100000
27value = 100000
benchmark/StreamKOps.hs+1−1
@@ -21,7 +21,7 @@ import qualified Data.List as List
21
21
22import qualified Streamly.Streams.StreamK as S
22import qualified Streamly.Streams.StreamK as S
23import qualified Streamly.Streams.Prelude as SP
23import qualified Streamly.Streams.Prelude as SP
24−import qualified Streamly.SVar as S
24+import qualified Streamly.Internal.Data.SVar as S
25
25
26value, value2, value3, value16, maxValue :: Int
26value, value2, value3, value16, maxValue :: Int
27value = 100000
27value = 100000
src/Streamly.hs+1−1
@@ -211,7 +211,7 @@ module Streamly
211where
211where
212
212
213import Data.Semigroup (Semigroup(..))
213import Data.Semigroup (Semigroup(..))
214−import Streamly.SVar (MonadAsync, Rate(..))
214+import Streamly.Internal.Data.SVar (MonadAsync, Rate(..))
215import Streamly.Streams.Ahead
215import Streamly.Streams.Ahead
216import Streamly.Streams.Async
216import Streamly.Streams.Async
217import Streamly.Streams.Combinators
217import Streamly.Streams.Combinators
src/Streamly/Internal/Data/Fold/Types.hs+1−1
@@ -43,7 +43,7 @@ import Data.Maybe (isJust, fromJust)
43import Data.Semigroup (Semigroup(..))
43import Data.Semigroup (Semigroup(..))
44#endif
44#endif
45import Streamly.Strict (Tuple'(..), Tuple3'(..), Either'(..))
45import Streamly.Strict (Tuple'(..), Tuple3'(..), Either'(..))
46−import Streamly.SVar (MonadAsync)
46+import Streamly.Internal.Data.SVar (MonadAsync)
47
47
48------------------------------------------------------------------------------
48------------------------------------------------------------------------------
49-- Monadic left folds
49-- Monadic left folds
src/Streamly/SVar.hs → src/Streamly/Internal/Data/SVar.hsrenamed+2−2
@@ -13,7 +13,7 @@
13{-# LANGUAGE UnboxedTuples #-}
13{-# LANGUAGE UnboxedTuples #-}
14
14
15-- |
15-- |
16−-- Module : Streamly.SVar
16+-- Module : Streamly.Internal.Data.SVar
17-- Copyright : (c) 2017 Harendra Kumar
17-- Copyright : (c) 2017 Harendra Kumar
18--
18--
19-- License : BSD3
19-- License : BSD3
@@ -21,7 +21,7 @@
21-- Stability : experimental
21-- Stability : experimental
22-- Portability : GHC
22-- Portability : GHC
23
23
24−module Streamly.SVar
24+module Streamly.Internal.Data.SVar
25 (
25 (
26 MonadAsync
26 MonadAsync
27 , SVarStyle (..)
27 , SVarStyle (..)
src/Streamly/Internal/FileSystem/File.hs+1−1
@@ -118,7 +118,7 @@ import qualified System.IO as SIO
118import Streamly.Internal.Memory.Array.Types (Array(..), defaultChunkSize)
118import Streamly.Internal.Memory.Array.Types (Array(..), defaultChunkSize)
119import Streamly.Streams.Serial (SerialT)
119import Streamly.Streams.Serial (SerialT)
120import Streamly.Streams.StreamK.Type (IsStream)
120import Streamly.Streams.StreamK.Type (IsStream)
121−import Streamly.SVar (MonadAsync)
121+import Streamly.Internal.Data.SVar (MonadAsync)
122-- import Streamly.Data.Fold (Fold)
122-- import Streamly.Data.Fold (Fold)
123-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)
123-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)
124
124
src/Streamly/Internal/Memory/Array/Types.hs+1−1
@@ -113,7 +113,7 @@ import GHC.Ptr (Ptr(..))
113import Streamly.Internal.Data.Fold.Types (Fold(..))
113import Streamly.Internal.Data.Fold.Types (Fold(..))
114import Streamly.Internal.Data.Unfold.Types (Unfold(..))
114import Streamly.Internal.Data.Unfold.Types (Unfold(..))
115import Streamly.Strict (Tuple'(..))
115import Streamly.Strict (Tuple'(..))
116−import Streamly.SVar (adaptState)
116+import Streamly.Internal.Data.SVar (adaptState)
117
117
118#if !defined(mingw32_HOST_OS)
118#if !defined(mingw32_HOST_OS)
119import Streamly.FileSystem.FDIO (IOVec(..))
119import Streamly.FileSystem.FDIO (IOVec(..))
src/Streamly/Internal/Prelude.hs+1−1
@@ -407,7 +407,7 @@ import Streamly.Internal.Data.Fold.Types (Fold (..))
407import Streamly.Internal.Data.Unfold.Types (Unfold)
407import Streamly.Internal.Data.Unfold.Types (Unfold)
408import Streamly.Internal.Memory.Array.Types (Array, writeNUnsafe)
408import Streamly.Internal.Memory.Array.Types (Array, writeNUnsafe)
409-- import Streamly.Memory.Ring (Ring)
409-- import Streamly.Memory.Ring (Ring)
410−import Streamly.SVar (MonadAsync, defState)
410+import Streamly.Internal.Data.SVar (MonadAsync, defState)
411import Streamly.Streams.Async (mkAsync')
411import Streamly.Streams.Async (mkAsync')
412import Streamly.Streams.Combinators (maxYields)
412import Streamly.Streams.Combinators (maxYields)
413import Streamly.Streams.Prelude
413import Streamly.Streams.Prelude
src/Streamly/Streams/Ahead.hs+1−1
@@ -48,7 +48,7 @@ import qualified Data.Heap as H
48
48
49import Streamly.Streams.SVar (fromSVar)
49import Streamly.Streams.SVar (fromSVar)
50import Streamly.Streams.Serial (map)
50import Streamly.Streams.Serial (map)
51−import Streamly.SVar
51+import Streamly.Internal.Data.SVar
52import Streamly.Streams.StreamK
52import Streamly.Streams.StreamK
53 (IsStream(..), Stream, mkStream, foldStream, foldStreamShared,
53 (IsStream(..), Stream, mkStream, foldStream, foldStreamShared,
54 foldStreamSVar)
54 foldStreamSVar)
src/Streamly/Streams/Async.hs+1−1
@@ -59,7 +59,7 @@ import qualified Data.Set as S
59import Streamly.Internal.Data.Atomics (atomicModifyIORefCAS)
59import Streamly.Internal.Data.Atomics (atomicModifyIORefCAS)
60import Streamly.Streams.SVar (fromSVar)
60import Streamly.Streams.SVar (fromSVar)
61import Streamly.Streams.Serial (map)
61import Streamly.Streams.Serial (map)
62−import Streamly.SVar
62+import Streamly.Internal.Data.SVar
63import Streamly.Streams.StreamK
63import Streamly.Streams.StreamK
64 (IsStream(..), Stream, mkStream, foldStream, adapt, foldStreamShared,
64 (IsStream(..), Stream, mkStream, foldStream, adapt, foldStreamShared,
65 foldStreamSVar)
65 foldStreamSVar)
src/Streamly/Streams/Combinators.hs+1−1
@@ -29,7 +29,7 @@ where
29import Control.Monad.IO.Class (MonadIO(liftIO))
29import Control.Monad.IO.Class (MonadIO(liftIO))
30import Data.Int (Int64)
30import Data.Int (Int64)
31
31
32−import Streamly.SVar
32+import Streamly.Internal.Data.SVar
33import Streamly.Streams.StreamK
33import Streamly.Streams.StreamK
34import Streamly.Streams.Serial (SerialT)
34import Streamly.Streams.Serial (SerialT)
35
35
src/Streamly/Streams/Parallel.hs+1−1
@@ -58,7 +58,7 @@ import qualified Data.Set as Set
58
58
59import Streamly.Streams.SVar (fromSVar, fromStreamVar)
59import Streamly.Streams.SVar (fromSVar, fromStreamVar)
60import Streamly.Streams.Serial (map)
60import Streamly.Streams.Serial (map)
61−import Streamly.SVar
61+import Streamly.Internal.Data.SVar
62import Streamly.Streams.StreamK (IsStream(..), Stream, mkStream, foldStream,
62import Streamly.Streams.StreamK (IsStream(..), Stream, mkStream, foldStream,
63 foldStreamShared, adapt)
63 foldStreamShared, adapt)
64import qualified Streamly.Streams.StreamK as K
64import qualified Streamly.Streams.StreamK as K
src/Streamly/Streams/SVar.hs+1−1
@@ -31,7 +31,7 @@ import System.IO (hPutStrLn, stderr)
31import Streamly.Time.Clock (Clock(Monotonic), getTime)
31import Streamly.Time.Clock (Clock(Monotonic), getTime)
32import System.Mem (performMajorGC)
32import System.Mem (performMajorGC)
33
33
34−import Streamly.SVar
34+import Streamly.Internal.Data.SVar
35import Streamly.Streams.StreamK hiding (reverse)
35import Streamly.Streams.StreamK hiding (reverse)
36
36
37printSVar :: SVar t m a -> String -> IO ()
37printSVar :: SVar t m a -> String -> IO ()
src/Streamly/Streams/StreamD.hs+1−1
@@ -301,7 +301,7 @@ import qualified Control.Monad.Catch as MC
301import Streamly.Internal.Memory.Array.Types (Array(..))
301import Streamly.Internal.Memory.Array.Types (Array(..))
302import Streamly.Internal.Data.Fold.Types (Fold(..))
302import Streamly.Internal.Data.Fold.Types (Fold(..))
303import Streamly.Internal.Data.Pipe.Types (Pipe(..), PipeState(..))
303import Streamly.Internal.Data.Pipe.Types (Pipe(..), PipeState(..))
304−import Streamly.SVar (MonadAsync, defState, adaptState)
304+import Streamly.Internal.Data.SVar (MonadAsync, defState, adaptState)
305import Streamly.Internal.Data.Unfold.Types (Unfold(..))
305import Streamly.Internal.Data.Unfold.Types (Unfold(..))
306import Streamly.Strict (Tuple'(..))
306import Streamly.Strict (Tuple'(..))
307
307
src/Streamly/Streams/StreamD/Type.hs+1−1
@@ -71,7 +71,7 @@ import Control.Monad.Trans (lift, MonadTrans)
71import GHC.Types (SPEC(..))
71import GHC.Types (SPEC(..))
72import Prelude hiding (map, mapM, foldr, take, concatMap)
72import Prelude hiding (map, mapM, foldr, take, concatMap)
73
73
74−import Streamly.SVar (State(..), adaptState, defState)
74+import Streamly.Internal.Data.SVar (State(..), adaptState, defState)
75import Streamly.Internal.Data.Fold.Types (Fold(..))
75import Streamly.Internal.Data.Fold.Types (Fold(..))
76
76
77import qualified Streamly.Streams.StreamK as K
77import qualified Streamly.Streams.StreamK as K
src/Streamly/Streams/StreamK.hs+1−1
@@ -194,7 +194,7 @@ import Prelude
194 foldr1, (!!), replicate, reverse, concatMap)
194 foldr1, (!!), replicate, reverse, concatMap)
195import qualified Prelude
195import qualified Prelude
196
196
197−import Streamly.SVar
197+import Streamly.Internal.Data.SVar
198import Streamly.Streams.StreamK.Type
198import Streamly.Streams.StreamK.Type
199
199
200-------------------------------------------------------------------------------
200-------------------------------------------------------------------------------
src/Streamly/Streams/StreamK/Type.hs+1−1
@@ -92,7 +92,7 @@ import Data.Semigroup (Semigroup(..))
92#endif
92#endif
93import Prelude hiding (map, mapM, concatMap, foldr)
93import Prelude hiding (map, mapM, concatMap, foldr)
94
94
95−import Streamly.SVar
95+import Streamly.Internal.Data.SVar
96
96
97------------------------------------------------------------------------------
97------------------------------------------------------------------------------
98-- Basic stream type
98-- Basic stream type
src/Streamly/Streams/Zip.hs+1−1
@@ -56,7 +56,7 @@ import Prelude hiding (map, repeat, zipWith)
56import Streamly.Streams.StreamK (IsStream(..), Stream, mkStream, foldStream)
56import Streamly.Streams.StreamK (IsStream(..), Stream, mkStream, foldStream)
57import Streamly.Streams.Async (mkAsync')
57import Streamly.Streams.Async (mkAsync')
58import Streamly.Streams.Serial (map)
58import Streamly.Streams.Serial (map)
59−import Streamly.SVar (MonadAsync, adaptState)
59+import Streamly.Internal.Data.SVar (MonadAsync, adaptState)
60
60
61import qualified Streamly.Streams.Prelude as P
61import qualified Streamly.Streams.Prelude as P
62import qualified Streamly.Streams.StreamK as K
62import qualified Streamly.Streams.StreamK as K
streamly.cabal+4−4
@@ -252,8 +252,7 @@ library
252 if os(darwin)
252 if os(darwin)
253 c-sources: src/Streamly/Time/Darwin.c
253 c-sources: src/Streamly/Time/Darwin.c
254 hs-source-dirs: src
254 hs-source-dirs: src
255− other-modules: Streamly.SVar
255+ other-modules: Streamly.Strict
256− , Streamly.Strict
257 , Streamly.Enumeration
256 , Streamly.Enumeration
258
257
259 -- Memory storage
258 -- Memory storage
@@ -305,6 +304,7 @@ library
305 -- Internal modules
304 -- Internal modules
306 , Streamly.Internal
305 , Streamly.Internal
307 , Streamly.Internal.Data.Atomics
306 , Streamly.Internal.Data.Atomics
307+ , Streamly.Internal.Data.SVar
308 , Streamly.Internal.Memory.Array.Types
308 , Streamly.Internal.Memory.Array.Types
309 , Streamly.Internal.Memory.ArrayStream
309 , Streamly.Internal.Memory.ArrayStream
310 , Streamly.Internal.Data.Fold.Types
310 , Streamly.Internal.Data.Fold.Types
@@ -644,9 +644,9 @@ benchmark base
644 hs-source-dirs: benchmark, src
644 hs-source-dirs: benchmark, src
645 main-is: BaseStreams.hs
645 main-is: BaseStreams.hs
646 other-modules: Streamly.Internal.Data.Atomics
646 other-modules: Streamly.Internal.Data.Atomics
647+ , Streamly.Internal.Data.SVar
647 , Streamly.Time.Units
648 , Streamly.Time.Units
648 , Streamly.Time.Clock
649 , Streamly.Time.Clock
649− , Streamly.SVar
650 , Streamly.Streams.StreamDK.Type
650 , Streamly.Streams.StreamDK.Type
651 , Streamly.Streams.StreamDK
651 , Streamly.Streams.StreamDK
652 , Streamly.Streams.StreamK.Type
652 , Streamly.Streams.StreamK.Type
@@ -699,9 +699,9 @@ executable nano-bench
699 c-sources: src/Streamly/Time/Darwin.c
699 c-sources: src/Streamly/Time/Darwin.c
700 main-is: NanoBenchmarks.hs
700 main-is: NanoBenchmarks.hs
701 other-modules: Streamly.Internal.Data.Atomics
701 other-modules: Streamly.Internal.Data.Atomics
702+ , Streamly.Internal.Data.SVar
702 , Streamly.Time.Units
703 , Streamly.Time.Units
703 , Streamly.Time.Clock
704 , Streamly.Time.Clock
704− , Streamly.SVar
705 , Streamly.Streams.StreamK.Type
705 , Streamly.Streams.StreamK.Type
706 , Streamly.Streams.StreamK
706 , Streamly.Streams.StreamK
707 , Streamly.Streams.StreamD.Type
707 , Streamly.Streams.StreamD.Type