[project @ 2005-03-10 14:03:28 by simonmar]

[ghc-hetmet.git] / ghc / compiler / prelude / TysPrim.lhs

diff --git a/ghc/compiler/prelude/TysPrim.lhs b/ghc/compiler/prelude/TysPrim.lhs
index f971348..b28506e 100644 (file)
--- a/ghc/compiler/prelude/TysPrim.lhs
+++ b/ghc/compiler/prelude/TysPrim.lhs
@@ -28,6 +28,7 @@ module TysPrim(
        mutVarPrimTyCon,                mkMutVarPrimTy,
 
        mVarPrimTyCon,                  mkMVarPrimTy,   
+        tVarPrimTyCon,                  mkTVarPrimTy,
        stablePtrPrimTyCon,             mkStablePtrPrimTy,
        stableNamePrimTyCon,            mkStableNamePrimTy,
        bcoPrimTyCon,                   bcoPrimTy,
@@ -45,8 +46,8 @@ module TysPrim(
 #include "HsVersions.h"
 
 import Var             ( TyVar, mkTyVar )
-import Name            ( Name, mkInternalName, mkWiredInName )
-import OccName         ( mkVarOcc, mkOccFS, tcName )
+import Name            ( Name, BuiltInSyntax(..), mkInternalName, mkWiredInName )
+import OccName         ( mkOccFS, tcName, mkTyVarOcc )
 import TyCon           ( TyCon, ArgVrcs, mkPrimTyCon, mkLiftedPrimTyCon,
                          PrimRep(..) )
 import Type            ( mkTyConApp, mkTyConTy, mkTyVarTys, mkTyVarTy,
@@ -87,6 +88,7 @@ primTyCons
     , mutableArrayPrimTyCon
     , mutableByteArrayPrimTyCon
     , mVarPrimTyCon
+    , tVarPrimTyCon
     , mutVarPrimTyCon
     , realWorldTyCon
     , stablePtrPrimTyCon
@@ -104,6 +106,7 @@ mkPrimTc fs uniq tycon
                  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,6 +126,7 @@ 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
@@ -143,7 +147,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]
@@ -313,6 +317,18 @@ mkMVarPrimTy s elt             = mkTyConApp mVarPrimTyCon [s, elt]
 
 %************************************************************************
 %*                                                                     *
+\subsection[TysPrim-stm-var]{The transactional variable type}
+%*                                                                     *
+%************************************************************************
+
+\begin{code}
+tVarPrimTyCon = pcPrimTyCon tVarPrimTyConName vrcsZP PtrRep
+
+mkTVarPrimTy s elt         = mkTyConApp tVarPrimTyCon [s, elt]
+\end{code}
+
+%************************************************************************
+%*                                                                     *
 \subsection[TysPrim-stable-ptrs]{The stable-pointer type}
 %*                                                                     *
 %************************************************************************