From 0b97160b4d55eca16f3c56b47a908997fc458284 Mon Sep 17 00:00:00 2001 From: pho Date: Wed, 18 Jun 2008 18:01:00 +0900 Subject: [PATCH] fixed the compilation breakage with newer HXT darcs-hash:20080618090100-62b54-ca69b03247eba0313ee45ae89ecace0533c37321.gz --- Rakka.cabal | 4 ++-- Rakka/Page.hs | 8 ++------ Rakka/Resource/PageEntity.hs | 12 ++---------- Rakka/Resource/Search.hs | 9 +-------- Rakka/TrackBack.hs | 8 ++------ Rakka/Wiki/Engine.hs | 6 +----- Rakka/Wiki/Interpreter/Base.hs | 7 ++----- schemas/rakka-page-1.0.rng | 1 + 8 files changed, 13 insertions(+), 42 deletions(-) diff --git a/Rakka.cabal b/Rakka.cabal index 7f2cef3..20efd88 100644 --- a/Rakka.cabal +++ b/Rakka.cabal @@ -5,8 +5,8 @@ Description: similar to MediaWiki. Version: 0.1 License: PublicDomain -Author: PHO -Maintainer: PHO +Author: PHO +Maintainer: PHO Stability: experimental Homepage: http://rakka.cielonegro.org/ Category: Web diff --git a/Rakka/Page.hs b/Rakka/Page.hs index 114e2d0..4dd5fcf 100644 --- a/Rakka/Page.hs +++ b/Rakka/Page.hs @@ -29,9 +29,6 @@ module Rakka.Page where import qualified Codec.Binary.UTF8.String as UTF8 -import Control.Arrow -import Control.Arrow.ArrowIO -import Control.Arrow.ArrowList import qualified Data.ByteString.Lazy as Lazy (ByteString) import qualified Data.ByteString.Lazy as L hiding (ByteString) import qualified Data.ByteString.Lazy.Char8 as L8 hiding (ByteString) @@ -47,8 +44,7 @@ import Rakka.Utils import Rakka.W3CDateTime import Subversion.Types import System.FilePath.Posix -import Text.XML.HXT.Arrow.XmlArrow -import Text.XML.HXT.Arrow.XmlNodeSet +import Text.XML.HXT.Arrow import Text.XML.HXT.DOM.TypeDefs @@ -393,4 +389,4 @@ parseUpdateInfo , uiOldName = oldName } - \ No newline at end of file + diff --git a/Rakka/Resource/PageEntity.hs b/Rakka/Resource/PageEntity.hs index 3ff0bba..670958e 100644 --- a/Rakka/Resource/PageEntity.hs +++ b/Rakka/Resource/PageEntity.hs @@ -3,10 +3,6 @@ module Rakka.Resource.PageEntity ) where -import Control.Arrow -import Control.Arrow.ArrowIO -import Control.Arrow.ArrowIf -import Control.Arrow.ArrowList import Control.Monad.Trans import Data.Char import qualified Data.Map as M @@ -25,11 +21,7 @@ import Rakka.W3CDateTime import Rakka.Wiki.Engine import System.FilePath import Text.HyperEstraier hiding (getText) -import Text.XML.HXT.Arrow.Namespace -import Text.XML.HXT.Arrow.WriteDocument -import Text.XML.HXT.Arrow.XmlArrow -import Text.XML.HXT.Arrow.XmlIOStateArrow -import Text.XML.HXT.Arrow.XmlNodeSet +import Text.XML.HXT.Arrow import Text.XML.HXT.DOM.TypeDefs import Text.XML.HXT.DOM.XmlKeywords @@ -582,4 +574,4 @@ findFeeds sto mkFeedURIStr :: URI -> PageName -> String mkFeedURIStr baseURI name - = uriToString id (mkFeedURI baseURI name) "" \ No newline at end of file + = uriToString id (mkFeedURI baseURI name) "" diff --git a/Rakka/Resource/Search.hs b/Rakka/Resource/Search.hs index c46d401..7318e30 100644 --- a/Rakka/Resource/Search.hs +++ b/Rakka/Resource/Search.hs @@ -4,11 +4,6 @@ module Rakka.Resource.Search where import qualified Codec.Binary.UTF8.String as UTF8 -import Control.Arrow -import Control.Arrow.ArrowIO -import Control.Arrow.ArrowIf -import Control.Arrow.ArrowList -import Control.Arrow.ArrowTree import Control.Monad.Trans import Data.Maybe import Data.Time @@ -25,9 +20,7 @@ import Rakka.W3CDateTime import Rakka.Wiki.Engine import System.FilePath import Text.HyperEstraier hiding (getText) -import Text.XML.HXT.Arrow.Namespace -import Text.XML.HXT.Arrow.XmlArrow -import Text.XML.HXT.Arrow.XmlNodeSet +import Text.XML.HXT.Arrow import Text.XML.HXT.DOM.TypeDefs diff --git a/Rakka/TrackBack.hs b/Rakka/TrackBack.hs index 4155e34..8b1d2cb 100644 --- a/Rakka/TrackBack.hs +++ b/Rakka/TrackBack.hs @@ -3,17 +3,13 @@ module Rakka.TrackBack ) where -import Control.Arrow -import Control.Arrow.ArrowList -import Control.Arrow.ArrowTree import Data.Maybe import Data.Time import Network.URI import Rakka.Attachment import Rakka.Utils import Rakka.W3CDateTime -import Text.XML.HXT.Arrow.XmlArrow -import Text.XML.HXT.Arrow.XmlNodeSet +import Text.XML.HXT.Arrow import Text.XML.HXT.DOM.TypeDefs @@ -97,4 +93,4 @@ instance Attachment [TrackBack] where , tbURL = url , tbBlogName = blogName , tbTime = time - } \ No newline at end of file + } diff --git a/Rakka/Wiki/Engine.hs b/Rakka/Wiki/Engine.hs index dc3d4f1..e135f15 100644 --- a/Rakka/Wiki/Engine.hs +++ b/Rakka/Wiki/Engine.hs @@ -9,9 +9,6 @@ module Rakka.Wiki.Engine where import qualified Codec.Binary.UTF8.String as UTF8 -import Control.Arrow -import Control.Arrow.ArrowIO -import Control.Arrow.ArrowList import qualified Data.ByteString.Lazy as Lazy import qualified Data.ByteString.Lazy.Char8 as L8 hiding (ByteString) import Data.Map (Map) @@ -30,8 +27,7 @@ import Rakka.Wiki.Formatter import Rakka.Wiki.Interpreter import Text.HyperEstraier hiding (getText) import Text.ParserCombinators.Parsec -import Text.XML.HXT.Arrow.XmlArrow hiding (err) -import Text.XML.HXT.Arrow.XmlNodeSet +import Text.XML.HXT.Arrow hiding (err) import Text.XML.HXT.DOM.TypeDefs diff --git a/Rakka/Wiki/Interpreter/Base.hs b/Rakka/Wiki/Interpreter/Base.hs index b17af32..2363b9b 100644 --- a/Rakka/Wiki/Interpreter/Base.hs +++ b/Rakka/Wiki/Interpreter/Base.hs @@ -3,8 +3,6 @@ module Rakka.Wiki.Interpreter.Base ) where -import Control.Arrow -import Control.Arrow.ListArrow import Data.Map (Map) import qualified Data.Map as M import Data.Maybe @@ -12,8 +10,7 @@ import Rakka.Page import Rakka.SystemConfig import Rakka.Wiki import Rakka.Wiki.Interpreter -import Text.XML.HXT.Arrow.XmlArrow -import Text.XML.HXT.Arrow.XmlNodeSet +import Text.XML.HXT.Arrow interpreters :: [Interpreter] @@ -176,4 +173,4 @@ searchFieldInterp ] in return (Input attrs) - } \ No newline at end of file + } diff --git a/schemas/rakka-page-1.0.rng b/schemas/rakka-page-1.0.rng index e3ff797..27d3cfa 100644 --- a/schemas/rakka-page-1.0.rng +++ b/schemas/rakka-page-1.0.rng @@ -11,6 +11,7 @@ 0 + 0 -- 2.40.0