[project @ 2002-04-29 14:03:38 by simonmar]

FastString cleanup, stage 1.

The FastString type is no longer a mixture of hashed strings and
literal strings, it contains hashed strings only with O(1) comparison
(except for UnicodeStr, but that will also go away in due course).  To
create a literal instance of FastString, use FSLIT("..").

By far the most common use of the old literal version of FastString
was in the pattern

	  ptext SLIT("...")

this combination still works, although it doesn't go via FastString
any more.  The next stage will be to remove the need to use this
special combination at all, using a RULE.

To convert a FastString into an SDoc, now use 'ftext' instead of
'ptext'.

I've also removed all the FAST_STRING related macros from HsVersions.h
except for SLIT and FSLIT, just use the relevant functions from
FastString instead.

1 files changed, 2 insertions, 2 deletions

diff --git a/ghc/compiler/codeGen/CodeGen.lhs b/ghc/compiler/codeGen/CodeGen.lhs
index 5d08357b73..477790d0c1 100644
--- a/ghc/compiler/codeGen/CodeGen.lhs
+++ b/ghc/compiler/codeGen/CodeGen.lhs
@@ -156,10 +156,10 @@ mkCostCentreStuff (local_CCs, extern_CCs, singleton_CCSs)
 	[ register_ccs, register_cc_stacks ]
       where
 	mk_register cc
-	  = CCallProfCCMacro SLIT("REGISTER_CC") [mkCCostCentre cc]
+	  = CCallProfCCMacro FSLIT("REGISTER_CC") [mkCCostCentre cc]
 
 	mk_register_ccs ccs
-	  = CCallProfCCMacro SLIT("REGISTER_CCS") [mkCCostCentreStack ccs]
+	  = CCallProfCCMacro FSLIT("REGISTER_CCS") [mkCCostCentreStack ccs]
 \end{code}
 
 %************************************************************************