From 13f7bc6e91a4322f5e85af4389ea6a7ff96ee703 Mon Sep 17 00:00:00 2001
From: panne <unknown>
Date: Sun, 28 May 2000 23:21:02 +0000
Subject: [PATCH] [project @ 2000-05-28 23:21:02 by panne] Prefix litlits with
"__litlit" in interface files. *please merge*
---
ghc/compiler/basicTypes/Literal.lhs | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/ghc/compiler/basicTypes/Literal.lhs b/ghc/compiler/basicTypes/Literal.lhs
index ca14f9a96993..f37318177c5e 100644
--- a/ghc/compiler/basicTypes/Literal.lhs
+++ b/ghc/compiler/basicTypes/Literal.lhs
@@ -249,13 +249,14 @@ litTag (MachLitLit _ _) = ILIT(10)
pprLit lit
= getPprStyle $ \ sty ->
let
- code_style = codeStyle sty
+ code_style = codeStyle sty
+ iface_style = ifaceStyle sty
in
case lit of
- MachChar ch | code_style -> hcat [ptext SLIT("(C_)"), char '\'',
- text (charToC ch), char '\'']
- | ifaceStyle sty -> char '\'' <> text (charToEasyHaskell ch) <> char '\''
- | otherwise -> text ['\'', ch, '\'']
+ MachChar ch | code_style -> hcat [ptext SLIT("(C_)"), char '\'',
+ text (charToC ch), char '\'']
+ | iface_style -> char '\'' <> text (charToEasyHaskell ch) <> char '\''
+ | otherwise -> text ['\'', ch, '\'']
MachStr s | code_style -> pprFSInCStyle s
| otherwise -> pprFSAsString s
@@ -277,16 +278,17 @@ pprLit lit
MachFloat f | code_style -> ptext SLIT("(StgFloat)") <> rational f
| otherwise -> ptext SLIT("__float") <+> rational f
- MachDouble d | ifaceStyle sty && d < 0 -> parens (rational d)
- | otherwise -> rational d
+ MachDouble d | iface_style && d < 0 -> parens (rational d)
+ | otherwise -> rational d
MachAddr p | code_style -> ptext SLIT("(void*)") <> integer p
| otherwise -> ptext SLIT("__addr") <+> integer p
- MachLitLit s ty | code_style -> ptext s
- | otherwise -> parens (hsep [ptext SLIT("__litlit"),
- pprFSAsString s,
- pprParendType ty])
+ MachLitLit s ty | code_style -> ptext s
+ | iface_style -> ptext SLIT("__litlit") <+> pprFSAsString s
+ | otherwise -> parens (hsep [ptext SLIT("__litlit"),
+ pprFSAsString s,
+ pprParendType ty])
pprIntVal :: Integer -> SDoc
-- Print negative integers with parens to be sure it's unambiguous
--
GitLab