X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FhsSyn%2FHsImpExp.lhs;h=52ce08bb9e6f6ff2bdeade220c2aee5881123d49;hb=aa78876d2949ebd4565e9b88ce64cedad581b60f;hp=9083d9e18c5d9e792570df1b057d41a17c76149b;hpb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;p=ghc-hetmet.git

diff --git a/ghc/compiler/hsSyn/HsImpExp.lhs b/ghc/compiler/hsSyn/HsImpExp.lhs
index 9083d9e..52ce08b 100644
--- a/ghc/compiler/hsSyn/HsImpExp.lhs
+++ b/ghc/compiler/hsSyn/HsImpExp.lhs
@@ -8,10 +8,11 @@ module HsImpExp where
 
 #include "HsVersions.h"
 
-import BasicTypes	( Module, IfaceFlavour(..) )
-import Name		( NamedThing )
+import Module		( ModuleName )
 import Outputable
+import FastString
 import SrcLoc		( SrcLoc )
+import Char		( isAlpha )
 \end{code}
 
 %************************************************************************
@@ -23,36 +24,37 @@ import SrcLoc		( SrcLoc )
 One per \tr{import} declaration in a module.
 \begin{code}
 data ImportDecl name
-  = ImportDecl	  Module			-- module name
+  = ImportDecl	  ModuleName			-- module name
+		  Bool				-- True <=> {-# SOURCE #-} import
 		  Bool				-- True => qualified
-		  IfaceFlavour			-- True => source imported module 
-						--    (current interpretation: ignore ufolding info)
-		  (Maybe Module)		-- as Module
+		  (Maybe ModuleName)		-- as Module
 		  (Maybe (Bool, [IE name]))	-- (True => hiding, names)
 		  SrcLoc
 \end{code}
 
 \begin{code}
-instance (NamedThing name, Outputable name) => Outputable (ImportDecl name) where
-    ppr (ImportDecl mod qual as_source as spec _)
-      = hang (hsep [ptext SLIT("import"), pp_src as_source, 
-                    pp_qual qual, ptext mod, pp_as as])
+instance (Outputable name) => Outputable (ImportDecl name) where
+    ppr (ImportDecl mod from qual as spec _)
+      = hang (hsep [ptext SLIT("import"), ppr_imp from, 
+                    pp_qual qual, ppr mod, pp_as as])
 	     4 (pp_spec spec)
       where
-	pp_src HiFile     = empty
-	pp_src HiBootFile = ptext SLIT("{-# SOURCE #-}")
-
 	pp_qual False   = empty
 	pp_qual True	= ptext SLIT("qualified")
 
 	pp_as Nothing   = empty
-	pp_as (Just a)  = ptext SLIT("as ") <+> ptext a
+	pp_as (Just a)  = ptext SLIT("as ") <+> ppr a
+
+	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)
+
+ideclName (ImportDecl mod_nm _ _ _ _ _) = mod_nm
 \end{code}
 
 %************************************************************************
@@ -67,7 +69,7 @@ data IE name
   | IEThingAbs          name		-- Class/Type (can't tell)
   | IEThingAll          name		-- Class/Type plus all methods/constructors
   | IEThingWith		name [name]	-- Class/Type plus some methods/constructors
-  | IEModuleContents    Module		-- (Export Only)
+  | IEModuleContents    ModuleName	-- (Export Only)
 \end{code}
 
 \begin{code}
@@ -76,16 +78,44 @@ ieName (IEVar n) 	 = n
 ieName (IEThingAbs  n)   = n
 ieName (IEThingWith n _) = n
 ieName (IEThingAll  n)   = n
+
+ieNames :: IE a -> [a]
+ieNames (IEVar            n   ) = [n]
+ieNames (IEThingAbs       n   ) = [n]
+ieNames (IEThingAll       n   ) = [n]
+ieNames (IEThingWith      n ns) = n:ns
+ieNames (IEModuleContents _   ) = []
 \end{code}
 
 \begin{code}
-instance (NamedThing name, Outputable name) => Outputable (IE name) where
-    ppr (IEVar	        var)	= ppr var
+instance (Outputable name) => Outputable (IE name) where
+    ppr (IEVar	        var)	= pprHsVar 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 pprHsVar withs)))
     ppr (IEModuleContents mod)
-	= ptext SLIT("module") <+> ptext mod
+	= ptext SLIT("module") <+> ppr mod
+\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
+	('(':s)   -> False		-- (), (,) etc
+	('[':s)   -> False		-- []
+	('$':c:s) -> not (isAlpha c)	-- Don't treat $d as an operator
+	(':':c:s) -> not (isAlpha c)	-- Don't treat :T as an operator
+	(c:s)     -> not (isAlpha c)	-- Starts with non-alpha
+	other     -> 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}