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

setupDB is now IO.

Browse Source
This commit is contained in:
Kazu Yamamoto 2014-07-17 12:25:10 +09:00
parent cee1b83daa
commit a6f08fe79f
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GHCModi.hs
View File

@ -31,7 +31,6 @@ import Data.Set (Set)
import qualified Data.Set as S import qualified Data.Set as S
import Data.Typeable (Typeable) import Data.Typeable (Typeable)
import Data.Version (showVersion) import Data.Version (showVersion)
import Exception (ghandle)
import GHC (GhcMonad) import GHC (GhcMonad)
import qualified GHC as G import qualified GHC as G
import Language.Haskell.GhcMod import Language.Haskell.GhcMod
@ -101,7 +100,7 @@ main = E.handle cmdHandler $
-- c = cradle0 { cradleCurrentDir = rootdir } TODO: ????? -- c = cradle0 { cradleCurrentDir = rootdir } TODO: ?????
setCurrentDirectory rootdir setCurrentDirectory rootdir
mvar <- liftIO newEmptyMVar mvar <- liftIO newEmptyMVar
void $ forkIO $ runGhcModT opt $ setupDB mvar void $ forkIO $ setupDB mvar
runGhcModT opt $ loop S.empty mvar runGhcModT opt $ loop S.empty mvar
where where
-- this is just in case. -- this is just in case.
@ -116,11 +115,8 @@ replace (x:xs) = x : replace xs
---------------------------------------------------------------- ----------------------------------------------------------------
setupDB :: IOish m => MVar SymbolDb -> GhcModT m () setupDB :: MVar SymbolDb -> IO ()
setupDB mvar = ghandle handler $ do setupDB mvar = getSymbolDb >>= putMVar mvar
liftIO (putMVar mvar =<< getSymbolDb)
where
handler (SomeException _) = return () -- fixme: put emptyDb?
---------------------------------------------------------------- ----------------------------------------------------------------