diff --git a/Language/Haskell/GhcMod.hs b/Language/Haskell/GhcMod.hs index 63a1f03..f47d091 100644 --- a/Language/Haskell/GhcMod.hs +++ b/Language/Haskell/GhcMod.hs @@ -33,7 +33,6 @@ module Language.Haskell.GhcMod ( , info , typeOf , listMods - , debug , lint ) where diff --git a/Language/Haskell/GhcMod/Debug.hs b/Language/Haskell/GhcMod/Debug.hs index b756c79..cfa0a35 100644 --- a/Language/Haskell/GhcMod/Debug.hs +++ b/Language/Haskell/GhcMod/Debug.hs @@ -1,12 +1,10 @@ -module Language.Haskell.GhcMod.Debug (debugInfo, debug, rootInfo) where +module Language.Haskell.GhcMod.Debug (debugInfo, rootInfo) where import Control.Applicative ((<$>)) import Control.Exception.IOChoice ((||>)) -import Control.Monad (void) import CoreMonad (liftIO) import Data.List (intercalate) import Data.Maybe (fromMaybe, isJust, fromJust) -import GHC (Ghc) import Language.Haskell.GhcMod.CabalApi import Language.Haskell.GhcMod.GHCApi import Language.Haskell.GhcMod.Types @@ -16,23 +14,13 @@ import Language.Haskell.GhcMod.Types -- | Obtaining debug information. debugInfo :: Options -> Cradle - -> FilePath -- ^ A target file. -> IO String -debugInfo opt cradle fileName = unlines <$> withGHC fileName (debug opt cradle fileName) - --- | Obtaining debug information. -debug :: Options - -> Cradle - -> FilePath -- ^ A target file. - -> Ghc [String] -debug opt cradle fileName = do +debugInfo opt cradle = convert opt <$> do CompilerOptions gopts incDir pkgs <- if cabal then liftIO (fromCabalFile ||> return simpleCompilerOption) else return simpleCompilerOption - void $ initializeFlagsWithCradle opt cradle gopts True - setTargetFiles [fileName] mglibdir <- liftIO getSystemLibDir return [ "Root directory: " ++ rootDir diff --git a/src/GHCMod.hs b/src/GHCMod.hs index 061dce5..9771ff2 100644 --- a/src/GHCMod.hs +++ b/src/GHCMod.hs @@ -30,7 +30,7 @@ usage = "ghc-mod version " ++ showVersion version ++ "\n" ++ "\t ghc-mod browse" ++ ghcOptHelp ++ "[-l] [-o] [-d] [-q] [-p package] [ ...]\n" ++ "\t ghc-mod check" ++ ghcOptHelp ++ "\n" ++ "\t ghc-mod expand" ++ ghcOptHelp ++ "\n" - ++ "\t ghc-mod debug" ++ ghcOptHelp ++ "\n" + ++ "\t ghc-mod debug" ++ ghcOptHelp ++ "\n" ++ "\t ghc-mod info" ++ ghcOptHelp ++ " \n" ++ "\t ghc-mod type" ++ ghcOptHelp ++ " \n" ++ "\t ghc-mod lint [-h opt] \n" @@ -112,7 +112,7 @@ main = flip E.catches handlers $ do "browse" -> concat <$> mapM (browseModule opt cradle) remainingArgs "check" -> checkSyntax opt cradle remainingArgs "expand" -> checkSyntax opt { expandSplice = True } cradle remainingArgs - "debug" -> nArgs 1 $ debugInfo opt cradle cmdArg1 + "debug" -> debugInfo opt cradle "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