X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FbasicTypes%2FVar.lhs;h=f2bef26ba2d57e77ee6a92555705150239b94c30;hp=566d502ae1a4a269ccc5b044fb0a5fb1f119a3fe;hb=ad94d40948668032189ad22a0ad741ac1f645f50;hpb=b526760519fa077794cc68478fa6d786200f9e70

diff --git a/compiler/basicTypes/Var.lhs b/compiler/basicTypes/Var.lhs
index 566d502..f2bef26 100644
--- a/compiler/basicTypes/Var.lhs
+++ b/compiler/basicTypes/Var.lhs
@@ -5,9 +5,16 @@
 \section{@Vars@: Variables}
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
+-- for details
+
 module Var (
 	Var, 
-	varName, varUnique, 
+	varName, varUnique, varType,
 	setVarName, setVarUnique, 
 
 	-- TyVars
@@ -71,7 +78,7 @@ data Var
 	realUnique :: FastInt,		-- Key for fast comparison
 					-- Identical to the Unique in the name,
 					-- cached here for speed
-	tyVarKind :: Kind,
+	varType       :: Kind,
         isCoercionVar :: Bool
  }
 
@@ -80,14 +87,14 @@ data Var
 					-- inference, as well
 	varName        :: !Name,
 	realUnique     :: FastInt,
-	tyVarKind      :: Kind,
+	varType        :: Kind,
 	tcTyVarDetails :: TcTyVarDetails }
 
   | GlobalId { 			-- Used for imported Ids, dict selectors etc
  				-- See Note [GlobalId/LocalId] below
 	varName    :: !Name,	-- Always an External or WiredIn Name
 	realUnique :: FastInt,
-   	idType     :: Type,
+   	varType    :: Type,
 	idInfo_    :: IdInfo,
 	gblDetails :: GlobalIdDetails }
 
@@ -95,7 +102,7 @@ data Var
 				-- See Note [GlobalId/LocalId] below
 	varName    :: !Name,
 	realUnique :: FastInt,
-   	idType     :: Type,
+   	varType    :: Type,
 	idInfo_    :: IdInfo,
 	lclDetails :: LocalIdDetails }
 
@@ -181,12 +188,13 @@ setVarName var new_name
 type TyVar = Var
 
 tyVarName = varName
+tyVarKind = varType
 
 setTyVarUnique = setVarUnique
 setTyVarName   = setVarName
 
 setTyVarKind :: TyVar -> Kind -> TyVar
-setTyVarKind tv k = tv {tyVarKind = k}
+setTyVarKind tv k = tv {varType = k}
 \end{code}
 
 \begin{code}
@@ -194,16 +202,17 @@ mkTyVar :: Name -> Kind -> TyVar
 mkTyVar name kind = ASSERT( not (isCoercionKind kind ) )
 		    TyVar { varName    = name
 			  , realUnique = getKey# (nameUnique name)
-			  , tyVarKind  = kind
+			  , varType  = kind
                           , isCoercionVar    = False
 			}
 
 mkTcTyVar :: Name -> Kind -> TcTyVarDetails -> TyVar
 mkTcTyVar name kind details
-  = ASSERT( not (isCoercionKind kind) )
+  = -- TOM: no longer valid assertion? 
+    -- ASSERT( not (isCoercionKind kind) )
     TcTyVar {	varName    = name,
 		realUnique = getKey# (nameUnique name),
-		tyVarKind  = kind,
+		varType  = kind,
 		tcTyVarDetails = details
 	}
 \end{code}
@@ -226,7 +235,7 @@ mkCoVar :: Name -> Kind -> CoVar
 mkCoVar name kind = ASSERT( isCoercionKind kind )
 		    TyVar { varName    = name
 			  , realUnique = getKey# (nameUnique name)
-			  , tyVarKind  = kind
+			  , varType  = kind
                           , isCoercionVar    = True
 			}
 
@@ -237,7 +246,7 @@ mkWildCoVar kind
   = ASSERT( isCoercionKind kind )
     TyVar { varName = mkSysTvName wild_uniq FSLIT("co_wild"),
             realUnique = _ILIT(1),
-            tyVarKind = kind,
+            varType = kind,
             isCoercionVar = True }
   where
     wild_uniq = mkBuiltinUnique 1
@@ -259,6 +268,7 @@ type DictId = Id
 \begin{code}
 idName    = varName
 idUnique  = varUnique
+idType    = varType
 
 setIdUnique :: Id -> Unique -> Id
 setIdUnique = setVarUnique
@@ -267,7 +277,7 @@ setIdName :: Id -> Name -> Id
 setIdName = setVarName
 
 setIdType :: Id -> Type -> Id
-setIdType id ty = id {idType = ty}
+setIdType id ty = id {varType = ty}
 
 setIdExported :: Id -> Id
 -- Can be called on GlobalIds, such as data cons and class ops,
@@ -283,7 +293,7 @@ globaliseId :: GlobalIdDetails -> Id -> Id
 -- If it's a local, make it global
 globaliseId details id = GlobalId { varName    = varName id,
 				    realUnique = realUnique id,
-			   	    idType     = idType id,
+			   	    varType    = varType id,
 				    idInfo_    = idInfo id,
 				    gblDetails = details }
 
@@ -322,7 +332,7 @@ mkGlobalId :: GlobalIdDetails -> Name -> Type -> IdInfo -> Id
 mkGlobalId details name ty info 
   = GlobalId {	varName    = name, 
 		realUnique = getKey# (nameUnique name), 	-- Cache the unique
-		idType     = ty,	
+		varType     = ty,	
 		gblDetails = details,
 		idInfo_    = info }
 
@@ -330,7 +340,7 @@ mk_local_id :: Name -> Type -> LocalIdDetails -> IdInfo -> Id
 mk_local_id name ty details info
   = LocalId {	varName    = name, 
 		realUnique = getKey# (nameUnique name), 	-- Cache the unique
-		idType     = ty,	
+		varType     = ty,	
 		lclDetails = details,
 		idInfo_    = info }