X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcTyFuns.lhs;h=625d4cdd72cd58add922da022bce47d80c27ff92;hb=30c122df62ec75f9ed7f392f24c2925675bf1d06;hp=706fe2fe2a2dd4cd12eea9267d329e208cdb7959;hpb=3787d9878e4d62829a555f01b2a4c5866f24f303;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcTyFuns.lhs b/compiler/typecheck/TcTyFuns.lhs
index 706fe2f..625d4cd 100644
--- a/compiler/typecheck/TcTyFuns.lhs
+++ b/compiler/typecheck/TcTyFuns.lhs
@@ -7,8 +7,6 @@ module TcTyFuns (
 
 	normaliseGivenEqs, normaliseGivenDicts, 
 	normaliseWantedEqs, normaliseWantedDicts,
-	solveWantedEqs,
-	substEqInDictInsts,
 	
         -- errors
         misMatchMsg, failWithMisMatch
@@ -37,10 +35,11 @@ import Bag
 import Outputable
 import SrcLoc	( Located(..) )
 import Maybes
+import FastString
 
 -- standard
 import Data.List
-import Control.Monad (liftM)
+import Control.Monad
 \end{code}
 
 
@@ -231,10 +230,6 @@ tcGenericNormaliseFamInst fun (ForAllTy tyvar ty1)
   = do 	{ (coi,nty1) <- tcGenericNormaliseFamInst fun ty1
 	; return (mkForAllTyCoI tyvar coi, mkForAllTy tyvar nty1)
 	}
-tcGenericNormaliseFamInst fun (NoteTy note ty1)
-  = do	{ (coi,nty1) <- tcGenericNormaliseFamInst fun ty1
-	; return (coi, NoteTy note nty1)
-	}
 tcGenericNormaliseFamInst fun ty@(TyVarTy tv)
   | isTcTyVar tv
   = do	{ traceTc (text "tcGenericNormaliseFamInst" <+> ppr ty)
@@ -311,38 +306,12 @@ normaliseGivenEqs givens
 \end{code}
 
 \begin{code}
-normaliseWantedEqs :: [Inst] -> TcM [Inst]
-normaliseWantedEqs insts 
-  = do { traceTc (text "normaliseWantedEqs <-" <+> ppr insts)
-       ; result <- liftM fst $ rewriteToFixedPoint Nothing
-		     [ ("(ZONK)",    dontRerun $ zonkInsts)
-		     , ("(TRIVIAL)", dontRerun $ trivialRule)
-		     , ("(DECOMP)",  decompRule)
-		     , ("(TOP)",     topRule)
-		     , ("(UNIFY)",   unifyMetaRule)      -- incl. occurs check
-		     , ("(SUBST)",   substRule)          -- incl. occurs check
-                     ] insts
-       ; traceTc (text "normaliseWantedEqs ->" <+> ppr result)
-       ; return result
-       }
-\end{code}
-
-
-%************************************************************************
-%*									*
-\section{Solving of wanted constraints with respect to a given set}
-%*									*
-%************************************************************************
-
-The set of given equalities must have been normalised already.
-
-\begin{code}
-solveWantedEqs :: [Inst]        -- givens
-	     -> [Inst] 	        -- wanteds
-	     -> TcM [Inst]	-- irreducible wanteds
-solveWantedEqs givens wanteds 
-  = do { traceTc $ text "solveWantedEqs <-" <+> ppr wanteds <+> text "with" <+> 
-                   ppr givens
+normaliseWantedEqs :: [Inst]        -- givens
+	           -> [Inst] 	    -- wanteds
+	           -> TcM [Inst]    -- irreducible wanteds
+normaliseWantedEqs givens wanteds 
+  = do { traceTc $ text "normaliseWantedEqs <-" <+> ppr wanteds 
+                   <+> text "with" <+> ppr givens
        ; result <- liftM fst $ rewriteToFixedPoint Nothing
                      [ ("(ZONK)",    dontRerun $ zonkInsts)
                      , ("(TRIVIAL)", dontRerun $ trivialRule)
@@ -350,8 +319,9 @@ solveWantedEqs givens wanteds
                      , ("(TOP)",     topRule)
                      , ("(GIVEN)",   substGivens givens) -- incl. occurs check
                      , ("(UNIFY)",   unifyMetaRule)      -- incl. occurs check
+		     , ("(SUBST)",   substRule)          -- incl. occurs check
                      ] wanteds
-       ; traceTc (text "solveWantedEqs ->" <+> ppr result)
+       ; traceTc (text "normaliseWantedEqs ->" <+> ppr result)
        ; return result
        }
   where
@@ -663,7 +633,7 @@ The following rules exploits the reflexivity of equality:
 \begin{code}
 trivialRule :: IdemRewriteRule
 trivialRule insts 
-  = liftM catMaybes $ mappM trivial insts
+  = liftM catMaybes $ mapM trivial insts
   where
     trivial inst
       | ASSERT( isEqInst inst )
@@ -986,26 +956,30 @@ unifyMetaRule insts
         uMeta _swapped _tv (IndirectTv _) _ty _cotv
           = return ([inst], False)
 
-        -- signature skolem meets non-variable type
-        -- => cannot update!
-        uMeta _swapped _tv (DoneTv (MetaTv (SigTv _) _)) ty _cotv
-          | not $ isTyVarTy ty
-          = return ([inst], False)
-
         -- type variable meets type variable
         -- => check that tv2 hasn't been updated yet and choose which to update
 	uMeta swapped tv1 (DoneTv details1) (TyVarTy tv2) cotv
+	  | tv1 == tv2
+ 	  = return ([inst], False)	-- The two types are already identical
+
+	  | otherwise
 	  = do { lookupTV2 <- lookupTcTyVar tv2
                ; case lookupTV2 of
-                   IndirectTv ty  -> uMeta swapped tv1 (DoneTv details1) ty cotv
-                   DoneTv details2 -> 
-                     uMetaVar swapped tv1 details1 tv2 details2 cotv
+                   IndirectTv ty   -> uMeta swapped tv1 (DoneTv details1) ty cotv
+                   DoneTv details2 -> uMetaVar swapped tv1 details1 tv2 details2 cotv
 	       }
 
+	------ Beyond this point we know that ty2 is not a type variable
+
+        -- signature skolem meets non-variable type
+        -- => cannot update!
+        uMeta _swapped _tv (DoneTv (MetaTv (SigTv _) _)) _non_tv_ty _cotv
+          = return ([inst], False)
+
         -- updatable meta variable meets non-variable type
         -- => occurs check, monotype check, and kinds match check, then update
-	uMeta swapped tv (DoneTv (MetaTv _ ref)) ty cotv
-	  = do { mb_ty' <- checkTauTvUpdate tv ty    -- occurs + monotype check
+	uMeta swapped tv (DoneTv (MetaTv _ ref)) non_tv_ty cotv
+	  = do { mb_ty' <- checkTauTvUpdate tv non_tv_ty    -- occurs + monotype check
                ; case mb_ty' of
                    Nothing  -> return ([inst], False)  -- tv occurs in faminst
                    Just ty' ->
@@ -1017,6 +991,7 @@ unifyMetaRule insts
 
         uMeta _ _ _ _ _ = panic "uMeta"
 
+	-- uMetaVar: unify two type variables
         -- meta variable meets skolem 
         -- => just update
         uMetaVar swapped tv1 (MetaTv _ ref) tv2 (SkolemTv _) cotv