From a6f08fe79f40f55e7e3f969dfb6a528a8703270d Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Thu, 17 Jul 2014 12:25:10 +0900 Subject: [PATCH] setupDB is now IO. --- src/GHCModi.hs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/GHCModi.hs b/src/GHCModi.hs index a60cdb4..16554c3 100644 --- a/src/GHCModi.hs +++ b/src/GHCModi.hs @@ -31,7 +31,6 @@ import Data.Set (Set) import qualified Data.Set as S import Data.Typeable (Typeable) import Data.Version (showVersion) -import Exception (ghandle) import GHC (GhcMonad) import qualified GHC as G import Language.Haskell.GhcMod @@ -101,7 +100,7 @@ main = E.handle cmdHandler $ -- c = cradle0 { cradleCurrentDir = rootdir } TODO: ????? setCurrentDirectory rootdir mvar <- liftIO newEmptyMVar - void $ forkIO $ runGhcModT opt $ setupDB mvar + void $ forkIO $ setupDB mvar runGhcModT opt $ loop S.empty mvar where -- this is just in case. @@ -116,11 +115,8 @@ replace (x:xs) = x : replace xs ---------------------------------------------------------------- -setupDB :: IOish m => MVar SymbolDb -> GhcModT m () -setupDB mvar = ghandle handler $ do - liftIO (putMVar mvar =<< getSymbolDb) - where - handler (SomeException _) = return () -- fixme: put emptyDb? +setupDB :: MVar SymbolDb -> IO () +setupDB mvar = getSymbolDb >>= putMVar mvar ----------------------------------------------------------------