X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcGadt.lhs;h=3761c68fada484fa600e215005bb306fbcaf7f36;hb=2423c249f5ca7785d0ec89eb33e72662da7561c1;hp=4c1f70ecf153e8a44a09bcc4d17c9657527b3f35;hpb=7a327c1297615a9498e7117a0017b09ff2458d53;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcGadt.lhs b/compiler/typecheck/TcGadt.lhs
index 4c1f70e..3761c68 100644
--- a/compiler/typecheck/TcGadt.lhs
+++ b/compiler/typecheck/TcGadt.lhs
@@ -11,8 +11,9 @@
 
 \begin{code}
 module TcGadt (
-	Refinement, emptyRefinement, gadtRefine, 
-	refineType, refineResType,
+	Refinement, emptyRefinement, isEmptyRefinement, 
+	gadtRefine, 
+	refineType, refinePred, refineResType,
 	dataConCanMatch,
 	tcUnifyTys, BindFlag(..)
   ) where
@@ -22,6 +23,7 @@ module TcGadt (
 import HsSyn
 import Coercion
 import Type
+
 import TypeRep
 import DataCon
 import Var
@@ -61,6 +63,8 @@ instance Outputable Refinement where
 emptyRefinement :: Refinement
 emptyRefinement = (Reft emptyInScopeSet emptyVarEnv)
 
+isEmptyRefinement :: Refinement -> Bool
+isEmptyRefinement (Reft _ env) = isEmptyVarEnv env
 
 refineType :: Refinement -> Type -> Maybe (Coercion, Type)
 -- Apply the refinement to the type.
@@ -77,6 +81,17 @@ refineType (Reft in_scope env) ty
     tv_subst = mkTvSubst in_scope (mapVarEnv snd env)
     co_subst = mkTvSubst in_scope (mapVarEnv fst env)
  
+refinePred :: Refinement -> PredType -> Maybe (Coercion, PredType)
+refinePred (Reft in_scope env) pred
+  | not (isEmptyVarEnv env),		-- Common case
+    any (`elemVarEnv` env) (varSetElems (tyVarsOfPred pred))
+  = Just (mkPredTy (substPred co_subst pred), substPred tv_subst pred)
+  | otherwise
+  = Nothing	-- The type doesn't mention any refined type variables
+  where
+    tv_subst = mkTvSubst in_scope (mapVarEnv snd env)
+    co_subst = mkTvSubst in_scope (mapVarEnv fst env)
+ 
 refineResType :: Refinement -> Type -> (HsWrapper, Type)
 -- Like refineType, but returns the 'sym' coercion
 -- If (refineResType r ty) = (co, ty')
@@ -169,7 +184,7 @@ gadtRefine (Reft in_scope env1)
     do_one reft co_var = unify reft (TyVarTy co_var) ty1 ty2
 	where
 	   (ty1,ty2) = splitCoercionKind (tyVarKind co_var)
-\end{code} 
+\end{code}
 
 %************************************************************************
 %*									*