diff --git a/datadir/resources/search.xml b/datadir/resources/search.xml
--- a/datadir/resources/search.xml
+++ b/datadir/resources/search.xml
@@ -11,8 +11,8 @@
- http://haskell.org/hoogle/datadir/resources/favicon.png
- http://haskell.org/hoogle/datadir/resources/favicon64.png
+ http://haskell.org/hoogle/res/favicon.png
+ http://haskell.org/hoogle/res/favicon64.png
Neil Mitchell
false
en-us
diff --git a/hoogle.cabal b/hoogle.cabal
--- a/hoogle.cabal
+++ b/hoogle.cabal
@@ -1,7 +1,7 @@
cabal-version: >= 1.10
build-type: Simple
name: hoogle
-version: 4.2.23
+version: 4.2.24
license: BSD3
license-file: docs/LICENSE
category: Development
@@ -15,7 +15,7 @@
or by approximate type signature.
homepage: http://www.haskell.org/hoogle/
bug-reports: https://github.com/ndmitchell/hoogle/issues
-stability: Beta
+tested-with: GHC==7.6.3, GHC==7.4.2
extra-source-files: README.txt
datadir/*.txt
@@ -72,8 +72,8 @@
Hoogle.Language.Haskell
other-modules:
- Data.Heap
- Data.TypeMap
+ General.Heap
+ General.TypeMap
General.Base
General.System
General.Util
@@ -172,17 +172,9 @@
Web.Template
test-suite hoogle-test
- main-is: HoogleSpec.hs
- hs-source-dirs: test
+ main-is: Test.hs
+ hs-source-dirs: src
default-language: Haskell98
type: exitcode-stdio-1.0
- build-depends:
- base >=3,
- hoogle,
- conduit >= 0.2,
- system-fileio >= 0.3.11,
- transformers >= 0.2,
- HUnit >= 1.2.5,
- hspec >= 1.4.4,
- hspec-expectations >= 0.3
+ build-depends: base >= 3, process, directory, filepath
diff --git a/src/Console/All.hs b/src/Console/All.hs
--- a/src/Console/All.hs
+++ b/src/Console/All.hs
@@ -29,10 +29,9 @@
action (Test files _) = do
testPrepare
fails <- fmap sum $ mapM (testFile action) files
- putStrLn $
- if fails == 0
- then "Tests passed"
- else "TEST FAILURES (" ++ show fails ++ ")"
+ if fails == 0 then putStrLn "Tests passed" else do
+ putStrLn $ "TEST FAILURES (" ++ show fails ++ ")"
+ exitFailure
action (Rank file) = rank file
diff --git a/src/Console/Test.hs b/src/Console/Test.hs
--- a/src/Console/Test.hs
+++ b/src/Console/Test.hs
@@ -22,6 +22,7 @@
putStrLn "Converting testdata"
performGC -- clean up the databases
dat <- getDataDir
+ createDirectoryIfMissing True $ dat "databases"
src <- readFileUtf8 $ dat "testdata.txt"
let (errs, dbOld) = createDatabase Haskell [] src
unless (null errs) $ error $ unlines $ "Couldn't convert testdata database:" : map show errs
diff --git a/src/Data/Heap.hs b/src/Data/Heap.hs
deleted file mode 100644
--- a/src/Data/Heap.hs
+++ /dev/null
@@ -1,75 +0,0 @@
-
-module Data.Heap(
- Heap, empty,
- fromList, toList, elems,
- singleton,
- insert, insertList,
- pop, popUntil, popWhile
- ) where
-
-import Prelude
-import qualified Data.Map as Map
-
-
--- (k,v) pairs are stored in reverse order
-
-newtype Heap k v = Heap (Map.Map k [(k,v)])
-
-empty :: Heap k v
-empty = Heap Map.empty
-
-
-fromList :: Ord k => [(k,v)] -> Heap k v
-fromList xs = insertList xs empty
-
-
-toList :: Heap k v -> [(k,v)]
-toList (Heap mp) = concatMap reverse $ Map.elems mp
-
-
-elems :: Heap k v -> [v]
-elems (Heap mp) = concatMap (reverse . map snd) $ Map.elems mp
-
-
-singleton :: Ord k => k -> v -> Heap k v
-singleton k v = insert k v empty
-
-
--- insert a value with a cost, does NOT overwrite values
-insert :: Ord k => k -> v -> Heap k v -> Heap k v
-insert k v (Heap xs) = Heap $ Map.insertWith (++) k [(k,v)] xs
-
-
-insertList :: Ord k => [(k,v)] -> Heap k v -> Heap k v
-insertList xs mp = foldr (uncurry insert) mp xs
-
-
--- retrieve the lowest value (can use minView in the future)
--- does NOT guarantee to be the first one inserted at that level
-pop :: Ord k => Heap k v -> Maybe ((k,v), Heap k v)
-pop (Heap mp) | Map.null mp = Nothing
- | null kvs = Just ((k1,v1), Heap mp2)
- | otherwise = Just ((k1,v1), Heap $ Map.insert k kvs mp2)
- where
- ((k,(k1,v1):kvs),mp2) = Map.deleteFindMin mp
-
-
--- until you reach this key, do not pop those at this key
--- guarantees to return by order, then insertion time
-popUntil :: Ord k => k -> Heap k v -> ([v], Heap k v)
-popUntil x = popBy (< x)
-
-
--- until you reach this key, and then pop those at this key
--- guarantees to return by order, then insertion time
-popWhile :: Ord k => k -> Heap k v -> ([v], Heap k v)
-popWhile x = popBy (<= x)
-
-
-popBy :: Ord k => (k -> Bool) -> Heap k v -> ([v], Heap k v)
-popBy cmp (Heap mp)
- | Map.null mp || not (cmp k) = ([], Heap mp)
- | otherwise = (reverse (map snd kvs) ++ res, mp3)
- where
- ((k,kvs),mp2) = Map.deleteFindMin mp
- (res,mp3) = popBy cmp (Heap mp2)
diff --git a/src/Data/TypeMap.hs b/src/Data/TypeMap.hs
deleted file mode 100644
--- a/src/Data/TypeMap.hs
+++ /dev/null
@@ -1,41 +0,0 @@
-{-# LANGUAGE CPP #-}
-
-module Data.TypeMap(
- TypeMap, empty,
- lookup, insert, find
- ) where
-
-import Prelude hiding (lookup)
-import Data.Dynamic
-import Data.Maybe
-import qualified Data.Map as Map
-
-newtype TypeMap = TypeMap (Map.Map TypeRep Dynamic)
-
-
-empty :: TypeMap
-empty = TypeMap Map.empty
-
-
-lookup :: Typeable a => TypeMap -> Maybe a
-lookup (TypeMap mp) = res
- where res = fmap (fromJust . fromDynamic) $ Map.lookup (typeOf $ fromJust res) mp
-
-
-find :: Typeable a => TypeMap -> a
-find mp = res
- where res = fromMaybe (error msg) $ lookup mp
- msg = "Data.TypeMap.find, couldn't find " ++ show (typeOf res)
-
-
-insert :: Typeable a => a -> TypeMap -> TypeMap
-insert a (TypeMap mp) = TypeMap $ Map.insert (typeOf a) (toDyn a) mp
-
-
-#if __GLASGOW_HASKELL__ < 702
-instance Ord TypeRep where
- compare a b = compare (splitTyConApp a) (splitTyConApp b)
-
-instance Ord TyCon where
- compare a b = compare (tyConString a) (tyConString b)
-#endif
diff --git a/src/General/Heap.hs b/src/General/Heap.hs
new file mode 100644
--- /dev/null
+++ b/src/General/Heap.hs
@@ -0,0 +1,75 @@
+
+module General.Heap(
+ Heap, empty,
+ fromList, toList, elems,
+ singleton,
+ insert, insertList,
+ pop, popUntil, popWhile
+ ) where
+
+import Prelude
+import qualified Data.Map as Map
+
+
+-- (k,v) pairs are stored in reverse order
+
+newtype Heap k v = Heap (Map.Map k [(k,v)])
+
+empty :: Heap k v
+empty = Heap Map.empty
+
+
+fromList :: Ord k => [(k,v)] -> Heap k v
+fromList xs = insertList xs empty
+
+
+toList :: Heap k v -> [(k,v)]
+toList (Heap mp) = concatMap reverse $ Map.elems mp
+
+
+elems :: Heap k v -> [v]
+elems (Heap mp) = concatMap (reverse . map snd) $ Map.elems mp
+
+
+singleton :: Ord k => k -> v -> Heap k v
+singleton k v = insert k v empty
+
+
+-- insert a value with a cost, does NOT overwrite values
+insert :: Ord k => k -> v -> Heap k v -> Heap k v
+insert k v (Heap xs) = Heap $ Map.insertWith (++) k [(k,v)] xs
+
+
+insertList :: Ord k => [(k,v)] -> Heap k v -> Heap k v
+insertList xs mp = foldr (uncurry insert) mp xs
+
+
+-- retrieve the lowest value (can use minView in the future)
+-- does NOT guarantee to be the first one inserted at that level
+pop :: Ord k => Heap k v -> Maybe ((k,v), Heap k v)
+pop (Heap mp) | Map.null mp = Nothing
+ | null kvs = Just ((k1,v1), Heap mp2)
+ | otherwise = Just ((k1,v1), Heap $ Map.insert k kvs mp2)
+ where
+ ((k,(k1,v1):kvs),mp2) = Map.deleteFindMin mp
+
+
+-- until you reach this key, do not pop those at this key
+-- guarantees to return by order, then insertion time
+popUntil :: Ord k => k -> Heap k v -> ([v], Heap k v)
+popUntil x = popBy (< x)
+
+
+-- until you reach this key, and then pop those at this key
+-- guarantees to return by order, then insertion time
+popWhile :: Ord k => k -> Heap k v -> ([v], Heap k v)
+popWhile x = popBy (<= x)
+
+
+popBy :: Ord k => (k -> Bool) -> Heap k v -> ([v], Heap k v)
+popBy cmp (Heap mp)
+ | Map.null mp || not (cmp k) = ([], Heap mp)
+ | otherwise = (reverse (map snd kvs) ++ res, mp3)
+ where
+ ((k,kvs),mp2) = Map.deleteFindMin mp
+ (res,mp3) = popBy cmp (Heap mp2)
diff --git a/src/General/TypeMap.hs b/src/General/TypeMap.hs
new file mode 100644
--- /dev/null
+++ b/src/General/TypeMap.hs
@@ -0,0 +1,41 @@
+{-# LANGUAGE CPP #-}
+
+module General.TypeMap(
+ TypeMap, empty,
+ lookup, insert, find
+ ) where
+
+import Prelude hiding (lookup)
+import Data.Dynamic
+import Data.Maybe
+import qualified Data.Map as Map
+
+newtype TypeMap = TypeMap (Map.Map TypeRep Dynamic)
+
+
+empty :: TypeMap
+empty = TypeMap Map.empty
+
+
+lookup :: Typeable a => TypeMap -> Maybe a
+lookup (TypeMap mp) = res
+ where res = fmap (fromJust . fromDynamic) $ Map.lookup (typeOf $ fromJust res) mp
+
+
+find :: Typeable a => TypeMap -> a
+find mp = res
+ where res = fromMaybe (error msg) $ lookup mp
+ msg = "General.TypeMap.find, couldn't find " ++ show (typeOf res)
+
+
+insert :: Typeable a => a -> TypeMap -> TypeMap
+insert a (TypeMap mp) = TypeMap $ Map.insert (typeOf a) (toDyn a) mp
+
+
+#if __GLASGOW_HASKELL__ < 702
+instance Ord TypeRep where
+ compare a b = compare (splitTyConApp a) (splitTyConApp b)
+
+instance Ord TyCon where
+ compare a b = compare (tyConString a) (tyConString b)
+#endif
diff --git a/src/General/Web.hs b/src/General/Web.hs
--- a/src/General/Web.hs
+++ b/src/General/Web.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE PatternGuards #-}
{- |
@@ -15,6 +16,9 @@
import General.System
import General.Base
import Network.Wai
+#if MIN_VERSION_wai(2, 0, 0)
+import Network.Wai.Internal
+#endif
import Network.HTTP.Types
import Data.CaseInsensitive(original)
import qualified Data.ByteString.Lazy.Char8 as LBS
@@ -34,10 +38,17 @@
responseFlatten :: Response -> IO (Status, ResponseHeaders, LBString)
responseFlatten r = do
+#if MIN_VERSION_wai(2, 0, 0)
+ let (s,hs,withSrc) = responseToSource r
+ chunks <- withSrc $ \src -> src $$ consume
+ let res = toLazyByteString $ mconcat [x | Chunk x <- chunks]
+ return (s,hs,res)
+#else
let (s,hs,rest) = responseSource r
chunks <- runResourceT $ rest $$ consume
let res = toLazyByteString $ mconcat [x | Chunk x <- chunks]
return (s,hs,res)
+#endif
responseEvaluate :: Response -> IO ()
diff --git a/src/Hoogle/DataBase/TypeSearch/Graphs.hs b/src/Hoogle/DataBase/TypeSearch/Graphs.hs
--- a/src/Hoogle/DataBase/TypeSearch/Graphs.hs
+++ b/src/Hoogle/DataBase/TypeSearch/Graphs.hs
@@ -11,7 +11,7 @@
import Hoogle.Store.All
import qualified Data.IntMap as IntMap
-import qualified Data.Heap as Heap
+import qualified General.Heap as Heap
import General.Base
import General.Util
import Control.Monad.Trans.State
diff --git a/src/Recipe/Download.hs b/src/Recipe/Download.hs
--- a/src/Recipe/Download.hs
+++ b/src/Recipe/Download.hs
@@ -47,8 +47,8 @@
, (inputs <.> "txt", inputs <.> "tar.gz", "http://old.hackage.haskell.org/packages/archive/00-hoogle.tar.gz")
]
withDownloader opt downloader items
- extractTarball cabals
- extractTarball inputs
+ doesFileExist (cabals <.> "tar.gz") >>= \b -> when b $ extractTarball cabals
+ doesFileExist (inputs <.> "tar.gz") >>= \b -> when b $ extractTarball inputs
check :: String -> IO (Maybe FilePath)
diff --git a/src/Recipe/Keyword.hs b/src/Recipe/Keyword.hs
--- a/src/Recipe/Keyword.hs
+++ b/src/Recipe/Keyword.hs
@@ -13,10 +13,9 @@
translate :: String -> String
translate src = unlines $ keywordPrefix ++ items
- where items = concatMap keywordFormat $ drop 1 $ partitions (~== "") $
+ where items = concatMap keywordFormat $ partitions (~== "") $
takeWhile (~/= "