[project @ 2001-03-08 11:59:02 by simonpj]

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

diff --git a/ghc/compiler/basicTypes/Name.lhs b/ghc/compiler/basicTypes/Name.lhs
index 8d8f56c..8286e39 100644 (file)
--- a/ghc/compiler/basicTypes/Name.lhs
+++ b/ghc/compiler/basicTypes/Name.lhs
@@ -12,7 +12,7 @@ module Name (
        Name,                                   -- Abstract
        mkLocalName, mkSysLocalName, mkCCallName,
        mkIPName,
-       mkDerivedName, mkGlobalName, mkKnownKeyGlobal, mkWiredInName,
+       mkGlobalName, mkKnownKeyGlobal, mkWiredInName,
 
        nameUnique, setNameUnique,
        nameOccName, nameModule, nameModule_maybe,
@@ -20,10 +20,11 @@ module Name (
        toRdrName, hashName, 
        globaliseName, localiseName,
 
-       nameSrcLoc, nameIsLocallyDefined, isDllName, nameIsFrom, nameIsLocalOrFrom,
+       nameSrcLoc, 
 
        isSystemName, isLocalName, isGlobalName, isExternallyVisibleName,
-       isTyVarName,
+       isTyVarName, isDllName, 
+       nameIsLocalOrFrom, isHomePackageName,
        
        -- Environment
        NameEnv, mkNameEnv,
@@ -35,8 +36,7 @@ module Name (
 
        -- Class NamedThing and overloaded friends
        NamedThing(..),
-       getSrcLoc, getOccString, toRdrName,
-       isFrom, isLocalOrFrom
+       getSrcLoc, getOccString, toRdrName
     ) where
 
 #include "HsVersions.h"
@@ -121,26 +121,29 @@ nameModule_maybe name                             = Nothing
 \end{code}
 
 \begin{code}
-nameIsLocallyDefined   :: Name -> Bool
-nameIsFrom             :: Module -> Name -> Bool
 nameIsLocalOrFrom      :: Module -> Name -> Bool
 isLocalName            :: Name -> Bool         -- Not globals
 isGlobalName           :: Name -> Bool
 isSystemName           :: Name -> Bool
 isExternallyVisibleName :: Name -> Bool
+isHomePackageName      :: Name -> Bool
 
 isGlobalName (Name {n_sort = Global _}) = True
 isGlobalName other                     = False
 
 isLocalName name = not (isGlobalName name)
 
-nameIsLocallyDefined name = isLocalName name
-
 nameIsLocalOrFrom from (Name {n_sort = Global mod}) = mod == from
 nameIsLocalOrFrom from other                       = True
 
-nameIsFrom from (Name {n_sort = Global mod}) = mod == from
-nameIsFrom from other                       = pprPanic "nameIsFrom" (ppr other)
+isHomePackageName (Name {n_sort = Global mod}) = isHomeModule mod
+isHomePackageName other                               = True   -- Local and system names
+
+isDllName :: Name -> Bool      -- Does this name refer to something in a different DLL?
+isDllName nm = not opt_Static && not (isHomePackageName nm)
+
+isTyVarName :: Name -> Bool
+isTyVarName name = isTvOcc (nameOccName name)
 
 -- Global names are by definition those that are visible
 -- outside the module, *as seen by the linker*.  Externally visible
@@ -198,14 +201,6 @@ mkIPName uniq occ
           n_sort = Local,
           n_occ  = occ,
           n_loc = noSrcLoc }
-
----------------------------------------------------------------------
-mkDerivedName :: (OccName -> OccName)
-             -> Name           -- Base name
-             -> Unique         -- New unique
-             -> Name           -- Result is always a value name
-
-mkDerivedName f name uniq = name {n_uniq = uniq, n_occ = f (n_occ name)}
 \end{code}
 
 \begin{code}
@@ -246,17 +241,6 @@ nameRdrName :: Name -> RdrName
 -- and an unqualified name just for Locals
 nameRdrName (Name { n_occ = occ, n_sort = Global mod }) = mkRdrOrig (moduleName mod) occ
 nameRdrName (Name { n_occ = occ })                     = mkRdrUnqual occ
-
-isDllName :: Name -> Bool
-       -- Does this name refer to something in a different DLL?
-isDllName nm = not opt_Static &&
-              not (isLocalName nm) &&                          -- isLocalName test needed 'cos
-              not (isHomeModule (nameModule nm))       -- nameModule won't work on local names
-
-
-
-isTyVarName :: Name -> Bool
-isTyVarName name = isTvOcc (nameOccName name)
 \end{code}
 
 
@@ -354,27 +338,32 @@ pprName name@(Name {n_sort = sort, n_uniq = uniq, n_occ = occ})
       System     -> pprSysLocal sty uniq occ
       Local      -> pprLocal sty uniq occ
 
-pprLocal sty uniq occ
-  | codeStyle sty  = pprUnique uniq
-  | debugStyle sty = pprOccName occ <> 
-                    text "{-" <> pprUnique10 uniq <> text "-}"
-  | otherwise      = pprOccName occ
-
 pprGlobal sty name uniq mod occ
   | codeStyle sty        = ppr (moduleName mod) <> char '_' <> pprOccName occ
 
   | debugStyle sty       = ppr (moduleName mod) <> dot <> pprOccName occ <> 
-                           text "{-" <> pprUnique10 uniq <> text "-}"
+                           text "{-" <> pprUnique uniq <> text "-}"
 
   | unqualStyle sty name = pprOccName occ
   | otherwise           = ppr (moduleName mod) <> dot <> pprOccName occ
 
+pprLocal sty uniq occ
+  | codeStyle sty  = pprUnique uniq
+  | debugStyle sty = pprOccName occ <> 
+                    text "{-" <> pprUnique uniq <> text "-}"
+  | otherwise      = pprOccName occ    -- User and Iface styles
+
+-- Like Local, except that we only omit the unique in Iface style
 pprSysLocal sty uniq occ
   | codeStyle sty  = pprUnique uniq
+  | ifaceStyle sty = pprOccName occ    -- The tidy phase has ensured that OccNames
+                                       -- are enough
   | otherwise     = pprOccName occ <> char '_' <> pprUnique uniq
+                               -- If the tidy phase hasn't run, the OccName
+                               -- is unlikely to be informative (like 's'),
+                               -- so print the unique
 \end{code}
 
-
 %************************************************************************
 %*                                                                     *
 \subsection{Overloaded functions related to Names}
@@ -393,13 +382,9 @@ class NamedThing a where
 getSrcLoc          :: NamedThing a => a -> SrcLoc
 getOccString       :: NamedThing a => a -> String
 toRdrName          :: NamedThing a => a -> RdrName
-isFrom             :: NamedThing a => Module -> a -> Bool
-isLocalOrFrom      :: NamedThing a => Module -> a -> Bool
 
 getSrcLoc          = nameSrcLoc           . getName
 getOccString       = occNameString        . getOccName
 toRdrName          = nameRdrName          . getName
-isFrom mod x       = nameIsFrom mod (getName x)
-isLocalOrFrom mod x = nameIsLocalOrFrom mod ( getName x)
 \end{code}