#include "HsVersions.h"
-import BasicTypes ( IfaceFlavour(..) )
-import Name ( Module, NamedThing, pprModule )
+import Module ( ModuleName, WhereFrom, pprModuleName )
import Outputable
import SrcLoc ( SrcLoc )
\end{code}
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, pprModuleName 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 ") <+> pprModuleName a
pp_spec Nothing = empty
pp_spec (Just (False, spec))
| 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}
\end{code}
\begin{code}
-instance (NamedThing name, Outputable name) => Outputable (IE name) where
+instance (Outputable name) => Outputable (IE name) where
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
+ = ptext SLIT("module") <+> pprModuleName mod
\end{code}