[project @ 2000-07-11 15:58:26 by simonmar]

[ghc-hetmet.git] / ghc / compiler / basicTypes / OccName.lhs

diff --git a/ghc/compiler/basicTypes/OccName.lhs b/ghc/compiler/basicTypes/OccName.lhs
index 98eb7c1..e2da548 100644 (file)
--- a/ghc/compiler/basicTypes/OccName.lhs
+++ b/ghc/compiler/basicTypes/OccName.lhs
@@ -1,4 +1,4 @@
-
+%
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
 
@@ -68,17 +68,10 @@ type EncodedString = String -- Encoded form
 pprEncodedFS :: EncodedFS -> SDoc
 pprEncodedFS fs
   = getPprStyle        $ \ sty ->
-    if userStyle sty then
-       let
-           s = decode (_UNPK_ fs)
-           c = head s
-       in
-       if startsVarSym c || startsConSym c then
-               parens (text s)
-       else
-               text s 
-    else
-       ptext fs
+    if userStyle sty
+       -- ptext (decodeFS fs) would needlessly pack the string again
+       then text (decode (_UNPK_ fs))
+        else ptext fs
 \end{code}
 
 %************************************************************************
@@ -470,10 +463,11 @@ The basic encoding scheme is this.
 alreadyEncoded :: String -> Bool
 alreadyEncoded s = all ok s
                 where
-                  ok ' ' = True                -- This is a bit of a lie; if we really wanted spaces
-                                               -- in names we'd have to encode them.  But we do put
-                                               -- spaces in ccall "occurrences", and we don't want to
-                                               -- reject them here
+                  ok ' ' = True
+                       -- This is a bit of a lie; if we really wanted spaces
+                       -- in names we'd have to encode them.  But we do put
+                       -- spaces in ccall "occurrences", and we don't want to
+                       -- reject them here
                   ok ch  = ISALPHANUM ch
 
 alreadyEncodedFS :: FAST_STRING -> Bool