xml-conduit 1.2.3.3 → 1.2.4
raw patch · 5 files changed
+28/−6 lines, 5 files
Files
- ChangeLog.md +4/−0
- Text/XML.hs +1/−1
- Text/XML/Stream/Parse.hs +21/−3
- Text/XML/Unresolved.hs +1/−1
- xml-conduit.cabal +1/−1
ChangeLog.md view
@@ -1,3 +1,7 @@+## 1.2.4++* 'parseText' becomes 'parseText'/'parseTextPos', depending on the output type [#47](https://github.com/snoyberg/xml/pull/47)+ ## 1.2.3.3 * Allow blaze-builder 0.4
Text/XML.hs view
@@ -270,7 +270,7 @@ sinkTextDoc :: MonadThrow m => ParseSettings -> Consumer Text m Document-sinkTextDoc ps = P.parseText ps =$= fromEvents+sinkTextDoc ps = P.parseTextPos ps =$= fromEvents fromEvents :: MonadThrow m => Consumer P.EventPos m Document fromEvents = do
Text/XML/Stream/Parse.hs view
@@ -51,7 +51,9 @@ ( -- * Parsing XML files parseBytes , parseBytesPos+ , parseText' , parseText+ , parseTextPos , detectUtf , parseFile , parseLBS@@ -243,7 +245,7 @@ -- provided by libxml-enumerator. However, this has the advantage of not -- relying on any C libraries. ----- This relies on 'detectUtf' to determine character encoding, and 'parseText'+-- This relies on 'detectUtf' to determine character encoding, and 'parseText'' -- to do the actual parsing. parseBytes :: MonadThrow m => ParseSettings@@ -253,7 +255,7 @@ parseBytesPos :: MonadThrow m => ParseSettings -> Conduit S.ByteString m EventPos-parseBytesPos ps = detectUtf =$= parseText ps+parseBytesPos ps = detectUtf =$= parseTextPos ps dropBOM :: Monad m => Conduit TS.Text m TS.Text dropBOM =@@ -274,10 +276,26 @@ -- messages do not give line/column information, so you may prefer to stick -- with the parser provided by libxml-enumerator. However, this has the -- advantage of not relying on any C libraries.+--+-- Since 1.2.4+parseText' :: MonadThrow m+ => ParseSettings+ -> Conduit TS.Text m Event+parseText' = mapOutput snd . parseTextPos++{-# DEPRECATED parseText "Please use 'parseText'' or 'parseTextPos'." #-} parseText :: MonadThrow m => ParseSettings -> Conduit TS.Text m EventPos-parseText de =+parseText = parseTextPos++-- | Same as 'parseText'', but includes the position of each event.+--+-- Since 1.2.4+parseTextPos :: MonadThrow m+ => ParseSettings+ -> Conduit TS.Text m EventPos+parseTextPos de = dropBOM =$= tokenize =$= toEventC de
Text/XML/Unresolved.hs view
@@ -262,4 +262,4 @@ sinkTextDoc :: MonadThrow m => ParseSettings -> Consumer Text m Document-sinkTextDoc ps = P.parseText ps =$= fromEvents+sinkTextDoc ps = P.parseTextPos ps =$= fromEvents
xml-conduit.cabal view
@@ -1,5 +1,5 @@ name: xml-conduit-version: 1.2.3.3+version: 1.2.4 license: BSD3 license-file: LICENSE author: Michael Snoyman <michael@snoyman.com>, Aristid Breitkreuz <aristidb@googlemail.com>