X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreUtils.lhs;h=a8439f8dbcc716eacf479b7674b5be6639aa3d53;hb=aff23274b14d6e8551e949c3290adaf265e31371;hp=1590978d33abc03556f2052476e80a2d21cd3e9e;hpb=c86161c5cf11de77e911fcb9e1e2bd1f8bd80b42;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/CoreUtils.lhs b/compiler/coreSyn/CoreUtils.lhs
index 1590978..a8439f8 100644
--- a/compiler/coreSyn/CoreUtils.lhs
+++ b/compiler/coreSyn/CoreUtils.lhs
@@ -36,7 +36,7 @@ module CoreUtils (
 	hashExpr,
 
 	-- * Equality
-	cheapEqExpr, 
+	cheapEqExpr, eqExpr,
 
 	-- * Manipulating data constructors and types
 	applyTypeToArgs, applyTypeToArg,
@@ -913,7 +913,9 @@ cheapEqExpr (Cast e1 t1) (Cast e2 t2)
   = e1 `cheapEqExpr` e2 && t1 `coreEqCoercion` t2
 
 cheapEqExpr _ _ = False
+\end{code}
 
+\begin{code}
 exprIsBig :: Expr b -> Bool
 -- ^ Returns @True@ of expressions that are too big to be compared by 'cheapEqExpr'
 exprIsBig (Lit _)      = False
@@ -925,7 +927,53 @@ exprIsBig (Cast e _)   = exprIsBig e	-- Hopefully coercions are not too big!
 exprIsBig _            = True
 \end{code}
 
+\begin{code}
+eqExpr :: InScopeSet -> CoreExpr -> CoreExpr -> Bool
+-- Compares for equality, modulo alpha
+eqExpr in_scope e1 e2
+  = go (mkRnEnv2 in_scope) e1 e2
+  where
+    go _   (Lit lit1) 	(Lit lit2)   = lit1 == lit2
+    go env (Type t1)  	(Type t2)    = coreEqType2 env t1 t2
+    go env (Var v1)   	(Var v2)     = rnOccL env v1 == rnOccR env v2
+    go env (Cast e1 t1) (Cast e2 t2) = go env e1 e2 && coreEqCoercion2 env t1 t2
+    go env (App f1 a1)  (App f2 a2)  = go env f1 f2 && go env a1 a2
+
+    go env (Lam b1 e1)  (Lam b2 e2)  
+      =  coreEqType2 env (varType b1) (varType b2)	-- Will return False for Id/TyVar combination
+      && go (rnBndr2 env b1 b2) e1 e2
+
+    go env (Case e1 b1 _ a1) (Case e2 b2 _ a2)
+      =  go env e1 e2
+      && coreEqType2 env (idType b1) (idType b2)
+      && all2 (go_alt (rnBndr2 env b1 b2)) a1 a2
+   
+    go env (Let (NonRec b1 r1) e1) (Let (NonRec b2 r2) e2)
+      =  go env r1 r2	-- No need to check binder types, since RHSs match
+      && go (rnBndr2 env b1 b2) e1 e2	
+
+    go env (Let (Rec p1) e1) (Let (Rec p2) e2)
+      | equalLength p1 p2
+      =  all2 (go env') rs1 rs2 && go env' e1 e2
+      where
+         (bs1,rs1) = unzip p1
+         (bs2,rs2) = unzip p2
+         env' = rnBndrs2 env bs1 bs2
 
+    go env (Note n1 e1) (Note n2 e2) = go_note n1 n2 && go env e1 e2
+
+    go _ _ _ = False
+
+    -----------
+    go_alt env (c1, bs1, e1) (c2, bs2, e2)
+      = c1 == c2 && go (rnBndrs2 env bs1 bs2) e1 e2
+
+    -----------
+    go_note (SCC cc1)     (SCC cc2)     = cc1==cc2
+    go_note (CoreNote s1) (CoreNote s2) = s1==s2
+    go_note _ _ = False
+\end{code}
+    
 
 %************************************************************************
 %*									*