[project @ 1996-04-25 16:31:20 by partain]

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

diff --git a/ghc/compiler/rename/RnUtils.lhs b/ghc/compiler/rename/RnUtils.lhs
index f79e7c4..f27614c 100644 (file)
--- a/ghc/compiler/rename/RnUtils.lhs
+++ b/ghc/compiler/rename/RnUtils.lhs
@@ -10,7 +10,9 @@ module RnUtils (
        RnEnv(..), QualNames(..),
        UnqualNames(..), ScopeStack(..),
        emptyRnEnv, extendGlobalRnEnv, extendLocalRnEnv,
-       lookupRnEnv, lookupTcRnEnv,
+       lookupRnEnv, lookupGlobalRnEnv, lookupTcRnEnv,
+
+       lubExportFlag,
 
        unknownNameErr,
        badClassOpErr,
@@ -18,9 +20,7 @@ module RnUtils (
        dupNamesErr,
        shadowedNameWarn,
        multipleOccWarn,
-
-       -- ToDo: nuke/move? WDP 96/04/05
-       GlobalNameMapper(..),  GlobalNameMappers(..)
+       negateNameWarn
     ) where
 
 import Ubiq
@@ -30,15 +30,11 @@ import ErrUtils             ( addShortErrLocLine, addErrLoc )
 import FiniteMap       ( FiniteMap, emptyFM, isEmptyFM,
                          lookupFM, addListToFM, addToFM )
 import Maybes          ( maybeToBool )
-import Name            ( RdrName(..), isQual )
-import Outputable      ( pprNonOp, getLocalName )
+import Name            ( RdrName(..), isQual, pprNonSym, getLocalName, ExportFlag(..) )
 import PprStyle                ( PprStyle(..) )
 import Pretty
 import RnHsSyn         ( RnName )
 import Util            ( assertPanic )
-
-type GlobalNameMapper  = RnName -> Maybe Name
-type GlobalNameMappers = (GlobalNameMapper, GlobalNameMapper)
 \end{code}
 
 *********************************************************
@@ -62,6 +58,7 @@ extendGlobalRnEnv :: RnEnv -> [(RdrName,RnName)] -> [(RdrName,RnName)]
                  -> (RnEnv, Bag (RdrName, RnName, RnName))
 extendLocalRnEnv  :: Bool -> RnEnv -> [RnName] -> (RnEnv, [RnName])
 lookupRnEnv      :: RnEnv -> RdrName -> Maybe RnName
+lookupGlobalRnEnv :: RnEnv -> RdrName -> Maybe RnName
 lookupTcRnEnv    :: RnEnv -> RdrName -> Maybe RnName
 \end{code}
 
@@ -73,9 +70,9 @@ vaule Unqual Names.
 @lookupTcRnEnv@ looks up tycons/classes in the alternative global
 name space.
 
-@extendGlobalRnEnv@ adds global names to the RnEnv. It takes seperate
+@extendGlobalRnEnv@ adds global names to the RnEnv. It takes separate
 value and tycon/class name lists. It returns any duplicate names
-seperatle.
+seperately.
 
 @extendRnEnv@ adds new local names to the ScopeStack in an RnEnv.
 It optionally reports any shadowed names.
@@ -84,10 +81,9 @@ It optionally reports any shadowed names.
 emptyRnEnv
   = ((emptyFM, emptyFM, emptyFM, emptyFM), emptyFM)
 
-
 extendGlobalRnEnv ((qual, unqual, tc_qual, tc_unqual), stack) val_list tc_list
   = ASSERT(isEmptyFM stack)
-    (((qual', unqual', tc_qual, tc_unqual), stack), tc_dups `unionBags` dups)
+    (((qual', unqual', tc_qual', tc_unqual'), stack), tc_dups `unionBags` dups)
   where
     (qual', unqual', dups)          = extend_global qual unqual val_list
     (tc_qual', tc_unqual', tc_dups) = extend_global tc_qual tc_unqual tc_list
@@ -143,6 +139,11 @@ lookupRnEnv ((qual, unqual, _, _), stack) rdr
            found@(Just name) -> found
            Nothing           -> do_on_fail
 
+lookupGlobalRnEnv ((qual, unqual, _, _), _) rdr
+  = case rdr of 
+      Unqual str   -> lookupFM unqual str
+      Qual mod str -> lookupFM qual (str,mod)
+
 lookupTcRnEnv ((_, _, tc_qual, tc_unqual), _) rdr
   = case rdr of 
       Unqual str   -> lookupFM tc_unqual str
@@ -151,6 +152,19 @@ lookupTcRnEnv ((_, _, tc_qual, tc_unqual), _) rdr
 
 *********************************************************
 *                                                      *
+\subsection{Export Flag Functions}
+*                                                      *
+*********************************************************
+
+\begin{code}
+lubExportFlag ExportAll ExportAll = ExportAll
+lubExportFlag ExportAll ExportAbs = ExportAll
+lubExportFlag ExportAbs ExportAll = ExportAll
+lubExportFlag ExportAbs ExportAbs = ExportAbs
+\end{code}
+
+*********************************************************
+*                                                      *
 \subsection{Errors used in RnMonad}
 *                                                      *
 *********************************************************
@@ -158,28 +172,29 @@ lookupTcRnEnv ((_, _, tc_qual, tc_unqual), _) rdr
 \begin{code}
 unknownNameErr descriptor name locn
   = addShortErrLocLine locn ( \ sty ->
-    ppBesides [ppStr "undefined ", ppStr descriptor, ppStr ": ", pprNonOp sty name] )
+    ppBesides [ppStr "undefined ", ppStr descriptor, ppStr ": ", pprNonSym sty name] )
 
 badClassOpErr clas op locn
   = addErrLoc locn "" ( \ sty ->
-    ppBesides [ppChar '`', pprNonOp sty op, ppStr "' is not an operation of class `",
+    ppBesides [ppChar '`', pprNonSym sty op, ppStr "' is not an operation of class `",
              ppr sty clas, ppStr "'"] )
 
 qualNameErr descriptor (name,locn)
   = addShortErrLocLine locn ( \ sty ->
-    ppBesides [ppStr "invalid use of qualified ", ppStr descriptor, ppStr ": ", pprNonOp sty name ] )
+    ppBesides [ppStr "invalid use of qualified ", ppStr descriptor, ppStr ": ", pprNonSym sty name ] )
 
 dupNamesErr descriptor ((name1,locn1) : dup_things) sty
   = ppAboves (item1 : map dup_item dup_things)
   where
     item1
-      = ppBesides [ ppr PprForUser locn1,
-           ppStr ": multiple declarations of a ", ppStr descriptor, ppStr ": ",
-           pprNonOp sty name1 ]
+      = addShortErrLocLine locn1 (\ sty ->
+       ppBesides [ppStr "multiple declarations of a ", ppStr descriptor, ppStr " `", 
+                  pprNonSym sty name1, ppStr "'" ]) sty
 
     dup_item (name, locn)
-      = ppBesides [ ppr PprForUser locn,
-           ppStr ": here was another declaration of `", pprNonOp sty name, ppStr "'" ]
+      = addShortErrLocLine locn (\ sty ->
+       ppBesides [ppStr "here was another declaration of `",
+                  pprNonSym sty name, ppStr "'" ]) sty
 
 shadowedNameWarn locn shadow
   = addShortErrLocLine locn ( \ sty ->
@@ -188,5 +203,9 @@ shadowedNameWarn locn shadow
 multipleOccWarn (name, occs) sty
   = ppBesides [ppStr "multiple names used to refer to `", ppr sty name, ppStr "': ",
               ppInterleave ppComma (map (ppr sty) occs)]
+
+negateNameWarn (name,locn) 
+  = addShortErrLocLine locn ( \ sty ->
+    ppBesides [ppStr "local binding of `negate' will be used for prefix `-'"])
 \end{code}