Add a Util module and move some functions out to it

Author: ndmitchell

hlint.cabal

@@ -40,6 +40,7 @@ executable hlint
         Report
         Type
         Test
+        Util
         HSE.All
         HSE.Bracket
         HSE.Evaluate

src/CmdLine.hs

@@ -11,6 +11,7 @@ import System.Exit
 import System.FilePath
 import HSE.All
 
+import Util
 import Paths_hlint
 import Data.Version
 
@@ -89,29 +90,3 @@ getFile file = do
         b <- doesFileExist file
         when (not b) $ error $ "Couldn't find file: " ++ file
         return [file]
-
-
-getDirectoryContentsRecursive :: FilePath -> IO [FilePath]
-getDirectoryContentsRecursive dir = do
-    xs <- getDirectoryContents dir
-    (dirs,files) <- partitionM doesDirectoryExist [dir </> x | x <- xs, not $ isBadDir x]
-    rest <- concatMapM getDirectoryContentsRecursive dirs
-    return $ files++rest
-
-
-partitionM :: Monad m => (a -> m Bool) -> [a] -> m ([a], [a])
-partitionM f [] = return ([], [])
-partitionM f (x:xs) = do
-    res <- f x
-    (as,bs) <- partitionM f xs
-    return ([x|res]++as, [x|not res]++bs)
-
-
-concatMapM :: Monad m => (a -> m [b]) -> [a] -> m [b]
-concatMapM f = liftM concat . mapM f
-
-
-isBadDir :: FilePath -> Bool
-isBadDir x = "." `isPrefixOf` x || "_" `isPrefixOf` x
-
-

src/HSE/All.hs

@@ -15,7 +15,7 @@ import HSE.Evaluate
 import HSE.Bracket
 import HSE.Match
 import HSE.Operators
-
+import Util
 
 
 -- | On failure returns an empty module and prints to the console

src/HSE/Util.hs

@@ -7,19 +7,7 @@ import Data.Generics.PlateData
 import Data.List
 import Data.Maybe
 import Language.Haskell.Exts
-
-
----------------------------------------------------------------------
--- GENERAL FUNCTIONS
-
-headDef :: a -> [a] -> a
-headDef x [] = x
-headDef x (y:ys) = y
-
-
-limit :: Int -> String -> String
-limit n s = if null post then s else pre ++ "..."
-    where (pre,post) = splitAt n s
+import Util
 
 
 ---------------------------------------------------------------------

src/Main.hs

@@ -14,6 +14,7 @@ import Settings
 import Report
 import Type
 import Test
+import Util
 import HSE.All
 import Hint.All
 import Paths_hlint
@@ -25,7 +26,7 @@ main = do
         settings <- readSettings cmdHintFiles
         let extra = [Classify ("","") Ignore x | x <- cmdIgnore]
         let apply = map (classify $ settings ++ extra) . applyHint (readHints settings)
-        ideas <- liftM concat $ mapM (liftM apply . parseFile) cmdFiles
+        ideas <- concatMapM (liftM apply . parseFile) cmdFiles
         mapM_ print [i | i <- ideas, cmdShowAll || rank i /= Ignore]
 
         -- figure out statistics        

src/Util.hs

@@ -0,0 +1,41 @@
+
+module Util where
+
+import Control.Monad
+import Data.List
+import System.Directory
+import System.FilePath
+
+
+getDirectoryContentsRecursive :: FilePath -> IO [FilePath]
+getDirectoryContentsRecursive dir = do
+    xs <- getDirectoryContents dir
+    (dirs,files) <- partitionM doesDirectoryExist [dir </> x | x <- xs, not $ isBadDir x]
+    rest <- concatMapM getDirectoryContentsRecursive dirs
+    return $ files++rest
+    where
+        isBadDir x = "." `isPrefixOf` x || "_" `isPrefixOf` x
+
+
+partitionM :: Monad m => (a -> m Bool) -> [a] -> m ([a], [a])
+partitionM f [] = return ([], [])
+partitionM f (x:xs) = do
+    res <- f x
+    (as,bs) <- partitionM f xs
+    return ([x|res]++as, [x|not res]++bs)
+
+
+concatMapM :: Monad m => (a -> m [b]) -> [a] -> m [b]
+concatMapM f = liftM concat . mapM f
+
+
+headDef :: a -> [a] -> a
+headDef x [] = x
+headDef x (y:ys) = y
+
+
+limit :: Int -> String -> String
+limit n s = if null post then s else pre ++ "..."
+    where (pre,post) = splitAt n s
+
+