Major patch to fix reporting of unused imports

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

diff --git a/compiler/hsSyn/HsImpExp.lhs b/compiler/hsSyn/HsImpExp.lhs
index 099537f..9465cd2 100644 (file)
--- a/compiler/hsSyn/HsImpExp.lhs
+++ b/compiler/hsSyn/HsImpExp.lhs
@@ -33,13 +33,16 @@ One per \tr{import} declaration in a module.
 \begin{code}
 type LImportDecl name = Located (ImportDecl name)
 
 \begin{code}
 type LImportDecl name = Located (ImportDecl name)
 

+-- | A single Haskell @import@ declaration.

 data ImportDecl name
 data ImportDecl name

-  = ImportDecl   (Located ModuleName)          -- module name
-                  (Maybe FastString)            -- package qualifier
-                 Bool                          -- True <=> {-# SOURCE #-} import
-                 Bool                          -- True => qualified
-                 (Maybe ModuleName)            -- as Module
-                 (Maybe (Bool, [LIE name]))    -- (True => hiding, names)
+  = ImportDecl {
+      ideclName      :: Located ModuleName, -- ^ Module name.
+      ideclPkgQual   :: Maybe FastString,   -- ^ Package qualifier.
+      ideclSource    :: Bool,               -- ^ True <=> {-# SOURCE #-} import
+      ideclQualified :: Bool,               -- ^ True => qualified
+      ideclAs        :: Maybe ModuleName,   -- ^ as Module
+      ideclHiding    :: Maybe (Bool, [LIE name]) -- ^ (True => hiding, names)
+    }

 \end{code}
 
 \begin{code}
 \end{code}
 
 \begin{code}

@@ -56,19 +59,17 @@ instance (Outputable name) => Outputable (ImportDecl name) where
        pp_qual True    = ptext (sLit "qualified")
 
        pp_as Nothing   = empty
        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 False = empty
 
 
        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)
+       pp_spec Nothing             = empty
+       pp_spec (Just (False, ies)) = ppr_ies ies
+       pp_spec (Just (True,  ies)) = ptext (sLit "hiding") <+> ppr_ies ies

 
 

-ideclName :: ImportDecl name -> Located ModuleName
-ideclName (ImportDecl mod_nm _ _ _ _ _) = mod_nm
+       ppr_ies []  = ptext (sLit "()")
+       ppr_ies ies = char '(' <+> interpp'SP ies <+> char ')'

 \end{code}
 
 %************************************************************************
 \end{code}
 
 %************************************************************************

@@ -80,15 +81,16 @@ ideclName (ImportDecl mod_nm _ _ _ _ _) = mod_nm
 \begin{code}
 type LIE name = Located (IE name)
 
 \begin{code}
 type LIE name = Located (IE name)
 

+-- | Imported or exported entity.

 data IE name
   = IEVar               name
 data IE name
   = IEVar               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    ModuleName      -- (Export Only)
-  | IEGroup             Int (HsDoc name) -- Doc section heading
-  | IEDoc               (HsDoc name)     -- Some documentation
-  | IEDocNamed          String           -- Reference to named doc
+  | 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    ModuleName      -- ^ (Export Only)
+  | IEGroup             Int (HsDoc name) -- ^ Doc section heading
+  | IEDoc               (HsDoc name)     -- ^ Some documentation
+  | IEDocNamed          String           -- ^ Reference to named doc

 \end{code}
 
 \begin{code}
 \end{code}
 
 \begin{code}