[project @ 2004-01-09 12:09:23 by simonmar]

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

diff --git a/ghc/compiler/rename/RnEnv.lhs b/ghc/compiler/rename/RnEnv.lhs
index afcfe17..417d873 100644 (file)
--- a/ghc/compiler/rename/RnEnv.lhs
+++ b/ghc/compiler/rename/RnEnv.lhs
@@ -48,7 +48,8 @@ import TcRnMonad
 import Name            ( Name, nameIsLocalOrFrom, mkInternalName, isInternalName,
                          nameSrcLoc, nameOccName, nameModuleName, nameParent )
 import NameSet
-import OccName         ( tcName, isDataOcc, occNameFlavour, reportIfUnused )
+import OccName         ( tcName, isDataOcc, occNameFlavour, reportIfUnused,
+                         isVarOcc )
 import Module          ( Module, ModuleName, moduleName, mkHomeModule )
 import PrelNames       ( mkUnboundName, rOOT_MAIN_Name, iNTERACTIVE )
 import UniqSupply
@@ -314,10 +315,7 @@ lookupGreRn_help rdr_name lookup
   = do { env <- getGlobalRdrEnv
        ; case lookup env of
            []    -> returnM Nothing
-           [gre] -> case gre_deprec gre of
-                       Nothing -> returnM (Just gre)
-                       Just _  -> do { warnDeprec gre
-                                     ; returnM (Just gre) }
+           [gre] -> returnM (Just gre)
            gres  -> do { addNameClashErrRn rdr_name gres
                        ; returnM (Just (head gres)) } }
 
@@ -724,9 +722,12 @@ shadowedNameWarn doc shadow
     $$ doc
 
 unknownNameErr name
-  = sep [text flavour <+> ptext SLIT("not in scope:"), quotes (ppr name)]
+  = sep [ptext SLIT("Not in scope:"), 
+        if isVarOcc occ_name then quotes (ppr name)
+                             else text (occNameFlavour occ_name) 
+                                       <+> quotes (ppr name)]
   where
-    flavour = occNameFlavour (rdrNameOcc name)
+    occ_name = rdrNameOcc name
 
 unknownInstBndrErr cls op
   = quotes (ppr op) <+> ptext SLIT("is not a (visible) method of class") <+> quotes (ppr cls)
@@ -740,10 +741,4 @@ dupNamesErr descriptor (L loc name : dup_things)
     addErr ((ptext SLIT("Conflicting definitions for") <+> quotes (ppr name))
              $$ 
              descriptor)
-warnDeprec :: GlobalRdrElt -> RnM ()
-warnDeprec (GRE {gre_name = name, gre_deprec = Just txt})
-  = ifOptM Opt_WarnDeprecations        $
-    addWarn (sep [ text (occNameFlavour (nameOccName name)) <+> 
-                    quotes (ppr name) <+> text "is deprecated:", 
-                    nest 4 (ppr txt) ])
 \end{code}