packages feed

wraxml 0.4.3 → 0.4.3.1

raw patch · 7 files changed

+21/−27 lines, 7 filesdep ~basedep ~containersdep ~hxt

Dependency ranges changed: base, containers, hxt, tagsoup, transformers

Files

src/Text/HTML/WraXML/Tree/HXT.hs view
@@ -30,9 +30,6 @@ import Text.XML.HXT.Parser.HtmlParser (parseHtmlDoc, ) import Text.XML.HXT.Parser.HtmlParsec (isEmptyHtmlTag, ) import Text.XML.HXT.DOM.EditFilters   (escapeXmlDoc, )-import Text.XML.HXT.DOM.ShowXml       (xshow, {- showXmlTree, showQName, -})-import Text.XML.HXT.DOM.QualifiedName (qualifiedName, )-import Data.Tree.NTree.Filter         (liftMf, )  import Control.Monad (msum, ) import Data.Maybe (fromMaybe, )
src/Text/XML/WraXML/Document/TagSoup.hs view
@@ -39,7 +39,7 @@  toXmlDocument ::    (Name.Tag name, Name.Attribute name) =>-   [Tag] -> XmlDoc.T Position.T name String+   [Tag String] -> XmlDoc.T Position.T name String toXmlDocument ts =    flip evalState       (TreeTagSoup.removeMetaPos@@ -67,7 +67,7 @@  toXmlDocumentString ::    (Name.Tag name, Name.Attribute name) =>-   [Tag] -> XmlDoc.T Position.T name String+   [Tag String] -> XmlDoc.T Position.T name String toXmlDocumentString =    toXmlDocument {- this would only work for String, because of isSpace@@ -82,6 +82,6 @@ example :: IO () example =   print .-  (toXmlDocumentString :: [Tag] -> XmlDoc.T Position.T NameLC.T String) .+  (toXmlDocumentString :: [Tag String] -> XmlDoc.T Position.T NameLC.T String) .   Tag.parseTagsOptions TreeTagSoup.parseOptions     =<< readFile "/home/thielema/public_html/index.html"
src/Text/XML/WraXML/Element.hs view
@@ -13,7 +13,6 @@ import           Data.Monoid (mconcat, )  import qualified Text.XML.Basic.Format as Format-import qualified Text.Show as Show   data T name str =
src/Text/XML/WraXML/Tree.hs view
@@ -58,7 +58,7 @@    | Warning String  -- better 'str'?  -{-# DEPRECTATED AttributePlain "use Attribute type from xml-basic package instead" #-}+{-# DEPRECATED AttributePlain "use Attribute type from xml-basic package instead" #-} type AttributePlain = (String, String)
src/Text/XML/WraXML/Tree/HXT.hs view
@@ -24,7 +24,6 @@  -- needed for code copies from HXT at the of the file import Text.XML.HXT.DOM.XmlTree (QName, NTree, XNode, )-import Text.XML.HXT.DOM.QualifiedName (qualifiedName)   {- * conversion from our XML tree to HXT tree -}
src/Text/XML/WraXML/Tree/TagSoup.hs view
@@ -4,12 +4,11 @@ module Text.XML.WraXML.Tree.TagSoup where  import qualified Text.HTML.TagSoup as Tag+import qualified Text.HTML.TagSoup as Match -- TagSoup.Match became hidden in tagsoup-0.8 import Text.HTML.TagSoup (Tag(..), )  import qualified Text.XML.WraXML.Tree.Literal as XmlTree -import qualified Text.HTML.TagSoup.Match as Match- import qualified Text.HTML.Basic.Tag as TagH import qualified Text.XML.Basic.Position as Position import qualified Text.XML.Basic.Attribute as Attr@@ -29,14 +28,14 @@ import qualified Data.List as List  -type PosTag = (Position.T, Tag)+type PosTag = (Position.T, Tag String) -- data PosTag = PosTag !Position.T Tag   defaultFilename :: String defaultFilename = "input" -attachPos :: [Tag] -> [PosTag]+attachPos :: [Tag String] -> [PosTag] attachPos =    snd .    List.mapAccumL@@ -73,7 +72,7 @@  toXmlTreesString ::    (Name.Tag name, Name.Attribute name) =>-   [Tag] -> [XmlTree name String]+   [Tag String] -> [XmlTree name String] toXmlTreesString =    toXmlTreesAux .    removeMetaPos .@@ -90,7 +89,7 @@   -type Parser i a = Parser.Parser (i, Tag) a+type Parser i a = Parser.Parser (i, Tag String) a   parseBranch ::@@ -147,7 +146,7 @@    ParserU.force $    if TagH.isEmpty name      then-       (Parser.satisfy (Match.tagCloseLit (Name.toString name) . snd) >> return [])+       (Parser.satisfy (Match.isTagCloseName (Name.toString name) . snd) >> return [])          `Parser.onFail` return []      else        ParserU.manyFinallyAppend@@ -190,7 +189,7 @@          _ -> fail $ "not a termination of a tag"  -parseOptions :: Tag.ParseOptions+parseOptions :: Tag.ParseOptions String parseOptions =    Tag.parseOptions       {Tag.optTagPosition = True,
wraxml.cabal view
@@ -1,10 +1,10 @@ Name:           wraxml-Version:        0.4.3+Version:        0.4.3.1 License:        GPL License-File:   LICENSE Author:         Henning Thielemann <haskell@henning-thielemann.de> Maintainer:     Henning Thielemann <haskell@henning-thielemann.de>-Homepage:       http://darcs.haskell.org/wraxml/+Homepage:       http://code.haskell.org/~thielema/wraxml/ Category:       XML Synopsis:   Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure Description:@@ -46,12 +46,12 @@  Source-Repository head    Type:     darcs-   Location: http://darcs.haskell.org/wraxml/+   Location: http://code.haskell.org/~thielema/wraxml/  Source-Repository this    Type:     darcs-   Location: http://darcs.haskell.org/wraxml/-   Tag:      0.4.3+   Location: http://code.haskell.org/~thielema/wraxml/+   Tag:      0.4.3.1  Flag buildExamples    description: Build example executables@@ -60,18 +60,18 @@ Library   Build-Depends:     polyparse >=1.2 && <1.4,-    tagsoup >=0.6 && <0.7,+    tagsoup >=0.8 && <0.11,     tagchup >=0.4 && <0.5,     xml-basic >=0.1 && <0.2,     HaXml >=1.19.4 && <1.20,-    hxt >=8.1.0 && <9,+    hxt >=8.5.0 && <8.6,     hxt-filter >=8.1.1 && <9,-    transformers >=0.1 && <0.2,+    transformers >=0.2 && <0.3,     utility-ht >=0.0.4 && <0.1,     explicit-exception >=0.1.3 && <0.2,     data-accessor >=0.2 && <0.3,-    containers >=0.1 && <0.3,-    base >=3 && <4+    containers >=0.1 && <0.5,+    base >=3 && <5   GHC-Options:    -Wall   Hs-source-dirs: src   Exposed-modules: