X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FUnify.lhs;h=43ce1f25a521858acc798d4c1c266420178e633c;hb=f93c225a0f8343dc17a5d569cfc0b4a35eba0b60;hp=439ccdaaf9ff46bcef89800ebca9e89fcfe4d7be;hpb=8e3bfa9b311ee374bd904604216a01d727e78fa1;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/Unify.lhs b/ghc/compiler/typecheck/Unify.lhs
index 439ccda..43ce1f2 100644
--- a/ghc/compiler/typecheck/Unify.lhs
+++ b/ghc/compiler/typecheck/Unify.lhs
@@ -17,7 +17,7 @@ module Unify ( unifyTauTy, unifyTauTyList, unifyTauTyLists,
 -- friends: 
 import TcMonad
 import Type	( GenType(..), Type, tyVarsOfType,
-		  typeKind, mkFunTy, splitFunTy_maybe, splitAppTys, splitTyConApp_maybe )
+		  typeKind, mkFunTy, splitFunTy_maybe, splitTyConApp_maybe )
 import TyCon	( TyCon, mkFunTyCon, isTupleTyCon, tyConArity, Arity )
 import TyVar	( GenTyVar(..), TyVar, tyVarKind, tyVarSetToList,
 		  TyVarEnv, lookupTyVarEnv, emptyTyVarEnv, addToTyVarEnv
@@ -380,6 +380,7 @@ uTysX :: Type -> Type
       -> Subst
       -> Maybe Subst
 
+uTysX (SynTy _ ty1) ty2 k subst = uTysX ty1 ty2 k subst
 uTysX ty1 (SynTy _ ty2) k subst = uTysX ty1 ty2 k subst
 
 	-- Variables; go for uVar
@@ -481,10 +482,6 @@ unifyMisMatch ty1 ty2
   = hang (ptext SLIT("Couldn't match the type"))
 	 4 (sep [quotes (ppr ty1), ptext SLIT("against"), quotes (ppr ty2)])
 
-expectedFunErr ty
-  = hang (text "Function type expected, but found the type")
-	 4 (ppr ty)
-
 unifyKindErr tyvar ty
   = hang (ptext SLIT("Compiler bug: kind mis-match between"))
 	 4 (sep [quotes (hsep [ppr tyvar, ptext SLIT("::"), ppr (tyVarKind tyvar)]),