[project @ 2001-12-04 19:26:17 by sof]

[ghc-hetmet.git] / ghc / compiler / hsSyn / HsImpExp.lhs

diff --git a/ghc/compiler/hsSyn/HsImpExp.lhs b/ghc/compiler/hsSyn/HsImpExp.lhs
index 8f51b6d..e483914 100644 (file)
--- a/ghc/compiler/hsSyn/HsImpExp.lhs
+++ b/ghc/compiler/hsSyn/HsImpExp.lhs
@@ -8,6 +8,7 @@ module HsImpExp where
 
 #include "HsVersions.h"
 
+import Name            ( isLexSym )
 import Module          ( ModuleName, WhereFrom )
 import Outputable
 import SrcLoc          ( SrcLoc )
@@ -48,6 +49,8 @@ instance (Outputable name) => Outputable (ImportDecl name) where
                        = parens (interpp'SP spec)
        pp_spec (Just (True, spec))
                        = ptext SLIT("hiding") <+> parens (interpp'SP spec)
+
+ideclName (ImportDecl mod_nm _ _ _ _ _) = mod_nm
 \end{code}
 
 %************************************************************************
@@ -82,12 +85,23 @@ ieNames (IEModuleContents _   ) = []
 
 \begin{code}
 instance (Outputable name) => Outputable (IE name) where
-    ppr (IEVar         var)    = ppr var
+    ppr (IEVar         var)    = ppr_var var
     ppr (IEThingAbs    thing)  = ppr thing
     ppr (IEThingAll    thing)  = hcat [ppr thing, text "(..)"]
     ppr (IEThingWith thing withs)
-       = ppr thing <> parens (fsep (punctuate comma (map ppr withs)))
+       = ppr thing <> parens (fsep (punctuate comma (map ppr_var withs)))
     ppr (IEModuleContents mod)
        = ptext SLIT("module") <+> ppr mod
+
+ppr_var v | isOperator v = parens (ppr v)
+         | otherwise    = ppr v
+\end{code}
+
+\begin{code}
+isOperator :: Outputable a => a -> Bool
+isOperator v = isLexSym (_PK_ (showSDocUnqual (ppr v)))
+       -- We use (showSDoc (ppr v)), rather than isSymOcc (getOccName v) simply so
+       -- that we don't need NamedThing in the context of all these functions.
+       -- Gruesome, but simple.
 \end{code}