X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHscTypes.lhs;h=18cac804b63d87a39469e3b347c1c30161e127af;hb=5e12e5be4fe676a79669f9a0cb5265e5cd33bebe;hp=c187932835cec9a8842d388b63587bc6e11a6baa;hpb=9a4607c35c107bca78f08f7e57896044c66118be;p=ghc-hetmet.git

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index c187932..18cac80 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -111,6 +111,7 @@ import ByteCodeAsm	( CompiledByteCode )
 import {-# SOURCE #-}  InteractiveEval ( Resume )
 #endif
 
+import HsSyn
 import RdrName
 import Name
 import NameEnv
@@ -480,7 +481,8 @@ withLocalCallbacks f m = do
   let cb' = f cb0
   setSession (hsc_env { hsc_callbacks = cb' `seq` cb' })
   r <- m
-  setSession (hsc_env { hsc_callbacks = cb0 })
+  hsc_env' <- getSession
+  setSession (hsc_env' { hsc_callbacks = cb0 })
   return r
 
 \end{code}
@@ -1852,7 +1854,8 @@ type OrigIParamCache = FiniteMap (IPName OccName) (IPName Name)
 -- There will be a node for each source module, plus a node for each hi-boot
 -- module.
 --
--- The graph is not necessarily stored in topologically-sorted order.
+-- The graph is not necessarily stored in topologically-sorted order.  Use
+-- 'GHC.topSortModuleGraph' and 'Digraph.flattenSCC' to achieve this.
 type ModuleGraph = [ModSummary]
 
 emptyMG :: ModuleGraph
@@ -1872,8 +1875,8 @@ data ModSummary
         ms_location  :: ModLocation,		-- ^ Location of the various files belonging to the module
         ms_hs_date   :: ClockTime,		-- ^ Timestamp of source file
 	ms_obj_date  :: Maybe ClockTime,	-- ^ Timestamp of object, if we have one
-        ms_srcimps   :: [Located ModuleName],	-- ^ Source imports of the module
-        ms_imps      :: [Located ModuleName],	-- ^ Non-source imports of the module
+        ms_srcimps   :: [Located (ImportDecl RdrName)],	-- ^ Source imports of the module
+        ms_imps      :: [Located (ImportDecl RdrName)],	-- ^ Non-source imports of the module
         ms_hspp_file :: FilePath,		-- ^ Filename of preprocessed source file
         ms_hspp_opts :: DynFlags,               -- ^ Cached flags from @OPTIONS@, @INCLUDE@
                                                 -- and @LANGUAGE@ pragmas in the modules source code