X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypes%2FType.lhs;h=f8164934761f700ab7feae032f34fda6c77bf6f5;hb=2a8cdc3aee5997374273e27365f92c161aca8453;hp=e872d6a8eb10cf835689e900f5e9ad130a091543;hpb=27897431cf24d4bde04b15947440c7205f2d703c;p=ghc-hetmet.git

diff --git a/compiler/types/Type.lhs b/compiler/types/Type.lhs
index e872d6a..f816493 100644
--- a/compiler/types/Type.lhs
+++ b/compiler/types/Type.lhs
@@ -115,22 +115,26 @@ import Name	( NamedThing(..), tidyNameOcc )
 import Class	( Class, classTyCon )
 import PrelNames( openTypeKindTyConKey, unliftedTypeKindTyConKey, 
                   ubxTupleKindTyConKey, argTypeKindTyConKey )
-import TyCon	( TyCon, isRecursiveTyCon, isPrimTyCon,
+import TyCon	( TyCon, isPrimTyCon,
 		  isUnboxedTupleTyCon, isUnLiftedTyCon,
-		  isFunTyCon, isNewTyCon, isClosedNewTyCon, isOpenTyCon,
+		  isFunTyCon, isNewTyCon, isClosedNewTyCon, 
 		  newTyConRep, newTyConRhs, 
-		  isAlgTyCon, tyConArity, isSuperKindTyCon,
+		  isAlgTyCon, isSuperKindTyCon,
 		  tcExpandTyCon_maybe, coreExpandTyCon_maybe,
-	          tyConKind, PrimRep(..), tyConPrimRep, tyConUnique,
-                  isCoercionTyCon_maybe, isCoercionTyCon
+	          tyConKind, PrimRep(..), tyConPrimRep, tyConUnique
 		)
 
 -- others
 import StaticFlags	( opt_DictsStrict )
-import Util		( mapAccumL, seqList, lengthIs, snocView, thenCmp, isEqual, all2 )
+import Util		( mapAccumL, seqList, snocView, thenCmp, isEqual, all2 )
 import Outputable
 import UniqSet		( sizeUniqSet )		-- Should come via VarSet
 import Maybe		( isJust )
+
+#ifdef DEBUG
+import TyCon	( isRecursiveTyCon, tyConArity, isCoercionTyCon )
+import Util	( lengthIs )
+#endif
 \end{code}
 
 
@@ -1028,9 +1032,13 @@ cmpPredX env (IParam n1 ty1) (IParam n2 ty2) = (n1 `compare` n2) `thenCmp` cmpTy
 	-- This comparison is used exclusively (I think) for the
 	-- finite map built in TcSimplify
 cmpPredX env (ClassP c1 tys1) (ClassP c2 tys2) = (c1 `compare` c2) `thenCmp` cmpTypesX env tys1 tys2
-cmpPredX env (IParam _ _)     (ClassP _ _)     = LT
-cmpPredX env (ClassP _ _)     (IParam _ _)     = GT
 cmpPredX env (EqPred ty1 ty2) (EqPred ty1' ty2') = (cmpTypeX env ty1 ty1') `thenCmp` (cmpTypeX env ty2 ty2')
+
+-- Constructor order: IParam < ClassP < EqPred
+cmpPredX env (IParam {})     _		    = LT
+cmpPredX env (ClassP {})    (IParam {})     = GT
+cmpPredX env (ClassP {})    (EqPred {})     = LT
+cmpPredX env (EqPred {})    _		    = GT
 \end{code}
 
 PredTypes are used as a FM key in TcSimplify, 
@@ -1430,7 +1438,7 @@ isKind k = isSuperKind (typeKind k)
 
 isSubKind :: Kind -> Kind -> Bool
 -- (k1 `isSubKind` k2) checks that k1 <: k2
-isSubKind (TyConApp kc1 []) (TyConApp kc2 []) = kc1 `isSubKindCon` kc1
+isSubKind (TyConApp kc1 []) (TyConApp kc2 []) = kc1 `isSubKindCon` kc2
 isSubKind (FunTy a1 r1) (FunTy a2 r2)	      = (a2 `isSubKind` a1) && (r1 `isSubKind` r2)
 isSubKind (PredTy (EqPred ty1 ty2)) (PredTy (EqPred ty1' ty2')) 
   = ty1 `tcEqType` ty1' && ty2 `tcEqType` ty2'