Import Parser instead of ParserD
commit5e0307ae79303746e780716dce70cde115779f8f
authorHarendra Kumar <harendra@composewell.com>
dateFri 21 Jul 2023, 23:49 (3 years ago)
parent5d59a2c
core/src/Streamly/Data/ParserK.hs+1−1
@@ -33,7 +33,7 @@ where
3333import Control.Monad.IO.Class (MonadIO)
3434import Streamly.Internal.Data.Fold (Fold)
3535import Streamly.Internal.Data.Unbox (Unbox)
36−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD
36+import qualified Streamly.Internal.Data.Parser as ParserD
3737
3838import Streamly.Internal.Data.Parser.ParserK.Type
3939
core/src/Streamly/Internal/Data/Array/Mut/Stream.hs+1−1
@@ -41,7 +41,7 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
4141import qualified Streamly.Internal.Data.Array.Mut.Type as MArray
4242import qualified Streamly.Internal.Data.Fold.Type as FL
4343import qualified Streamly.Internal.Data.Stream.StreamD as D
44−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD
44+import qualified Streamly.Internal.Data.Parser as ParserD
4545
4646-- | @chunksOf n stream@ groups the elements in the input stream into arrays of
4747-- @n@ elements each.
core/src/Streamly/Internal/Data/Fold/Chunked.hs+2−2
@@ -67,12 +67,12 @@ import Streamly.Internal.Data.Unbox (peekWith, sizeOf, Unbox)
6767import GHC.Types (SPEC(..))
6868import Streamly.Internal.Data.Array.Mut.Type (touch)
6969import Streamly.Internal.Data.Array.Type (Array(..))
70−import Streamly.Internal.Data.Parser.ParserD (Initial(..), Step(..))
70+import Streamly.Internal.Data.Parser (Initial(..), Step(..))
7171import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
7272
7373import qualified Streamly.Internal.Data.Array as Array
7474import qualified Streamly.Internal.Data.Fold as Fold
75−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD
75+import qualified Streamly.Internal.Data.Parser as ParserD
7676import qualified Streamly.Internal.Data.Parser.ParserD.Type as ParserD
7777import qualified Streamly.Internal.Data.Parser as Parser
7878
core/src/Streamly/Internal/Data/Parser/ParserDK.hs+1−1
@@ -254,7 +254,7 @@ import Streamly.Internal.Data.Parser.ParserK.Type (Parser)
254254
255255import qualified Data.Foldable as Foldable
256256import qualified Streamly.Internal.Data.Fold.Type as FL
257−import qualified Streamly.Internal.Data.Parser.ParserD as D
257+import qualified Streamly.Internal.Data.Parser as D
258258import qualified Streamly.Internal.Data.Parser.ParserK.Type as K
259259
260260#ifdef USE_STREAMK
core/src/Streamly/Internal/Data/Producer/Source.hs+2−2
@@ -36,11 +36,11 @@ where
3636import Control.Exception (assert)
3737import GHC.Exts (SpecConstrAnnotation(..))
3838import GHC.Types (SPEC(..))
39−import Streamly.Internal.Data.Parser.ParserD (ParseError(..), Step(..))
39+import Streamly.Internal.Data.Parser (ParseError(..), Step(..))
4040import Streamly.Internal.Data.Producer.Type (Producer(..))
4141import Streamly.Internal.Data.Stream.StreamD.Step (Step(..))
4242
43−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD
43+import qualified Streamly.Internal.Data.Parser as ParserD
4444-- import qualified Streamly.Internal.Data.Parser.ParserK.Type as ParserK
4545
4646import Prelude hiding (read)
core/src/Streamly/Internal/Data/Stream/Chunked.hs+1−1
@@ -95,7 +95,7 @@ import qualified Streamly.Internal.Data.Array.Mut.Type as MA
9595import qualified Streamly.Internal.Data.Array.Mut.Stream as AS
9696import qualified Streamly.Internal.Data.Fold.Type as FL (Fold(..), Step(..))
9797import qualified Streamly.Internal.Data.Parser as PR
98−import qualified Streamly.Internal.Data.Parser.ParserD as PRD
98+import qualified Streamly.Internal.Data.Parser as PRD
9999 (Parser(..), Initial(..))
100100import qualified Streamly.Internal.Data.Stream.StreamD as D
101101import qualified Streamly.Internal.Data.Stream.StreamK as K
core/src/Streamly/Internal/Data/Stream/Eliminate.hs+1−1
@@ -85,7 +85,7 @@ import Streamly.Internal.Data.Stream.Type (Stream)
8585
8686import qualified Streamly.Internal.Data.Array.Type as Array
8787import qualified Streamly.Internal.Data.Fold as Fold
88−import qualified Streamly.Internal.Data.Parser.ParserD as PRD
88+import qualified Streamly.Internal.Data.Parser as PRD
8989import qualified Streamly.Internal.Data.Parser.ParserK.Type as PRK
9090import qualified Streamly.Internal.Data.Stream.StreamD as D
9191import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
core/src/Streamly/Internal/Data/Stream/Reduce.hs+2−2
@@ -61,14 +61,14 @@ import Control.Monad.IO.Class (MonadIO(..))
6161import Streamly.Internal.Data.Array.Type (Array)
6262import Streamly.Internal.Data.Fold.Type (Fold (..))
6363import Streamly.Internal.Data.Parser (Parser (..))
64−import Streamly.Internal.Data.Parser.ParserD (ParseError)
64+import Streamly.Internal.Data.Parser (ParseError)
6565import Streamly.Internal.Data.Refold.Type (Refold (..))
6666import Streamly.Internal.Data.Stream.Bottom (foldManyPost)
6767import Streamly.Internal.Data.Stream.Type (Stream, fromStreamD, toStreamD)
6868import Streamly.Internal.Data.Unbox (Unbox)
6969
7070import qualified Streamly.Internal.Data.Array.Type as Array
71−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD
71+import qualified Streamly.Internal.Data.Parser as ParserD
7272import qualified Streamly.Internal.Data.Stream.StreamD as D
7373
7474import Prelude hiding (concatMap, map)
core/src/Streamly/Internal/Data/Stream/StreamD/Eliminate.hs+1−1
@@ -98,7 +98,7 @@ import Streamly.Internal.Data.Maybe.Strict (Maybe'(..))
9898import qualified Streamly.Internal.Data.Array.Type as Array
9999import qualified Streamly.Internal.Data.Fold as Fold
100100import qualified Streamly.Internal.Data.Parser as PR
101−import qualified Streamly.Internal.Data.Parser.ParserD as PRD
101+import qualified Streamly.Internal.Data.Parser as PRD
102102import qualified Streamly.Internal.Data.Stream.StreamD.Generate as StreamD
103103import qualified Streamly.Internal.Data.Stream.StreamD.Nesting as Nesting
104104import qualified Streamly.Internal.Data.Stream.StreamD.Transform as StreamD
core/src/Streamly/Internal/Data/Stream/StreamD/Nesting.hs+1−1
@@ -194,7 +194,7 @@ import Streamly.Internal.Data.Unfold.Type (Unfold(..))
194194import qualified Streamly.Internal.Data.Array.Type as A
195195import qualified Streamly.Internal.Data.Fold as FL
196196import qualified Streamly.Internal.Data.Parser as PR
197−import qualified Streamly.Internal.Data.Parser.ParserD as PRD
197+import qualified Streamly.Internal.Data.Parser as PRD
198198import qualified Streamly.Internal.Data.Ring.Unboxed as RB
199199
200200import Streamly.Internal.Data.Stream.StreamD.Transform
core/src/Streamly/Internal/Data/Stream/StreamK.hs+1−1
@@ -218,7 +218,7 @@ import Prelude
218218 (!!), replicate, reverse, concatMap, iterate, splitAt)
219219import Data.Foldable (sum, length)
220220import Streamly.Internal.Data.Stream.StreamK.Type
221−import Streamly.Internal.Data.Parser.ParserD (ParseError(..))
221+import Streamly.Internal.Data.Parser (ParseError(..))
222222
223223#include "DocTestDataStreamK.hs"
224224
core/src/Streamly/Internal/Serialize/FromBytes.hs+1−1
@@ -54,7 +54,7 @@ import qualified Streamly.Internal.Data.Array as A
5454 (unsafeIndex, castUnsafe)
5555import qualified Streamly.Internal.Data.Parser as PR
5656 (fromPure, either, satisfy, takeEQ)
57−import qualified Streamly.Internal.Data.Parser.ParserD as PRD
57+import qualified Streamly.Internal.Data.Parser as PRD
5858 (Parser(..), Initial(..), Step(..))
5959
6060-- Note: The () type does not need to have an on-disk representation in theory.
core/src/Streamly/Internal/Unicode/Stream.hs+1−1
@@ -116,7 +116,7 @@ import qualified Streamly.Data.Fold as Fold
116116import qualified Streamly.Data.Unfold as Unfold
117117import qualified Streamly.Internal.Data.Array.Type as Array
118118import qualified Streamly.Internal.Data.Parser as Parser (Parser)
119−import qualified Streamly.Internal.Data.Parser.ParserD as ParserD
119+import qualified Streamly.Internal.Data.Parser as ParserD
120120import qualified Streamly.Internal.Data.Stream.StreamD as Stream
121121import qualified Streamly.Internal.Data.Stream.StreamD as D
122122
src/Streamly/Internal/Data/Stream/IsStream/Eliminate.hs+1−1
@@ -169,7 +169,7 @@ import Streamly.Internal.Data.Unbox (Unbox)
169169import qualified Streamly.Internal.Data.Array as A
170170import qualified Streamly.Internal.Data.Stream.Serial as Stream
171171import qualified Streamly.Internal.Data.Fold as FL
172−import qualified Streamly.Internal.Data.Parser.ParserD as PRD
172+import qualified Streamly.Internal.Data.Parser as PRD
173173-- import qualified Streamly.Internal.Data.Parser.ParserK.Type as PRK
174174import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
175175import qualified Streamly.Internal.Data.Stream.StreamD as D
src/Streamly/Internal/Data/Stream/IsStream/Reduce.hs+1−1
@@ -189,7 +189,7 @@ import qualified Streamly.Internal.Data.Array.Type as A
189189import qualified Streamly.Internal.Data.Fold as FL
190190 (Fold, Step(..), takeEndBy_, takeEndBy, catMaybes, take)
191191import qualified Streamly.Internal.Data.IsMap as IsMap
192−import qualified Streamly.Internal.Data.Parser.ParserD as PRD (Parser(..))
192+import qualified Streamly.Internal.Data.Parser as PRD (Parser(..))
193193import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
194194import qualified Streamly.Internal.Data.Stream.StreamD as D
195195 ( foldMany
test/Streamly/Test/Data/Parser.hs+1−1
@@ -26,7 +26,7 @@ import qualified Test.Hspec as H
2626
2727import Test.QuickCheck (chooseAny)
2828import Control.Monad.Identity (Identity(runIdentity, Identity))
29−import Streamly.Internal.Data.Parser.ParserD (ParseError(..))
29+import Streamly.Internal.Data.Parser (ParseError(..))
3030
3131#else
3232
test/Streamly/Test/Data/Parser/ParserD.hs+1−1
@@ -16,7 +16,7 @@ import qualified Prelude
1616import qualified Streamly.Data.Stream as S
1717import qualified Streamly.Internal.Data.Array as A
1818import qualified Streamly.Internal.Data.Fold as FL
19−import qualified Streamly.Internal.Data.Parser.ParserD as P
19+import qualified Streamly.Internal.Data.Parser as P
2020import qualified Streamly.Internal.Data.Producer.Source as Source
2121import qualified Streamly.Internal.Data.Producer as Producer
2222import qualified Streamly.Internal.Data.Stream as S