X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FhsSyn%2FHsImpExp.lhs;h=4e58dd71f0da18a284256803ff8b983197131336;hb=cec9b62f2ccdd358aa1d99c4143794b541b87f7e;hp=029ec28475646bb9c7eb8c3e4c139ecb7a8a0138;hpb=8e76ea3d26c93a581fc5133833044cade2fbccc7;p=ghc-hetmet.git

diff --git a/compiler/hsSyn/HsImpExp.lhs b/compiler/hsSyn/HsImpExp.lhs
index 029ec28..4e58dd7 100644
--- a/compiler/hsSyn/HsImpExp.lhs
+++ b/compiler/hsSyn/HsImpExp.lhs
@@ -15,15 +15,12 @@ HsImpExp: Abstract syntax: imports, exports, interfaces
 
 module HsImpExp where
 
-#include "HsVersions.h"
-
 import Module		( ModuleName )
 import HsDoc		( HsDoc )
 
 import Outputable
 import FastString
 import SrcLoc		( Located(..) )
-import Char		( isAlpha )
 \end{code}
 
 %************************************************************************
@@ -47,24 +44,24 @@ data ImportDecl name
 \begin{code}
 instance (Outputable name) => Outputable (ImportDecl name) where
     ppr (ImportDecl mod from qual as spec)
-      = hang (hsep [ptext SLIT("import"), ppr_imp from, 
+      = hang (hsep [ptext (sLit "import"), ppr_imp from, 
                     pp_qual qual, ppr mod, pp_as as])
 	     4 (pp_spec spec)
       where
 	pp_qual False   = empty
-	pp_qual True	= ptext SLIT("qualified")
+	pp_qual True	= ptext (sLit "qualified")
 
 	pp_as Nothing   = empty
-	pp_as (Just a)  = ptext SLIT("as ") <+> ppr a
+	pp_as (Just a)  = ptext (sLit "as ") <+> ppr a
 
-	ppr_imp True  = ptext SLIT("{-# SOURCE #-}")
+	ppr_imp True  = ptext (sLit "{-# SOURCE #-}")
 	ppr_imp False = empty
 
 	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)
+			= ptext (sLit "hiding") <+> parens (interpp'SP spec)
 
 ideclName :: ImportDecl name -> Located ModuleName
 ideclName (ImportDecl mod_nm _ _ _ _) = mod_nm
@@ -116,31 +113,10 @@ instance (Outputable name) => Outputable (IE name) where
     ppr (IEThingWith thing withs)
 	= ppr thing <> parens (fsep (punctuate comma (map pprHsVar withs)))
     ppr (IEModuleContents mod)
-	= ptext SLIT("module") <+> ppr mod
+	= ptext (sLit "module") <+> ppr mod
     ppr (IEGroup n _)           = text ("<IEGroup: " ++ (show n) ++ ">")
     ppr (IEDoc doc)             = ppr doc
     ppr (IEDocNamed string)     = text ("<IEDocNamed: " ++ string ++ ">")
 \end{code}
 
-\begin{code}
-pprHsVar :: Outputable name => name -> SDoc
-pprHsVar v | isOperator ppr_v = parens ppr_v
-	   | otherwise	      = ppr_v
-	   where
-	     ppr_v = ppr v
-
-isOperator :: SDoc -> Bool
-isOperator ppr_v 
-  = case showSDocUnqual ppr_v of
-        ('(':_)   -> False              -- (), (,) etc
-        ('[':_)   -> False              -- []
-        ('$':c:_) -> not (isAlpha c)    -- Don't treat $d as an operator
-        (':':c:_) -> not (isAlpha c)    -- Don't treat :T as an operator
-        ('_':_)   -> False              -- Not an operator
-        (c:_)     -> not (isAlpha c)    -- Starts with non-alpha
-        _         -> False
-    -- 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}