[project @ 2002-01-30 17:16:36 by simonpj]

[ghc-hetmet.git] / ghc / compiler / rename / RnMonad.lhs

diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs
index 495b50f..de320ae 100644 (file)
--- a/ghc/compiler/rename/RnMonad.lhs
+++ b/ghc/compiler/rename/RnMonad.lhs
@@ -59,7 +59,7 @@ import Name           ( Name, OccName, NamedThing(..),
                          decode, mkLocalName, mkKnownKeyGlobal
                        )
 import NameEnv         ( NameEnv, lookupNameEnv, emptyNameEnv, extendNameEnvList )
-import Module          ( Module, ModuleName, ModuleSet, emptyModuleSet )
+import Module          ( Module, ModuleName, ModuleSet, emptyModuleSet,                                    PackageName )
 import NameSet         
 import CmdLineOpts     ( DynFlags, DynFlag(..), dopt )
 import SrcLoc          ( SrcLoc, generatedSrcLoc, noSrcLoc )
@@ -202,14 +202,6 @@ lookupLocalFixity env name
        Nothing                  -> defaultFixity
 \end{code}
 
-\begin{code}
-type ExportAvails = (FiniteMap ModuleName Avails,
-       -- Used to figure out "module M" export specifiers
-       -- Includes avails only from *unqualified* imports
-       -- (see 1.4 Report Section 5.1.1)
-
-                    AvailEnv)  -- Used to figure out all other export specifiers.
-\end{code}
 
 %===================================================
 \subsubsection{                INTERFACE FILE STUFF}
@@ -224,7 +216,8 @@ type IfaceDeprecs = Maybe (Either DeprecTxt [(RdrName,DeprecTxt)])
 
 data ParsedIface
   = ParsedIface {
-      pi_mod      :: Module,                           -- Complete with package info
+      pi_mod      :: ModuleName,
+      pi_pkg       :: PackageName,
       pi_vers     :: Version,                          -- Module version number
       pi_orphan    :: WhetherHasOrphans,               -- Whether this module has orphans
       pi_usages           :: [ImportVersion OccName],          -- Usages