X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FFamInst.lhs;h=224a9601b84388bdb17d8b4eed9b8b91a51e6717;hb=30c122df62ec75f9ed7f392f24c2925675bf1d06;hp=9c5b597f216d773655b795e16564712cef26251a;hpb=f4510d27c5883fe7e8570f4dd49d45a8b0122f2c;p=ghc-hetmet.git

diff --git a/compiler/typecheck/FamInst.lhs b/compiler/typecheck/FamInst.lhs
index 9c5b597..224a960 100644
--- a/compiler/typecheck/FamInst.lhs
+++ b/compiler/typecheck/FamInst.lhs
@@ -1,6 +1,13 @@
 The @FamInst@ type: family instance heads
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module FamInst ( 
         checkFamInstConsistency, tcExtendLocalFamInstEnv
     ) where
@@ -18,7 +25,9 @@ import Name
 import Module
 import SrcLoc
 import Outputable
+import LazyUniqFM
 import FiniteMap
+import FastString
 
 import Maybe
 import Monad
@@ -64,6 +73,7 @@ instance Ord ModulePair where
 --
 type ModulePairSet = FiniteMap ModulePair ()
 
+listToSet :: [ModulePair] -> ModulePairSet
 listToSet l = listToFM (zip l (repeat ()))
 
 checkFamInstConsistency :: [Module] -> [Module] -> TcM ()
@@ -78,7 +88,14 @@ checkFamInstConsistency famInstMods directlyImpMods
                    Nothing    -> panic "FamInst.checkFamInstConsistency"
                    Just iface -> iface
 
-             ; modInstsEnv   = eps_mod_fam_inst_env eps
+             ; hmiModule     = mi_module . hm_iface
+	     ; hmiFamInstEnv = mkFamInstEnv . md_fam_insts . hm_details
+	     ; mkFamInstEnv  = extendFamInstEnvList emptyFamInstEnv
+             ; hptModInsts   = [ (hmiModule hmi, hmiFamInstEnv hmi) 
+			       | hmi <- eltsUFM hpt]
+             ; modInstsEnv   = eps_mod_fam_inst_env eps	-- external modules
+			       `extendModuleEnvList`	-- plus
+			       hptModInsts		-- home package modules
 	     ; groups        = map (dep_finsts . mi_deps . modIface) 
 				   directlyImpMods
 	     ; okPairs       = listToSet $ concatMap allPairs groups
@@ -95,7 +112,9 @@ checkFamInstConsistency famInstMods directlyImpMods
     allPairs []     = []
     allPairs (m:ms) = map (ModulePair m) ms ++ allPairs ms
 
-    -- Check the consistency of the family instances of the two modules.
+    -- The modules are guaranteed to be in the environment, as they are either
+    -- already loaded in the EPS or they are in the HPT.
+    --
     check modInstsEnv (ModulePair m1 m2)
       = let { instEnv1 = fromJust . lookupModuleEnv modInstsEnv $ m1
 	    ; instEnv2 = fromJust . lookupModuleEnv modInstsEnv $ m2
@@ -169,19 +188,27 @@ checkForConflicts inst_envs famInst
 
        ; let { matches   = lookupFamInstEnvUnify inst_envs fam tys'
 	     ; conflicts = [ conflictingFamInst
-			   | match@(_, conflictingFamInst) <- matches
-			   , conflicting fam tys' tycon match 
+			   | match@((conflictingFamInst, _), _) <- matches
+			   , conflicting tycon match 
 			   ]
 	     }
        ; unless (null conflicts) $
 	   conflictInstErr famInst (head conflicts)
        }
   where
-    -- In the case of data/newtype instances, any overlap is a conflict (as
-    -- these instances imply injective type mappings).
-    conflicting _   _    tycon _                 | isAlgTyCon tycon = True
-    conflicting fam tys' tycon (subst, cFamInst) | otherwise	  =
-      panic "FamInst.checkForConflicts: overlap check for indexed synonyms is still missing"
+      -- * In the case of data family instances, any overlap is fundamentally a 
+      --   conflict (as these instances imply injective type mappings).
+      -- * In the case of type family instances, overlap is admitted as long as 
+      --   the right-hand sides of the overlapping rules coincide under the
+      --   overlap substitution.  We require that they are syntactically equal;
+      --   anything else would be difficult to test for at this stage.
+    conflicting tycon1 ((famInst2, _), subst) 
+      | isAlgTyCon tycon1 = True
+      | otherwise         = not (rhs1 `tcEqType` rhs2)
+      where
+        tycon2 = famInstTyCon famInst2
+        rhs1   = substTy subst $ synTyConType tycon1
+        rhs2   = substTy subst $ synTyConType tycon2
 
 conflictInstErr famInst conflictingFamInst
   = addFamInstLoc famInst $