@@ -247,7 +247,7 @@ instance Monoid a => Monoid (Future s a) where
247247 mconcat = liftM mconcat . sequence
248248
249249-- | Parse characters while a predicate is true.
250−takeWhileP :: Stream [Char] m Char
250+takeWhileP :: Monad m
251251 => (Char -> Bool) -> ParserT [Char] st m [Char]
252252takeWhileP f = do
253253 -- faster than 'many (satisfy f)'
@@ -262,7 +262,7 @@ takeWhileP f = do
262262
263263-- Parse n characters of input (or the rest of the input if
264264-- there aren't n characters).
265−takeP :: Stream [Char] m Char => Int -> ParserT [Char] st m [Char]
265+takeP :: Monad m => Int -> ParserT [Char] st m [Char]
266266takeP n = do
267267 guard (n > 0)
268268 -- faster than 'count n anyChar'
@@ -276,7 +276,7 @@ takeP n = do
276276 return xs
277277
278278-- | Parse any line of text
279−anyLine :: Stream [Char] m Char => ParserT [Char] st m [Char]
279+anyLine :: Monad m => ParserT [Char] st m [Char]
280280anyLine = do
281281 -- This is much faster than:
282282 -- manyTill anyChar newline
@@ -292,11 +292,11 @@ anyLine = do
292292 _ -> mzero
293293
294294-- | Parse any line, include the final newline in the output
295−anyLineNewline :: Stream [Char] m Char => ParserT [Char] st m [Char]
295+anyLineNewline :: Monad m => ParserT [Char] st m [Char]
296296anyLineNewline = (++ "\n") <$> anyLine
297297
298298-- | Parse indent by specified number of spaces (or equiv. tabs)
299−indentWith :: Stream [Char] m Char
299+indentWith :: Monad m
300300 => HasReaderOptions st
301301 => Int -> ParserT [Char] st m [Char]
302302indentWith num = do
@@ -422,7 +422,7 @@ parseFromString' parser str = do
422422 return res
423423
424424-- | Parse raw line block up to and including blank lines.
425−lineClump :: Stream [Char] m Char => ParserT [Char] st m String
425+lineClump :: Monad m => ParserT [Char] st m String
426426lineClump = blanklines
427427 <|> (many1 (notFollowedBy blankline >> anyLine) >>= return . unlines)
428428
@@ -520,7 +520,7 @@ uriScheme :: Stream s m Char => ParserT s st m String
520520uriScheme = oneOfStringsCI (Set.toList schemes)
521521
522522-- | Parses a URI. Returns pair of original and URI-escaped version.
523−uri :: Stream [Char] m Char => ParserT [Char] st m (String, String)
523+uri :: Monad m => ParserT [Char] st m (String, String)
524524uri = try $ do
525525 scheme <- uriScheme
526526 char ':'
@@ -625,7 +625,7 @@ withHorizDisplacement parser = do
625625
626626-- | Applies a parser and returns the raw string that was parsed,
627627-- along with the value produced by the parser.
628−withRaw :: Stream [Char] m Char => ParsecT [Char] st m a -> ParsecT [Char] st m (a, [Char])
628+withRaw :: Monad m => ParsecT [Char] st m a -> ParsecT [Char] st m (a, [Char])
629629withRaw parser = do
630630 pos1 <- getPosition
631631 inp <- getInput
@@ -786,7 +786,7 @@ charRef = do
786786 c <- characterReference
787787 return $ Str [c]
788788
789−lineBlockLine :: Stream [Char] m Char => ParserT [Char] st m String
789+lineBlockLine :: Monad m => ParserT [Char] st m String
790790lineBlockLine = try $ do
791791 char '|'
792792 char ' '
@@ -796,11 +796,11 @@ lineBlockLine = try $ do
796796 continuations <- many (try $ char ' ' >> anyLine)
797797 return $ white ++ unwords (line : continuations)
798798
799−blankLineBlockLine :: Stream [Char] m Char => ParserT [Char] st m Char
799+blankLineBlockLine :: Monad m => ParserT [Char] st m Char
800800blankLineBlockLine = try (char '|' >> blankline)
801801
802802-- | Parses an RST-style line block and returns a list of strings.
803−lineBlockLines :: Stream [Char] m Char => ParserT [Char] st m [String]
803+lineBlockLines :: Monad m => ParserT [Char] st m [String]
804804lineBlockLines = try $ do
805805 lines' <- many1 (lineBlockLine <|> ((:[]) <$> blankLineBlockLine))
806806 skipMany1 $ blankline <|> blankLineBlockLine
@@ -870,7 +870,7 @@ widthsFromIndices numColumns' indices =
870870-- (which may be grid), then the rows,
871871-- which may be grid, separated by blank lines, and
872872-- ending with a footer (dashed line followed by blank line).
873−gridTableWith :: (Stream [Char] m Char, HasReaderOptions st,
873+gridTableWith :: (Monad m, HasReaderOptions st,
874874 Functor mf, Applicative mf, Monad mf)
875875 => ParserT [Char] st m (mf Blocks) -- ^ Block list parser
876876 -> Bool -- ^ Headerless table
@@ -879,7 +879,7 @@ gridTableWith blocks headless =
879879 tableWith (gridTableHeader headless blocks) (gridTableRow blocks)
880880 (gridTableSep '-') gridTableFooter
881881
882−gridTableWith' :: (Stream [Char] m Char, HasReaderOptions st,
882+gridTableWith' :: (Monad m, HasReaderOptions st,
883883 Functor mf, Applicative mf, Monad mf)
884884 => ParserT [Char] st m (mf Blocks) -- ^ Block list parser
885885 -> Bool -- ^ Headerless table
@@ -919,7 +919,7 @@ gridTableSep :: Stream s m Char => Char -> ParserT s st m Char
919919gridTableSep ch = try $ gridDashedLines ch >> return '\n'
920920
921921-- | Parse header for a grid table.
922−gridTableHeader :: (Stream [Char] m Char, Functor mf, Applicative mf, Monad mf)
922+gridTableHeader :: (Monad m, Functor mf, Applicative mf, Monad mf)
923923 => Bool -- ^ Headerless table
924924 -> ParserT [Char] st m (mf Blocks)
925925 -> ParserT [Char] st m (mf [Blocks], [Alignment], [Int])