X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FbasicTypes%2FVar.lhs;h=dae237db0eea8ac2453d976d1785490eb3889793;hp=351082859297d5bba8a6629182eb476c15464e15;hb=ac704fcac946590eef0ec91ae19f3b47d779a75f;hpb=28d732c362e13e58d653b3dc15fd376c3f0c54c2

diff --git a/compiler/basicTypes/Var.lhs b/compiler/basicTypes/Var.lhs
index 3510828..dae237d 100644
--- a/compiler/basicTypes/Var.lhs
+++ b/compiler/basicTypes/Var.lhs
@@ -40,6 +40,10 @@ 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
 import FastTypes
@@ -187,7 +191,8 @@ setTyVarKind tv k = tv {tyVarKind = k}
 
 \begin{code}
 mkTyVar :: Name -> Kind -> TyVar
-mkTyVar name kind = TyVar { varName    = name
+mkTyVar name kind = ASSERT( not (isCoercionKind kind ) )
+		    TyVar { varName    = name
 			  , realUnique = getKey# (nameUnique name)
 			  , tyVarKind  = kind
                           , isCoercionVar    = False
@@ -195,22 +200,12 @@ mkTyVar name kind = TyVar { varName    = name
 
 mkTcTyVar :: Name -> Kind -> TcTyVarDetails -> TyVar
 mkTcTyVar name kind details
-  = TcTyVar {	varName    = name,
+  = ASSERT( not (isCoercionKind kind) )
+    TcTyVar {	varName    = name,
 		realUnique = getKey# (nameUnique name),
 		tyVarKind  = kind,
 		tcTyVarDetails = details
 	}
-
-mkWildCoVar :: Kind -> TyVar
--- A type variable that is never referred to,
--- so its unique doesn't matter
-mkWildCoVar kind 
-  = TyVar { varName = mkSysTvName wild_uniq FSLIT("co_wild"),
-            realUnique = _ILIT(1),
-            tyVarKind = kind,
-            isCoercionVar = True }
-  where
-    wild_uniq = mkBuiltinUnique 1
 \end{code}
 
 %************************************************************************
@@ -228,12 +223,24 @@ setCoVarUnique = setVarUnique
 setCoVarName   = setVarName
 
 mkCoVar :: Name -> Kind -> CoVar
-mkCoVar name kind = TyVar { varName    = name
+mkCoVar name kind = ASSERT( isCoercionKind kind )
+		    TyVar { varName    = name
 			  , realUnique = getKey# (nameUnique name)
 			  , tyVarKind  = kind
                           , isCoercionVar    = True
 			}
 
+mkWildCoVar :: Kind -> TyVar
+-- A type variable that is never referred to,
+-- so its unique doesn't matter
+mkWildCoVar kind 
+  = ASSERT( isCoercionKind kind )
+    TyVar { varName = mkSysTvName wild_uniq FSLIT("co_wild"),
+            realUnique = _ILIT(1),
+            tyVarKind = kind,
+            isCoercionVar = True }
+  where
+    wild_uniq = mkBuiltinUnique 1
 \end{code}
 
 %************************************************************************