88334a8 · streamly · git.iko.soy

git.iko.soy/streamly

Move Console.Stdio to streamly-core

And some formatting changes.

commit88334a819002136c5fad5de3fbfa4c1f7428da80 authorRanjeet Kumar Ranjan <ranjeetr@composewell.com> dateThu 22 Sep 2022, 17:30 (4 years ago) parentf609af1

4 files changed+23−27

compare with master

unifiedsplit

src/Streamly/Console/Stdio.hs → core/src/Streamly/Console/Stdio.hs src/Streamly/Internal/Console/Stdio.hs → core/src/Streamly/Internal/Console/Stdio.hs+3−3 core/src/Streamly/Internal/Unicode/Stream.hs+18−18 streamly.cabal+2−6

src/Streamly/Console/Stdio.hs → core/src/Streamly/Console/Stdio.hsrenamed

The content is the same.

src/Streamly/Internal/Console/Stdio.hs → core/src/Streamly/Internal/Console/Stdio.hsrenamed+3−3

@@ -47,9 +47,9 @@ import Streamly.Internal.Data.Stream (Stream)

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

4848import Streamly.Internal.Data.Fold (Fold)

4949

50−import qualified Streamly.Data.Array.Unboxed as Array (fromList)

51−import qualified Streamly.Data.Unfold as Unfold (lmap)

52−import qualified Streamly.Internal.Data.Stream.IsStream as Stream

50+import qualified Streamly.Internal.Data.Array.Unboxed as Array

51+import qualified Streamly.Internal.Data.Stream as Stream (intersperseSuffix)

52+import qualified Streamly.Internal.Data.Unfold as Unfold

5353import qualified Streamly.Internal.FileSystem.Handle as Handle

5454import qualified Streamly.Internal.Unicode.Stream as Unicode

5555

core/src/Streamly/Internal/Unicode/Stream.hs+18−18

@@ -144,7 +144,7 @@ import Prelude hiding (lines, words, unlines, unwords)

144144--

145145-- @since 0.8.0

146146{-# INLINE decodeLatin1 #-}

147−decodeLatin1 :: (Monad m) => Stream m Word8 -> Stream m Char

147+decodeLatin1 :: Monad m => Stream m Word8 -> Stream m Char

148148decodeLatin1 = fmap (unsafeChr . fromIntegral)

149149

150150-------------------------------------------------------------------------------

@@ -157,7 +157,7 @@ decodeLatin1 = fmap (unsafeChr . fromIntegral)

157157--

158158-- @since 0.8.0

159159{-# INLINE encodeLatin1' #-}

160−encodeLatin1' :: (Monad m) => Stream m Char -> Stream m Word8

160+encodeLatin1' :: Monad m => Stream m Char -> Stream m Word8

161161encodeLatin1' = fmap convert

162162 where

163163 convert c =

@@ -179,21 +179,21 @@ encodeLatin1' = fmap convert

179179--

180180-- /Since: 0.8.0 (Lenient Behaviour)/

181181{-# INLINE encodeLatin1 #-}

182−encodeLatin1 :: (Monad m) => Stream m Char -> Stream m Word8

182+encodeLatin1 :: Monad m => Stream m Char -> Stream m Word8

183183encodeLatin1 = fmap (fromIntegral . ord)

184184

185185-- | Like 'encodeLatin1' but drops the input characters beyond 255.

186186--

187187-- @since 0.8.0

188188{-# INLINE encodeLatin1_ #-}

189−encodeLatin1_ :: (Monad m) => Stream m Char -> Stream m Word8

189+encodeLatin1_ :: Monad m => Stream m Char -> Stream m Word8

190190encodeLatin1_ = fmap (fromIntegral . ord) . Stream.filter (<= chr 255)

191191

192192-- | Same as 'encodeLatin1'

193193--

194194{-# DEPRECATED encodeLatin1Lax "Please use 'encodeLatin1' instead" #-}

195195{-# INLINE encodeLatin1Lax #-}

196−encodeLatin1Lax :: (Monad m) => Stream m Char -> Stream m Word8

196+encodeLatin1Lax :: Monad m => Stream m Char -> Stream m Word8

197197encodeLatin1Lax = encodeLatin1

198198

199199-------------------------------------------------------------------------------

@@ -424,7 +424,7 @@ decodeUtf8EitherD = resumeDecodeUtf8EitherD 0 0

424424--

425425-- /Pre-release/

426426{-# INLINE decodeUtf8Either #-}

427−decodeUtf8Either :: (Monad m)

427+decodeUtf8Either :: Monad m

428428 => Stream m Word8 -> Stream m (Either DecodeError Char)

429429decodeUtf8Either = fromStreamD . decodeUtf8EitherD . toStreamD

430430

@@ -433,7 +433,7 @@ decodeUtf8Either = fromStreamD . decodeUtf8EitherD . toStreamD

433433-- /Pre-release/

434434{-# INLINE resumeDecodeUtf8Either #-}

435435resumeDecodeUtf8Either

436− :: (Monad m)

436+ :: Monad m

437437 => DecodeState

438438 -> CodePoint

439439 -> Stream m Word8

@@ -657,7 +657,7 @@ decodeUtf8D = decodeUtf8WithD TransliterateCodingFailure

657657--

658658-- /Since: 0.8.0 (Lenient Behaviour)/

659659{-# INLINE decodeUtf8 #-}

660−decodeUtf8 :: (Monad m) => Stream m Word8 -> Stream m Char

660+decodeUtf8 :: Monad m => Stream m Word8 -> Stream m Char

661661decodeUtf8 = fromStreamD . decodeUtf8D . toStreamD

662662

663663{-# INLINE decodeUtf8D' #-}

@@ -669,7 +669,7 @@ decodeUtf8D' = decodeUtf8WithD ErrorOnCodingFailure

669669--

670670-- @since 0.8.0

671671{-# INLINE decodeUtf8' #-}

672−decodeUtf8' :: (Monad m) => Stream m Word8 -> Stream m Char

672+decodeUtf8' :: Monad m => Stream m Word8 -> Stream m Char

673673decodeUtf8' = fromStreamD . decodeUtf8D' . toStreamD

674674

675675{-# INLINE decodeUtf8D_ #-}

@@ -681,14 +681,14 @@ decodeUtf8D_ = decodeUtf8WithD DropOnCodingFailure

681681--

682682-- @since 0.8.0

683683{-# INLINE decodeUtf8_ #-}

684−decodeUtf8_ :: (Monad m) => Stream m Word8 -> Stream m Char

684+decodeUtf8_ :: Monad m => Stream m Word8 -> Stream m Char

685685decodeUtf8_ = fromStreamD . decodeUtf8D_ . toStreamD

686686

687687-- | Same as 'decodeUtf8'

688688--

689689{-# DEPRECATED decodeUtf8Lax "Please use 'decodeUtf8' instead" #-}

690690{-# INLINE decodeUtf8Lax #-}

691−decodeUtf8Lax :: (Monad m) => Stream m Word8 -> Stream m Char

691+decodeUtf8Lax :: Monad m => Stream m Word8 -> Stream m Char

692692decodeUtf8Lax = decodeUtf8

693693

694694-------------------------------------------------------------------------------

@@ -936,7 +936,7 @@ encodeUtf8D' = D.unfoldMany readCharUtf8'

936936--

937937-- @since 0.8.0

938938{-# INLINE encodeUtf8' #-}

939−encodeUtf8' :: (Monad m) => Stream m Char -> Stream m Word8

939+encodeUtf8' :: Monad m => Stream m Char -> Stream m Word8

940940encodeUtf8' = fromStreamD . encodeUtf8D' . toStreamD

941941

942942{-# INLINE_NORMAL readCharUtf8 #-}

@@ -958,7 +958,7 @@ encodeUtf8D = D.unfoldMany readCharUtf8

958958--

959959-- /Since: 0.8.0 (Lenient Behaviour)/

960960{-# INLINE encodeUtf8 #-}

961−encodeUtf8 :: (Monad m) => Stream m Char -> Stream m Word8

961+encodeUtf8 :: Monad m => Stream m Char -> Stream m Word8

962962encodeUtf8 = fromStreamD . encodeUtf8D . toStreamD

963963

964964{-# INLINE_NORMAL readCharUtf8_ #-}

@@ -974,14 +974,14 @@ encodeUtf8D_ = D.unfoldMany readCharUtf8_

974974--

975975-- @since 0.8.0

976976{-# INLINE encodeUtf8_ #-}

977−encodeUtf8_ :: (Monad m) => Stream m Char -> Stream m Word8

977+encodeUtf8_ :: Monad m => Stream m Char -> Stream m Word8

978978encodeUtf8_ = fromStreamD . encodeUtf8D_ . toStreamD

979979

980980-- | Same as 'encodeUtf8'

981981--

982982{-# DEPRECATED encodeUtf8Lax "Please use 'encodeUtf8' instead" #-}

983983{-# INLINE encodeUtf8Lax #-}

984−encodeUtf8Lax :: (Monad m) => Stream m Char -> Stream m Word8

984+encodeUtf8Lax :: Monad m => Stream m Char -> Stream m Word8

985985encodeUtf8Lax = encodeUtf8

986986

987987-------------------------------------------------------------------------------

@@ -1060,7 +1060,7 @@ stripTail = undefined

10601060--

10611061-- /Pre-release/

10621062{-# INLINE stripHead #-}

1063−stripHead :: (Monad m) => Stream m Char -> Stream m Char

1063+stripHead :: Monad m => Stream m Char -> Stream m Char

10641064stripHead = Stream.dropWhile isSpace

10651065

10661066-- | Fold each line of the stream using the supplied 'Fold'

@@ -1073,7 +1073,7 @@ stripHead = Stream.dropWhile isSpace

10731073--

10741074-- /Pre-release/

10751075{-# INLINE lines #-}

1076−lines :: (Monad m) => Fold m Char b -> Stream m Char -> Stream m b

1076+lines :: Monad m => Fold m Char b -> Stream m Char -> Stream m b

10771077lines f = Stream.foldMany (Fold.takeEndBy_ (== '\n') f)

10781078

10791079#if !MIN_VERSION_base(4,17,0)

@@ -1104,7 +1104,7 @@ isSpace c

11041104--

11051105-- /Pre-release/

11061106{-# INLINE words #-}

1107−words :: (Monad m) => Fold m Char b -> Stream m Char -> Stream m b

1107+words :: Monad m => Fold m Char b -> Stream m Char -> Stream m b

11081108words f m = Stream.fromStreamD $ D.wordsBy isSpace f (Stream.toStreamD m)

11091109

11101110-- | Unfold a stream to character streams using the supplied 'Unfold'

streamly.cabal+2−6

@@ -228,6 +228,8 @@ extra-source-files:

228228 core/src/Streamly/Internal/Unicode/Stream.hs

229229 core/src/Streamly/Internal/Unicode/String.hs

230230 core/src/Streamly/Unicode/Stream.hs

231+ core/src/Streamly/Console/Stdio.hs

232+ core/src/Streamly/Internal/Console/Stdio.hs

231233 core/streamly-core.cabal

232234 core/jsbits/clock.js

233235 core/Setup.hs

@@ -496,9 +498,6 @@ library

496498 , Streamly.Internal.FileSystem.Dir

497499 , Streamly.Internal.FileSystem.File

498500

499− -- streamly-console

500− , Streamly.Internal.Console.Stdio

501−

502501 -- streamly-network

503502 , Streamly.Internal.Network.Socket

504503 , Streamly.Internal.Network.Inet.TCP

@@ -506,9 +505,6 @@ library

506505 -- Exposed modules

507506 , Streamly.Prelude

508507

509− -- Filesystem/IO

510− , Streamly.Console.Stdio

511−

512508 -- Network/IO

513509 , Streamly.Network.Socket

514510 , Streamly.Network.Inet.TCP