[project @ 2001-03-27 14:05:09 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 84dcfce..e483914 100644 (file)
--- a/ghc/compiler/hsSyn/HsImpExp.lhs
+++ b/ghc/compiler/hsSyn/HsImpExp.lhs
@@ -8,8 +8,8 @@ module HsImpExp where
 
 #include "HsVersions.h"
 
-import BasicTypes      ( IfaceFlavour(..) )
-import Name            ( Module, NamedThing, pprModule )
+import Name            ( isLexSym )
+import Module          ( ModuleName, WhereFrom )
 import Outputable
 import SrcLoc          ( SrcLoc )
 \end{code}
@@ -23,36 +23,34 @@ import SrcLoc               ( SrcLoc )
 One per \tr{import} declaration in a module.
 \begin{code}
 data ImportDecl name
-  = ImportDecl   Module                        -- module name
+  = ImportDecl   ModuleName                    -- module name
+                 WhereFrom
                  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, pprModule mod, pp_as as])
+instance (Outputable name) => Outputable (ImportDecl name) where
+    ppr (ImportDecl mod from qual as spec _)
+      = hang (hsep [ptext SLIT("import"), ppr 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 ") <+> pprModule 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}
 
 %************************************************************************
@@ -67,7 +65,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 +74,34 @@ 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)    = 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") <+> pprModule 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}