X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fprelude%2FPrelNames.lhs;h=c903b16efc34ad00d488e249f7d23abbfc55a297;hb=864ce5bdfa24cf352c466d6de8e9f938302d4253;hp=f99fe5f148eb3d8fb785c25fca97e4c89d83888e;hpb=b732f90c9e6b1c0177e04a5f84abac7f50cca4e4;p=ghc-hetmet.git diff --git a/ghc/compiler/prelude/PrelNames.lhs b/ghc/compiler/prelude/PrelNames.lhs index f99fe5f..c903b16 100644 --- a/ghc/compiler/prelude/PrelNames.lhs +++ b/ghc/compiler/prelude/PrelNames.lhs @@ -37,8 +37,8 @@ module PrelNames ( #include "HsVersions.h" import Module ( ModuleName, mkPrelModule, mkModuleName ) -import OccName ( NameSpace, varName, dataName, tcName, clsName ) -import RdrName ( RdrName, mkPreludeQual ) +import OccName ( NameSpace, UserFS, varName, dataName, tcName, clsName, mkKindOccFS ) +import RdrName ( RdrName, mkOrig, mkUnqual ) import UniqFM import Unique ( Unique, Uniquable(..), hasKey, mkPreludeMiscIdUnique, mkPreludeDataConUnique, @@ -48,7 +48,7 @@ import BasicTypes ( Boxity(..), Arity ) import UniqFM ( UniqFM, listToUFM ) import Name ( Name, mkLocalName, mkKnownKeyGlobal, nameRdrName ) import RdrName ( rdrNameOcc ) -import SrcLoc ( noSrcLoc ) +import SrcLoc ( builtinSrcLoc ) import Util ( nOfThem ) import Panic ( panic ) \end{code} @@ -78,6 +78,7 @@ knownKeyNames byteArrayTyConName, mutableByteArrayTyConName, foreignObjTyConName, + foreignPtrTyConName, bcoPrimTyConName, stablePtrTyConName, stablePtrDataConName, @@ -123,7 +124,7 @@ knownKeyNames fromRationalName, deRefStablePtrName, - makeStablePtrName, + newStablePtrName, bindIOName, returnIOName, @@ -195,8 +196,8 @@ pREL_FLOAT_Name = mkModuleName "PrelFloat" pREL_MAIN_Name = mkModuleName "PrelMain" mAIN_Name = mkModuleName "Main" -iNT_Name = mkModuleName "Int" -wORD_Name = mkModuleName "Word" +pREL_INT_Name = mkModuleName "PrelInt" +pREL_WORD_Name = mkModuleName "PrelWord" pREL_GHC = mkPrelModule pREL_GHC_Name pREL_BASE = mkPrelModule pREL_BASE_Name @@ -217,7 +218,7 @@ pREL_FLOAT = mkPrelModule pREL_FLOAT_Name %************************************************************************ \begin{code} -mkTupNameStr :: Boxity -> Int -> (ModuleName, FAST_STRING) +mkTupNameStr :: Boxity -> Int -> (ModuleName, UserFS) mkTupNameStr Boxed 0 = (pREL_BASE_Name, SLIT("()")) mkTupNameStr Boxed 1 = panic "Name.mkTupNameStr: 1 ???" @@ -235,7 +236,22 @@ mkTupNameStr Unboxed n = (pREL_GHC_Name, _PK_ ("(#" ++ nOfThem (n-1) ',' ++ "#)" mkTupConRdrName :: NameSpace -> Boxity -> Arity -> RdrName mkTupConRdrName space boxity arity = case mkTupNameStr boxity arity of - (mod, occ) -> mkPreludeQual space mod occ + (mod, occ) -> mkOrig space mod occ +\end{code} + + +%************************************************************************ +%* * +\subsection{Unqualified RdrNames} +%* * +%************************************************************************ + +\begin{code} +main_RDR_Unqual :: RdrName +main_RDR_Unqual = mkUnqual varName SLIT("main") +-- Don't get a RdrName from PrelNames.mainName, because nameRdrName +-- gets an Orig RdrName, and we want a Qual or Unqual one. An Unqual +-- one will do fine. \end{code} @@ -245,7 +261,7 @@ mkTupConRdrName space boxity arity = case mkTupNameStr boxity arity of %* * %************************************************************************ -These RdrNames are not really "built in", but some parts of the +Many of these Names are not really "built in", but some parts of the compiler (notably the deriving mechanism) need to mention their names, and it's convenient to write them all down in one place. @@ -253,9 +269,41 @@ and it's convenient to write them all down in one place. mainName = varQual mAIN_Name SLIT("main") mainKey -- Stuff from PrelGHC -funTyConName = tcQual pREL_GHC_Name SLIT("(->)") funTyConKey -cCallableClassName = clsQual pREL_GHC_Name SLIT("CCallable") cCallableClassKey -cReturnableClassName = clsQual pREL_GHC_Name SLIT("CReturnable") cReturnableClassKey +usOnceTyConName = kindQual SLIT(".") usOnceTyConKey +usManyTyConName = kindQual SLIT("!") usManyTyConKey +superKindName = kindQual SLIT("KX") kindConKey +superBoxityName = kindQual SLIT("BX") boxityConKey +boxedConName = kindQual SLIT("*") boxedConKey +unboxedConName = kindQual SLIT("#") unboxedConKey +openKindConName = kindQual SLIT("?") anyBoxConKey +usageKindConName = kindQual SLIT("$") usageConKey +typeConName = kindQual SLIT("Type") typeConKey + +funTyConName = tcQual pREL_GHC_Name SLIT("(->)") funTyConKey +charPrimTyConName = tcQual pREL_GHC_Name SLIT("Char#") charPrimTyConKey +intPrimTyConName = tcQual pREL_GHC_Name SLIT("Int#") intPrimTyConKey +int64PrimTyConName = tcQual pREL_GHC_Name SLIT("Int64#") int64PrimTyConKey +wordPrimTyConName = tcQual pREL_GHC_Name SLIT("Word#") wordPrimTyConKey +word64PrimTyConName = tcQual pREL_GHC_Name SLIT("Word64#") word64PrimTyConKey +addrPrimTyConName = tcQual pREL_GHC_Name SLIT("Addr#") addrPrimTyConKey +floatPrimTyConName = tcQual pREL_GHC_Name SLIT("Float#") floatPrimTyConKey +doublePrimTyConName = tcQual pREL_GHC_Name SLIT("Double#") doublePrimTyConKey +statePrimTyConName = tcQual pREL_GHC_Name SLIT("State#") statePrimTyConKey +realWorldTyConName = tcQual pREL_GHC_Name SLIT("RealWorld") realWorldTyConKey +arrayPrimTyConName = tcQual pREL_GHC_Name SLIT("Array#") arrayPrimTyConKey +byteArrayPrimTyConName = tcQual pREL_GHC_Name SLIT("ByteArray#") byteArrayPrimTyConKey +mutableArrayPrimTyConName = tcQual pREL_GHC_Name SLIT("MutableArray#") mutableArrayPrimTyConKey +mutableByteArrayPrimTyConName = tcQual pREL_GHC_Name SLIT("MutableByteArray#") mutableByteArrayPrimTyConKey +mutVarPrimTyConName = tcQual pREL_GHC_Name SLIT("MutVar#") mutVarPrimTyConKey +mVarPrimTyConName = tcQual pREL_GHC_Name SLIT("MVar#") mVarPrimTyConKey +stablePtrPrimTyConName = tcQual pREL_GHC_Name SLIT("StablePtr#") stablePtrPrimTyConKey +stableNamePrimTyConName = tcQual pREL_GHC_Name SLIT("StableName#") stableNamePrimTyConKey +foreignObjPrimTyConName = tcQual pREL_GHC_Name SLIT("ForeignObj#") foreignObjPrimTyConKey +bcoPrimTyConName = tcQual pREL_GHC_Name SLIT("BCO#") bcoPrimTyConKey +weakPrimTyConName = tcQual pREL_GHC_Name SLIT("Weak#") weakPrimTyConKey +threadIdPrimTyConName = tcQual pREL_GHC_Name SLIT("ThreadId#") threadIdPrimTyConKey +cCallableClassName = clsQual pREL_GHC_Name SLIT("CCallable") cCallableClassKey +cReturnableClassName = clsQual pREL_GHC_Name SLIT("CReturnable") cReturnableClassKey -- PrelBase data types and constructors charTyConName = tcQual pREL_BASE_Name SLIT("Char") charTyConKey @@ -372,16 +420,16 @@ bindIOName = varQual pREL_IO_BASE_Name SLIT("bindIO") bindIOIdKey returnIOName = varQual pREL_IO_BASE_Name SLIT("returnIO") returnIOIdKey -- Int, Word, and Addr things -int8TyConName = tcQual iNT_Name SLIT("Int8") int8TyConKey -int16TyConName = tcQual iNT_Name SLIT("Int16") int16TyConKey -int32TyConName = tcQual iNT_Name SLIT("Int32") int32TyConKey +int8TyConName = tcQual pREL_INT_Name SLIT("Int8") int8TyConKey +int16TyConName = tcQual pREL_INT_Name SLIT("Int16") int16TyConKey +int32TyConName = tcQual pREL_INT_Name SLIT("Int32") int32TyConKey int64TyConName = tcQual pREL_ADDR_Name SLIT("Int64") int64TyConKey -wordTyConName = tcQual pREL_ADDR_Name SLIT("Word") wordTyConKey -wordDataConName = dataQual pREL_ADDR_Name SLIT("W#") wordDataConKey -word8TyConName = tcQual wORD_Name SLIT("Word8") word8TyConKey -word16TyConName = tcQual wORD_Name SLIT("Word16") word16TyConKey -word32TyConName = tcQual wORD_Name SLIT("Word32") word32TyConKey +wordTyConName = tcQual pREL_ADDR_Name SLIT("Word") wordTyConKey +wordDataConName = dataQual pREL_ADDR_Name SLIT("W#") wordDataConKey +word8TyConName = tcQual pREL_WORD_Name SLIT("Word8") word8TyConKey +word16TyConName = tcQual pREL_WORD_Name SLIT("Word16") word16TyConKey +word32TyConName = tcQual pREL_WORD_Name SLIT("Word32") word32TyConKey word64TyConName = tcQual pREL_ADDR_Name SLIT("Word64") word64TyConKey addrTyConName = tcQual pREL_ADDR_Name SLIT("Addr") addrTyConKey @@ -395,11 +443,12 @@ mutableByteArrayTyConName = tcQual pREL_BYTEARR_Name SLIT("MutableByteArray") m -- Forign objects and weak pointers foreignObjTyConName = tcQual pREL_IO_BASE_Name SLIT("ForeignObj") foreignObjTyConKey foreignObjDataConName = dataQual pREL_IO_BASE_Name SLIT("ForeignObj") foreignObjDataConKey -bcoPrimTyConName = tcQual pREL_BASE_Name SLIT("BCO#") bcoPrimTyConKey +foreignPtrTyConName = tcQual pREL_FOREIGN_Name SLIT("ForeignPtr") foreignPtrTyConKey +foreignPtrDataConName = dataQual pREL_FOREIGN_Name SLIT("ForeignPtr") foreignPtrDataConKey stablePtrTyConName = tcQual pREL_STABLE_Name SLIT("StablePtr") stablePtrTyConKey stablePtrDataConName = dataQual pREL_STABLE_Name SLIT("StablePtr") stablePtrDataConKey deRefStablePtrName = varQual pREL_STABLE_Name SLIT("deRefStablePtr") deRefStablePtrIdKey -makeStablePtrName = varQual pREL_STABLE_Name SLIT("makeStablePtr") makeStablePtrIdKey +newStablePtrName = varQual pREL_STABLE_Name SLIT("newStablePtr") newStablePtrIdKey errorName = varQual pREL_ERR_Name SLIT("error") errorIdKey assertName = varQual pREL_GHC_Name SLIT("assert") assertIdKey @@ -417,42 +466,109 @@ The following names are known to the compiler, but they don't require pre-assigned keys. Mostly these names are used in generating deriving code, which is passed through the renamer anyway. + THEY ARE ALL ORIGINAL NAMES, HOWEVER + +\begin{code} +-- Lists and tuples +tupleCon_RDR, tupleTyCon_RDR :: Int -> RdrName +ubxTupleCon_RDR, ubxTupleTyCon_RDR :: Int -> RdrName + +tupleCon_RDR = mkTupConRdrName dataName Boxed +tupleTyCon_RDR = mkTupConRdrName tcName Boxed +ubxTupleCon_RDR = mkTupConRdrName dataName Unboxed +ubxTupleTyCon_RDR = mkTupConRdrName tcName Unboxed + +unitCon_RDR = dataQual_RDR pREL_BASE_Name SLIT("()") +unitTyCon_RDR = tcQual_RDR pREL_BASE_Name SLIT("()") + +and_RDR = varQual_RDR pREL_BASE_Name SLIT("&&") +not_RDR = varQual_RDR pREL_BASE_Name SLIT("not") +compose_RDR = varQual_RDR pREL_BASE_Name SLIT(".") +ne_RDR = varQual_RDR pREL_BASE_Name SLIT("/=") +le_RDR = varQual_RDR pREL_BASE_Name SLIT("<=") +lt_RDR = varQual_RDR pREL_BASE_Name SLIT("<") +gt_RDR = varQual_RDR pREL_BASE_Name SLIT(">") +ltTag_RDR = dataQual_RDR pREL_BASE_Name SLIT("LT") +eqTag_RDR = dataQual_RDR pREL_BASE_Name SLIT("EQ") +gtTag_RDR = dataQual_RDR pREL_BASE_Name SLIT("GT") +max_RDR = varQual_RDR pREL_BASE_Name SLIT("max") +min_RDR = varQual_RDR pREL_BASE_Name SLIT("min") +compare_RDR = varQual_RDR pREL_BASE_Name SLIT("compare") +showList_RDR = varQual_RDR pREL_SHOW_Name SLIT("showList") +showList___RDR = varQual_RDR pREL_SHOW_Name SLIT("showList__") +showsPrec_RDR = varQual_RDR pREL_SHOW_Name SLIT("showsPrec") +showSpace_RDR = varQual_RDR pREL_SHOW_Name SLIT("showSpace") +showString_RDR = varQual_RDR pREL_SHOW_Name SLIT("showString") +showParen_RDR = varQual_RDR pREL_SHOW_Name SLIT("showParen") +readsPrec_RDR = varQual_RDR pREL_READ_Name SLIT("readsPrec") +readList_RDR = varQual_RDR pREL_READ_Name SLIT("readList") +readParen_RDR = varQual_RDR pREL_READ_Name SLIT("readParen") +lex_RDR = varQual_RDR pREL_READ_Name SLIT("lex") +readList___RDR = varQual_RDR pREL_READ_Name SLIT("readList__") +times_RDR = varQual_RDR pREL_NUM_Name SLIT("*") +plus_RDR = varQual_RDR pREL_NUM_Name SLIT("+") +negate_RDR = varQual_RDR pREL_NUM_Name SLIT("negate") +range_RDR = varQual_RDR pREL_ARR_Name SLIT("range") +index_RDR = varQual_RDR pREL_ARR_Name SLIT("index") +inRange_RDR = varQual_RDR pREL_ARR_Name SLIT("inRange") +succ_RDR = varQual_RDR pREL_ENUM_Name SLIT("succ") +pred_RDR = varQual_RDR pREL_ENUM_Name SLIT("pred") +minBound_RDR = varQual_RDR pREL_ENUM_Name SLIT("minBound") +maxBound_RDR = varQual_RDR pREL_ENUM_Name SLIT("maxBound") +assertErr_RDR = varQual_RDR pREL_ERR_Name SLIT("assertError") +\end{code} + +These RDR names also have known keys, so we need to get back the RDR names to +populate the occurrence list above. + \begin{code} -and_RDR = varQual_RDR pREL_BASE_Name SLIT("&&") -not_RDR = varQual_RDR pREL_BASE_Name SLIT("not") -compose_RDR = varQual_RDR pREL_BASE_Name SLIT(".") -ne_RDR = varQual_RDR pREL_BASE_Name SLIT("/=") -le_RDR = varQual_RDR pREL_BASE_Name SLIT("<=") -lt_RDR = varQual_RDR pREL_BASE_Name SLIT("<") -gt_RDR = varQual_RDR pREL_BASE_Name SLIT(">") -ltTag_RDR = dataQual_RDR pREL_BASE_Name SLIT("LT") -eqTag_RDR = dataQual_RDR pREL_BASE_Name SLIT("EQ") -gtTag_RDR = dataQual_RDR pREL_BASE_Name SLIT("GT") -max_RDR = varQual_RDR pREL_BASE_Name SLIT("max") -min_RDR = varQual_RDR pREL_BASE_Name SLIT("min") -compare_RDR = varQual_RDR pREL_BASE_Name SLIT("compare") -showList_RDR = varQual_RDR pREL_SHOW_Name SLIT("showList") -showList___RDR = varQual_RDR pREL_SHOW_Name SLIT("showList__") -showsPrec_RDR = varQual_RDR pREL_SHOW_Name SLIT("showsPrec") -showSpace_RDR = varQual_RDR pREL_SHOW_Name SLIT("showSpace") -showString_RDR = varQual_RDR pREL_SHOW_Name SLIT("showString") -showParen_RDR = varQual_RDR pREL_SHOW_Name SLIT("showParen") -readsPrec_RDR = varQual_RDR pREL_READ_Name SLIT("readsPrec") -readList_RDR = varQual_RDR pREL_READ_Name SLIT("readList") -readParen_RDR = varQual_RDR pREL_READ_Name SLIT("readParen") -lex_RDR = varQual_RDR pREL_READ_Name SLIT("lex") -readList___RDR = varQual_RDR pREL_READ_Name SLIT("readList__") -times_RDR = varQual_RDR pREL_NUM_Name SLIT("*") -plus_RDR = varQual_RDR pREL_NUM_Name SLIT("+") -negate_RDR = varQual_RDR pREL_NUM_Name SLIT("negate") -range_RDR = varQual_RDR pREL_ARR_Name SLIT("range") -index_RDR = varQual_RDR pREL_ARR_Name SLIT("index") -inRange_RDR = varQual_RDR pREL_ARR_Name SLIT("inRange") -succ_RDR = varQual_RDR pREL_ENUM_Name SLIT("succ") -pred_RDR = varQual_RDR pREL_ENUM_Name SLIT("pred") -minBound_RDR = varQual_RDR pREL_ENUM_Name SLIT("minBound") -maxBound_RDR = varQual_RDR pREL_ENUM_Name SLIT("maxBound") -assertErr_RDR = varQual_RDR pREL_ERR_Name SLIT("assertError") +funTyCon_RDR = nameRdrName funTyConName +nilCon_RDR = nameRdrName nilDataConName +listTyCon_RDR = nameRdrName listTyConName +ioTyCon_RDR = nameRdrName ioTyConName +intTyCon_RDR = nameRdrName intTyConName +eq_RDR = nameRdrName eqName +ge_RDR = nameRdrName geName +numClass_RDR = nameRdrName numClassName +ordClass_RDR = nameRdrName ordClassName +map_RDR = nameRdrName mapName +append_RDR = nameRdrName appendName +foldr_RDR = nameRdrName foldrName +build_RDR = nameRdrName buildName +enumFromTo_RDR = nameRdrName enumFromToName +returnM_RDR = nameRdrName returnMName +thenM_RDR = nameRdrName thenMName +failM_RDR = nameRdrName failMName +false_RDR = nameRdrName falseDataConName +true_RDR = nameRdrName trueDataConName +error_RDR = nameRdrName errorName +getTag_RDR = nameRdrName getTagName +fromEnum_RDR = nameRdrName fromEnumName +toEnum_RDR = nameRdrName toEnumName +enumFrom_RDR = nameRdrName enumFromName +mkInt_RDR = nameRdrName intDataConName +enumFromThen_RDR = nameRdrName enumFromThenName +enumFromThenTo_RDR = nameRdrName enumFromThenToName +ratioDataCon_RDR = nameRdrName ratioDataConName +plusInteger_RDR = nameRdrName plusIntegerName +timesInteger_RDR = nameRdrName timesIntegerName +enumClass_RDR = nameRdrName enumClassName +monadClass_RDR = nameRdrName monadClassName +ioDataCon_RDR = nameRdrName ioDataConName +cCallableClass_RDR = nameRdrName cCallableClassName +cReturnableClass_RDR = nameRdrName cReturnableClassName +eqClass_RDR = nameRdrName eqClassName +eqString_RDR = nameRdrName eqStringName +unpackCString_RDR = nameRdrName unpackCStringName +unpackCStringFoldr_RDR = nameRdrName unpackCStringFoldrName +unpackCStringUtf8_RDR = nameRdrName unpackCStringUtf8Name +deRefStablePtr_RDR = nameRdrName deRefStablePtrName +newStablePtr_RDR = nameRdrName newStablePtrName +bindIO_RDR = nameRdrName bindIOName +returnIO_RDR = nameRdrName returnIOName +fromInteger_RDR = nameRdrName fromIntegerName +fromRational_RDR = nameRdrName fromRationalName +minus_RDR = nameRdrName minusName \end{code} %************************************************************************ @@ -461,14 +577,23 @@ assertErr_RDR = varQual_RDR pREL_ERR_Name SLIT("assertError") %* * %************************************************************************ -\begin{code} -varQual mod str uq = mkKnownKeyGlobal (mkPreludeQual varName mod str) uq -dataQual mod str uq = mkKnownKeyGlobal (mkPreludeQual dataName mod str) uq -tcQual mod str uq = mkKnownKeyGlobal (mkPreludeQual tcName mod str) uq -clsQual mod str uq = mkKnownKeyGlobal (mkPreludeQual clsName mod str) uq +All these are original names; hence mkOrig -varQual_RDR mod str = mkPreludeQual varName mod str -dataQual_RDR mod str = mkPreludeQual dataName mod str +\begin{code} +varQual mod str uq = mkKnownKeyGlobal (varQual_RDR mod str) uq +dataQual mod str uq = mkKnownKeyGlobal (dataQual_RDR mod str) uq +tcQual mod str uq = mkKnownKeyGlobal (tcQual_RDR mod str) uq +clsQual mod str uq = mkKnownKeyGlobal (clsQual_RDR mod str) uq + +kindQual str uq = mkLocalName uq (mkKindOccFS tcName str) builtinSrcLoc + -- Kinds are not z-encoded in interface file, hence mkKindOccFS + -- And they don't come from any particular module; indeed we always + -- want to print them unqualified. Hence the LocalName + +varQual_RDR mod str = mkOrig varName mod str +tcQual_RDR mod str = mkOrig tcName mod str +clsQual_RDR mod str = mkOrig clsName mod str +dataQual_RDR mod str = mkOrig dataName mod str \end{code} %************************************************************************ @@ -531,17 +656,18 @@ integerTyConKey = mkPreludeTyConUnique 21 listTyConKey = mkPreludeTyConUnique 22 foreignObjPrimTyConKey = mkPreludeTyConUnique 23 foreignObjTyConKey = mkPreludeTyConUnique 24 -weakPrimTyConKey = mkPreludeTyConUnique 25 -mutableArrayPrimTyConKey = mkPreludeTyConUnique 26 -mutableByteArrayPrimTyConKey = mkPreludeTyConUnique 27 -orderingTyConKey = mkPreludeTyConUnique 28 -mVarPrimTyConKey = mkPreludeTyConUnique 29 -ratioTyConKey = mkPreludeTyConUnique 30 -rationalTyConKey = mkPreludeTyConUnique 31 -realWorldTyConKey = mkPreludeTyConUnique 32 -stablePtrPrimTyConKey = mkPreludeTyConUnique 33 -stablePtrTyConKey = mkPreludeTyConUnique 34 -statePrimTyConKey = mkPreludeTyConUnique 35 +foreignPtrTyConKey = mkPreludeTyConUnique 25 +weakPrimTyConKey = mkPreludeTyConUnique 26 +mutableArrayPrimTyConKey = mkPreludeTyConUnique 27 +mutableByteArrayPrimTyConKey = mkPreludeTyConUnique 28 +orderingTyConKey = mkPreludeTyConUnique 29 +mVarPrimTyConKey = mkPreludeTyConUnique 30 +ratioTyConKey = mkPreludeTyConUnique 31 +rationalTyConKey = mkPreludeTyConUnique 32 +realWorldTyConKey = mkPreludeTyConUnique 33 +stablePtrPrimTyConKey = mkPreludeTyConUnique 34 +stablePtrTyConKey = mkPreludeTyConUnique 35 +statePrimTyConKey = mkPreludeTyConUnique 36 stableNamePrimTyConKey = mkPreludeTyConUnique 50 stableNameTyConKey = mkPreludeTyConUnique 51 mutableByteArrayTyConKey = mkPreludeTyConUnique 52 @@ -564,10 +690,15 @@ typeConKey = mkPreludeTyConUnique 69 threadIdPrimTyConKey = mkPreludeTyConUnique 70 bcoPrimTyConKey = mkPreludeTyConUnique 71 +-- Usage type constructors +usageConKey = mkPreludeTyConUnique 72 +usOnceTyConKey = mkPreludeTyConUnique 73 +usManyTyConKey = mkPreludeTyConUnique 74 + -- Generic Type Constructors -crossTyConKey = mkPreludeTyConUnique 72 -plusTyConKey = mkPreludeTyConUnique 73 -genUnitTyConKey = mkPreludeTyConUnique 74 +crossTyConKey = mkPreludeTyConUnique 75 +plusTyConKey = mkPreludeTyConUnique 76 +genUnitTyConKey = mkPreludeTyConUnique 77 \end{code} %************************************************************************ @@ -587,13 +718,14 @@ intDataConKey = mkPreludeDataConUnique 6 smallIntegerDataConKey = mkPreludeDataConUnique 7 largeIntegerDataConKey = mkPreludeDataConUnique 8 foreignObjDataConKey = mkPreludeDataConUnique 9 -nilDataConKey = mkPreludeDataConUnique 10 -ratioDataConKey = mkPreludeDataConUnique 11 -stablePtrDataConKey = mkPreludeDataConUnique 12 -stableNameDataConKey = mkPreludeDataConUnique 13 -trueDataConKey = mkPreludeDataConUnique 14 -wordDataConKey = mkPreludeDataConUnique 15 -ioDataConKey = mkPreludeDataConUnique 16 +foreignPtrDataConKey = mkPreludeDataConUnique 10 +nilDataConKey = mkPreludeDataConUnique 11 +ratioDataConKey = mkPreludeDataConUnique 12 +stablePtrDataConKey = mkPreludeDataConUnique 13 +stableNameDataConKey = mkPreludeDataConUnique 14 +trueDataConKey = mkPreludeDataConUnique 15 +wordDataConKey = mkPreludeDataConUnique 16 +ioDataConKey = mkPreludeDataConUnique 17 -- Generic data constructors crossDataConKey = mkPreludeDataConUnique 17 @@ -645,7 +777,7 @@ zipIdKey = mkPreludeMiscIdUnique 35 bindIOIdKey = mkPreludeMiscIdUnique 36 returnIOIdKey = mkPreludeMiscIdUnique 37 deRefStablePtrIdKey = mkPreludeMiscIdUnique 38 -makeStablePtrIdKey = mkPreludeMiscIdUnique 39 +newStablePtrIdKey = mkPreludeMiscIdUnique 39 getTagIdKey = mkPreludeMiscIdUnique 40 plusIntegerIdKey = mkPreludeMiscIdUnique 41 timesIntegerIdKey = mkPreludeMiscIdUnique 42 @@ -709,6 +841,7 @@ cCallishTyKeys = , byteArrayTyConKey , mutableByteArrayTyConKey , foreignObjTyConKey + , foreignPtrTyConKey , stablePtrTyConKey , int8TyConKey , int16TyConKey @@ -781,32 +914,6 @@ deriving_occ_info -- or for taggery. -- ordClass: really it's the methods that are actually used. -- numClass: for Int literals - --- these RDR names also have known keys, so we need to get back the RDR names to --- populate the occurrence list above. -intTyCon_RDR = nameRdrName intTyConName -eq_RDR = nameRdrName eqName -ge_RDR = nameRdrName geName -numClass_RDR = nameRdrName numClassName -ordClass_RDR = nameRdrName ordClassName -map_RDR = nameRdrName mapName -append_RDR = nameRdrName appendName -foldr_RDR = nameRdrName foldrName -build_RDR = nameRdrName buildName -enumFromTo_RDR = nameRdrName enumFromToName -returnM_RDR = nameRdrName returnMName -thenM_RDR = nameRdrName thenMName -failM_RDR = nameRdrName failMName -false_RDR = nameRdrName falseDataConName -true_RDR = nameRdrName trueDataConName -error_RDR = nameRdrName errorName -getTag_RDR = nameRdrName getTagName -fromEnum_RDR = nameRdrName fromEnumName -toEnum_RDR = nameRdrName toEnumName -enumFrom_RDR = nameRdrName enumFromName -mkInt_RDR = nameRdrName intDataConName -enumFromThen_RDR = nameRdrName enumFromThenName -enumFromThenTo_RDR = nameRdrName enumFromThenToName \end{code} @@ -859,7 +966,7 @@ noDictClassKeys -- These classes are used only for type annotations; -- mkUnboundName makes a place-holder Name; it shouldn't be looked at except possibly -- during compiler debugging. mkUnboundName :: RdrName -> Name -mkUnboundName rdr_name = mkLocalName unboundKey (rdrNameOcc rdr_name) noSrcLoc +mkUnboundName rdr_name = mkLocalName unboundKey (rdrNameOcc rdr_name) builtinSrcLoc isUnboundName :: Name -> Bool isUnboundName name = name `hasKey` unboundKey