From 718b3fa3df4d2a0046d4f10d03b87eee4f107df8 Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Mon, 6 Feb 2012 15:13:41 +0900 Subject: [PATCH] cosmetic change. --- CabalDev.hs | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/CabalDev.hs b/CabalDev.hs index 41c5cb0..c002cdf 100644 --- a/CabalDev.hs +++ b/CabalDev.hs @@ -1,10 +1,8 @@ --- {-# LANGUAGE DoAndIfThenElse #-} -- not in GHC 6.12.3 - module CabalDev (modifyOptions) where {- -If the directory 'cabal-dev/packages-X.X.X.conf' exists, add it to the -options ghc-mod uses to check the source. Otherwise just pass it on. + If the directory 'cabal-dev/packages-X.X.X.conf' exists, add it to the + options ghc-mod uses to check the source. Otherwise just pass it on. -} import Control.Applicative ((<$>)) @@ -17,33 +15,33 @@ import Types modifyOptions :: Options -> IO Options modifyOptions opts = - fmap (has_cdev opts) findCabalDev - where - has_cdev :: Options -> Maybe String -> Options - has_cdev op Nothing = op - has_cdev op (Just path) = addPath op path + fmap (has_cdev opts) findCabalDev + where + has_cdev :: Options -> Maybe String -> Options + has_cdev op Nothing = op + has_cdev op (Just path) = addPath op path findCabalDev :: IO (Maybe String) findCabalDev = - getCurrentDirectory >>= searchIt . splitPath + getCurrentDirectory >>= searchIt . splitPath addPath :: Options -> String -> Options addPath orig_opts path = do - let orig_ghcopt = ghcOpts orig_opts - orig_opts { ghcOpts = orig_ghcopt ++ ["-package-conf", path] } + let orig_ghcopt = ghcOpts orig_opts + orig_opts { ghcOpts = orig_ghcopt ++ ["-package-conf", path] } searchIt :: [FilePath] -> IO (Maybe FilePath) searchIt [] = return Nothing searchIt path = do - a <- doesDirectoryExist (mpath path) - if a then do - findConf (mpath path) - else - searchIt $ init path + a <- doesDirectoryExist (mpath path) + if a then do + findConf (mpath path) + else + searchIt $ init path where mpath a = joinPath a "cabal-dev/" findConf :: FilePath -> IO (Maybe FilePath) findConf path = do - f <- find (=~ "packages.*\\.conf") <$> getDirectoryContents path - return $ ((path ) <$> f) + f <- find (=~ "packages.*\\.conf") <$> getDirectoryContents path + return $ ((path ) <$> f)