X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FVar.lhs;h=5b3097da7da056b1f561367184fcc463893eee4d;hb=6c4e3c1ce1ee67c6355a811a6d4698efb343e361;hp=cd21b9dd9fc95fde223a6ea21ca19da5a0c30a94;hpb=8ffdb8eed6b38db00761093889f5cddbe8ca1d60;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/Var.lhs b/compiler/basicTypes/Var.lhs
index cd21b9d..5b3097d 100644
--- a/compiler/basicTypes/Var.lhs
+++ b/compiler/basicTypes/Var.lhs
@@ -5,6 +5,13 @@
 \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/Commentary/CodingStyle#Warnings
+-- for details
+
 module Var (
 	Var, 
 	varName, varUnique, varType,
@@ -40,9 +47,7 @@ import {-# SOURCE #-}	TypeRep( Type, Kind )
 import {-# SOURCE #-}	TcType( TcTyVarDetails, pprTcTyVarDetails )
 import {-# SOURCE #-}	IdInfo( GlobalIdDetails, notGlobalId, 
                                 IdInfo, seqIdInfo )
-#ifdef DEBUG
 import {-# SOURCE #-}	TypeRep( isCoercionKind )
-#endif
 
 import Name hiding (varName)
 import Unique
@@ -161,12 +166,12 @@ varUnique var = mkUniqueGrimily (iBox (realUnique var))
 
 setVarUnique :: Var -> Unique -> Var
 setVarUnique var uniq 
-  = var { realUnique = getKey# uniq, 
+  = var { realUnique = getKeyFastInt uniq, 
 	  varName = setNameUnique (varName var) uniq }
 
 setVarName :: Var -> Name -> Var
 setVarName var new_name
-  = var { realUnique = getKey# (getUnique new_name), 
+  = var { realUnique = getKeyFastInt (getUnique new_name), 
    	  varName = new_name }
 \end{code}
 
@@ -194,16 +199,17 @@ setTyVarKind tv k = tv {varType = k}
 mkTyVar :: Name -> Kind -> TyVar
 mkTyVar name kind = ASSERT( not (isCoercionKind kind ) )
 		    TyVar { varName    = name
-			  , realUnique = getKey# (nameUnique name)
+			  , realUnique = getKeyFastInt (nameUnique name)
 			  , 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),
+		realUnique = getKeyFastInt (nameUnique name),
 		varType  = kind,
 		tcTyVarDetails = details
 	}
@@ -225,10 +231,11 @@ setCoVarName   = setVarName
 
 mkCoVar :: Name -> Kind -> CoVar
 mkCoVar name kind = ASSERT( isCoercionKind kind )
-		    TyVar { varName    = name
-			  , realUnique = getKey# (nameUnique name)
-			  , varType  = kind
-                          , isCoercionVar    = True
+		    TyVar { varName    	  = name
+			  , realUnique 	  = getKeyFastInt (nameUnique name)
+			  , varType    	  = kind	
+				-- varType is always PredTy (EqPred t1 t2)
+                          , isCoercionVar = True
 			}
 
 mkWildCoVar :: Kind -> TyVar
@@ -323,7 +330,7 @@ maybeModifyIdInfo Nothing	  id = id
 mkGlobalId :: GlobalIdDetails -> Name -> Type -> IdInfo -> Id
 mkGlobalId details name ty info 
   = GlobalId {	varName    = name, 
-		realUnique = getKey# (nameUnique name), 	-- Cache the unique
+		realUnique = getKeyFastInt (nameUnique name), 	-- Cache the unique
 		varType     = ty,	
 		gblDetails = details,
 		idInfo_    = info }
@@ -331,7 +338,7 @@ mkGlobalId details name ty info
 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
+		realUnique = getKeyFastInt (nameUnique name), 	-- Cache the unique
 		varType     = ty,	
 		lclDetails = details,
 		idInfo_    = info }