From 0080f9b68c288145779b87d551983f2af8cee77c Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Fri, 18 Jul 2014 15:42:05 +0900 Subject: [PATCH] Internal exports extra Monad stuff. --- Language/Haskell/GhcMod.hs | 6 +++--- Language/Haskell/GhcMod/Find.hs | 3 ++- Language/Haskell/GhcMod/Internal.hs | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Language/Haskell/GhcMod.hs b/Language/Haskell/GhcMod.hs index 24833f8..0c2d0a0 100644 --- a/Language/Haskell/GhcMod.hs +++ b/Language/Haskell/GhcMod.hs @@ -28,8 +28,6 @@ module Language.Haskell.GhcMod ( , checkSyntax , debugInfo , expandTemplate - , findSymbol - , dumpSymbol , info , lint , pkgDoc @@ -40,9 +38,11 @@ module Language.Haskell.GhcMod ( , modules , languages , flags + , findSymbol + , lookupSymbol + , dumpSymbol -- * SymbolDb , loadSymbolDb - , lookupSymbol ) where import Language.Haskell.GhcMod.Boot diff --git a/Language/Haskell/GhcMod/Find.hs b/Language/Haskell/GhcMod/Find.hs index 6cda765..16feba6 100644 --- a/Language/Haskell/GhcMod/Find.hs +++ b/Language/Haskell/GhcMod/Find.hs @@ -68,7 +68,8 @@ packageConfDir = "package.conf.d" ---------------------------------------------------------------- --- | Finding modules to which the symbol belong. +-- | Looking up 'SymbolDb' with 'Symbol' to \['ModuleString'\] +-- which will be concatenated. 'loadSymbolDb' is called internally. findSymbol :: IOish m => Symbol -> GhcModT m String findSymbol sym = liftIO loadSymbolDb >>= lookupSymbol sym diff --git a/Language/Haskell/GhcMod/Internal.hs b/Language/Haskell/GhcMod/Internal.hs index 52e4858..62d4063 100644 --- a/Language/Haskell/GhcMod/Internal.hs +++ b/Language/Haskell/GhcMod/Internal.hs @@ -26,6 +26,26 @@ module Language.Haskell.GhcMod.Internal ( , withLogger , setNoWaringFlags , setAllWaringFlags + -- * Environment, state and logging + , GhcModEnv(..) + , newGhcModEnv + , GhcModState + , defaultState + , Mode(..) + , GhcModWriter + -- * Monad utilities + , runGhcMod + , runGhcModT' + , withErrorHandler + -- ** Conversion + , liftGhcMod + , toGhcModT + -- ** Accessing 'GhcModEnv' and 'GhcModState' + , options + , cradle + , getMode + , setMode + , withOptions -- * 'Ghc' Choice , (||>) , goNext @@ -40,6 +60,7 @@ import Language.Haskell.GhcMod.CabalApi import Language.Haskell.GhcMod.DynFlags import Language.Haskell.GhcMod.GHCChoice import Language.Haskell.GhcMod.Logger +import Language.Haskell.GhcMod.Monad import Language.Haskell.GhcMod.Target import Language.Haskell.GhcMod.Types