X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FHscMain.lhs;h=01c27ab51bd73cf35aa7e4d9f0217e6cc0f582a8;hp=9d77c4d68c86df6698df64f3bc79b3182f261428;hb=2a8cdc3aee5997374273e27365f92c161aca8453;hpb=e69ddd9cc12f59c7ef7103e54fee2d1c55b9fc14

diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index 9d77c4d..01c27ab 100644
--- a/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
@@ -25,7 +25,8 @@ module HscMain
 #include "HsVersions.h"
 
 #ifdef GHCI
-import HsSyn		( Stmt(..), LStmt, LHsType )
+import HsSyn		( Stmt(..), LHsExpr, LStmt, LHsType )
+import Module		( Module )
 import CodeOutput	( outputForeignStubs )
 import ByteCodeGen	( byteCodeGen, coreExprToBCOs )
 import Linker		( HValue, linkExpr )
@@ -48,7 +49,8 @@ import VarEnv		( emptyTidyEnv )
 import Var		( Id )
 import Module		( emptyModuleEnv, ModLocation(..) )
 import RdrName		( GlobalRdrEnv, RdrName, emptyGlobalRdrEnv )
-import HsSyn		( HsModule, LHsBinds, HsGroup, LIE, LImportDecl )
+import HsSyn		( HsModule, LHsBinds, HsGroup, LIE, LImportDecl, HsDoc,
+                          HaddockModInfo )
 import SrcLoc		( Located(..) )
 import StringBuffer	( hGetStringBuffer, stringToStringBuffer )
 import Parser
@@ -175,7 +177,8 @@ data HscChecked
         -- parsed
         (Located (HsModule RdrName))
         -- renamed
-        (Maybe (HsGroup Name,[LImportDecl Name],Maybe [LIE Name]))
+        (Maybe (HsGroup Name, [LImportDecl Name], Maybe [LIE Name],
+                Maybe (HsDoc Name), HaddockModInfo Name))
         -- typechecked
         (Maybe (LHsBinds Id, GlobalRdrEnv, ModDetails))
 
@@ -398,7 +401,7 @@ batchMsg mb_mod_index recomp
          liftIO $ do
          if recomp
             then showMsg "Compiling "
-            else if verbosity (hsc_dflags hsc_env) >= 2
+            else if verbosity (hsc_dflags hsc_env) >= 1
                     then showMsg "Skipping  "
                     else return ()
 
@@ -672,17 +675,21 @@ hscFileCheck hsc_env mod_summary = do {
 	; case maybe_tc_result of {
       	     Nothing -> return (Just (HscChecked rdr_module Nothing Nothing));
       	     Just tc_result -> do
-		let md = ModDetails { 
-				md_types   = tcg_type_env tc_result,
-				md_exports = tcg_exports  tc_result,
-				md_insts   = tcg_insts    tc_result,
-				md_rules   = [panic "no rules"] }
+		let type_env = tcg_type_env tc_result
+		    md = ModDetails { 
+				md_types     = type_env,
+				md_exports   = tcg_exports   tc_result,
+				md_insts     = tcg_insts     tc_result,
+				md_fam_insts = tcg_fam_insts tc_result,
+				md_rules     = [panic "no rules"] }
 				   -- Rules are CoreRules, not the
 				   -- RuleDecls we get out of the typechecker
                     rnInfo = do decl <- tcg_rn_decls tc_result
                                 imports <- tcg_rn_imports tc_result
                                 let exports = tcg_rn_exports tc_result
-                                return (decl,imports,exports)
+			        let doc = tcg_doc tc_result
+				    hmi = tcg_hmi tc_result
+                                return (decl,imports,exports,doc,hmi)
 		return (Just (HscChecked rdr_module 
                                    rnInfo
 				   (Just (tcg_binds tc_result,