[project @ 2000-11-20 14:48:52 by simonpj]

When renaming, typechecking an expression from the user
interface, we may suck in declarations from interface
files (e.g. the Prelude).  This commit takes account of that.

To do so, I did some significant restructuring in TcModule,
with consequential changes and tidy ups elsewhere in the type
checker.  I think there should be fewer lines in total than before.

1 files changed, 12 insertions, 5 deletions

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