diff --git a/Language/Haskell/GhcMod/Debug.hs b/Language/Haskell/GhcMod/Debug.hs index 6eb9403..b756c79 100644 --- a/Language/Haskell/GhcMod/Debug.hs +++ b/Language/Haskell/GhcMod/Debug.hs @@ -1,4 +1,4 @@ -module Language.Haskell.GhcMod.Debug (debugInfo, debug, rootInfo, root) where +module Language.Haskell.GhcMod.Debug (debugInfo, debug, rootInfo) where import Control.Applicative ((<$>)) import Control.Exception.IOChoice ((||>)) @@ -62,13 +62,5 @@ debug opt cradle fileName = do -- | Obtaining root information. rootInfo :: Options -> Cradle - -> FilePath -- ^ A target file. -> IO String -rootInfo opt cradle fileName = withGHC fileName (root opt cradle fileName) - --- | Obtaining root information. -root :: Options - -> Cradle - -> FilePath -- ^ A target file. - -> Ghc String -root _ cradle _ = return $ cradleRootDir cradle ++ "\n" +rootInfo opt cradle = return $ convert opt $ cradleRootDir cradle diff --git a/src/GHCMod.hs b/src/GHCMod.hs index 43bed57..061dce5 100644 --- a/src/GHCMod.hs +++ b/src/GHCMod.hs @@ -34,7 +34,7 @@ usage = "ghc-mod version " ++ showVersion version ++ "\n" ++ "\t ghc-mod info" ++ ghcOptHelp ++ " \n" ++ "\t ghc-mod type" ++ ghcOptHelp ++ " \n" ++ "\t ghc-mod lint [-h opt] \n" - ++ "\t ghc-mod root \n" + ++ "\t ghc-mod root\n" ++ "\t ghc-mod doc \n" ++ "\t ghc-mod boot\n" ++ "\t ghc-mod help\n" @@ -116,7 +116,7 @@ main = flip E.catches handlers $ do "info" -> nArgs 3 infoExpr opt cradle cmdArg1 cmdArg3 "type" -> nArgs 4 $ typeExpr opt cradle cmdArg1 (read cmdArg3) (read cmdArg4) "lint" -> nArgs 1 withFile (lintSyntax opt) cmdArg1 - "root" -> nArgs 1 $ rootInfo opt cradle cmdArg1 + "root" -> rootInfo opt cradle "doc" -> nArgs 1 $ packageDoc opt cradle cmdArg1 "boot" -> do mods <- listModules opt cradle