X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fprelude%2FPrelInfo.lhs;h=36b9520eefd39026c8ea6a3ca0362aee5542648e;hb=94a28821c91acc060baa966a64e23e1dbff3d069;hp=e97d2882b6767fadc9de76311c759bb9bcb40ad3;hpb=caac75c6a454396dadff0323162ed14adb4893cd;p=ghc-hetmet.git

diff --git a/ghc/compiler/prelude/PrelInfo.lhs b/ghc/compiler/prelude/PrelInfo.lhs
index e97d288..36b9520 100644
--- a/ghc/compiler/prelude/PrelInfo.lhs
+++ b/ghc/compiler/prelude/PrelInfo.lhs
@@ -5,52 +5,42 @@
 
 \begin{code}
 module PrelInfo (
-	module PrelNames,
 	module MkId,
 
-	wiredInThings, 	-- Names of wired in things
-	wiredInThingEnv,
 	ghcPrimExports,
-	cCallableClassDecl, cReturnableClassDecl, assertDecl,
+	wiredInThings, basicKnownKeyNames,
+	primOpId,
 	
-	-- Primop RdrNames
-	eqH_Char_RDR,   ltH_Char_RDR,   eqH_Word_RDR,  ltH_Word_RDR, 
-	eqH_Addr_RDR,   ltH_Addr_RDR,   eqH_Float_RDR, ltH_Float_RDR, 
-	eqH_Double_RDR, ltH_Double_RDR, eqH_Int_RDR,   ltH_Int_RDR,
-	geH_RDR, leH_RDR, minusH_RDR, tagToEnumH_RDR, 
-
 	-- Random other things
 	maybeCharLikeCon, maybeIntLikeCon,
 
 	-- Class categories
-	isCcallishClass, isCreturnableClass, isNoDictClass, 
-	isNumericClass, isStandardClass
+	isNoDictClass, isNumericClass, isStandardClass
 
     ) where
 
 #include "HsVersions.h"
 
-import PrelNames	-- Prelude module names
+import PrelNames	( basicKnownKeyNames, 
+			  hasKey, charDataConKey, intDataConKey,
+			  numericClassKeys, standardClassKeys,
+			  noDictClassKeys )
 
-import PrimOp		( PrimOp(..), allThePrimOps, primOpRdrName, primOpOcc )
+import PrimOp		( PrimOp, allThePrimOps, primOpOcc, primOpTag, maxPrimOpTag )
 import DataCon		( DataCon )
-import Id		( idName )
+import Id		( Id, idName )
 import MkId		( mkPrimOpId, wiredInIds )
 import MkId		-- All of it, for re-export
-import Name		( nameOccName, nameRdrName )
-import RdrName		( mkRdrUnqual )
-import HsSyn		( HsTyVarBndr(..), TyClDecl(..), HsType(..) )
-import OccName		( mkVarOcc )
+import Name		( nameOccName )
 import TysPrim		( primTyCons )
 import TysWiredIn	( wiredInTyCons )
-import RdrHsSyn		( mkClassDecl )
-import HscTypes 	( TyThing(..), implicitTyThingIds, TypeEnv, mkTypeEnv,
-			  GenAvailInfo(..), RdrAvailInfo )
+import HscTypes 	( TyThing(..), implicitTyThings, GenAvailInfo(..), RdrAvailInfo )
 import Class	 	( Class, classKey )
-import Type		( funTyCon, openTypeKind, liftedTypeKind )
+import Type		( funTyCon )
 import TyCon		( tyConName )
-import SrcLoc		( noSrcLoc )
 import Util		( isIn )
+
+import Array		( Array, array, (!) )
 \end{code}
 
 %************************************************************************
@@ -64,11 +54,11 @@ We have two ``builtin name funs,'' one to look up @TyCons@ and
 
 \begin{code}
 wiredInThings :: [TyThing]
-wiredInThings
+wiredInThings		
   = concat
     [		-- Wired in TyCons and their implicit Ids
 	  tycon_things
-	, map AnId (implicitTyThingIds tycon_things)
+	, concatMap implicitTyThings tycon_things
 
 		-- Wired in Ids
 	, map AnId wiredInIds
@@ -78,9 +68,6 @@ wiredInThings
     ]
   where
     tycon_things = map ATyCon ([funTyCon] ++ primTyCons ++ wiredInTyCons)
-
-wiredInThingEnv :: TypeEnv
-wiredInThingEnv = mkTypeEnv wiredInThings
 \end{code}
 
 We let a lot of "non-standard" values be visible, so that we can make
@@ -89,83 +76,36 @@ sense of them in interface pragmas. It's cool, though they all have
 
 %************************************************************************
 %*									*
-\subsection{Export lists for pseudo-modules (GHC.Prim)}
+		PrimOpIds
 %*									*
 %************************************************************************
 
-GHC.Prim "exports" all the primops and primitive types, some 
-wired-in Ids, and the CCallable & CReturnable classes.
-
 \begin{code}
-ghcPrimExports :: [RdrAvailInfo]
- = AvailTC cCallableOcc [ cCallableOcc ] :
-   AvailTC cReturnableOcc [ cReturnableOcc ] :
-   Avail (nameOccName assertName) :	-- doesn't have an Id
-   map (Avail . nameOccName . idName) ghcPrimIds ++
-   map (Avail . primOpOcc) allThePrimOps ++
-   [ AvailTC occ [occ] |
-     n <- funTyCon : primTyCons, let occ = nameOccName (tyConName n) 
-   ]
- where
-   cCallableOcc = nameOccName cCallableClassName
-   cReturnableOcc = nameOccName cReturnableClassName
-
-assertDecl
-  = IfaceSig { 
- 	tcdName = nameRdrName assertName,
-	tcdType = HsForAllTy (Just [liftedAlpha]) [] (HsTyVar alpha),
-	tcdIdInfo = [],
-	tcdLoc = noSrcLoc
-    }
-
-cCallableClassDecl
-  = mkClassDecl
-    ([], nameRdrName cCallableClassName, [openAlpha])
-    [] -- no fds
-    [] -- no sigs
-    Nothing -- no mbinds
-    noSrcLoc
-
-cReturnableClassDecl
-  = mkClassDecl
-    ([], nameRdrName cReturnableClassName, [openAlpha])
-    [] -- no fds
-    [] -- no sigs
-    Nothing -- no mbinds
-    noSrcLoc
-
-alpha = mkRdrUnqual (mkVarOcc FSLIT("a"))
-openAlpha = IfaceTyVar alpha openTypeKind
-liftedAlpha = IfaceTyVar alpha liftedTypeKind
+primOpIds :: Array Int Id	-- Indexed by PrimOp tag
+primOpIds = array (1,maxPrimOpTag) [ (primOpTag op, mkPrimOpId op) 
+				   | op <- allThePrimOps]
+
+primOpId :: PrimOp -> Id
+primOpId op = primOpIds ! primOpTag op
 \end{code}
 
+
 %************************************************************************
 %*									*
-\subsection{RdrNames for the primops}
+\subsection{Export lists for pseudo-modules (GHC.Prim)}
 %*									*
 %************************************************************************
 
-These can't be in PrelNames, because we get the RdrName from the PrimOp,
-which is above PrelNames in the module hierarchy.
+GHC.Prim "exports" all the primops and primitive types, some 
+wired-in Ids.
 
 \begin{code}
-eqH_Char_RDR	= primOpRdrName CharEqOp
-ltH_Char_RDR	= primOpRdrName CharLtOp
-eqH_Word_RDR	= primOpRdrName WordEqOp
-ltH_Word_RDR	= primOpRdrName WordLtOp
-eqH_Addr_RDR	= primOpRdrName AddrEqOp
-ltH_Addr_RDR	= primOpRdrName AddrLtOp
-eqH_Float_RDR	= primOpRdrName FloatEqOp
-ltH_Float_RDR	= primOpRdrName FloatLtOp
-eqH_Double_RDR	= primOpRdrName DoubleEqOp
-ltH_Double_RDR	= primOpRdrName DoubleLtOp
-eqH_Int_RDR	= primOpRdrName IntEqOp
-ltH_Int_RDR	= primOpRdrName IntLtOp
-geH_RDR		= primOpRdrName IntGeOp
-leH_RDR		= primOpRdrName IntLeOp
-minusH_RDR	= primOpRdrName IntSubOp
-
-tagToEnumH_RDR	= primOpRdrName TagToEnumOp
+ghcPrimExports :: [RdrAvailInfo]
+ = map (Avail . nameOccName . idName) ghcPrimIds ++
+   map (Avail . primOpOcc) allThePrimOps ++
+   [ AvailTC occ [occ] |
+     n <- funTyCon : primTyCons, let occ = nameOccName (tyConName n) 
+   ]
 \end{code}
 
 
@@ -191,13 +131,10 @@ maybeIntLikeCon  con = con `hasKey` intDataConKey
 %************************************************************************
 
 \begin{code}
-isCcallishClass, isCreturnableClass, isNoDictClass, 
-  isNumericClass, isStandardClass :: Class -> Bool
+isNoDictClass, isNumericClass, isStandardClass :: Class -> Bool
 
 isNumericClass     clas = classKey clas `is_elem` numericClassKeys
 isStandardClass    clas = classKey clas `is_elem` standardClassKeys
-isCcallishClass	   clas = classKey clas `is_elem` cCallishClassKeys
-isCreturnableClass clas = classKey clas == cReturnableClassKey
 isNoDictClass      clas = classKey clas `is_elem` noDictClassKeys
 is_elem = isIn "is_X_Class"
 \end{code}