[project @ 2005-01-31 13:53:29 by simonpj]

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

diff --git a/ghc/compiler/typecheck/TcType.lhs b/ghc/compiler/typecheck/TcType.lhs
index 39035dd..d31866d 100644 (file)
--- a/ghc/compiler/typecheck/TcType.lhs
+++ b/ghc/compiler/typecheck/TcType.lhs
@@ -94,7 +94,7 @@ module TcType (
   -- Type substitutions
   TvSubst(..),         -- Representation visible to a few friends
   TvSubstEnv, emptyTvSubst,
-  mkTvSubst, zipTvSubst, zipTopTvSubst, mkTopTvSubst,
+  mkOpenTvSubst, zipOpenTvSubst, zipTopTvSubst, mkTopTvSubst,
   getTvSubstEnv, setTvSubstEnv, getTvInScope, extendTvInScope,
   extendTvSubst, extendTvSubstList, isInScope,
   substTy, substTys, substTyWith, substTheta, substTyVar, substTyVarBndr,
@@ -146,7 +146,7 @@ import Type         (       -- Re-exports
 
                          TvSubst(..),
                          TvSubstEnv, emptyTvSubst,
-                         mkTvSubst, zipTvSubst, zipTopTvSubst, mkTopTvSubst,
+                         mkOpenTvSubst, zipOpenTvSubst, zipTopTvSubst, mkTopTvSubst,
                          getTvSubstEnv, setTvSubstEnv, getTvInScope, extendTvInScope,
                          extendTvSubst, extendTvSubstList, isInScope,
                          substTy, substTys, substTyWith, substTheta, substTyVar, substTyVarBndr,
@@ -683,7 +683,7 @@ hoistForAllTys ty
        --      if t2 is a for-all type, push t1 inside it
        --      if t2 is (pred -> t3), check for duplicates
     mk_fun_ty ty1 ty2
-       | not (isOverloadedTy ty2)      -- No forall's, or context => 
+       | not (isSigmaTy ty2)           -- No forall's, or context => 
        = FunTy ty1 ty2         
        | PredTy p1 <- ty1              -- ty1 is a predicate
        = if p1 `elem` theta then       -- so check for duplicates