[project @ 2004-03-22 09:00:28 by ralf]

[ghc-hetmet.git] / ghc / compiler / basicTypes / RdrName.lhs

diff --git a/ghc/compiler/basicTypes/RdrName.lhs b/ghc/compiler/basicTypes/RdrName.lhs
index df4b4d1..d858dbc 100644 (file)
--- a/ghc/compiler/basicTypes/RdrName.lhs
+++ b/ghc/compiler/basicTypes/RdrName.lhs
@@ -10,11 +10,9 @@ module RdrName (
 
        -- Construction
        mkRdrUnqual, mkRdrQual, 
-       mkUnqual, mkVarUnqual, mkQual, mkOrig, mkIfaceOrig, 
+       mkUnqual, mkVarUnqual, mkQual, mkOrig,
        nameRdrName, getRdrName, 
-       qualifyRdrName, unqualifyRdrName, 
        mkDerivedRdrName, 
-       dummyRdrVarName, dummyRdrTcName,
 
        -- Destruction
        rdrNameModule, rdrNameOcc, setRdrNameSpace,
@@ -22,7 +20,6 @@ module RdrName (
        isOrig, isOrig_maybe, isExact, isExact_maybe, isSrcRdrName,
 
        -- Printing;    instance Outputable RdrName
-       pprUnqualRdrName,
 
        -- LocalRdrEnv
        LocalRdrEnv, emptyLocalRdrEnv, extendLocalRdrEnv,
@@ -35,27 +32,25 @@ module RdrName (
 
        -- GlobalRdrElt, Provenance, ImportSpec
        GlobalRdrElt(..), Provenance(..), ImportSpec(..),
-       isLocalGRE, unQualOK, hasQual,
+       isLocalGRE, unQualOK,
        pprNameProvenance
   ) where 
 
 #include "HsVersions.h"
 
-import OccName ( NameSpace, tcName, varName,
-                 OccName, UserFS, EncodedFS,
-                 mkSysOccFS, setOccNameSpace,
-                 mkOccFS, mkVarOcc, occNameFlavour,
+import OccName ( NameSpace, varName,
+                 OccName, UserFS, 
+                 setOccNameSpace,
+                 mkOccFS, occNameFlavour,
                  isDataOcc, isTvOcc, isTcOcc,
                  OccEnv, emptyOccEnv, extendOccEnvList, lookupOccEnv, 
                  elemOccEnv, plusOccEnv_C, extendOccEnv_C, foldOccEnv,
                  occEnvElts
                )
-import Module   ( ModuleName, mkSysModuleNameFS, mkModuleNameFS        )
+import Module   ( ModuleName, mkModuleNameFS   )
 import Name    ( Name, NamedThing(getName), nameModuleName, nameParent_maybe,
                  nameOccName, isExternalName, nameSrcLoc )
-import Maybes  ( seqMaybe )
-import SrcLoc  ( SrcLoc, isGoodSrcLoc )
-import BasicTypes( DeprecTxt )
+import SrcLoc  ( isGoodSrcLoc, SrcSpan )
 import Outputable
 import Util    ( thenCmp )
 \end{code}
@@ -141,9 +136,6 @@ mkRdrQual mod occ = Qual mod occ
 mkOrig :: ModuleName -> OccName -> RdrName
 mkOrig mod occ = Orig mod occ
 
-mkIfaceOrig :: NameSpace -> EncodedFS -> EncodedFS -> RdrName
-mkIfaceOrig ns m n = Orig (mkSysModuleNameFS m) (mkSysOccFS ns n)
-
 ---------------
 mkDerivedRdrName :: Name -> (OccName -> OccName) -> (RdrName)
 mkDerivedRdrName parent mk_occ
@@ -170,13 +162,6 @@ nameRdrName name = Exact name
 -- unique is still there for debug printing, particularly
 -- of Types (which are converted to IfaceTypes before printing)
 
-qualifyRdrName :: ModuleName -> RdrName -> RdrName
-       -- Sets the module name of a RdrName, even if it has one already
-qualifyRdrName mod rn = Qual mod (rdrNameOcc rn)
-
-unqualifyRdrName :: RdrName -> RdrName
-unqualifyRdrName rdr_name = Unqual (rdrNameOcc rdr_name)
-
 nukeExact :: Name -> RdrName
 nukeExact n 
   | isExternalName n = Orig (nameModuleName n) (nameOccName n)
@@ -184,17 +169,6 @@ nukeExact n
 \end{code}
 
 \begin{code}
-       -- This guy is used by the reader when HsSyn has a slot for
-       -- an implicit name that's going to be filled in by
-       -- the renamer.  We can't just put "error..." because
-       -- we sometimes want to print out stuff after reading but
-       -- before renaming
-dummyRdrVarName = Unqual (mkVarOcc FSLIT("V-DUMMY"))
-dummyRdrTcName  = Unqual (mkOccFS tcName FSLIT("TC-DUMMY"))
-\end{code}
-
-
-\begin{code}
 isRdrDataCon rn = isDataOcc (rdrNameOcc rn)
 isRdrTyVar   rn = isTvOcc   (rdrNameOcc rn)
 isRdrTc      rn = isTcOcc   (rdrNameOcc rn)
@@ -243,8 +217,6 @@ instance OutputableBndr RdrName where
        | isTvOcc (rdrNameOcc n) = char '@' <+> ppr n
        | otherwise              = ppr n
 
-pprUnqualRdrName rdr_name = ppr (rdrNameOcc rdr_name)
-
 instance Eq RdrName where
     (Exact n1)           == (Exact n2)    = n1==n2
        -- Convert exact to orig
@@ -338,8 +310,7 @@ globalRdrEnvElts env = foldOccEnv (++) [] env
 
 data GlobalRdrElt 
   = GRE { gre_name   :: Name,
-         gre_prov   :: Provenance,     -- Why it's in scope
-         gre_deprec :: Maybe DeprecTxt -- Whether this name is deprecated
+         gre_prov   :: Provenance      -- Why it's in scope
     }
 
 instance Outputable GlobalRdrElt where
@@ -417,11 +388,8 @@ insertGRE new_g (old_g : old_gs)
 plusGRE :: GlobalRdrElt -> GlobalRdrElt -> GlobalRdrElt
 -- Used when the gre_name fields match
 plusGRE g1 g2
-  = GRE { gre_name   = gre_name g1,
-         gre_prov   = gre_prov g1 `plusProv` gre_prov g2,
-         gre_deprec = gre_deprec g1 `seqMaybe` gre_deprec g2 }
-       -- Could the deprecs be different?  If we re-export
-       -- something deprecated, is it propagated?  I forget.
+  = GRE { gre_name = gre_name g1,
+         gre_prov = gre_prov g1 `plusProv` gre_prov g2 }
 \end{code}
 
 
@@ -459,7 +427,7 @@ data ImportSpec             -- Describes a particular import declaration
                                        -- the defining module for this thing!
        is_as   :: ModuleName,          -- 'as M' (or 'Muggle' if there is no 'as' clause)
        is_qual :: Bool,                -- True <=> qualified (only)
-       is_loc  :: SrcLoc }             -- Location of import statment
+       is_loc  :: SrcSpan }            -- Location of import statment
 
 -- Comparison of provenance is just used for grouping 
 -- error messages (in RnEnv.warnUnusedBinds)
@@ -499,10 +467,11 @@ pprNameProvenance :: GlobalRdrElt -> SDoc
 pprNameProvenance (GRE {gre_name = name, gre_prov = LocalDef _})
   = ptext SLIT("defined at") <+> ppr (nameSrcLoc name)
 pprNameProvenance (GRE {gre_name = name, gre_prov = Imported (why:whys) _})
-  = sep [ppr_reason why, nest 2 (ppr_defn (nameSrcLoc name))]
+  = sep [ppr why, nest 2 (ppr_defn (nameSrcLoc name))]
 
-ppr_reason imp_spec
- = ptext SLIT("imported from") <+> ppr (is_mod imp_spec) 
+instance Outputable ImportSpec where
+   ppr imp_spec
+     = ptext SLIT("imported from") <+> ppr (is_mod imp_spec) 
        <+> ptext SLIT("at") <+> ppr (is_loc imp_spec)
 
 ppr_defn loc | isGoodSrcLoc loc = parens (ptext SLIT("defined at") <+> ppr loc)