From: simonpj@microsoft.com <unknown>
Date: Fri, 5 Sep 2008 17:25:07 +0000 (+0000)
Subject: Minor refactoring to share InstEnv.instanceBindFun
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=eee94cc7e8e39f84dc61c07461582b9655270d67

Minor refactoring to share InstEnv.instanceBindFun
---

diff --git a/compiler/types/FamInstEnv.lhs b/compiler/types/FamInstEnv.lhs
index 783ee13..ba96a55 100644
--- a/compiler/types/FamInstEnv.lhs
+++ b/compiler/types/FamInstEnv.lhs
@@ -23,7 +23,6 @@ module FamInstEnv (
 #include "HsVersions.h"
 
 import InstEnv
-import TcType
 import Unify
 import Type
 import TypeRep
@@ -314,17 +313,11 @@ lookupFamInstEnvUnify (pkg_ie, home_ie) fam tys
 		)
 		-- Unification will break badly if the variables overlap
 		-- They shouldn't because we allocate separate uniques for them
-        case tcUnifyTys bind_fn tpl_tys tys of
+        case tcUnifyTys instanceBindFun tpl_tys tys of
 	    Just subst -> let rep_tys = substTyVars subst (tyConTyVars tycon)
                           in
                           ((item, rep_tys), subst) : find rest
 	    Nothing    -> find rest
-
--- See explanation at @InstEnv.bind_fn@.
---
-bind_fn :: TyVar -> BindFlag
-bind_fn tv | isTcTyVar tv && isExistentialTyVar tv = Skolem
-	   | otherwise	 		 	   = BindMe
 \end{code}
 
 %************************************************************************
diff --git a/compiler/types/InstEnv.lhs b/compiler/types/InstEnv.lhs
index 774808d..a6ddc3c 100644
--- a/compiler/types/InstEnv.lhs
+++ b/compiler/types/InstEnv.lhs
@@ -15,7 +15,7 @@ module InstEnv (
 
 	InstEnv, emptyInstEnv, extendInstEnv, 
 	extendInstEnvList, lookupInstEnv, instEnvElts,
-	classInstances, 
+	classInstances, instanceBindFun,
 	instanceCantMatch, roughMatchTcs
     ) where
 
@@ -375,7 +375,7 @@ extendInstEnv inst_env ins_item@(Instance { is_cls = cls_nm, is_tcs = mb_tcs })
 
 %************************************************************************
 %*									*
-\subsection{Looking up an instance}
+	Looking up an instance
 %*									*
 %************************************************************************
 
@@ -481,32 +481,11 @@ lookupInstEnv (pkg_ie, home_ie) cls tys
 		)
 		-- Unification will break badly if the variables overlap
 		-- They shouldn't because we allocate separate uniques for them
-        case tcUnifyTys bind_fn tpl_tys tys of
+        case tcUnifyTys instanceBindFun tpl_tys tys of
 	    Just _   -> find ms (item:us) rest
 	    Nothing  -> find ms us	  rest
 
 ---------------
-bind_fn :: TyVar -> BindFlag
-bind_fn tv | isTcTyVar tv && isExistentialTyVar tv = Skolem
-	   | otherwise	 		 	   = BindMe
-	-- The key_tys can contain skolem constants, and we can guarantee that those
-	-- are never going to be instantiated to anything, so we should not involve
-	-- them in the unification test.  Example:
-	--	class Foo a where { op :: a -> Int }
-	--	instance Foo a => Foo [a] 	-- NB overlap
-	--	instance Foo [Int]		-- NB overlap
-	-- 	data T = forall a. Foo a => MkT a
-	--	f :: T -> Int
-	--	f (MkT x) = op [x,x]
-	-- The op [x,x] means we need (Foo [a]).  Without the filterVarSet we'd
-	-- complain, saying that the choice of instance depended on the instantiation
-	-- of 'a'; but of course it isn't *going* to be instantiated.
-	--
-	-- We do this only for pattern-bound skolems.  For example we reject
-	--	g :: forall a => [a] -> Int
-	--	g x = op x
-	-- on the grounds that the correct instance depends on the instantiation of 'a'
-
 ---------------
 insert_overlapping :: InstMatch -> [InstMatch] -> [InstMatch]
 -- Add a new solution, knocking out strictly less specific ones
@@ -535,3 +514,40 @@ insert_overlapping new_item (item:items)
 			_         -> True
 \end{code}
 
+
+%************************************************************************
+%*									*
+	Binding decisions
+%*									*
+%************************************************************************
+
+\begin{code}
+instanceBindFun :: TyVar -> BindFlag
+instanceBindFun tv | isTcTyVar tv && isExistentialTyVar tv = Skolem
+	           | otherwise	 		 	= BindMe
+   -- Note [Binding when looking up instances]
+\end{code}
+
+Note [Binding when looking up instances]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+When looking up in the instance environment, or family-instance environment,
+we are careful about multiple matches, as described above in 
+Note [Overlapping instances]
+
+The key_tys can contain skolem constants, and we can guarantee that those
+are never going to be instantiated to anything, so we should not involve
+them in the unification test.  Example:
+	class Foo a where { op :: a -> Int }
+	instance Foo a => Foo [a] 	-- NB overlap
+	instance Foo [Int]		-- NB overlap
+	data T = forall a. Foo a => MkT a
+	f :: T -> Int
+	f (MkT x) = op [x,x]
+The op [x,x] means we need (Foo [a]).  Without the filterVarSet we'd
+complain, saying that the choice of instance depended on the instantiation
+of 'a'; but of course it isn't *going* to be instantiated.
+
+We do this only for pattern-bound skolems.  For example we reject
+	g :: forall a => [a] -> Int
+	g x = op x
+on the grounds that the correct instance depends on the instantiation of 'a'