X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=967daf35404cd4d7ce794aa2ebe6376d50fe2795;hb=5109078b26bdbf226acdf1b0fe7c2861a7114571;hp=85ecf58a0b8ab80be37b1b00f6a7df00475bdd42;hpb=7379e82aafc7d0c1b839a13a20d52babeafed023;p=ghc-hetmet.git

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index 85ecf58..967daf3 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -74,6 +74,7 @@ module GHC (
 	setContext, getContext,	
 	getNamesInScope,
 	getRdrNamesInScope,
+        getGRE,
 	moduleIsInterpreted,
 	getInfo,
 	exprType,
@@ -92,7 +93,7 @@ module GHC (
         InteractiveEval.forward,
 	showModule,
         isModuleInterpreted,
-	compileExpr, HValue, dynCompileExpr,
+	InteractiveEval.compileExpr, HValue, dynCompileExpr,
 	lookupName,
         GHC.obtainTerm, GHC.obtainTerm1, GHC.obtainTermB, reconstructType,
         modInfoModBreaks,
@@ -235,7 +236,7 @@ import DriverPipeline
 import DriverPhases	( HscSource(..), Phase(..), isHaskellSrcFilename, startPhase )
 import HeaderInfo	( getImports, getOptions )
 import Finder
-import HscMain          hiding (compileExpr)
+import HscMain
 import HscTypes
 import DynFlags
 import StaticFlags
@@ -482,7 +483,10 @@ setGlobalTypeScope session ids
 -- Parsing Haddock comments
 
 parseHaddockComment :: String -> Either String (HsDoc RdrName)
-parseHaddockComment string = parseHaddockParagraphs (tokenise string)
+parseHaddockComment string = 
+  case parseHaddockParagraphs (tokenise string) of
+    MyLeft x  -> Left x
+    MyRight x -> Right x
 
 -- -----------------------------------------------------------------------------
 -- Loading the program
@@ -1149,7 +1153,7 @@ upsweep hsc_env old_hpt stable_mods cleanup sccs = do
 	cleanup		-- Remove unwanted tmp files between compilations
 
         case mb_mod_info of
-	    Nothing -> return (Failed, hsc_env, [])
+	    Nothing -> return (Failed, hsc_env, done)
 	    Just mod_info -> do 
 		let this_mod = ms_mod_name mod
 
@@ -2049,6 +2053,12 @@ lookupGlobalName s name = withSession s $ \hsc_env -> do
    return $! lookupType (hsc_dflags hsc_env) 
 			(hsc_HPT hsc_env) (eps_PTE eps) name
 
+#ifdef GHCI
+-- | get the GlobalRdrEnv for a session
+getGRE :: Session -> IO GlobalRdrEnv
+getGRE s = withSession s $ \hsc_env-> return $ ic_rn_gbl_env (hsc_IC hsc_env)
+#endif
+
 -- -----------------------------------------------------------------------------
 -- Misc exported utils