diff options
| author | simonmar <unknown> | 2002-04-29 14:04:11 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2002-04-29 14:04:11 +0000 |
| commit | b085ee40c7f265a5977ea6ec1c415e573be5ff8c (patch) | |
| tree | ab849b59a7eb6a57bc89559706cd71256b5898e4 /ghc/compiler/codeGen/CgHeapery.lhs | |
| parent | f6124b6ca2ec9820f7eb454dbcffbf4b8b790d4f (diff) | |
| download | haskell-b085ee40c7f265a5977ea6ec1c415e573be5ff8c.tar.gz | |
[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.
Diffstat (limited to 'ghc/compiler/codeGen/CgHeapery.lhs')
| -rw-r--r-- | ghc/compiler/codeGen/CgHeapery.lhs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ghc/compiler/codeGen/CgHeapery.lhs b/ghc/compiler/codeGen/CgHeapery.lhs index ebc51019da..a040d32c00 100644 --- a/ghc/compiler/codeGen/CgHeapery.lhs +++ b/ghc/compiler/codeGen/CgHeapery.lhs @@ -1,7 +1,7 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % -% $Id: CgHeapery.lhs,v 1.30 2002/02/05 14:39:24 simonpj Exp $ +% $Id: CgHeapery.lhs,v 1.31 2002/04/29 14:03:41 simonmar Exp $ % \section[CgHeapery]{Heap management functions} @@ -118,7 +118,7 @@ fastEntryChecks regs tags ret node_points code = mkAbstractCs [ real_check, if hp == 0 then AbsCNop - else profCtrAbsC SLIT("TICK_ALLOC_HEAP") + else profCtrAbsC FSLIT("TICK_ALLOC_HEAP") [ mkIntCLit hp, CLbl ctr DataPtrRep ] ] @@ -258,7 +258,7 @@ altHeapCheck is_fun regs tags fail_code (Just ret_addr) code then AbsCNop else mkAbstractCs [ checking_code tag_assts, - profCtrAbsC SLIT("TICK_ALLOC_HEAP") + profCtrAbsC FSLIT("TICK_ALLOC_HEAP") [ mkIntCLit words_required, CLbl ctr DataPtrRep ] ] ) `thenC` @@ -317,7 +317,7 @@ altHeapCheck is_fun regs [] AbsCNop Nothing code then AbsCNop else mkAbstractCs [ checking_code, - profCtrAbsC SLIT("TICK_ALLOC_HEAP") + profCtrAbsC FSLIT("TICK_ALLOC_HEAP") [ mkIntCLit words_required, CLbl ctr DataPtrRep ] ] ) `thenC` |