#include "HsVersions.h"
-import Module ( ModuleName, WhereFrom, pprModuleName )
+import Name ( isLexSym )
+import Module ( ModuleName, WhereFrom )
import Outputable
import SrcLoc ( SrcLoc )
\end{code}
instance (Outputable name) => Outputable (ImportDecl name) where
ppr (ImportDecl mod from qual as spec _)
= hang (hsep [ptext SLIT("import"), ppr from,
- pp_qual qual, pprModuleName mod, pp_as as])
+ pp_qual qual, ppr mod, pp_as as])
4 (pp_spec spec)
where
pp_qual False = empty
pp_qual True = ptext SLIT("qualified")
pp_as Nothing = empty
- pp_as (Just a) = ptext SLIT("as ") <+> pprModuleName a
+ pp_as (Just a) = ptext SLIT("as ") <+> ppr a
pp_spec Nothing = empty
pp_spec (Just (False, spec))
= parens (interpp'SP spec)
pp_spec (Just (True, spec))
= ptext SLIT("hiding") <+> parens (interpp'SP spec)
+
+ideclName (ImportDecl mod_nm _ _ _ _ _) = mod_nm
\end{code}
%************************************************************************
\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") <+> pprModuleName 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}