X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcEnv.lhs;h=6799653e547c1eb20c77b60d2f249d6ca0a0c569;hb=e0ab62c1879c97b1db44b23150b2e260a9ec48cf;hp=19deca9e4c1eb4c43d0270bae916f1f9f8cf1f8b;hpb=3e83dfb21b2f2220dce97427fff5c19459ae68d1;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index 19deca9..6799653 100644
--- a/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
@@ -38,26 +38,26 @@ module TcEnv(
 	topIdLvl, 
 
 	-- New Ids
-	newLocalName, newDFunName
+	newLocalName, newDFunName, newFamInstTyConName
   ) where
 
 #include "HsVersions.h"
 
 import HsSyn		( LRuleDecl, LHsBinds, LSig, 
 			  LHsTyVarBndr, HsTyVarBndr(..), pprLHsBinds,
-		 	  ExprCoFn(..), idCoercion, (<.>) )
+		 	  idHsWrapper, (<.>) )
 import TcIface		( tcImportDecl )
 import IfaceEnv		( newGlobalBinder )
 import TcRnMonad
 import TcMType		( zonkTcType, zonkTcTyVarsAndFV )
-import TcType		( Type, TcKind, TcTyVar, TcTyVarSet, TcType, TvSubst,
-			  substTy, substTyVar, tyVarsOfType, tcTyVarsOfTypes, mkTyConApp,
+import TcType		( Type, TcKind, TcTyVar, TcTyVarSet, TcType, PredType,
+			  tyVarsOfType, tcTyVarsOfTypes, mkTyConApp,
 			  getDFunTyKey, tcTyConAppTyCon, tcGetTyVar, mkTyVarTy,
 			  tidyOpenType, isRefineableTy
 			)
 import TcGadt		( Refinement, refineType )
 import qualified Type	( getTyVar_maybe )
-import Id		( idName, isLocalId, setIdType )
+import Id		( idName, isLocalId )
 import Var		( TyVar, Id, idType, tyVarName )
 import VarSet
 import VarEnv
@@ -66,11 +66,13 @@ import InstEnv		( Instance, DFunId, instanceDFunId, instanceHead )
 import DataCon		( DataCon )
 import TyCon		( TyCon )
 import Class		( Class )
-import Name		( Name, NamedThing(..), getSrcLoc, nameModule )
+import Name		( Name, NamedThing(..), getSrcLoc, nameModule,
+			  nameOccName )
 import PrelNames	( thFAKE )
 import NameEnv
-import OccName		( mkDFunOcc, occNameString )
-import HscTypes		( extendTypeEnvList, lookupType, TyThing(..), ExternalPackageState(..) )
+import OccName		( mkDFunOcc, occNameString, mkInstTyTcOcc )
+import HscTypes		( extendTypeEnvList, lookupType, TyThing(..),
+			  ExternalPackageState(..) )
 import SrcLoc		( SrcLoc, Located(..) )
 import Outputable
 \end{code}
@@ -324,7 +326,7 @@ tcExtendIdEnv2 names_w_ids thing_inside
 					       tct_level = th_lvl,
 					       tct_type = id_ty, 
 					       tct_co = if isRefineableTy id_ty 
-							then Just idCoercion
+							then Just idHsWrapper
 							else Nothing })
 			      | (name,id) <- names_w_ids, let id_ty = idType id]
 	le'		    = extendNameEnvList (tcl_env env) extra_env
@@ -360,7 +362,7 @@ findGlobals tvs tidy_env
 	  Just d  -> go tidy_env1 (d:acc) things
 	  Nothing -> go tidy_env1 acc     things
 
-    ignore_it ty = not (tvs `intersectsVarSet` tyVarsOfType ty)
+    ignore_it ty = tvs `disjointVarSet` tyVarsOfType ty
 
 -----------------------
 find_thing ignore_it tidy_env (ATcId { tct_id = id })
@@ -565,11 +567,19 @@ data InstBindings
 	[LSig Name]		-- User pragmas recorded for generating 
 				-- specialised instances
 
-  | NewTypeDerived 		-- Used for deriving instances of newtypes, where the
-	[Type]			-- witness dictionary is identical to the argument 
-				-- dictionary.  Hence no bindings, no pragmas
-	-- The [Type] are the representation types
-	-- See notes in TcDeriv
+  | NewTypeDerived              -- Used for deriving instances of newtypes, where the
+				-- witness dictionary is identical to the argument 
+				-- dictionary.  Hence no bindings, no pragmas.
+	(Maybe [PredType])
+		-- Nothing      => The newtype-derived instance involves type variables,
+		--	           and the dfun has a type like df :: forall a. Eq a => Eq (T a)
+		-- Just (r:scs) => The newtype-defined instance has no type variables
+		--		   so the dfun is just a constant, df :: Eq T
+		-- 		   In this case we need to know waht the rep dict, r, and the 
+		--		   superclasses, scs, are.  (In the Nothing case these are in the
+		--		   dict fun's type.)
+		--		   Invariant: these PredTypes have no free variables
+		-- NB: In both cases, the representation dict is the *first* dict.
 
 pprInstInfo info = vcat [ptext SLIT("InstInfo:") <+> ppr (idType (iDFunId info))]
 
@@ -609,6 +619,19 @@ newDFunName clas (ty:_) loc
 newDFunName clas [] loc = pprPanic "newDFunName" (ppr clas <+> ppr loc)
 \end{code}
 
+Make a name for the representation tycon of a data/newtype instance.  It's an
+*external* name, like otber top-level names, and hence must be made with
+newGlobalBinder.
+
+\begin{code}
+newFamInstTyConName :: Name -> SrcLoc -> TcM Name
+newFamInstTyConName tc_name loc
+  = do	{ index <- nextDFunIndex
+	; mod   <- getModule
+	; let occ = nameOccName tc_name
+	; newGlobalBinder mod (mkInstTyTcOcc index occ) Nothing loc }
+\end{code}
+
 
 %************************************************************************
 %*									*