Skip to content

Commit f0c0e7d

Browse files
adithyaovadithyaov
committed
Change Parser.Error to Parser.SError
1 parent fc4f6de commit f0c0e7d

19 files changed

Lines changed: 174 additions & 171 deletions

File tree

‎benchmark/Streamly/Benchmark/Data/Parser.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ takeWhileFail predicate (Fold fstep finitial _ ffinal) =
366366
$ case fres of
367367
Fold.Partial s1 -> SPartial 1 s1
368368
Fold.Done b -> SDone 1 b
369-
else return $ Error "fail"
369+
else return $ SError "fail"
370370

371371
extract s = fmap (FDone 0) (ffinal s)
372372

‎benchmark/Streamly/Benchmark/Data/ParserK.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ takeWhileFailD predicate (Fold fstep finitial _ ffinal) =
236236
$ case fres of
237237
Fold.Partial s1 -> SContinue 1 s1
238238
Fold.Done b -> SDone 1 b
239-
else return $ Error "fail"
239+
else return $ SError "fail"
240240

241241
extract s = fmap (FDone 0) (ffinal s)
242242

‎core/src/Streamly/Internal/Data/Array.hs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ parseBreakD
842842
-- constructors every time.
843843
str = D.cons arr0 (D.cons arr1 (D.Stream step s))
844844
return (b, str)
845-
PR.Error err -> throwM $ ParseError err
845+
PR.SError err -> throwM $ ParseError err
846846
847847
-- | Parse an array stream using the supplied 'Parser'. Returns the parse
848848
-- result and the unconsumed stream. Throws 'ParseError' if the parse fails.
@@ -924,7 +924,7 @@ parseBreakChunksK (Parser pstep initial extract) stream = do
924924
arr1 = Array contents next end
925925
str = StreamK.cons arr0 (StreamK.cons arr1 st)
926926
return (Right b, str)
927-
Parser.Error err -> do
927+
Parser.SError err -> do
928928
let n = Prelude.length backBuf
929929
arr0 = fromListN n (Prelude.reverse backBuf)
930930
arr1 = Array contents cur end
@@ -975,7 +975,7 @@ parseBreakChunksK (Parser pstep initial extract) stream = do
975975
arr1 = Array contents next end
976976
str = StreamK.cons arr0 (StreamK.fromPure arr1)
977977
return (Right b, str)
978-
Parser.Error err -> do
978+
Parser.SError err -> do
979979
let n = Prelude.length backBuf
980980
arr0 = fromListN n (Prelude.reverse backBuf)
981981
arr1 = Array contents cur end
@@ -1008,7 +1008,7 @@ parseBreakChunksK (Parser pstep initial extract) stream = do
10081008
-- arr0 = A.fromListRevN n src0
10091009
arr0 = fromListN n (Prelude.reverse src0)
10101010
return (Right b, StreamK.fromPure arr0)
1011-
Parser.Error err -> do
1011+
Parser.SError err -> do
10121012
let n = Prelude.length backBuf
10131013
arr0 = fromListN n (Prelude.reverse backBuf)
10141014
return (Left (ParseError err), StreamK.fromPure arr0)
@@ -1098,7 +1098,7 @@ parseBreak parser input = do
10981098
assertM(n1 >= 0 && n1 <= sum (Prelude.map length backBuf))
10991099
let (s1, _) = backtrack n1 backBuf StreamK.nil
11001100
in return (Right b, s1)
1101-
ParserK.Error _ err -> do
1101+
ParserK.SError _ err -> do
11021102
let s1 = Prelude.foldl (flip StreamK.cons) StreamK.nil backBuf
11031103
return (Left (ParseError err), s1)
11041104

@@ -1143,7 +1143,7 @@ parseBreak parser input = do
11431143
assertM(n1 <= sum (Prelude.map length (arr:backBuf)))
11441144
let (s1, _) = backtrack n1 (arr:backBuf) stream
11451145
in return (Right b, s1)
1146-
ParserK.Error _ err -> do
1146+
ParserK.SError _ err -> do
11471147
let s1 = Prelude.foldl (flip StreamK.cons) stream (arr:backBuf)
11481148
return (Left (ParseError err), s1)
11491149

@@ -1255,7 +1255,7 @@ adaptCWith pstep initial extract cont !offset0 !usedCount !input = do
12551255
go SPEC cur pst1
12561256
ParserD.SContinue n pst1 ->
12571257
onBack (move n) elemSize onContinue pst1
1258-
ParserD.Error err ->
1258+
ParserD.SError err ->
12591259
onError curOff err
12601260

12611261
{-# NOINLINE parseContNothing #-}

‎core/src/Streamly/Internal/Data/Array/Generic.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ parseBreak parser input = do
465465
assertM(n1 >= 0 && n1 <= sum (Prelude.map length backBuf))
466466
let (s1, _) = backtrack n1 backBuf StreamK.nil
467467
in return (Right b, s1)
468-
ParserK.Error _ err ->
468+
ParserK.SError _ err ->
469469
let strm = Prelude.foldl (flip StreamK.cons) StreamK.nil backBuf
470470
in return (Left (ParseError err), strm)
471471

@@ -517,7 +517,7 @@ parseBreak parser input = do
517517
assertM(n1 <= sum (Prelude.map length (arr:backBuf)))
518518
let (s1, _) = backtrack n1 (arr:backBuf) stream
519519
in return (Right b, s1)
520-
ParserK.Error _ err ->
520+
ParserK.SError _ err ->
521521
let strm = Prelude.foldl (flip StreamK.cons) stream (arr:backBuf)
522522
in return (Left (ParseError err), strm)
523523

@@ -632,7 +632,7 @@ adaptCGWith pstep initial extract cont !offset0 !usedCount !input = do
632632
go SPEC cur pst1
633633
ParserD.SContinue n pst1 ->
634634
onBack (move n) onContinue pst1
635-
ParserD.Error err ->
635+
ParserD.SError err ->
636636
onError curOff err
637637

638638
{-# NOINLINE parseContNothing #-}

‎core/src/Streamly/Internal/Data/Array/Stream.hs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ runArrayParserDBreak
370370
let src0 = takeArrayListRev n (x:getList backBuf)
371371
src = Prelude.reverse src0 ++ xs
372372
return (Right b, D.append (D.fromList src) (D.Stream step s))
373-
PR.Error err -> do
373+
PR.SError err -> do
374374
let src0 = x:getList backBuf
375375
src = Prelude.reverse src0 ++ x:xs
376376
strm = D.append (D.fromList src) (D.Stream step s)
@@ -408,7 +408,7 @@ runArrayParserDBreak
408408
let src0 = takeArrayListRev n (x:getList backBuf)
409409
src = Prelude.reverse src0 ++ xs
410410
return (Right b, D.fromList src)
411-
PR.Error err -> do
411+
PR.SError err -> do
412412
let src0 = getList backBuf
413413
src = Prelude.reverse src0 ++ x:xs
414414
return (Left (ParseError err), D.fromList src)
@@ -591,7 +591,7 @@ runArrayFoldManyD
591591
return
592592
$ D.Skip
593593
$ ParseChunksYield (Right b) next
594-
PR.Error err -> do
594+
PR.SError err -> do
595595
let next = ParseChunksInitLeftOver []
596596
return
597597
$ D.Skip
@@ -633,7 +633,7 @@ runArrayFoldManyD
633633
return
634634
$ D.Skip
635635
$ ParseChunksYield (Right b) (ParseChunksInit src s)
636-
PR.Error err -> do
636+
PR.SError err -> do
637637
let next = ParseChunksInitLeftOver []
638638
return
639639
$ D.Skip
@@ -671,7 +671,7 @@ runArrayFoldManyD
671671
return
672672
$ D.Skip
673673
$ ParseChunksYield (Right b) (ParseChunksInitBuf src)
674-
PR.Error err -> do
674+
PR.SError err -> do
675675
let next = ParseChunksInitLeftOver []
676676
return
677677
$ D.Skip

‎core/src/Streamly/Internal/Data/Fold/Chunked.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ fromParserD (ParserD.Parser step1 initial1 extract1) =
178178
partial arrRem cur next elemSize Partial n fs1
179179
ParserD.Continue n fs1 -> do
180180
partial arrRem cur next elemSize Continue n fs1
181-
Error err -> return $ Error err
181+
SError err -> return $ SError err
182182

183183
-- | Convert an element 'Parser.Parser' into an array stream fold. If the
184184
-- parser fails the fold would throw an exception.
@@ -343,7 +343,7 @@ take n (ChunkFold (ParserD.Parser step1 initial1 extract1)) =
343343
-- i2 == i1 == j == 0
344344
r <- extract1 s
345345
return $ case r of
346-
FError err -> Error err
346+
FError err -> SError err
347347
FDone n1 b -> Done n1 b
348348
FContinue n1 s1 -> Continue n1 (Tuple' i2 s1)
349349

@@ -358,7 +358,7 @@ take n (ChunkFold (ParserD.Parser step1 initial1 extract1)) =
358358
Partial j s -> partial i1 Partial j s
359359
Continue j s -> partial i1 Continue j s
360360
Done j b -> return $ Done j b
361-
Error err -> return $ Error err
361+
SError err -> return $ SError err
362362
else do
363363
let !(Array contents start _) = arr
364364
end = INDEX_OF(start,i,a)
@@ -376,6 +376,6 @@ take n (ChunkFold (ParserD.Parser step1 initial1 extract1)) =
376376
remaining (Tuple' 0) id <$> extract1 s
377377
Continue j s -> return $ Continue (remaining + j) (Tuple' j s)
378378
Done j b -> return $ Done (remaining + j) b
379-
Error err -> return $ Error err
379+
SError err -> return $ SError err
380380

381381
extract (Tuple' i r) = first (Tuple' i) <$> extract1 r

‎core/src/Streamly/Internal/Data/Fold/Type.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@
210210
--
211211
-- This means: takeWhile, groupBy, wordBy would be implemented as parsers.
212212
--
213-
-- A proposed design is to use the same Step type with Error in Folds as well
214-
-- as Parsers. Folds won't use the Error constructor and even if they use, it
213+
-- A proposed design is to use the same Step type with SError in Folds as well
214+
-- as Parsers. Folds won't use the SError constructor and even if they use, it
215215
-- will be equivalent to just throwing an error. They won't have an
216216
-- alternative.
217217
--
@@ -244,7 +244,7 @@
244244
-- would succeed if the condition is satisfied and it would fail otherwise, on
245245
-- failure an alternative parser can be used on the same input.
246246
--
247-
-- We add @Error@ and @Continue@ to the @Step@ type of fold. @Continue@ is to
247+
-- We add @SError@ and @Continue@ to the @Step@ type of fold. @Continue@ is to
248248
-- skip producing an output or to backtrack. We also add the ability to
249249
-- backtrack in @Partial@ and @Done@.:
250250
--
@@ -257,7 +257,7 @@
257257
-- Partial Int s -- partial result and how much to backtrack
258258
-- | Done Int b -- final result and how much to backtrack
259259
-- | Continue Int s -- no result and how much to backtrack
260-
-- | Error String -- error
260+
-- | SError String -- error
261261
--
262262
-- data Parser a m b =
263263
-- forall s. Fold

0 commit comments

Comments
 (0)