X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FbasicTypes%2FName.lhs;h=7ff32cb45f6c0fc5560f22d71bfb012d7b6b4fd8;hb=801c9549052461a51db94cc9618816c5862800c9;hp=2e66f082b70665a89e708ecc1ad233fbab8fe548;hpb=96cf57e3ca14b3d9e6654a7780ea0b0ea4f5c0e8;p=ghc-hetmet.git diff --git a/ghc/compiler/basicTypes/Name.lhs b/ghc/compiler/basicTypes/Name.lhs index 2e66f08..7ff32cb 100644 --- a/ghc/compiler/basicTypes/Name.lhs +++ b/ghc/compiler/basicTypes/Name.lhs @@ -10,33 +10,25 @@ module Name ( -- The Name type Name, -- Abstract - mkLocalName, mkSysLocalName, mkCCallName, - mkTopName, mkIPName, - mkDerivedName, mkGlobalName, mkKnownKeyGlobal, mkWiredInName, + mkInternalName, mkSystemName, mkFCallName, + mkIPName, + mkExternalName, mkKnownKeyExternalName, mkWiredInName, nameUnique, setNameUnique, - tidyTopName, nameOccName, nameModule, nameModule_maybe, setNameOcc, nameRdrName, setNameModuleAndLoc, - toRdrName, hashName, + toRdrName, hashName, + externaliseName, localiseName, - nameSrcLoc, nameIsLocallyDefined, isDllName, nameIsFrom, nameIsLocalOrFrom, + nameSrcLoc, - isSystemName, isLocalName, isGlobalName, isExternallyVisibleName, - isTyVarName, + isSystemName, isInternalName, isExternalName, + isTyVarName, isDllName, + nameIsLocalOrFrom, isHomePackageName, - -- Environment - NameEnv, mkNameEnv, - emptyNameEnv, unitNameEnv, nameEnvElts, - extendNameEnv_C, extendNameEnv, foldNameEnv, - plusNameEnv, plusNameEnv_C, extendNameEnv, extendNameEnvList, - lookupNameEnv, lookupNameEnv_NF, delFromNameEnv, elemNameEnv, - - -- Class NamedThing and overloaded friends NamedThing(..), - getSrcLoc, getOccString, toRdrName, - isFrom, isLocalOrFrom + getSrcLoc, getOccString, toRdrName ) where #include "HsVersions.h" @@ -44,12 +36,11 @@ module Name ( import OccName -- All of it import Module ( Module, moduleName, mkVanillaModule, isHomeModule ) import RdrName ( RdrName, mkRdrOrig, mkRdrUnqual, rdrNameOcc, rdrNameModule ) -import CmdLineOpts ( opt_Static, opt_OmitInterfacePragmas, opt_EnsureSplittableC ) +import CmdLineOpts ( opt_Static ) import SrcLoc ( builtinSrcLoc, noSrcLoc, SrcLoc ) -import Unique ( Unique, Uniquable(..), u2i, pprUnique, pprUnique10 ) +import Unique ( Unique, Uniquable(..), u2i, pprUnique ) import FastTypes -import Maybes ( expectJust ) -import UniqFM +import Binary import Outputable \end{code} @@ -62,18 +53,22 @@ import Outputable \begin{code} data Name = Name { n_sort :: NameSort, -- What sort of name it is - n_occ :: OccName, -- Its occurrence name + n_occ :: !OccName, -- Its occurrence name n_uniq :: Unique, - n_loc :: SrcLoc -- Definition site + n_loc :: !SrcLoc -- Definition site } +-- NOTE: we make the n_loc field strict to eliminate some potential +-- (and real!) space leaks, due to the fact that we don't look at +-- the SrcLoc in a Name all that often. + data NameSort - = Global Module -- (a) TyCon, Class, their derived Ids, dfun Id + = External Module -- (a) TyCon, Class, their derived Ids, dfun Id -- (b) Imported Id -- (c) Top-level Id in the original source, even if -- locally defined - | Local -- A user-defined Id or TyVar + | Internal -- A user-defined Id or TyVar -- defined in the module being compiled | System -- A system-defined Id or TyVar. Typically the @@ -82,16 +77,16 @@ data NameSort Notes about the NameSorts: -1. Initially, top-level Ids (including locally-defined ones) get Global names, - and all other local Ids get Local names +1. Initially, top-level Ids (including locally-defined ones) get External names, + and all other local Ids get Internal names -2. Things with a @Global@ name are given C static labels, so they finally +2. Things with a External name are given C static labels, so they finally appear in the .o file's symbol table. They appear in the symbol table in the form M.n. If originally-local things have this property they - must be made @Global@ first. + must be made @External@ first. -3. In the tidy-core phase, a Global that is not visible to an importer - is changed to Local, and a Local that is visible is changed to Global +3. In the tidy-core phase, a External that is not visible to an importer + is changed to Internal, and a Internal that is visible is changed to External 4. A System Name differs in the following ways: a) has unique attached when printing dumps @@ -113,39 +108,36 @@ nameUnique name = n_uniq name nameOccName name = n_occ name nameSrcLoc name = n_loc name -nameModule (Name { n_sort = Global mod }) = mod +nameModule (Name { n_sort = External mod }) = mod nameModule name = pprPanic "nameModule" (ppr name) -nameModule_maybe (Name { n_sort = Global mod }) = Just mod +nameModule_maybe (Name { n_sort = External mod }) = Just mod 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 +nameIsLocalOrFrom :: Module -> Name -> Bool +isInternalName :: Name -> Bool +isExternalName :: Name -> Bool +isSystemName :: Name -> Bool +isHomePackageName :: Name -> Bool -isGlobalName (Name {n_sort = Global _}) = True -isGlobalName other = False +isExternalName (Name {n_sort = External _}) = True +isExternalName other = False -isLocalName name = not (isGlobalName name) +isInternalName name = not (isExternalName name) -nameIsLocallyDefined name = isLocalName name +nameIsLocalOrFrom from (Name {n_sort = External mod}) = mod == from +nameIsLocalOrFrom from other = True -nameIsLocalOrFrom from (Name {n_sort = Global mod}) = mod == from -nameIsLocalOrFrom from other = True +isHomePackageName (Name {n_sort = External mod}) = isHomeModule mod +isHomePackageName other = True -- Internal and system names -nameIsFrom from (Name {n_sort = Global mod}) = mod == from -nameIsFrom from other = pprPanic "nameIsFrom" (ppr other) +isDllName :: Name -> Bool -- Does this name refer to something in a different DLL? +isDllName nm = not opt_Static && not (isHomePackageName nm) --- Global names are by definition those that are visible --- outside the module, *as seen by the linker*. Externally visible --- does not mean visible at the source level -isExternallyVisibleName name = isGlobalName name +isTyVarName :: Name -> Bool +isTyVarName name = isTvOcc (nameOccName name) isSystemName (Name {n_sort = System}) = True isSystemName other = False @@ -159,8 +151,8 @@ isSystemName other = False %************************************************************************ \begin{code} -mkLocalName :: Unique -> OccName -> SrcLoc -> Name -mkLocalName uniq occ loc = Name { n_uniq = uniq, n_sort = Local, n_occ = occ, n_loc = loc } +mkInternalName :: Unique -> OccName -> SrcLoc -> Name +mkInternalName uniq occ loc = Name { n_uniq = uniq, n_sort = Internal, n_occ = occ, n_loc = loc } -- NB: You might worry that after lots of huffing and -- puffing we might end up with two local names with distinct -- uniques, but the same OccName. Indeed we can, but that's ok @@ -170,43 +162,34 @@ mkLocalName uniq occ loc = Name { n_uniq = uniq, n_sort = Local, n_occ = occ, n_ -- * for interface files we tidyCore first, which puts the uniques -- into the print name (see setNameVisibility below) -mkGlobalName :: Unique -> Module -> OccName -> SrcLoc -> Name -mkGlobalName uniq mod occ loc = Name { n_uniq = uniq, n_sort = Global mod, +mkExternalName :: Unique -> Module -> OccName -> SrcLoc -> Name +mkExternalName uniq mod occ loc = Name { n_uniq = uniq, n_sort = External mod, n_occ = occ, n_loc = loc } - -mkKnownKeyGlobal :: RdrName -> Unique -> Name -mkKnownKeyGlobal rdr_name uniq - = mkGlobalName uniq (mkVanillaModule (rdrNameModule rdr_name)) +mkKnownKeyExternalName :: RdrName -> Unique -> Name +mkKnownKeyExternalName rdr_name uniq + = mkExternalName uniq (mkVanillaModule (rdrNameModule rdr_name)) (rdrNameOcc rdr_name) builtinSrcLoc mkWiredInName :: Module -> OccName -> Unique -> Name -mkWiredInName mod occ uniq = mkGlobalName uniq mod occ builtinSrcLoc +mkWiredInName mod occ uniq = mkExternalName uniq mod occ builtinSrcLoc -mkSysLocalName :: Unique -> UserFS -> Name -mkSysLocalName uniq fs = Name { n_uniq = uniq, n_sort = System, +mkSystemName :: Unique -> EncodedFS -> Name +mkSystemName uniq fs = Name { n_uniq = uniq, n_sort = System, n_occ = mkVarOcc fs, n_loc = noSrcLoc } -mkCCallName :: Unique -> EncodedString -> Name +mkFCallName :: Unique -> EncodedString -> Name -- The encoded string completely describes the ccall -mkCCallName uniq str = Name { n_uniq = uniq, n_sort = Local, - n_occ = mkCCallOcc str, n_loc = noSrcLoc } +mkFCallName uniq str = Name { n_uniq = uniq, n_sort = Internal, + n_occ = mkFCallOcc str, n_loc = noSrcLoc } mkIPName :: Unique -> OccName -> Name mkIPName uniq occ = Name { n_uniq = uniq, - n_sort = Local, + n_sort = Internal, 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} @@ -216,103 +199,21 @@ mkDerivedName f name uniq = name {n_uniq = uniq, n_occ = f (n_occ name)} setNameUnique name uniq = name {n_uniq = uniq} setNameOcc :: Name -> OccName -> Name - -- Give the thing a new OccName, *and* - -- record that it's no longer a sys-local - -- This is used by the tidy-up pass setNameOcc name occ = name {n_occ = occ} +externaliseName :: Name -> Module -> Name +externaliseName n mod = n { n_sort = External mod } + +localiseName :: Name -> Name +localiseName n = n { n_sort = Internal } + setNameModuleAndLoc :: Name -> Module -> SrcLoc -> Name setNameModuleAndLoc name mod loc = name {n_sort = set (n_sort name), n_loc = loc} where - set (Global _) = Global mod -\end{code} - - -%************************************************************************ -%* * -\subsection{Tidying a name} -%* * -%************************************************************************ - -tidyTopName is applied to top-level names in the final program - -For top-level things, - it globalises Local names - (if all top-level things should be visible) - and localises non-exported Global names - (if only exported things should be visible) - -In all cases except an exported global, it gives it a new occurrence name. - -The "visibility" here concerns whether the .o file's symbol table -mentions the thing; if so, it needs a module name in its symbol. -The Global things are "visible" and the Local ones are not - -Why should things be "visible"? Certainly they must be if they -are exported. But also: - -(a) In certain (prelude only) modules we split up the .hc file into - lots of separate little files, which are separately compiled by the C - compiler. That gives lots of little .o files. The idea is that if - you happen to mention one of them you don't necessarily pull them all - in. (Pulling in a piece you don't need can be v bad, because it may - mention other pieces you don't need either, and so on.) - - Sadly, splitting up .hc files means that local names (like s234) are - now globally visible, which can lead to clashes between two .hc - files. So unlocaliseWhatnot goes through making all the local things - into global things, essentially by giving them full names so when they - are printed they'll have their module name too. Pretty revolting - really. - -(b) When optimisation is on we want to make all the internal - top-level defns externally visible - -\begin{code} -tidyTopName :: Module -> TidyOccEnv -> Bool -> Name -> (TidyOccEnv, Name) -tidyTopName mod env is_exported - name@(Name { n_occ = occ, n_sort = sort, n_uniq = uniq, n_loc = loc }) - = case sort of - Global _ | is_exported -> (env, name) - | otherwise -> (env, name { n_sort = new_sort }) - -- Don't change the occurrnce names of globals, because many of them - -- are bound by either a class declaration or a data declaration - -- or an explicit user export. - - other | is_exported -> (env', name { n_sort = Global mod, n_occ = occ' }) - | otherwise -> (env', name { n_sort = new_sort, n_occ = occ' }) - where - (env', occ') = tidyOccName env occ - new_sort = mkLocalTopSort mod - -mkTopName :: Unique -> Module -> FAST_STRING -> Name - -- Make a top-level name; make it Global if top-level - -- things should be externally visible; Local otherwise - -- This chap is only used *after* the tidyCore phase - -- Notably, it is used during STG lambda lifting - -- - -- We have to make sure that the name is globally unique - -- and we don't have tidyCore to help us. So we append - -- the unique. Hack! Hack! - -- (Used only by the STG lambda lifter.) -mkTopName uniq mod fs - = Name { n_uniq = uniq, - n_sort = mkLocalTopSort mod, - n_occ = mkVarOcc (_PK_ ((_UNPK_ fs) ++ show uniq)), - n_loc = noSrcLoc } - -mkLocalTopSort :: Module -> NameSort -mkLocalTopSort mod - | all_toplev_ids_visible = Global mod - | otherwise = Local - -all_toplev_ids_visible - = not opt_OmitInterfacePragmas || -- Pragmas can make them visible - opt_EnsureSplittableC -- Splitting requires visiblilty + set (External _) = External mod \end{code} - %************************************************************************ %* * \subsection{Predicates and selectors} @@ -325,22 +226,10 @@ hashName name = iBox (u2i (nameUnique name)) nameRdrName :: Name -> RdrName --- Makes a qualified name for top-level (Global) names, whether locally defined or not --- 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) - +-- Makes a qualified name for top-level (External) names, +-- whether locally defined or not and an unqualified name just for Internals +nameRdrName (Name { n_occ = occ, n_sort = External mod }) = mkRdrOrig (moduleName mod) occ +nameRdrName (Name { n_occ = occ }) = mkRdrUnqual occ \end{code} @@ -373,51 +262,27 @@ instance NamedThing Name where getName n = n \end{code} - %************************************************************************ %* * -\subsection{Name environment} +\subsection{Binary output} %* * %************************************************************************ \begin{code} -type NameEnv a = UniqFM a -- Domain is Name - -emptyNameEnv :: NameEnv a -mkNameEnv :: [(Name,a)] -> NameEnv a -nameEnvElts :: NameEnv a -> [a] -extendNameEnv_C :: (a->a->a) -> NameEnv a -> Name -> a -> NameEnv a -extendNameEnv :: NameEnv a -> Name -> a -> NameEnv a -plusNameEnv :: NameEnv a -> NameEnv a -> NameEnv a -plusNameEnv_C :: (a->a->a) -> NameEnv a -> NameEnv a -> NameEnv a -extendNameEnvList:: NameEnv a -> [(Name,a)] -> NameEnv a -delFromNameEnv :: NameEnv a -> Name -> NameEnv a -elemNameEnv :: Name -> NameEnv a -> Bool -unitNameEnv :: Name -> a -> NameEnv a -lookupNameEnv :: NameEnv a -> Name -> Maybe a -lookupNameEnv_NF :: NameEnv a -> Name -> a -mapNameEnv :: (a->b) -> NameEnv a -> NameEnv b -foldNameEnv :: (a -> b -> b) -> b -> NameEnv a -> b - -emptyNameEnv = emptyUFM -foldNameEnv = foldUFM -mkNameEnv = listToUFM -nameEnvElts = eltsUFM -extendNameEnv_C = addToUFM_C -extendNameEnv = addToUFM -plusNameEnv = plusUFM -plusNameEnv_C = plusUFM_C -extendNameEnvList= addListToUFM -delFromNameEnv = delFromUFM -elemNameEnv = elemUFM -mapNameEnv = mapUFM -unitNameEnv = unitUFM - -lookupNameEnv = lookupUFM -lookupNameEnv_NF env n = expectJust "lookupNameEnv_NF" (lookupUFM env n) +instance Binary Name where + -- we must print these as RdrNames, because that's how they will be read in + put_ bh Name {n_sort = sort, n_uniq = uniq, n_occ = occ} = + case sort of + External mod + | this_mod == mod -> put_ bh (mkRdrUnqual occ) + | otherwise -> put_ bh (mkRdrOrig (moduleName mod) occ) + where (this_mod,_,_,_) = getUserData bh + _ -> do + put_ bh (mkRdrUnqual occ) + + get bh = error "can't Binary.get a Name" \end{code} - %************************************************************************ %* * \subsection{Pretty printing} @@ -426,37 +291,40 @@ lookupNameEnv_NF env n = expectJust "lookupNameEnv_NF" (lookupUFM env n) \begin{code} instance Outputable Name where - -- When printing interfaces, all Locals have been given nice print-names + -- When printing interfaces, all Internals have been given nice print-names ppr name = pprName name pprName name@(Name {n_sort = sort, n_uniq = uniq, n_occ = occ}) = getPprStyle $ \ sty -> case sort of - Global mod -> pprGlobal sty name uniq mod occ - System -> pprSysLocal sty uniq occ - Local -> pprLocal sty uniq occ + External mod -> pprExternal sty name uniq mod occ + System -> pprSystem sty uniq occ + Internal -> pprInternal 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 +pprExternal 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 -pprSysLocal sty uniq occ +pprInternal sty uniq occ + | codeStyle sty = pprUnique uniq + | debugStyle sty = pprOccName occ <> + text "{-" <> pprUnique uniq <> text "-}" + | otherwise = pprOccName occ -- User style + +-- Like Internal, except that we only omit the unique in Iface style +pprSystem sty uniq occ | codeStyle sty = pprUnique uniq | 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} @@ -475,13 +343,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}