hunt changed to work with ghc-7.10.3 and lts-5.9 without warnings

hunt-framework · Mar 24, 2016 · 481cabc · 481cabc
1 parent 1b32f37
commit 481cabc
Show file tree

Hide file tree

Showing 70 changed files with 642 additions and 874 deletions.
diff --git a/Makefile b/Makefile
@@ -14,6 +14,7 @@ RTSPROF =
 RUNOPTS = +RTS $(RTSPROF) -RTS
 PATTERN =
 
+# put $HOME/.local/bin into PATH
 SERVER  = http://localhost:3000
 EXE     = hunt-server
 PROFSH  = ./prof.sh

diff --git a/html-hunter/HtmlHunter.hs b/html-hunter/HtmlHunter.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE FlexibleContexts  #-}
 
 -- ------------------------------------------------------------
 
@@ -20,31 +21,25 @@ module Main
     (main)
 where
 
-import           Control.Applicative
-import qualified Control.Monad                        as CM (when)
-import           Control.Monad.Error                  hiding (when)
-import           Control.Monad.IO.Class               ()
-import           Control.Monad.Reader                 hiding (when)
-
-import           Data.Char                            (isAlphaNum)
-import           Data.List                            (intercalate)
-import           Data.Maybe                           (fromMaybe)
-import           Data.Text                            (Text)
-import qualified Data.Text                            as T
-
+import qualified Control.Monad as CM (when)
+import           Control.Monad.Except hiding (when)
+import           Control.Monad.IO.Class ()
+import           Control.Monad.Reader hiding (when)
+import           Data.Char (isAlphaNum)
+import           Data.List (intercalate)
+import           Data.Maybe (fromMaybe)
+import           Data.Text (Text)
+import qualified Data.Text as T
 import           Hunt.ClientInterface
-import           Hunt.Server.Client                   (evalOnServer_)
-
-import           Text.Regex.XMLSchema.String          (match)
-import           Text.XML.HXT.Arrow.XmlState.TypeDefs
-import           Text.XML.HXT.Core
-import           Text.XML.HXT.HTTP
-import           Text.XML.HXT.XPath                   (getXPathTreesInDoc,
-                                                       parseXPathExpr)
-
+import           Hunt.Server.Client (evalOnServer_)
 import           System.Console.CmdArgs
 import           System.Exit
 import           System.IO
+import           Text.Regex.XMLSchema.Generic (match)
+import           Text.XML.HXT.Arrow.XmlState.TypeDefs
+import           Text.XML.HXT.Core
+import           Text.XML.HXT.HTTP
+import           Text.XML.HXT.XPath (getXPathTreesInDoc, parseXPathExpr)
 
 -- ------------------------------------------------------------
 
@@ -66,7 +61,7 @@ data ParseMode
       deriving (Data, Typeable, Eq, Show)
 
 type HIO
-    = ReaderT AppOpts (ErrorT String IO)
+    = ReaderT AppOpts (ExceptT String IO)
 
 cmdArgsDescr :: Mode (CmdArgs AppOpts)
 cmdArgsDescr
@@ -172,7 +167,7 @@ main :: IO ()
 main
     = do argl <- cmdArgsRun cmdArgsDescr
 --         print argl
-         res  <- runErrorT $ runReaderT doTheWork argl
+         res  <- runExceptT $ runReaderT doTheWork argl
          either (failure) (const exitSuccess) res
     where
       failure s

diff --git a/html-hunter/html-hunter.cabal b/html-hunter/html-hunter.cabal
@@ -1,5 +1,5 @@
 name:                html-hunter
-version:             0.1.0.0
+version:             0.1.1.0
 synopsis:            Hunting for HTML content
 description:         Extracting text out of HTML pages and prepare
                      it for feeding into the Hunt search engine
@@ -21,7 +21,7 @@ executable html-hunter
   main-is:             HtmlHunter.hs
   -- other-modules:
   -- other-extensions:
-  build-depends:   base >=4.7 && <5
+  build-depends:   base                   >=4.8 && <5
                  , bytestring             >= 0.10
                  , aeson                  >= 0.6
                  , aeson-pretty           >= 0.7
@@ -35,10 +35,8 @@ executable html-hunter
                  , hxt-regex-xmlschema    >= 9     && < 10
                  , hxt-xpath              >= 9
                  , mtl                    >= 2.1
---                 , parsec                 >= 2.1   && < 4
                  , text                   >= 0.11
                  , transformers           >= 0.3
---                 , time                   >= 1.4
 
   if flag(network-uri)
      build-depends: network-uri >= 2.6, network >= 2.6

diff --git a/hunt-client/hunt-client.cabal b/hunt-client/hunt-client.cabal
@@ -1,5 +1,5 @@
 name:          hunt-client
-version:       0.1
+version:       0.1.1
 license:       MIT
 license-file:  LICENSE
 author:        Sebastian Philipp
@@ -29,7 +29,7 @@ library
 
   build-depends:  aeson                  >= 0.6
                 , aeson-pretty
-                , base >= 4
+                , base                   >= 4.8
                 , bytestring             >= 0.9.1
                 , conduit                >= 1.1 && < 1.3
                 , conduit-combinators

diff --git a/hunt-client/src/Hunt/Conduit.hs b/hunt-client/src/Hunt/Conduit.hs
@@ -3,24 +3,18 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE UndecidableInstances  #-}
 {-# OPTIONS_GHC -fno-warn-orphans  #-}
+
 module Hunt.Conduit where
 
 import           Prelude hiding ( mapM_, map, putStrLn)
-
-import           Control.Applicative ((<$>))
 import           Control.Monad.Primitive (PrimMonad)
-
 import           Data.Aeson.Encode.Pretty (encodePretty)
 import           Data.Aeson (Value, ToJSON)
-
 import           Data.ByteString.Lazy (ByteString)
 import           Data.ByteString.Lazy.Char8  (putStrLn)
-
 import           Data.Conduit.List  (mapM_, map, mapAccum, consume)
 import           Conduit
-
 import qualified Data.Vector as Vector
-
 import           Hunt.Server.Client
 import qualified Hunt.ClientInterface as H
 

diff --git a/hunt-client/src/Hunt/Server/Client.hs b/hunt-client/src/Hunt/Server/Client.hs
@@ -3,7 +3,6 @@
 {-# LANGUAGE FlexibleInstances          #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE MultiParamTypeClasses      #-}
-{-# LANGUAGE OverlappingInstances       #-}
 {-# LANGUAGE OverloadedStrings          #-}
 
 module Hunt.Server.Client
@@ -35,41 +34,33 @@ module Hunt.Server.Client
     )
 where
 
-import           Control.Applicative          (Applicative, (<$>))
-import           Control.Exception            (Exception, throwIO)
-import           Control.Monad                (mzero, liftM)
-import           Control.Monad.Catch          (MonadThrow, throwM)
-import           Control.Monad.IO.Class       (MonadIO, liftIO)
-import           Control.Monad.Reader         (MonadReader, ReaderT, ask,
-                                               runReaderT)
-import           Control.Monad.Trans.Class    (MonadTrans, lift)
+import           Control.Exception (Exception, throwIO)
+import           Control.Monad (mzero, liftM)
+import           Control.Monad.Catch (MonadThrow, throwM)
+import           Control.Monad.IO.Class (MonadIO, liftIO)
+import           Control.Monad.Reader (MonadReader, ReaderT, ask, runReaderT)
+import           Control.Monad.Trans.Class (MonadTrans, lift)
 import           Control.Monad.Trans.Resource (MonadBaseControl, ResourceT,
                                                runResourceT)
-
-import           Data.Aeson                   (FromJSON, ToJSON, (.:), (.=))
-import qualified Data.Aeson                   as JSON
-import qualified Data.Aeson.Types             as JSON
-import           Data.ByteString.Lazy         (ByteString)
-import           Data.Char                    (toLower)
-import           Data.Default                 (Default, def)
-import           Data.String.Conversions      (cs, (<>))
-import           Data.Text                    (Text)
-import qualified Data.Text                    as T
-import           Data.Typeable                (Typeable)
-
-import qualified Network.HTTP.Client          as HTTP (defaultManagerSettings)
-import qualified Network.HTTP.Conduit         as HTTP
-import           Network.HTTP.Types.URI       (urlEncode)
-
-import qualified Hunt.ClientInterface         as H
-import qualified Hunt.Common.ApiDocument      as H (ApiDocuments)
--- import qualified Hunt.Interpreter.Command     as H (CmdRes)
--- import qualified Hunt.Common.BasicTypes       as H (RegEx, Score, Weight)
-import qualified Hunt.Index.Schema            as H (CNormalizer,
-                                                   ContextSchema (..),
-                                                  ContextType (..))
-import qualified Hunt.Interpreter.Command     as H (Command (..))
-import           Hunt.Query.Language.Grammar  (Query)
+import           Data.Aeson (FromJSON, ToJSON, (.:), (.=))
+import qualified Data.Aeson as JSON
+import qualified Data.Aeson.Types as JSON
+import           Data.ByteString.Lazy (ByteString)
+import           Data.Char (toLower)
+import           Data.Default (Default, def)
+import           Data.String.Conversions (cs, (<>))
+import           Data.Text (Text)
+import qualified Data.Text as T
+import           Data.Typeable (Typeable)
+import qualified Hunt.ClientInterface as H
+import qualified Hunt.Common.ApiDocument as H (ApiDocuments)
+import qualified Hunt.Index.Schema as H (CNormalizer, ContextSchema (..),
+                                         ContextType (..))
+import qualified Hunt.Interpreter.Command as H (Command (..))
+import           Hunt.Query.Language.Grammar (Query)
+import qualified Network.HTTP.Client as HTTP (defaultManagerSettings)
+import qualified Network.HTTP.Conduit as HTTP
+import           Network.HTTP.Types.URI (urlEncode)
 
 
 data JsonResponse r
@@ -211,8 +202,9 @@ postCommand cmd = do
                   }
     httpLbs request
 
-postCommand_ :: (MonadIO m, MonadThrow m) => H.Command -> HuntConnectionT m JSON.Value
-postCommand_ = postCommand
+-- not used
+-- postCommand_ :: (MonadIO m, MonadThrow m) => H.Command -> HuntConnectionT m JSON.Value
+-- postCommand_ = postCommand
 
 handleJsonResponse :: (FromJSON a, Monad m, MonadThrow m) => ByteString -> m a
 handleJsonResponse r

diff --git a/hunt-crawler/hunt-crawler.cabal b/hunt-crawler/hunt-crawler.cabal
@@ -1,5 +1,5 @@
 name:          hunt-crawler
-version:       0.0.0.1
+version:       0.0.1.0
 license:       MIT
 license-file:  LICENSE
 author:        Uwe Schmidt
@@ -48,7 +48,7 @@ library
     Holumbus.Crawler.XmlArrows
 
   build-depends:
-                base                   >= 4
+                base                   >= 4.8
               , binary                 >= 0.5
               , bytestring             >= 0.10.4
               , bzlib                  >= 0.4

diff --git a/hunt-crawler/src/Control/Monad/ReaderStateIOError.hs b/hunt-crawler/src/Control/Monad/ReaderStateIOError.hs
@@ -8,13 +8,13 @@ module Control.Monad.ReaderStateIOError
     ( module Control.Monad.ReaderStateIOError
     )
 where
-import           Control.Applicative
-import           Control.Monad
-import           Control.Monad.Error
-import           Control.Monad.Reader
-import           Control.Monad.State
 
-import           System.IO.Error
+import Control.Applicative ()
+import Control.Monad
+import Control.Monad.Error
+import Control.Monad.Reader
+import Control.Monad.State
+import System.IO.Error
 
 -- ------------------------------------------------------------
 

diff --git a/hunt-crawler/src/Data/IntSet/Cache.hs b/hunt-crawler/src/Data/IntSet/Cache.hs
@@ -2,9 +2,8 @@ module Data.IntSet.Cache
 where
 
 import           Control.DeepSeq
-
-import qualified Data.IntSet     as S
-import qualified Data.Vector     as V
+import qualified Data.IntSet as S
+import qualified Data.Vector as V
 
 -- ------------------------------------------------------------
 --
@@ -32,6 +31,3 @@ s1 :: S.IntSet
 s1 = cacheAt 1
 
 -- ------------------------------------------------------------
-
-
-
diff --git a/hunt-crawler/src/Holumbus/Crawler/CacheCore.hs b/hunt-crawler/src/Holumbus/Crawler/CacheCore.hs
@@ -5,19 +5,12 @@
 module Holumbus.Crawler.CacheCore
 where
 
-import           Control.DeepSeq
-
-import           Data.Binary            (Binary (..))
-{-
-import qualified Data.Binary                    as B
--- -}
-
-import           Data.Function.Selector
-
-import           Holumbus.Crawler
-
-import           Text.XML.HXT.Core
-import           Text.XML.HXT.Curl
+import Control.DeepSeq
+import Data.Binary (Binary (..))
+import Data.Function.Selector
+import Holumbus.Crawler
+import Text.XML.HXT.Core
+import Text.XML.HXT.Curl
 
 -- ------------------------------------------------------------
 
@@ -32,6 +25,7 @@ newtype CacheState              = CS ()
 -- but this can be taken as a pattern for other crawlers
 
 instance NFData CacheState where
+  rnf (CS ()) = ()
 
 instance Binary CacheState where
     put                 = const $ return ()

diff --git a/hunt-crawler/src/Holumbus/Crawler/IndexerCore.hs b/hunt-crawler/src/Holumbus/Crawler/IndexerCore.hs
@@ -28,16 +28,12 @@ where
 -- ------------------------------------------------------------
 
 import           Control.DeepSeq
-
-import           Data.Binary            (Binary)
-import qualified Data.Binary            as B
+import           Data.Binary (Binary)
+import qualified Data.Binary as B
 import           Data.Function.Selector
 import           Data.Maybe
-
 import           Holumbus.Crawler
-
--- import           Holumbus.Index.Common  hiding (URI)
-
+import           Prelude hiding (Word)
 import           Text.XML.HXT.Core
 
 -- ------------------------------------------------------------

diff --git a/hunt-crawler/src/Holumbus/Crawler/RobotTypes.hs b/hunt-crawler/src/Holumbus/Crawler/RobotTypes.hs
@@ -38,6 +38,8 @@ instance Binary RobotAction where
     get                 = B.get >>= return . toEnum
 
 instance NFData RobotAction where
+  rnf Disallow = ()
+  rnf _        = ()
 
 instance XmlPickler RobotAction where
     xpickle             = xpPrim

diff --git a/hunt-crawler/src/Holumbus/Crawler/Util.hs b/hunt-crawler/src/Holumbus/Crawler/Util.hs
@@ -5,11 +5,9 @@
 module Holumbus.Crawler.Util
 where
 
-import           Control.Applicative                            ( liftA2 )
-
+import           Control.Applicative ( liftA2 )
 import           Data.List
-
-import qualified Text.Regex.XMLSchema.String                  as RE
+import qualified Text.Regex.XMLSchema.Generic as RE
 
 -- ------------------------------------------------------------
 

diff --git a/hunt-searchengine/hunt-searchengine.cabal b/hunt-searchengine/hunt-searchengine.cabal
@@ -1,5 +1,5 @@
 name:          hunt-searchengine
-version:       0.3.0.2
+version:       0.3.1.0
 license:       MIT
 license-file:  LICENSE
 author:        Chris Reumann, Ulf Sauer, Uwe Schmidt
@@ -31,7 +31,7 @@ source-repository head
 
 library
 
-  build-depends: base                   >= 4.5     && < 5
+  build-depends: base                   >= 4.8     && < 5
                , aeson                  >= 0.6
                , aeson-pretty           >= 0.7
                , binary                 >= 0.5     && < 1