hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosmetic change.

Browse Source
This commit is contained in:
Kazu Yamamoto 2013-03-04 10:40:06 +09:00
parent d76b17bc4b
commit 2e440f9214
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Cradle.hs
View File

@ -22,16 +22,18 @@ findCradle (Just sbox) = do
cfiles <- cabalDir wdir cfiles <- cabalDir wdir
return $ case cfiles of return $ case cfiles of
Nothing -> Cradle { Nothing -> Cradle {
cradleCurrentDir = wdir cradleCurrentDir = wdir
, cradleCabalDir = Nothing , cradleCabalDir = Nothing
, cradleCabalFile = Nothing , cradleCabalFile = Nothing
, cradlePackageConfOpts = Just confOpts , cradlePackageConfOpts = Just confOpts
, cradleGHCVersion = strver
} }
Just (cdir,cfile) -> Cradle { Just (cdir,cfile) -> Cradle {
cradleCurrentDir = wdir cradleCurrentDir = wdir
, cradleCabalDir = Just cdir , cradleCabalDir = Just cdir
, cradleCabalFile = Just cfile , cradleCabalFile = Just cfile
, cradlePackageConfOpts = Just confOpts , cradlePackageConfOpts = Just confOpts
, cradleGHCVersion = strver
} }
findCradle Nothing = do findCradle Nothing = do
(strver, ver) <- ghcVersion (strver, ver) <- ghcVersion
@ -39,10 +41,11 @@ findCradle Nothing = do
cfiles <- cabalDir wdir cfiles <- cabalDir wdir
case cfiles of case cfiles of
Nothing -> return Cradle { Nothing -> return Cradle {
cradleCurrentDir = wdir cradleCurrentDir = wdir
, cradleCabalDir = Nothing , cradleCabalDir = Nothing
, cradleCabalFile = Nothing , cradleCabalFile = Nothing
, cradlePackageConfOpts = Nothing , cradlePackageConfOpts = Nothing
, cradleGHCVersion = strver
} }
Just (cdir,cfile) -> do Just (cdir,cfile) -> do
let sbox = cdir </> "cabal-dev/" let sbox = cdir </> "cabal-dev/"
@ -54,6 +57,7 @@ findCradle Nothing = do
, cradleCabalDir = Just cdir , cradleCabalDir = Just cdir
, cradleCabalFile = Just cfile , cradleCabalFile = Just cfile
, cradlePackageConfOpts = if exist then Just confOpts else Nothing , cradlePackageConfOpts = if exist then Just confOpts else Nothing
, cradleGHCVersion = strver
} }
cabalDir :: FilePath -> IO (Maybe (FilePath,FilePath)) cabalDir :: FilePath -> IO (Maybe (FilePath,FilePath))