diff options
Diffstat (limited to 'ghc/compiler/compMan')
| -rw-r--r-- | ghc/compiler/compMan/CmLink.lhs | 2 | ||||
| -rw-r--r-- | ghc/compiler/compMan/CompManager.lhs | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/ghc/compiler/compMan/CmLink.lhs b/ghc/compiler/compMan/CmLink.lhs index cb3956babe..247d2f50a1 100644 --- a/ghc/compiler/compMan/CmLink.lhs +++ b/ghc/compiler/compMan/CmLink.lhs @@ -12,7 +12,9 @@ module CmLink ( Linkable(..), Unlinked(..), link, unload, PersistentLinkerState{-abstractly!-}, emptyPLS, +#ifdef GHCI linkExpr +#endif ) where diff --git a/ghc/compiler/compMan/CompManager.lhs b/ghc/compiler/compMan/CompManager.lhs index a853f1f675..9e78ee0d9e 100644 --- a/ghc/compiler/compMan/CompManager.lhs +++ b/ghc/compiler/compMan/CompManager.lhs @@ -5,7 +5,9 @@ \begin{code} module CompManager ( cmInit, cmLoadModule, +#ifdef GHCI cmGetExpr, cmRunExpr, +#endif CmState, emptyCmState -- abstract ) where @@ -15,8 +17,6 @@ where import CmLink import CmTypes import HscTypes -import HscMain ( hscExpr ) -import Interpreter ( HValue ) import Module ( ModuleName, moduleName, isModuleInThisPackage, moduleEnvElts, moduleNameUserString ) @@ -26,7 +26,6 @@ import GetImports import HscTypes ( HomeSymbolTable, HomeIfaceTable, PersistentCompilerState, ModDetails(..) ) import Name ( lookupNameEnv ) -import RdrName import Module import PrelNames ( mainName ) import HscMain ( initPersistentCompilerState ) @@ -36,11 +35,18 @@ import UniqFM ( emptyUFM, lookupUFM, addToUFM, delListFromUFM, import Unique ( Uniquable ) import Digraph ( SCC(..), stronglyConnComp ) import DriverUtil ( BarfKind(..), splitFilename3 ) -import CmdLineOpts ( DynFlags ) import Util import Outputable import Panic ( panic ) +#ifdef GHCI +import CmdLineOpts ( DynFlags ) +import Interpreter ( HValue ) +import HscMain ( hscExpr ) +import RdrName +import PrelGHC ( unsafeCoerce# ) +#endif + -- lang import Exception ( throwDyn ) @@ -50,7 +56,6 @@ import Directory ( getModificationTime, doesFileExist ) import IO import List ( nub ) import Maybe ( catMaybes, fromMaybe, isJust ) -import PrelGHC ( unsafeCoerce# ) \end{code} @@ -59,6 +64,7 @@ cmInit :: PackageConfigInfo -> GhciMode -> IO CmState cmInit raw_package_info gmode = emptyCmState raw_package_info gmode +#ifdef GHCI cmGetExpr :: CmState -> DynFlags -> ModuleName @@ -83,6 +89,7 @@ cmRunExpr :: HValue -> IO () cmRunExpr hval = do unsafeCoerce# hval :: IO () -- putStrLn "done." +#endif -- Persistent state just for CM, excluding link & compile subsystems data PersistentCMState |