diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2015-01-30 12:31:12 +0000 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2015-03-22 20:11:30 +0000 |
| commit | 5dc902cbcca92326126ef3647a3cebf2ae3071a5 (patch) | |
| tree | 5de5589c800870de0285accd0b58f867c8c3423f /src/Text | |
| parent | f6419a269139f48a2821b38b19342f8da4bf05ab (diff) | |
| download | pandoc-5dc902cbcca92326126ef3647a3cebf2ae3071a5.tar.gz | |
Changed parseWithWarnings to the more general returnWarnings parser transformer
Diffstat (limited to 'src/Text')
| -rw-r--r-- | src/Text/Pandoc/Parsing.hs | 11 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/RST.hs | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs index ec15adf77..2a1d61b97 100644 --- a/src/Text/Pandoc/Parsing.hs +++ b/src/Text/Pandoc/Parsing.hs @@ -65,7 +65,7 @@ module Text.Pandoc.Parsing ( anyLine, widthsFromIndices, gridTableWith, readWith, - readWithWarnings, + returnWarnings, readWithM, testStringWith, guardEnabled, @@ -885,11 +885,10 @@ readWith :: Parser [Char] st a -> a readWith p t inp = runIdentity $ readWithM p t inp -readWithWarnings :: Parser [Char] ParserState a - -> ParserState - -> String - -> (a, [String]) -readWithWarnings p = readWith $ do +returnWarnings :: (Stream s m c) + => ParserT s ParserState m a + -> ParserT s ParserState m (a, [String]) +returnWarnings p = do doc <- p warnings <- stateWarnings <$> getState return (doc, warnings) diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs index b9a77c5d6..4ae9d52ae 100644 --- a/src/Text/Pandoc/Readers/RST.hs +++ b/src/Text/Pandoc/Readers/RST.hs @@ -58,7 +58,7 @@ readRST :: ReaderOptions -- ^ Reader options readRST opts s = (readWith parseRST) def{ stateOptions = opts } (s ++ "\n\n") readRSTWithWarnings :: ReaderOptions -> String -> (Pandoc, [String]) -readRSTWithWarnings opts s = (readWithWarnings parseRST) def{ stateOptions = opts } (s ++ "\n\n") +readRSTWithWarnings opts s = (readWith (returnWarnings parseRST)) def{ stateOptions = opts } (s ++ "\n\n") type RSTParser = Parser [Char] ParserState |