X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FHscMain.lhs;h=0563f3442ce883d8dae81e18f3f1a3a04cf353be;hp=422c2701724f716c4fbb547447cb43f0df6f0527;hb=b00b5bc04ff36a551552470060064f0b7d84ca30;hpb=7a59afcebe45ea87c42006873f77eb4600d7316f

diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index 422c270..0563f34 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 )
@@ -38,7 +39,7 @@ import SimplCore        ( simplifyExpr )
 import TcRnDriver	( tcRnStmt, tcRnExpr, tcRnType ) 
 import Type		( Type )
 import PrelNames	( iNTERACTIVE )
-import Kind		( Kind )
+import {- Kind parts of -} Type		( Kind )
 import CoreLint		( lintUnfolding )
 import DsMeta		( templateHaskellNames )
 import SrcLoc		( SrcSpan, noSrcLoc, interactiveSrcLoc, srcLocSpan )
@@ -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 ()
 
@@ -524,7 +527,7 @@ hscNormalIface simpl_result
 		<- {-# SCC "MkFinalIface" #-}
 		   mkIface hsc_env maybe_old_iface simpl_result details
 	-- Emit external core
-       emitExternalCore (hsc_dflags hsc_env) (mg_exports simpl_result) cg_guts -- Move this? --Lemmih 03/07/2006
+       emitExternalCore (hsc_dflags hsc_env) (availsToNameSet (mg_exports simpl_result)) cg_guts -- Move this? --Lemmih 03/07/2006
        dumpIfaceStats hsc_env
 
  	    -------------------
@@ -538,9 +541,11 @@ hscNormalIface simpl_result
 hscWriteIface :: (ModIface, Bool, ModDetails, a) -> Comp (ModIface, ModDetails, a)
 hscWriteIface (iface, no_change, details, a)
     = do mod_summary <- gets compModSummary
+         hsc_env <- gets compHscEnv
+         let dflags = hsc_dflags hsc_env
          liftIO $ do
          unless no_change
-           $ writeIfaceFile (ms_location mod_summary) iface
+           $ writeIfaceFile dflags (ms_location mod_summary) iface
          return (iface, details, a)
 
 hscIgnoreIface :: (ModIface, Bool, ModDetails, a) -> Comp (ModIface, ModDetails, a)
@@ -672,17 +677,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,