[project @ 2006-01-10 13:35:04 by simonmar]

Z-encode cost centre symbols when printing them out.

ghc/compiler/profiling/CostCentre.lhs

@@ -33,7 +33,7 @@ module CostCentre (
 
 import Var		( Id )
 import Name		( getOccName, occNameFS )
-import Module		( Module )
+import Module		( Module, moduleFS )
 import Outputable	
 import FastTypes
 import FastString
@@ -339,12 +339,12 @@ instance Outputable CostCentre where
 
 -- Printing in an interface file or in Core generally
 pprCostCentreCore (AllCafsCC {cc_mod = m})
-  = text "__sccC" <+> braces (ppr m)
+  = text "__sccC" <+> braces (ppr_mod m)
 pprCostCentreCore (NormalCC {cc_name = n, cc_mod = m,
 			     cc_is_caf = caf, cc_is_dupd = dup})
   = text "__scc" <+> braces (hsep [
-	ftext n,
-	ppr m,	
+	ftext (zEncodeFS n),
+	ppr_mod m,
 	pp_dup dup,
 	pp_caf caf
     ])
@@ -355,12 +355,13 @@ pp_dup other   = empty
 pp_caf CafCC = text "__C"
 pp_caf other   = empty
 
+ppr_mod m = ftext (zEncodeFS (moduleFS m))
 
 -- Printing as a C label
 ppCostCentreLbl (NoCostCentre)		  = text "NONE_cc"
 ppCostCentreLbl (AllCafsCC  {cc_mod = m}) = ppr m <> text "_CAFs_cc"
 ppCostCentreLbl (NormalCC {cc_name = n, cc_mod = m, cc_is_caf = is_caf}) 
-  = ppr m <> ftext n <> 
+  = ppr_mod m <> ftext (zEncodeFS n) <> 
 	text (case is_caf of { CafCC -> "_CAF"; _ -> "" }) <> text "_cc"
 
 -- This is the name to go in the user-displayed string,