X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHscTypes.lhs;h=92b7228dd50cba4c7051315ce2f64e89646acade;hb=d6b899273f0993030b33a7278329ba8b27f3b6e0;hp=41558079740a77ae315ba1dd6b0f132eecc26d51;hpb=376101055fb111ebd52b5ef1fb76e00334b44304;p=ghc-hetmet.git

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index 4155807..92b7228 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -91,7 +91,7 @@ import TyCon
 import DataCon		( DataCon, dataConImplicitIds )
 import PrelNames	( gHC_PRIM )
 import Packages		( PackageId )
-import DynFlags		( DynFlags(..), isOneShot, HscTarget (..) )
+import DynFlags		( DynFlags(..), DynFlag(..), isOneShot, HscTarget (..) )
 import DriverPhases	( HscSource(..), isHsBoot, hscSourceString, Phase )
 import BasicTypes	( Version, initialVersion, IPName, 
 			  Fixity, defaultFixity, DeprecTxt )
@@ -485,7 +485,10 @@ data ModGuts
         mg_rdr_env   :: !GlobalRdrEnv,	 -- Top-level lexical environment
 	mg_fix_env   :: !FixityEnv,	 -- Fixity env, for things declared in
 					 --   this module 
-	mg_deprecs   :: !Deprecations,	 -- Deprecations declared in the module
+
+	mg_fam_inst_env :: FamInstEnv,	 -- Type-family instance enviroment
+					 -- for *home-package* modules (including
+					 -- this one).  c.f. tcg_fam_inst_env
 
 	mg_types     :: !TypeEnv,
 	mg_insts     :: ![Instance],	 -- Instances 
@@ -493,6 +496,7 @@ data ModGuts
         mg_rules     :: ![CoreRule],	 -- Rules from this module
 	mg_binds     :: ![CoreBind],	 -- Bindings for this module
 	mg_foreign   :: !ForeignStubs,
+	mg_deprecs   :: !Deprecations,	 -- Deprecations declared in the module
 	mg_hpc_info  :: !HpcInfo,        -- info about coverage tick boxes
         mg_dbg_sites :: ![(SiteNumber, Coord)]     -- Bkpts inserted by the renamer
     }
@@ -670,12 +674,14 @@ implicitTyThings (ATyCon tc) = implicitCoTyCon tc ++
 			       concatMap (extras_plus . ADataCon) 
 					 (tyConDataCons tc)
 		     
-	-- For classes, add the class TyCon too (and its extras)
-	-- and the class selector Ids and the associated types (they don't
-	-- have extras as these are only the family decls)
-implicitTyThings (AClass cl) = map AnId (classSelIds cl) ++
-			       map ATyCon (classATs cl) ++
-			       extras_plus (ATyCon (classTyCon cl))
+	-- For classes, add the class selector Ids, and assoicated TyCons
+	-- and the class TyCon too (and its extras)
+implicitTyThings (AClass cl) 
+  = map AnId (classSelIds cl) ++
+    map ATyCon (classATs cl) ++
+	-- No extras_plus for the classATs, because they
+	-- are only the family decls; they have no implicit things
+    extras_plus (ATyCon (classTyCon cl))
 
 	-- For data cons add the worker and wrapper (if any)
 implicitTyThings (ADataCon dc) = map AnId (dataConImplicitIds dc)
@@ -1134,7 +1140,12 @@ showModMsg target recomp mod_summary
   = showSDoc (hsep [text (mod_str ++ replicate (max 0 (16 - length mod_str)) ' '),
 	            char '(', text (msHsFilePath mod_summary) <> comma,
 		    case target of
-                      HscInterpreted | recomp
+#if defined(GHCI) && defined(DEBUGGER)
+                      HscInterpreted | recomp && 
+                                       Opt_Debugging `elem` modflags
+                                 -> text "interpreted(debugging)"
+#endif
+                      HscInterpreted | recomp 
                                  -> text "interpreted"
                       HscNothing -> text "nothing"
                       _other     -> text (msObjFilePath mod_summary),
@@ -1142,6 +1153,7 @@ showModMsg target recomp mod_summary
  where 
     mod     = moduleName (ms_mod mod_summary)
     mod_str = showSDoc (ppr mod) ++ hscSourceString (ms_hsc_src mod_summary)
+    modflags= flags(ms_hspp_opts mod_summary)
 \end{code}