Merge remote-tracking branch 'kazu/master'

src/GHCMod.hs

@@ -10,6 +10,7 @@ import qualified Control.Exception as E
 import Data.Typeable (Typeable)
 import Data.Version (showVersion)
 import Language.Haskell.GhcMod
+import Language.Haskell.GhcMod.Ghc
 import Language.Haskell.GhcMod.Monad
 import Paths_ghc_mod
 import System.Console.GetOpt (OptDescr(..), ArgDescr(..), ArgOrder(..))
@@ -130,6 +131,7 @@ main = flip E.catches handlers $ do
       "lint"    -> nArgs 1 $ withFile lint cmdArg1
       "root"    -> rootInfo
       "doc"     -> nArgs 1 $ pkgDoc cmdArg1
+      "dumpsym" -> dumpSymbol
       "boot"    -> boot
       "version" -> return progVersion
       "help"    -> return $ O.usageInfo usage argspec

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,15 +115,12 @@ replace (x:xs)    =  x  : replace xs
 
 ----------------------------------------------------------------
 
-setupDB :: IOish m => MVar SymMdlDb -> GhcModT m ()
-setupDB mvar = ghandle handler $ do
-    liftIO . putMVar mvar =<< getSymMdlDb
-  where
-    handler (SomeException _) = return () -- fixme: put emptyDb?
+setupDB :: MVar SymbolDb -> IO ()
+setupDB mvar = getSymbolDb >>= putMVar mvar
 
 ----------------------------------------------------------------
 
-loop :: IOish m => Set FilePath -> MVar SymMdlDb -> GhcModT m ()
+loop :: IOish m => Set FilePath -> MVar SymbolDb -> GhcModT m ()
 loop set mvar = do
     cmdArg <- liftIO getLine
     let (cmd,arg') = break (== ' ') cmdArg
@@ -193,12 +189,12 @@ isSameMainFile file (Just x)
 
 ----------------------------------------------------------------
 
-findSym :: IOish m => Set FilePath -> String -> MVar SymMdlDb
+findSym :: IOish m => Set FilePath -> String -> MVar SymbolDb
         -> GhcModT m (String, Bool, Set FilePath)
 findSym set sym mvar = do
     db <- liftIO $ readMVar mvar
     opt <- options
-    let ret = lookupSym' opt sym db
+    let ret = lookupSymbol opt sym db
     return (ret, True, set)
 
 lintStx :: IOish m => Set FilePath