X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fspecialise%2FRules.lhs;h=18dfdce32ba37dcbe7486bc28879ed8d33681b43;hp=758d60db04de959e3d30a6a9046265acc04191a6;hb=ad94d40948668032189ad22a0ad741ac1f645f50;hpb=1ca40c2037a0e973dd73d98cd20313ecdbfeb6fc

diff --git a/compiler/specialise/Rules.lhs b/compiler/specialise/Rules.lhs
index 758d60d..18dfdce 100644
--- a/compiler/specialise/Rules.lhs
+++ b/compiler/specialise/Rules.lhs
@@ -4,6 +4,13 @@
 \section[CoreRules]{Transformation rules}
 
 \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/CodingStyle#Warnings
+-- for details
+
 module Rules (
 	RuleBase, emptyRuleBase, mkRuleBase, extendRuleBaseList, 
 	unionRuleBase, pprRuleBase, ruleCheckProgram,
@@ -20,7 +27,7 @@ module Rules (
 
 import CoreSyn		-- All of it
 import OccurAnal	( occurAnalyseExpr )
-import CoreFVs		( exprFreeVars, exprsFreeVars, bindFreeVars, rulesRhsFreeVars )
+import CoreFVs		( exprFreeVars, exprsFreeVars, bindFreeVars, rulesFreeVars )
 import CoreUnfold	( isCheapUnfolding, unfoldingTemplate )
 import CoreUtils	( tcEqExprX, exprType )
 import PprCore		( pprRules )
@@ -38,13 +45,14 @@ import Name		( Name, NamedThing(..) )
 import NameEnv
 import Unify 		( ruleMatchTyX, MatchEnv(..) )
 import BasicTypes	( Activation, CompilerPhase, isActive )
+import StaticFlags	( opt_PprStyle_Debug )
 import Outputable
 import FastString
 import Maybes
 import OrdList
 import Bag
 import Util
-import List hiding( mapAccumL )	-- Also defined in Util
+import Data.List
 \end{code}
 
 
@@ -135,11 +143,11 @@ ruleCantMatch ts	     as		    = False
 
 \begin{code}
 mkSpecInfo :: [CoreRule] -> SpecInfo
-mkSpecInfo rules = SpecInfo rules (rulesRhsFreeVars rules)
+mkSpecInfo rules = SpecInfo rules (rulesFreeVars rules)
 
 extendSpecInfo :: SpecInfo -> [CoreRule] -> SpecInfo
 extendSpecInfo (SpecInfo rs1 fvs1) rs2
-  = SpecInfo (rs2 ++ rs1) (rulesRhsFreeVars rs2 `unionVarSet` fvs1)
+  = SpecInfo (rs2 ++ rs1) (rulesFreeVars rs2 `unionVarSet` fvs1)
 
 addSpecInfo :: SpecInfo -> SpecInfo -> SpecInfo
 addSpecInfo (SpecInfo rs1 fvs1) (SpecInfo rs2 fvs2) 
@@ -258,10 +266,15 @@ findBest target (rule1,ans1) ((rule2,ans2):prs)
   | rule1 `isMoreSpecific` rule2 = findBest target (rule1,ans1) prs
   | rule2 `isMoreSpecific` rule1 = findBest target (rule2,ans2) prs
 #ifdef DEBUG
-  | otherwise = pprTrace "Rules.findBest: rule overlap (Rule 1 wins)"
-			 (vcat [ptext SLIT("Expression to match:") <+> ppr fn <+> sep (map ppr args),
-				ptext SLIT("Rule 1:") <+> ppr rule1, 
-				ptext SLIT("Rule 2:") <+> ppr rule2]) $
+  | otherwise = let pp_rule rule 
+			| opt_PprStyle_Debug = ppr rule
+			| otherwise          = doubleQuotes (ftext (ru_name rule))
+		in pprTrace "Rules.findBest: rule overlap (Rule 1 wins)"
+			 (vcat [if opt_PprStyle_Debug then 
+				   ptext SLIT("Expression to match:") <+> ppr fn <+> sep (map ppr args)
+				else empty,
+				ptext SLIT("Rule 1:") <+> pp_rule rule1, 
+				ptext SLIT("Rule 2:") <+> pp_rule rule2]) $
 		findBest target (rule1,ans1) prs
 #else
   | otherwise = findBest target (rule1,ans1) prs