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

Obsoleting fromCabalFile.

Browse Source
This commit is contained in:
Kazu Yamamoto
2013-09-19 16:21:48 +09:00
parent 97da4e9be1
commit 8e4d2cec21
4 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Language/Haskell/GhcMod/GHCApi.hs
View File

@@ -16,7 +16,7 @@ import Control.Applicative
import Control.Exception
import Control.Monad
import CoreMonad
import Data.Maybe (isJust)
import Data.Maybe (isJust,fromJust)
import DynFlags
import Exception
import GHC
@@ -65,9 +65,11 @@ initializeFlagsWithCradle opt cradle ghcopts logging
| cabal = withCabal |||> withoutCabal
| otherwise = withoutCabal
where
cabal = isJust $ cradleCabalFile cradle
mCradleFile = cradleCabalFile cradle
cabal = isJust mCradleFile
withCabal = do
compOpts <- liftIO $ fromCabalFile ghcopts cradle
pkgDesc <- liftIO $ parseCabalFile $ fromJust mCradleFile
compOpts <- liftIO $ getCompilerOptions ghcopts cradle pkgDesc
initSession CabalPkg opt compOpts logging
withoutCabal =
initSession SingleFile opt compOpts logging