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

diff --git a/compiler/typecheck/TcUnify.lhs b/compiler/typecheck/TcUnify.lhs
index dac7803..b2782d6 100644
--- a/compiler/typecheck/TcUnify.lhs
+++ b/compiler/typecheck/TcUnify.lhs
@@ -526,7 +526,7 @@ boxyLub orig_ty1 orig_ty2
 
 	-- Look inside type synonyms, but only if the naive version fails
     go ty1 ty2 | Just ty1' <- tcView ty1 = go ty1' ty2
-	       | Just ty2' <- tcView ty1 = go ty1 ty2'
+	       | Just ty2' <- tcView ty2 = go ty1 ty2'
 
     -- For now, we don't look inside ForAlls, PredTys
     go ty1 ty2 = orig_ty1	-- Default
@@ -1780,6 +1780,10 @@ unifyFunKind other		       = returnM Nothing
 checkExpectedKind :: Outputable a => a -> TcKind -> TcKind -> TcM ()
 -- A fancy wrapper for 'unifyKind', which tries 
 -- to give decent error messages.
+-- 	(checkExpectedKind ty act_kind exp_kind)
+-- checks that the actual kind act_kind is compatible 
+-- 	with the expected kind exp_kind
+-- The first argument, ty, is used only in the error message generation
 checkExpectedKind ty act_kind exp_kind
   | act_kind `isSubKind` exp_kind -- Short cut for a very common case
   = returnM ()