X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fprelude%2FTysPrim.lhs;h=2f6168bafb0cf1c8e1146c37d7ff58cc9816650f;hb=28a464a75e14cece5db40f2765a29348273ff2d2;hp=fab63e5011a07f812445de848bc2e6c3873946d8;hpb=98688c6e8fd33f31c51218cf93cbf03fe3a5e73d;p=ghc-hetmet.git

diff --git a/ghc/compiler/prelude/TysPrim.lhs b/ghc/compiler/prelude/TysPrim.lhs
index fab63e5..2f6168b 100644
--- a/ghc/compiler/prelude/TysPrim.lhs
+++ b/ghc/compiler/prelude/TysPrim.lhs
@@ -28,11 +28,11 @@ module TysPrim(
 	mutVarPrimTyCon,		mkMutVarPrimTy,
 
 	mVarPrimTyCon,			mkMVarPrimTy,	
+        tVarPrimTyCon,                  mkTVarPrimTy,
 	stablePtrPrimTyCon,		mkStablePtrPrimTy,
 	stableNamePrimTyCon,		mkStableNamePrimTy,
 	bcoPrimTyCon,			bcoPrimTy,
 	weakPrimTyCon,  		mkWeakPrimTy,
-	foreignObjPrimTyCon,		foreignObjPrimTy,
 	threadIdPrimTyCon,		threadIdPrimTy,
 	
 	int32PrimTyCon,		int32PrimTy,
@@ -45,10 +45,10 @@ module TysPrim(
 #include "HsVersions.h"
 
 import Var		( TyVar, mkTyVar )
-import Name		( Name, mkInternalName, mkWiredInName )
-import OccName		( mkVarOcc, mkOccFS, tcName )
-import PrimRep		( PrimRep(..) )
-import TyCon		( TyCon, ArgVrcs, mkPrimTyCon, mkLiftedPrimTyCon )
+import Name		( Name, BuiltInSyntax(..), mkInternalName, mkWiredInName )
+import OccName		( mkOccNameFS, tcName, mkTyVarOcc )
+import TyCon		( TyCon, ArgVrcs, mkPrimTyCon, mkLiftedPrimTyCon,
+			  PrimRep(..) )
 import Type		( mkTyConApp, mkTyConTy, mkTyVarTys, mkTyVarTy,
 			  unliftedTypeKind, liftedTypeKind, openTypeKind, 
 			  Kind, mkArrowKinds,
@@ -81,12 +81,12 @@ primTyCons
     , intPrimTyCon
     , int32PrimTyCon
     , int64PrimTyCon
-    , foreignObjPrimTyCon
     , bcoPrimTyCon
     , weakPrimTyCon
     , mutableArrayPrimTyCon
     , mutableByteArrayPrimTyCon
     , mVarPrimTyCon
+    , tVarPrimTyCon
     , mutVarPrimTyCon
     , realWorldTyCon
     , stablePtrPrimTyCon
@@ -100,10 +100,11 @@ primTyCons
 
 mkPrimTc :: FastString -> Unique -> TyCon -> Name
 mkPrimTc fs uniq tycon
-  = mkWiredInName gHC_PRIM (mkOccFS tcName fs) 
+  = mkWiredInName gHC_PRIM (mkOccNameFS tcName fs) 
 		  uniq
 		  Nothing 		-- No parent object
 		  (ATyCon tycon)	-- Relevant TyCon
+		  UserSyntax		-- None are built-in syntax
 
 charPrimTyConName    	      = mkPrimTc FSLIT("Char#") charPrimTyConKey charPrimTyCon
 intPrimTyConName     	      = mkPrimTc FSLIT("Int#") intPrimTyConKey  intPrimTyCon
@@ -123,9 +124,9 @@ mutableArrayPrimTyConName     = mkPrimTc FSLIT("MutableArray#") mutableArrayPrim
 mutableByteArrayPrimTyConName = mkPrimTc FSLIT("MutableByteArray#") mutableByteArrayPrimTyConKey mutableByteArrayPrimTyCon
 mutVarPrimTyConName	      = mkPrimTc FSLIT("MutVar#") mutVarPrimTyConKey mutVarPrimTyCon
 mVarPrimTyConName	      = mkPrimTc FSLIT("MVar#") mVarPrimTyConKey mVarPrimTyCon
+tVarPrimTyConName	      = mkPrimTc FSLIT("TVar#") tVarPrimTyConKey tVarPrimTyCon
 stablePtrPrimTyConName        = mkPrimTc FSLIT("StablePtr#") stablePtrPrimTyConKey stablePtrPrimTyCon
 stableNamePrimTyConName       = mkPrimTc FSLIT("StableName#") stableNamePrimTyConKey stableNamePrimTyCon
-foreignObjPrimTyConName       = mkPrimTc FSLIT("ForeignObj#") foreignObjPrimTyConKey foreignObjPrimTyCon
 bcoPrimTyConName 	      = mkPrimTc FSLIT("BCO#") bcoPrimTyConKey bcoPrimTyCon
 weakPrimTyConName  	      = mkPrimTc FSLIT("Weak#") weakPrimTyConKey weakPrimTyCon
 threadIdPrimTyConName  	      = mkPrimTc FSLIT("ThreadId#") threadIdPrimTyConKey threadIdPrimTyCon
@@ -143,7 +144,7 @@ alphaTyVars is a list of type variables for use in templates:
 \begin{code}
 tyVarList :: Kind -> [TyVar]
 tyVarList kind = [ mkTyVar (mkInternalName (mkAlphaTyVarUnique u) 
-				(mkVarOcc (mkFastString name))
+				(mkTyVarOcc (mkFastString name))
 			 	noSrcLoc) kind
 	         | u <- [2..],
 		   let name | c <= 'z'  = [c]
@@ -204,13 +205,13 @@ pcPrimTyCon0 name rep
     result_kind = unliftedTypeKind -- all primitive types are unlifted
 
 charPrimTy	= mkTyConTy charPrimTyCon
-charPrimTyCon	= pcPrimTyCon0 charPrimTyConName CharRep
+charPrimTyCon	= pcPrimTyCon0 charPrimTyConName WordRep
 
 intPrimTy	= mkTyConTy intPrimTyCon
 intPrimTyCon	= pcPrimTyCon0 intPrimTyConName IntRep
 
 int32PrimTy	= mkTyConTy int32PrimTyCon
-int32PrimTyCon	= pcPrimTyCon0 int32PrimTyConName Int32Rep
+int32PrimTyCon	= pcPrimTyCon0 int32PrimTyConName IntRep
 
 int64PrimTy	= mkTyConTy int64PrimTyCon
 int64PrimTyCon	= pcPrimTyCon0 int64PrimTyConName Int64Rep
@@ -219,7 +220,7 @@ wordPrimTy	= mkTyConTy wordPrimTyCon
 wordPrimTyCon	= pcPrimTyCon0 wordPrimTyConName WordRep
 
 word32PrimTy	= mkTyConTy word32PrimTyCon
-word32PrimTyCon	= pcPrimTyCon0 word32PrimTyConName Word32Rep
+word32PrimTyCon	= pcPrimTyCon0 word32PrimTyConName WordRep
 
 word64PrimTy	= mkTyConTy word64PrimTyCon
 word64PrimTyCon	= pcPrimTyCon0 word64PrimTyConName Word64Rep
@@ -256,7 +257,7 @@ statePrimTyCon	 = pcPrimTyCon statePrimTyConName vrcsZ VoidRep
 \end{code}
 
 RealWorld is deeply magical.  It is *primitive*, but it is not
-*unlifted* (hence PtrRep).  We never manipulate values of type
+*unlifted* (hence ptrArg).  We never manipulate values of type
 RealWorld; it's only used in the type system, to parameterise State#.
 
 \begin{code}
@@ -313,47 +314,38 @@ mkMVarPrimTy s elt 	    = mkTyConApp mVarPrimTyCon [s, elt]
 
 %************************************************************************
 %*									*
-\subsection[TysPrim-stable-ptrs]{The stable-pointer type}
+\subsection[TysPrim-stm-var]{The transactional variable type}
 %*									*
 %************************************************************************
 
 \begin{code}
-stablePtrPrimTyCon = pcPrimTyCon stablePtrPrimTyConName vrcsP StablePtrRep
+tVarPrimTyCon = pcPrimTyCon tVarPrimTyConName vrcsZP PtrRep
 
-mkStablePtrPrimTy ty = mkTyConApp stablePtrPrimTyCon [ty]
+mkTVarPrimTy s elt 	    = mkTyConApp tVarPrimTyCon [s, elt]
 \end{code}
 
 %************************************************************************
 %*									*
-\subsection[TysPrim-stable-names]{The stable-name type}
+\subsection[TysPrim-stable-ptrs]{The stable-pointer type}
 %*									*
 %************************************************************************
 
 \begin{code}
-stableNamePrimTyCon = pcPrimTyCon stableNamePrimTyConName vrcsP PtrRep
+stablePtrPrimTyCon = pcPrimTyCon stablePtrPrimTyConName vrcsP AddrRep
 
-mkStableNamePrimTy ty = mkTyConApp stableNamePrimTyCon [ty]
+mkStablePtrPrimTy ty = mkTyConApp stablePtrPrimTyCon [ty]
 \end{code}
 
 %************************************************************************
 %*									*
-\subsection[TysPrim-foreign-objs]{The ``foreign object'' type}
+\subsection[TysPrim-stable-names]{The stable-name type}
 %*									*
 %************************************************************************
 
-A Foreign Object is just a boxed, unlifted, Addr#.  They're needed
-because finalisers (weak pointers) can't watch Addr#s, they can only
-watch heap-resident objects.  
-
-We can't use a lifted Addr# (such as Addr) because race conditions
-could bite us.  For example, if the program deconstructed the Addr
-before passing its contents to a ccall, and a weak pointer was
-watching the Addr, the weak pointer might deduce that the Addr was
-dead before it really was.
-
 \begin{code}
-foreignObjPrimTy    = mkTyConTy foreignObjPrimTyCon
-foreignObjPrimTyCon = pcPrimTyCon0 foreignObjPrimTyConName PtrRep
+stableNamePrimTyCon = pcPrimTyCon stableNamePrimTyConName vrcsP PtrRep
+
+mkStableNamePrimTy ty = mkTyConApp stableNamePrimTyCon [ty]
 \end{code}
 
 %************************************************************************