@@ -371,15 +371,15 @@ notWord8 c = satisfy (/= c) <?> "not " ++ show c
371371-- combinators such as 'many', because such parsers loop until a
372372-- failure occurs. Careless use will thus result in an infinite loop.
373373peekWord8 :: Parser (Maybe Word8)
374−peekWord8 = T.Parser $ \t pos more _lose succ ->
374+peekWord8 = T.Parser $ \t pos@(Pos pos_) more _lose succ ->
375375 case () of
376− _| pos < B.length t ->
377− let !w = B.unsafeIndex t pos
376+ _| pos_ < B.length t ->
377+ let !w = B.unsafeIndex t pos_
378378 in succ t pos more (Just w)
379379 | more == Complete ->
380380 succ t pos more Nothing
381381 | otherwise ->
382− let succ' t' pos' more' = let !w = B.unsafeIndex t pos
382+ let succ' t' pos' more' = let !w = B.unsafeIndex t pos_
383383 in succ t' pos' more' (Just w)
384384 lose' t' pos' more' = succ t' pos' more' Nothing
385385 in prompt t pos more lose' succ'
@@ -400,22 +400,22 @@ endOfLine = (word8 10 >> return ()) <|> (string "\r\n" >> return ())
400400
401401-- | Terminal failure continuation.
402402failK :: Failure a
403−failK t pos _more stack msg = Fail (B.unsafeDrop pos t) stack msg
403+failK t (Pos pos) _more stack msg = Fail (B.unsafeDrop pos t) stack msg
404404{-# INLINE failK #-}
405405
406406-- | Terminal success continuation.
407407successK :: Success a a
408−successK t pos _more a = Done (B.unsafeDrop pos t) a
408+successK t (Pos pos) _more a = Done (B.unsafeDrop pos t) a
409409{-# INLINE successK #-}
410410
411411-- | Run a parser.
412412parse :: Parser a -> B.ByteString -> Result a
413−parse m s = T.runParser m s 0 Incomplete failK successK
413+parse m s = T.runParser m s (Pos 0) Incomplete failK successK
414414{-# INLINE parse #-}
415415
416416-- | Run a parser that cannot be resupplied via a 'Partial' result.
417417parseOnly :: Parser a -> B.ByteString -> Either String a
418−parseOnly m s = case T.runParser m s 0 Complete failK successK of
418+parseOnly m s = case T.runParser m s (Pos 0) Complete failK successK of
419419 Fail _ _ err -> Left err
420420 Done _ a -> Right a
421421 _ -> error "parseOnly: impossible error!"
@@ -430,16 +430,18 @@ inlinePerformIO (IO m) = case m realWorld# of (# _, r #) -> r
430430{-# INLINE inlinePerformIO #-}
431431
432432get :: Parser ByteString
433−get = T.Parser $ \t pos more _lose succ -> succ t pos more (B.unsafeDrop pos t)
433+get = T.Parser $ \t pos more _lose succ ->
434+ succ t pos more (B.unsafeDrop (fromPos pos) t)
434435{-# INLINE get #-}
435436
436437endOfChunk :: Parser Bool
437438endOfChunk = T.Parser $ \t pos more _lose succ ->
438− succ t pos more (pos == B.length t)
439+ succ t pos more (fromPos pos == B.length t)
439440{-# INLINE endOfChunk #-}
440441
441442advance :: Int -> Parser ()
442−advance n = T.Parser $ \t pos more _lose succ -> succ t (pos+n) more ()
443+advance n = T.Parser $ \t pos more _lose succ ->
444+ succ t (pos + Pos n) more ()
443445{-# INLINE advance #-}
444446
445447ensureSuspended :: Int -> ByteString -> Pos -> More
@@ -450,7 +452,7 @@ ensureSuspended n t pos more lose succ =
450452 runParser (demandInput >> go) t pos more lose succ
451453 where go = T.Parser $ \t' pos' more' lose' succ' ->
452454 if lengthAtLeast pos' n t'
453− then succ' t' pos' more' (substring pos n t')
455+ then succ' t' pos' more' (substring pos (Pos n) t')
454456 else runParser (demandInput >> go) t' pos' more' lose' succ'
455457
456458-- | If at least @n@ elements of input are available, return the
@@ -458,7 +460,7 @@ ensureSuspended n t pos more lose succ =
458460ensure :: Int -> Parser ByteString
459461ensure n = T.Parser $ \t pos more lose succ ->
460462 if lengthAtLeast pos n t
461− then succ t pos more (substring pos n t)
463+ then succ t pos more (substring pos (Pos n) t)
462464 -- The uncommon case is kept out-of-line to reduce code size:
463465 else ensureSuspended n t pos more lose succ
464466-- Non-recursive so the bounds check can be inlined:
@@ -511,8 +513,8 @@ endOfInput = T.Parser $ \t pos more lose succ ->
511513-- portion of the input that was consumed while it was being parsed.
512514match :: Parser a -> Parser (ByteString, a)
513515match p = T.Parser $ \t pos more lose succ ->
514− let succ' t' pos' more' a = succ t' pos' more'
515− (substring pos (pos'-pos) t', a)
516+ let succ' t' pos' more' a =
517+ succ t' pos' more' (substring pos (pos'-pos) t', a)
516518 in runParser p t pos more lose succ'
517519
518520-- | Return an indication of whether the end of input has been
@@ -522,9 +524,9 @@ atEnd = not <$> wantInput
522524{-# INLINE atEnd #-}
523525
524526lengthAtLeast :: Pos -> Int -> ByteString -> Bool
525−lengthAtLeast pos n bs = B.length bs >= pos + n
527+lengthAtLeast (Pos pos) n bs = B.length bs >= pos + n
526528{-# INLINE lengthAtLeast #-}
527529
528−substring :: Pos -> Int -> ByteString -> ByteString
529−substring pos n bs = B.unsafeTake n (B.unsafeDrop pos bs)
530+substring :: Pos -> Pos -> ByteString -> ByteString
531+substring (Pos pos) (Pos n) bs = B.unsafeTake n (B.unsafeDrop pos bs)
530532{-# INLINE substring #-}