X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fprelude%2FPrelInfo.lhs;h=36b9520eefd39026c8ea6a3ca0362aee5542648e;hb=0b9322d86ca2a18c495318a4cf44c9d35d5823b1;hp=3e0cf4a5c1ee9f6e40da3d1ebd33b7e59b9c40a1;hpb=9b4d74c78cd4bf34c361d6647e14833e7f59c117;p=ghc-hetmet.git

diff --git a/ghc/compiler/prelude/PrelInfo.lhs b/ghc/compiler/prelude/PrelInfo.lhs
index 3e0cf4a..36b9520 100644
--- a/ghc/compiler/prelude/PrelInfo.lhs
+++ b/ghc/compiler/prelude/PrelInfo.lhs
@@ -5,55 +5,42 @@
 
 \begin{code}
 module PrelInfo (
-	module PrelNames,
 	module MkId,
 
-	wiredInThings, 	-- Names of wired in things
-	wiredInThingEnv,
 	ghcPrimExports,
-	cCallableClassDecl, cReturnableClassDecl,
-	knownKeyNames,
+	wiredInThings, basicKnownKeyNames,
+	primOpId,
 	
 	-- Random other things
 	maybeCharLikeCon, maybeIntLikeCon,
 
 	-- Class categories
-	isCcallishClass, isCreturnableClass, isNoDictClass, 
-	isNumericClass, isStandardClass
+	isNoDictClass, isNumericClass, isStandardClass
 
     ) where
 
 #include "HsVersions.h"
 
 import PrelNames	( basicKnownKeyNames, 
-			  cCallableClassName, cReturnableClassName,
 			  hasKey, charDataConKey, intDataConKey,
-			  numericClassKeys, standardClassKeys, cCallishClassKeys,
+			  numericClassKeys, standardClassKeys,
 			  noDictClassKeys )
-#ifdef GHCI
-import DsMeta		( templateHaskellNames )
-import NameSet		( nameSetToList )
-#endif
 
-import PrimOp		( allThePrimOps, 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		( Name, nameOccName )
-import RdrName		( mkRdrUnqual, getRdrName )
-import HsSyn		( HsTyVarBndr(..) )
-import OccName		( mkVarOcc )
+import Name		( nameOccName )
 import TysPrim		( primTyCons )
 import TysWiredIn	( wiredInTyCons )
-import RdrHsSyn		( mkClassDecl )
-import HscTypes 	( TyThing(..), implicitTyThingIds, TypeEnv, mkTypeEnv,
-			  GenAvailInfo(..), RdrAvailInfo )
-import Class	 	( Class, classKey, className )
-import Type		( funTyCon, openTypeKind, liftedTypeKind )
+import HscTypes 	( TyThing(..), implicitTyThings, GenAvailInfo(..), RdrAvailInfo )
+import Class	 	( Class, classKey )
+import Type		( funTyCon )
 import TyCon		( tyConName )
-import SrcLoc		( noSrcLoc )
 import Util		( isIn )
+
+import Array		( Array, array, (!) )
 \end{code}
 
 %************************************************************************
@@ -67,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
@@ -81,16 +68,6 @@ wiredInThings
     ]
   where
     tycon_things = map ATyCon ([funTyCon] ++ primTyCons ++ wiredInTyCons)
-
-wiredInThingEnv :: TypeEnv
-wiredInThingEnv = mkTypeEnv wiredInThings
-
-knownKeyNames :: [Name]
-knownKeyNames 
-  = basicKnownKeyNames
-#ifdef GHCI
-    ++ nameSetToList templateHaskellNames
-#endif
 \end{code}
 
 We let a lot of "non-standard" values be visible, so that we can make
@@ -99,45 +76,36 @@ sense of them in interface pragmas. It's cool, though they all have
 
 %************************************************************************
 %*									*
+		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{Export lists for pseudo-modules (GHC.Prim)}
 %*									*
 %************************************************************************
 
 GHC.Prim "exports" all the primops and primitive types, some 
-wired-in Ids, and the CCallable & CReturnable classes.
+wired-in Ids.
 
 \begin{code}
 ghcPrimExports :: [RdrAvailInfo]
- = AvailTC cCallableOcc [ cCallableOcc ] :
-   AvailTC cReturnableOcc [ cReturnableOcc ] :
-   map (Avail . nameOccName . idName) ghcPrimIds ++
+ = 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
-
-cCallableClassDecl
-  = mkClassDecl
-    ([], getRdrName cCallableClassName, [openAlpha])
-    [] -- no fds
-    [] -- no sigs
-    Nothing -- no mbinds
-    noSrcLoc
-
-cReturnableClassDecl
-  = mkClassDecl
-    ([], getRdrName cReturnableClassName, [openAlpha])
-    [] -- no fds
-    [] -- no sigs
-    Nothing -- no mbinds
-    noSrcLoc
-
-alpha = mkRdrUnqual (mkVarOcc FSLIT("a"))
-openAlpha = IfaceTyVar alpha openTypeKind
-liftedAlpha = IfaceTyVar alpha liftedTypeKind
 \end{code}
 
 
@@ -163,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 = className clas == cReturnableClassName
 isNoDictClass      clas = classKey clas `is_elem` noDictClassKeys
 is_elem = isIn "is_X_Class"
 \end{code}