[project @ 1999-01-27 14:51:14 by simonpj]

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

diff --git a/ghc/compiler/hsSyn/HsImpExp.lhs b/ghc/compiler/hsSyn/HsImpExp.lhs
index b1d462d..ff1a095 100644 (file)
--- a/ghc/compiler/hsSyn/HsImpExp.lhs
+++ b/ghc/compiler/hsSyn/HsImpExp.lhs
@@ -1,18 +1,15 @@
 %
-% (c) The GRASP/AQUA Project, Glasgow University, 1992-1996
+% (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
 \section[HsImpExp]{Abstract syntax: imports, exports, interfaces}
 
 \begin{code}
-#include "HsVersions.h"
-
 module HsImpExp where
 
-import Ubiq
+#include "HsVersions.h"
 
+import OccName         ( Module, pprModule, moduleIfaceFlavour, bootFlavour )
 import Outputable
-import PprStyle                ( PprStyle(..) )
-import Pretty
 import SrcLoc          ( SrcLoc )
 \end{code}
 
@@ -34,22 +31,25 @@ data ImportDecl name
 
 \begin{code}
 instance (Outputable name) => Outputable (ImportDecl name) where
-    ppr sty (ImportDecl mod qual as spec _)
-      = ppHang (ppCat [ppStr "import", pp_qual qual, ppPStr mod, pp_as as])
+    ppr (ImportDecl mod qual as spec _)
+      = hang (hsep [ptext SLIT("import"), pp_src, 
+                    pp_qual qual, pprModule mod, pp_as as])
             4 (pp_spec spec)
       where
-       pp_qual False   = ppNil
-       pp_qual True    = ppStr "qualified"
+       pp_src | bootFlavour (moduleIfaceFlavour mod) = ptext SLIT("{-# SOURCE #-}")
+              | otherwise                            = empty
 
-       pp_as Nothing   = ppNil
-       pp_as (Just a)  = ppCat [ppStr "as", ppPStr a]
+       pp_qual False   = empty
+       pp_qual True    = ptext SLIT("qualified")
 
-       pp_spec Nothing = ppNil
+       pp_as Nothing   = empty
+       pp_as (Just a)  = ptext SLIT("as ") <+> pprModule a
+
+       pp_spec Nothing = empty
        pp_spec (Just (False, spec))
-                       = ppBesides [ppStr "(", interpp'SP sty spec, ppStr ")"]
+                       = parens (interpp'SP spec)
        pp_spec (Just (True, spec))
-                       = ppBesides [ppStr "hiding (", interpp'SP sty spec, ppStr ")"]
-
+                       = ptext SLIT("hiding") <+> parens (interpp'SP spec)
 \end{code}
 
 %************************************************************************
@@ -57,6 +57,7 @@ instance (Outputable name) => Outputable (ImportDecl name) where
 \subsection{Imported and exported entities}
 %*                                                                     *
 %************************************************************************
+
 \begin{code}
 data IE name
   = IEVar              name
@@ -67,13 +68,21 @@ data IE name
 \end{code}
 
 \begin{code}
+ieName :: IE name -> name
+ieName (IEVar n)        = n
+ieName (IEThingAbs  n)   = n
+ieName (IEThingWith n _) = n
+ieName (IEThingAll  n)   = n
+\end{code}
+
+\begin{code}
 instance (Outputable name) => Outputable (IE name) where
-    ppr sty (IEVar     var)    = ppr sty var
-    ppr sty (IEThingAbs        thing)  = ppr sty thing
-    ppr sty (IEThingAll        thing)
-       = ppBesides [ppr sty thing, ppStr "(..)"]
-    ppr sty (IEThingWith thing withs)
-       = ppBesides [ppr sty thing, ppLparen, ppInterleave ppComma (map (ppr sty) withs), ppRparen]
-    ppr sty (IEModuleContents mod)
-       = ppBeside (ppPStr SLIT("module ")) (ppPStr mod)
+    ppr (IEVar         var)    = ppr 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 (IEModuleContents mod)
+       = ptext SLIT("module") <+> pprModule mod
 \end{code}
+