From 5f6adb53f23e29cfe95a7f698c98ba9843a2a865 Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Thu, 27 Mar 2014 16:02:16 +0900 Subject: [PATCH] close import. --- Language/Haskell/GhcMod/Gap.hs | 12 ++++++------ Language/Haskell/GhcMod/List.hs | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Language/Haskell/GhcMod/Gap.hs b/Language/Haskell/GhcMod/Gap.hs index 424913d..b460dec 100644 --- a/Language/Haskell/GhcMod/Gap.hs +++ b/Language/Haskell/GhcMod/Gap.hs @@ -31,11 +31,11 @@ module Language.Haskell.GhcMod.Gap ( ) where import Control.Applicative hiding (empty) -import Control.Monad -import CoreSyn -import Data.List -import Data.Maybe -import Data.Time.Clock +import Control.Monad (filterM) +import CoreSyn (CoreExpr) +import Data.List (intersperse) +import Data.Maybe (catMaybes) +import Data.Time.Clock (UTCTime) import DataCon (dataConRepType) import Desugar (deSugarExpr) import DynFlags @@ -321,7 +321,7 @@ typeForUser = pprTypeForUser False #endif deSugar :: TypecheckedModule -> LHsExpr Id -> HscEnv - -> IO (Maybe CoreSyn.CoreExpr) + -> IO (Maybe CoreExpr) #if __GLASGOW_HASKELL__ >= 707 deSugar _ e hs_env = snd <$> deSugarExpr hs_env e #else diff --git a/Language/Haskell/GhcMod/List.hs b/Language/Haskell/GhcMod/List.hs index 3f47313..3082d0a 100644 --- a/Language/Haskell/GhcMod/List.hs +++ b/Language/Haskell/GhcMod/List.hs @@ -1,13 +1,14 @@ module Language.Haskell.GhcMod.List (listModules, listMods) where -import Control.Applicative +import Control.Applicative ((<$>)) import Control.Monad (void) -import Data.List -import GHC +import Data.List (nub, sort) +import GHC (Ghc) +import qualified GHC as G import Language.Haskell.GhcMod.GHCApi import Language.Haskell.GhcMod.Types -import Packages -import UniqFM +import Packages (pkgIdMap, exposedModules, sourcePackageId, display) +import UniqFM (eltsUFM) ---------------------------------------------------------------- @@ -23,11 +24,11 @@ listModules opt cradle = convert opt . nub . sort . map dropPkgs <$> withGHCDumm listMods :: Options -> Cradle -> Ghc [(String, String)] listMods opt cradle = do void $ initializeFlagsWithCradle opt cradle [] False - getExposedModules <$> getSessionDynFlags + getExposedModules <$> G.getSessionDynFlags where getExposedModules = concatMap exposedModules' - . eltsUFM . pkgIdMap . pkgState + . eltsUFM . pkgIdMap . G.pkgState exposedModules' p = - map moduleNameString (exposedModules p) + map G.moduleNameString (exposedModules p) `zip` - repeat (display $ sourcePackageId p) + repeat (display $ sourcePackageId p)