X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcUnify.lhs;h=dac7803638c2c85924621e87a55af602f788aceb;hb=bcbb5b1e74623fe8d97ae711854c7925ed4ec0b4;hp=4a5b2cc5e2ab382b4c4df0ec5098f6062db6723f;hpb=e975c8f09ac8d85059a4b42cf56ebe036aa95dc7;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcUnify.lhs b/compiler/typecheck/TcUnify.lhs
index 4a5b2cc..dac7803 100644
--- a/compiler/typecheck/TcUnify.lhs
+++ b/compiler/typecheck/TcUnify.lhs
@@ -112,6 +112,7 @@ subFunTys error_herald n_pats res_ty thing_inside
   where
 	-- In 'loop', the parameter 'arg_tys' accumulates 
 	-- the arg types so far, in *reverse order*
+	-- INVARIANT:   res_ty :: *
     loop n args_so_far res_ty
 	| Just res_ty' <- tcView res_ty  = loop n args_so_far res_ty'
 
@@ -142,7 +143,7 @@ subFunTys error_herald n_pats res_ty thing_inside
 	       else loop n args_so_far (FunTy arg_ty' res_ty') }
 
     loop n args_so_far (TyVarTy tv)
-        | not (isImmutableTyVar tv)
+        | isTyConableTyVar tv
 	= do { cts <- readMetaTyVar tv 
 	     ; case cts of
 		 Indirect ty -> loop n args_so_far ty
@@ -193,10 +194,12 @@ boxySplitTyConApp tc orig_ty
 	return (args ++ args_so_far)
 
     loop n_req args_so_far (AppTy fun arg)
+      | n_req > 0
       = loop (n_req - 1) (arg:args_so_far) fun
 
     loop n_req args_so_far (TyVarTy tv)
-      | not (isImmutableTyVar tv)
+      | isTyConableTyVar tv
+      , res_kind `isSubKind` tyVarKind tv
       = do { cts <- readMetaTyVar tv
 	   ; case cts of
 	       Indirect ty -> loop n_req args_so_far ty
@@ -205,7 +208,7 @@ boxySplitTyConApp tc orig_ty
 	}
       where
 	mk_res_ty arg_tys' = mkTyConApp tc arg_tys'
-	arg_kinds = map tyVarKind (take n_req (tyConTyVars tc))
+	(arg_kinds, res_kind) = splitKindFunTysN n_req (tyConKind tc)
 
     loop _ _ _ = boxySplitFailure (mkTyConApp tc (mkTyVarTys (tyConTyVars tc))) orig_ty
 
@@ -218,7 +221,8 @@ boxySplitListTy exp_ty = do { [elt_ty] <- boxySplitTyConApp listTyCon exp_ty
 ----------------------
 boxySplitAppTy :: BoxyRhoType				-- Type to split: m a
 	       -> TcM (BoxySigmaType, BoxySigmaType)	-- Returns m, a
--- Assumes (m: * -> k), where k is the kind of the incoming type
+-- If the incoming type is a mutable type variable of kind k, then 
+-- boxySplitAppTy returns a new type variable (m: * -> k); note the *.
 -- If the incoming type is boxy, then so are the result types; and vice versa
 
 boxySplitAppTy orig_ty
@@ -232,7 +236,7 @@ boxySplitAppTy orig_ty
       = return (fun_ty, arg_ty)
 
     loop (TyVarTy tv)
-      | not (isImmutableTyVar tv)
+      | isTyConableTyVar tv
       = do { cts <- readMetaTyVar tv
 	   ; case cts of
 	       Indirect ty -> loop ty
@@ -721,8 +725,12 @@ tc_sub1 sub_ctxt act_sty actual_ty exp_ib exp_sty expected_ty
 -----------------------------------
 defer_to_boxy_matching sub_ctxt act_sty actual_ty exp_ib exp_sty expected_ty
   = do	{ addSubCtxt sub_ctxt act_sty exp_sty $
-	  u_tys True False act_sty actual_ty exp_ib exp_sty expected_ty
+	  u_tys outer False act_sty actual_ty exp_ib exp_sty expected_ty
 	; return idHsWrapper }
+  where
+    outer = case sub_ctxt of		-- Ugh
+		SubDone -> False
+		other	-> True
 
 -----------------------------------
 tc_sub_funs act_arg act_res exp_ib exp_arg exp_res