X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fprelude%2FPrelInfo.lhs;h=31457b2b630e113fd28ab1b40f7480a777eadfa6;hb=e31827c6f8e3dc8aee72500cd224c7bdb4f6a764;hp=0a532a11dfd6a69ca7f00bb3a20ff451c6d107e4;hpb=903bcc5b181653de76c7e67e5438d5144ab23b5a;p=ghc-hetmet.git

diff --git a/ghc/compiler/prelude/PrelInfo.lhs b/ghc/compiler/prelude/PrelInfo.lhs
index 0a532a1..31457b2 100644
--- a/ghc/compiler/prelude/PrelInfo.lhs
+++ b/ghc/compiler/prelude/PrelInfo.lhs
@@ -5,50 +5,41 @@
 
 \begin{code}
 module PrelInfo (
-	module PrelNames,
 	module MkId,
 
-	wiredInNames, 	-- Names of wired in things
-	wiredInThings,
-
+	ghcPrimExports,
+	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
 
     ) where
 
 #include "HsVersions.h"
 
--- friends:
-import PrelNames	-- Prelude module names
+import PrelNames	( basicKnownKeyNames, 
+			  hasKey, charDataConKey, intDataConKey,
+			  numericClassKeys, standardClassKeys )
 
-import PrimOp		( PrimOp(..), allThePrimOps, primOpRdrName )
-import DataCon		( DataCon, dataConId, dataConWrapId )
+import PrimOp		( PrimOp, allThePrimOps, primOpOcc, primOpTag, maxPrimOpTag )
+import DataCon		( DataCon )
+import Id		( Id, idName )
 import MkId		( mkPrimOpId, wiredInIds )
 import MkId		-- All of it, for re-export
+import Name		( nameOccName )
 import TysPrim		( primTyCons )
 import TysWiredIn	( wiredInTyCons )
-import HscTypes		( TyThing(..) )
-
--- others:
-import RdrName		( RdrName )
-import Name		( Name, getName )
-import TyCon		( tyConDataConsIfAvailable, TyCon )
+import HscTypes 	( TyThing(..), implicitTyThings, GenAvailInfo(..), RdrAvailInfo )
 import Class	 	( Class, classKey )
 import Type		( funTyCon )
-import Bag
-import BasicTypes	( Boxity(..) )
+import TyCon		( tyConName )
 import Util		( isIn )
+
+import Array		( Array, array, (!) )
 \end{code}
 
 %************************************************************************
@@ -62,10 +53,11 @@ We have two ``builtin name funs,'' one to look up @TyCons@ and
 
 \begin{code}
 wiredInThings :: [TyThing]
-wiredInThings
+wiredInThings		
   = concat
-    [		-- Wired in TyCons
-	  map ATyCon ([funTyCon] ++ primTyCons ++ wiredInTyCons)
+    [		-- Wired in TyCons and their implicit Ids
+	  tycon_things
+	, concatMap implicitTyThings tycon_things
 
 		-- Wired in Ids
 	, map AnId wiredInIds
@@ -73,50 +65,47 @@ wiredInThings
 		-- PrimOps
 	, map (AnId . mkPrimOpId) allThePrimOps
     ]
-
-wiredInNames :: [Name]
-wiredInNames = [n | thing <- wiredInThings, n <- tyThingNames]
-
-tyThingNames :: TyCon -> [Name]
-tyThingNames (AnClass cl) = pprPanic "tyThingNames" (ppr cl)	-- Not used
-tyThingNames (AnId    id) = [getName id]
-tyThingNames (ATyCon  tc) = getName tycon : [ getName n | dc <- tyConDataConsIfAvailable tycon, 
-							  n  <- [dataConId dc, dataConWrapId dc] ]
-						-- Synonyms return empty list of constructors
+  where
+    tycon_things = map ATyCon ([funTyCon] ++ primTyCons ++ wiredInTyCons)
 \end{code}
 
 We let a lot of "non-standard" values be visible, so that we can make
 sense of them in interface pragmas. It's cool, though they all have
 "non-standard" names, so they won't get past the parser in user code.
 
+%************************************************************************
+%*									*
+		PrimOpIds
+%*									*
+%************************************************************************
+
+\begin{code}
+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]
+ghcPrimExports
+ = map (Avail . nameOccName . idName) ghcPrimIds ++
+   map (Avail . primOpOcc) allThePrimOps ++
+   [ AvailTC occ [occ] |
+     n <- funTyCon : primTyCons, let occ = nameOccName (tyConName n) 
+   ]
 \end{code}
 
 
@@ -142,13 +131,9 @@ maybeIntLikeCon  con = con `hasKey` intDataConKey
 %************************************************************************
 
 \begin{code}
-isCcallishClass, isCreturnableClass, isNoDictClass, 
-  isNumericClass, isStandardClass :: Class -> Bool
+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}