X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypes%2FType.lhs;h=ab47c4c8427bc8531de729bf2c75ed059ae8bc51;hp=c1e05447ec14b5436c22ca2f73178c7b5b41cd39;hb=4ff3da9aa11dc1c5d00f03248dc41c7d84309fa1;hpb=deda0c55629600e886f47a5e90bad67953df1ad8

diff --git a/compiler/types/Type.lhs b/compiler/types/Type.lhs
index c1e0544..ab47c4c 100644
--- a/compiler/types/Type.lhs
+++ b/compiler/types/Type.lhs
@@ -67,8 +67,8 @@ module Type (
 	newTyConInstRhs,
 
 	-- Lifting and boxity
-	isUnLiftedType, isUnboxedTupleType, isAlgType, isPrimitiveType,
-	isStrictType, isStrictPred, 
+	isUnLiftedType, isUnboxedTupleType, isAlgType, isClosedAlgType,
+	isPrimitiveType, isStrictType, isStrictPred, 
 
 	-- Free variables
 	tyVarsOfType, tyVarsOfTypes, tyVarsOfPred, tyVarsOfTheta,
@@ -281,10 +281,12 @@ repSplitAppTy_maybe :: Type -> Maybe (Type,Type)
 -- Does the AppTy split, but assumes that any view stuff is already done
 repSplitAppTy_maybe (FunTy ty1 ty2)   = Just (TyConApp funTyCon [ty1], ty2)
 repSplitAppTy_maybe (AppTy ty1 ty2)   = Just (ty1, ty2)
-repSplitAppTy_maybe (TyConApp tc tys) = case snocView tys of
-						Just (tys', ty') -> Just (TyConApp tc tys', ty')
-						Nothing		 -> Nothing
-repSplitAppTy_maybe other = Nothing
+repSplitAppTy_maybe (TyConApp tc tys) 
+  | not (isOpenSynTyCon tc) || length tys > tyConArity tc 
+  = case snocView tys of       -- never create unsaturated type family apps
+      Just (tys', ty') -> Just (TyConApp tc tys', ty')
+      Nothing	       -> Nothing
+repSplitAppTy_maybe _other = Nothing
 -------------
 splitAppTy :: Type -> (Type, Type)
 splitAppTy ty = case splitAppTy_maybe ty of
@@ -297,7 +299,13 @@ splitAppTys ty = split ty ty []
   where
     split orig_ty ty args | Just ty' <- coreView ty = split orig_ty ty' args
     split orig_ty (AppTy ty arg)        args = split ty ty (arg:args)
-    split orig_ty (TyConApp tc tc_args) args = (TyConApp tc [], tc_args ++ args)
+    split orig_ty (TyConApp tc tc_args) args 
+      = let -- keep type families saturated
+            n | isOpenSynTyCon tc = tyConArity tc
+              | otherwise         = 0
+            (tc_args1, tc_args2)  = splitAt n tc_args
+        in
+        (TyConApp tc tc_args1, tc_args2 ++ args)
     split orig_ty (FunTy ty1 ty2)       args = ASSERT( null args )
 					       (TyConApp funTyCon [], [ty1,ty2])
     split orig_ty ty		        args = (orig_ty, args)
@@ -853,10 +861,19 @@ isUnboxedTupleType ty = case splitTyConApp_maybe ty of
 
 -- Should only be applied to *types*; hence the assert
 isAlgType :: Type -> Bool
-isAlgType ty = case splitTyConApp_maybe ty of
-			Just (tc, ty_args) -> ASSERT( ty_args `lengthIs` tyConArity tc )
-					      isAlgTyCon tc
-			other		   -> False
+isAlgType ty 
+  = case splitTyConApp_maybe ty of
+      Just (tc, ty_args) -> ASSERT( ty_args `lengthIs` tyConArity tc )
+			    isAlgTyCon tc
+      _other	         -> False
+
+-- Should only be applied to *types*; hence the assert
+isClosedAlgType :: Type -> Bool
+isClosedAlgType ty
+  = case splitTyConApp_maybe ty of
+      Just (tc, ty_args) -> ASSERT( ty_args `lengthIs` tyConArity tc )
+			    isAlgTyCon tc && not (isOpenTyCon tc)
+      _other	         -> False
 \end{code}
 
 @isStrictType@ computes whether an argument (or let RHS) should
@@ -1004,9 +1021,11 @@ about binders, as we are only interested in syntactic subterms.)
 
 \begin{code}
 tcPartOfType :: Type -> Type -> Bool
-tcPartOfType t1              t2 = tcEqType t1 t2
+tcPartOfType t1              t2 
+  | tcEqType t1 t2              = True
 tcPartOfType t1              t2 
   | Just t2' <- tcView t2       = tcPartOfType t1 t2'
+tcPartOfType _  (TyVarTy _)     = False
 tcPartOfType t1 (ForAllTy _ t2) = tcPartOfType t1 t2
 tcPartOfType t1 (AppTy s2 t2)   = tcPartOfType t1 s2 || tcPartOfType t1 t2
 tcPartOfType t1 (FunTy s2 t2)   = tcPartOfType t1 s2 || tcPartOfType t1 t2