X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplify.lhs;h=62f226c8ad8a268557fc8d6c3ff7475aa3789acf;hb=b88025eabcd83f65d1d81f09272f5172f06a60e7;hp=1be1ae375c0d97932fe089d125b9a78736c8a2dd;hpb=7a327c1297615a9498e7117a0017b09ff2458d53;p=ghc-hetmet.git

diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
index 1be1ae3..62f226c 100644
--- a/compiler/simplCore/Simplify.lhs
+++ b/compiler/simplCore/Simplify.lhs
@@ -553,7 +553,7 @@ completeBind env top_lvl old_bndr new_bndr new_rhs
     loop_breaker = isNonRuleLoopBreaker occ_info
     old_info     = idInfo old_bndr
     occ_info     = occInfo old_info
-\end{code}    
+\end{code}
 
 
 
@@ -626,8 +626,9 @@ simplExprC env expr cont
 simplExprF :: SimplEnv -> InExpr -> SimplCont
 	   -> SimplM (SimplEnv, OutExpr)
 
-simplExprF env e cont = -- pprTrace "simplExprF" (ppr e $$ ppr cont {- $$ ppr (seIdSubst env) -} $$ ppr (seFloats env) ) $
-			simplExprF' env e cont
+simplExprF env e cont 
+  = -- pprTrace "simplExprF" (ppr e $$ ppr cont $$ ppr (seTvSubst env) $$ ppr (seIdSubst env) {- $$ ppr (seFloats env) -} ) $
+    simplExprF' env e cont
     				     
 simplExprF' env (Var v)	      cont = simplVar env v cont
 simplExprF' env (Lit lit)      cont = rebuild env (Lit lit) cont
@@ -874,16 +875,8 @@ simplNote env InlineMe e cont
   = simplExprF env e cont
 
 simplNote env (CoreNote s) e cont
-  = do	{ e' <- simplExpr env e
-	; rebuild env (Note (CoreNote s) e') cont }
-
-simplNote env note@(TickBox {}) e cont
-  = do	{ e' <- simplExpr env e
-	; rebuild env (Note note e') cont }
-
-simplNote env note@(BinaryTickBox {}) e cont
-  = do	{ e' <- simplExpr env e
-	; rebuild env (Note note e') cont }
+  = simplExpr env e    `thenSmpl` \ e' ->
+    rebuild env (Note (CoreNote s) e') cont
 \end{code}