[project @ 2004-09-10 09:46:21 by simonmar]

[ghc-hetmet.git] / ghc / compiler / typecheck / TcType.lhs

diff --git a/ghc/compiler/typecheck/TcType.lhs b/ghc/compiler/typecheck/TcType.lhs
index 0e430f4..eaade6d 100644 (file)
--- a/ghc/compiler/typecheck/TcType.lhs
+++ b/ghc/compiler/typecheck/TcType.lhs
@@ -79,7 +79,7 @@ module TcType (
 
   ---------------------------------
   -- Unifier and matcher  
-  unifyTysX, unifyTyListsX, unifyExtendTysX,
+  unifyTysX, unifyTyListsX, unifyExtendTyListsX,
   matchTy, matchTys, match,
 
   --------------------------------
@@ -508,7 +508,7 @@ allDistinctTyVars (ty:tys) acc
 tcSplitPredTy_maybe :: Type -> Maybe PredType
    -- Returns Just for predicates only
 tcSplitPredTy_maybe (NoteTy _ ty) = tcSplitPredTy_maybe ty
-tcSplitPredTy_maybe (PredTy p)  = Just p
+tcSplitPredTy_maybe (PredTy p)    = Just p
 tcSplitPredTy_maybe other        = Nothing
        
 predTyUnique :: PredType -> Unique
@@ -966,7 +966,6 @@ isByteArrayLikeTyCon tc =
 %************************************************************************
 
 Unify types with an explicit substitution and no monad.
-Ignore usage annotations.
 
 \begin{code}
 type MySubst
@@ -980,13 +979,14 @@ unifyTysX :: TyVarSet             -- Template tyvars
 unifyTysX tmpl_tyvars ty1 ty2
   = uTysX ty1 ty2 (\(_,s) -> Just s) (tmpl_tyvars, emptySubstEnv)
 
-unifyExtendTysX :: TyVarSet            -- Template tyvars
-               -> TyVarSubstEnv        -- Substitution to start with
-               -> Type
-               -> Type
-               -> Maybe TyVarSubstEnv  -- Extended substitution
-unifyExtendTysX tmpl_tyvars subst ty1 ty2
-  = uTysX ty1 ty2 (\(_,s) -> Just s) (tmpl_tyvars, subst)
+unifyExtendTyListsX 
+       :: TyVarSet             -- Template tyvars
+       -> TyVarSubstEnv        -- Substitution to start with
+       -> [Type]
+       -> [Type]
+        -> Maybe TyVarSubstEnv -- Extended substitution
+unifyExtendTyListsX tmpl_tyvars subst tys1 tys2
+  = uTyListsX tys1 tys2 (\(_,s) -> Just s) (tmpl_tyvars, subst)
 
 unifyTyListsX :: TyVarSet -> [Type] -> [Type]
               -> Maybe TyVarSubstEnv