X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcEnv.lhs;h=d59278a26357a881769db37943203ea7f17addf2;hb=b88025eabcd83f65d1d81f09272f5172f06a60e7;hp=c638c04d5e060aef26355946d6870a255c03eb6d;hpb=49c98d143c382a1341e1046f5ca00819a25691ba;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index c638c04..d59278a 100644
--- a/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
@@ -17,7 +17,7 @@ module TcEnv(
 	tcLookupLocatedGlobal,	tcLookupGlobal, 
 	tcLookupField, tcLookupTyCon, tcLookupClass, tcLookupDataCon,
 	tcLookupLocatedGlobalId, tcLookupLocatedTyCon,
-	tcLookupLocatedClass, 
+	tcLookupLocatedClass, tcLookupFamInst,
 	
 	-- Local environment
 	tcExtendKindEnv, tcExtendKindEnvTvs,
@@ -61,6 +61,7 @@ import VarSet
 import VarEnv
 import RdrName
 import InstEnv
+import FamInstEnv
 import DataCon
 import TyCon
 import Class
@@ -157,6 +158,18 @@ tcLookupLocatedClass = addLocM tcLookupClass
 
 tcLookupLocatedTyCon :: Located Name -> TcM TyCon
 tcLookupLocatedTyCon = addLocM tcLookupTyCon
+
+-- Look up the representation tycon of a family instance.
+--
+tcLookupFamInst :: TyCon -> [Type] -> TcM TyCon
+tcLookupFamInst tycon tys
+  = do { env <- getGblEnv
+       ; eps <- getEps
+       ; let instEnv = (eps_fam_inst_env eps, tcg_fam_inst_env env)
+       ; case lookupFamInstEnvExact instEnv tycon tys of
+	   Nothing      -> famInstNotFound tycon tys
+	   Just famInst -> return $ famInstTyCon famInst
+       }
 \end{code}
 
 %************************************************************************
@@ -400,16 +413,21 @@ refineEnvironment :: Refinement -> TcM a -> TcM a
 -- I don't think I have to refine the set of global type variables in scope
 -- Reason: the refinement never increases that set
 refineEnvironment reft thing_inside
+  | isEmptyRefinement reft		-- Common case
+  = thing_inside
+  | otherwise
   = do	{ env <- getLclEnv
 	; let le' = mapNameEnv refine (tcl_env env)
  	; setLclEnv (env {tcl_env = le'}) thing_inside }
   where
     refine elt@(ATcId { tct_co = Just co, tct_type = ty })
-			  = let (co', ty') = refineType reft ty
-			    in elt { tct_co = Just (co' <.> co), tct_type = ty' }
-    refine (ATyVar tv ty) = ATyVar tv (snd (refineType reft ty))
-				-- Ignore the coercion that refineType returns
-    refine elt		  = elt
+	| Just (co', ty') <- refineType reft ty
+	= elt { tct_co = Just (WpCo co' <.> co), tct_type = ty' }
+    refine (ATyVar tv ty) 
+	| Just (_, ty') <- refineType reft ty
+	= ATyVar tv ty'	-- Ignore the coercion that refineType returns
+
+    refine elt = elt	-- Common case
 \end{code}
 
 %************************************************************************
@@ -651,4 +669,9 @@ notFound name
 wrongThingErr expected thing name
   = failWithTc (pprTcTyThingCategory thing <+> quotes (ppr name) <+> 
 		ptext SLIT("used as a") <+> text expected)
+
+famInstNotFound tycon tys
+  = failWithTc (quotes famInst <+> ptext SLIT("is not in scope"))
+  where
+    famInst = ppr tycon <+> hsep (map pprParendType tys)
 \end{code}