git.iko.soy/streamly
on master help sign in
Disable ParserDK dev module to fix dev build (#2294)
509de0cRanjeet Ranjan
core/src/Streamly/Internal/Data/Stream/Eliminate.hs+11−14
compare with master
unifiedsplit
@@ -36,9 +36,9 @@ module Streamly.Internal.Data.Stream.Eliminate
36 -- * Running a 'Parser'
36 -- * Running a 'Parser'
37 -- "Streamly.Internal.Data.Parser".
37 -- "Streamly.Internal.Data.Parser".
38 , parse
38 , parse
39− , parseK
39+ --, parseK
40 , parseD
40 , parseD
41− , parseBreak
41+ --, parseBreak
42 , parseBreakD
42 , parseBreakD
43
43
44 -- * Stream Deconstruction
44 -- * Stream Deconstruction
@@ -81,6 +81,7 @@ import Control.Monad.IO.Class (MonadIO(..))
81import Foreign.Storable (Storable)
81import Foreign.Storable (Storable)
82import Streamly.Internal.Data.Parser (Parser (..), ParseError (..))
82import Streamly.Internal.Data.Parser (Parser (..), ParseError (..))
83import Streamly.Internal.Data.Unboxed (Unbox)
83import Streamly.Internal.Data.Unboxed (Unbox)
84+import Streamly.Internal.Data.Stream.Type (Stream)
84
85
85import qualified Streamly.Internal.Data.Array.Type as Array
86import qualified Streamly.Internal.Data.Array.Type as Array
86import qualified Streamly.Internal.Data.Fold as Fold
87import qualified Streamly.Internal.Data.Fold as Fold
@@ -91,7 +92,7 @@ import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
91import qualified Streamly.Internal.Data.Stream.StreamK as K
92import qualified Streamly.Internal.Data.Stream.StreamK as K
92
93
93import Streamly.Internal.Data.Stream.Bottom
94import Streamly.Internal.Data.Stream.Bottom
94−import Streamly.Internal.Data.Stream.Type
95+import Streamly.Internal.Data.Stream.Type hiding (Stream)
95
96
96import Prelude hiding (foldr, init, reverse)
97import Prelude hiding (foldr, init, reverse)
97
98
@@ -224,9 +225,9 @@ parseD p = D.parseD p . toStreamD
224-- | Parse a stream using the supplied ParserK 'PRK.Parser'.
225-- | Parse a stream using the supplied ParserK 'PRK.Parser'.
225--
226--
226-- /Internal/
227-- /Internal/
227−{-# INLINE parseK #-}
228+--{-# INLINE parseK #-}
228−parseK :: Monad m => PRK.Parser a m b -> Stream m a -> m (Either ParseError b)
229+--parseK :: Monad m => PRK.Parser a m b -> Stream m a -> m (Either ParseError b)
229−parseK = parse
230+--parseK = parse
230
231
231-- | Parse a stream using the supplied 'Parser'.
232-- | Parse a stream using the supplied 'Parser'.
232--
233--
@@ -242,7 +243,7 @@ parseK = parse
242--
243--
243{-# INLINE [3] parse #-}
244{-# INLINE [3] parse #-}
244parse :: Monad m => Parser a m b -> Stream m a -> m (Either ParseError b)
245parse :: Monad m => Parser a m b -> Stream m a -> m (Either ParseError b)
245−parse = parseD . PRD.fromParserK
246+parse = parseD
246
247
247{-# INLINE_NORMAL parseBreakD #-}
248{-# INLINE_NORMAL parseBreakD #-}
248parseBreakD :: Monad m =>
249parseBreakD :: Monad m =>
@@ -255,13 +256,9 @@ parseBreakD parser strm = do
255--
256--
256-- /CPS/
257-- /CPS/
257--
258--
258−{-# INLINE parseBreak #-}
259+--{-# INLINE parseBreak #-}
259−parseBreak :: Monad m => Parser a m b -> Stream m a -> m (Either ParseError b, Stream m a)
260+--parseBreak :: Monad m => Parser a m b -> Stream m a -> m (Either ParseError b, Stream m a)
260−parseBreak p strm = fmap f $ K.parseBreak p (toStreamK strm)
261+--parseBreak p strm = D.parseBreak p strm
261−
262− where
263−
264− f (b, str) = (b, fromStreamK str)
265
262
266------------------------------------------------------------------------------
263------------------------------------------------------------------------------
267-- Multi-stream folds
264-- Multi-stream folds
core/src/Streamly/Internal/Data/Stream/Reduce.hs+2−2
@@ -355,7 +355,7 @@ parseMany
355 -> Stream m a
355 -> Stream m a
356 -> Stream m (Either ParseError b)
356 -> Stream m (Either ParseError b)
357parseMany p m =
357parseMany p m =
358− fromStreamD $ D.parseManyD (ParserD.fromParserK p) (toStreamD m)
358+ fromStreamD $ D.parseManyD p (toStreamD m)
359
359
360-- | Same as parseMany but for StreamD streams.
360-- | Same as parseMany but for StreamD streams.
361--
361--
@@ -424,7 +424,7 @@ parseIterate
424 -> Stream m a
424 -> Stream m a
425 -> Stream m (Either ParseError b)
425 -> Stream m (Either ParseError b)
426parseIterate f i m = fromStreamD $
426parseIterate f i m = fromStreamD $
427− D.parseIterateD (ParserD.fromParserK . f) i (toStreamD m)
427+ D.parseIterateD f i (toStreamD m)
428
428
429------------------------------------------------------------------------------
429------------------------------------------------------------------------------
430-- Chunking
430-- Chunking
core/streamly-core.cabal+1−1
@@ -417,7 +417,7 @@ library
417 , Streamly.Internal.Data.Stream.Cross
417 , Streamly.Internal.Data.Stream.Cross
418 , Streamly.Internal.Data.List
418 , Streamly.Internal.Data.List
419 , Streamly.Data.Stream.Zip
419 , Streamly.Data.Stream.Zip
420− , Streamly.Internal.Data.Parser.ParserDK
420+ --, Streamly.Internal.Data.Parser.ParserDK
421
421
422 build-depends:
422 build-depends:
423 -- streamly-base
423 -- streamly-base
src/Streamly/Internal/FileSystem/FD.hs+1−1
@@ -146,7 +146,7 @@ import qualified Streamly.Internal.System.IOVec.Type as RawIO
146import qualified Streamly.Data.Array as A
146import qualified Streamly.Data.Array as A
147import qualified Streamly.Data.Fold as FL
147import qualified Streamly.Data.Fold as FL
148import qualified Streamly.Internal.Data.Array.Mut as MArray
148import qualified Streamly.Internal.Data.Array.Mut as MArray
149− (Array(..), newPinnedBytes, asPtrUnsafe)
149+ (MutArray(..), newPinnedBytes, asPtrUnsafe)
150import qualified Streamly.Internal.Data.Stream.Chunked as AS
150import qualified Streamly.Internal.Data.Stream.Chunked as AS
151import qualified Streamly.Internal.Data.Stream.StreamD as S
151import qualified Streamly.Internal.Data.Stream.StreamD as S
152import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
152import qualified Streamly.Internal.Data.Stream.StreamD.Type as D