[project @ 2000-02-25 14:55:31 by panne]

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

diff --git a/ghc/compiler/hsSyn/HsSyn.lhs b/ghc/compiler/hsSyn/HsSyn.lhs
index a6219b1..42731cc 100644 (file)
--- a/ghc/compiler/hsSyn/HsSyn.lhs
+++ b/ghc/compiler/hsSyn/HsSyn.lhs
@@ -1,5 +1,5 @@
 %
-% (c) The GRASP/AQUA Project, Glasgow University, 1992-1996
+% (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
 \section{Haskell abstract syntax definition}
 
@@ -22,7 +22,7 @@ module HsSyn (
        module HsMatches,
        module HsPat,
        module HsTypes,
-       Fixity, NewOrData, IfaceFlavour,
+       Fixity, NewOrData, 
 
        collectTopBinders, collectMonoBinders
      ) where
@@ -30,38 +30,29 @@ module HsSyn (
 #include "HsVersions.h"
 
 -- friends:
+import HsDecls         
 import HsBinds
-import HsDecls         ( HsDecl(..), TyDecl(..), InstDecl(..), ClassDecl(..), 
-                         DefaultDecl(..), 
-                         FixityDecl(..), 
-                         ConDecl(..), ConDetails(..), BangType(..),
-                         IfaceSig(..), HsIdInfo,  SpecDataSig(..), 
-                         hsDeclName
-                       )
 import HsExpr
 import HsImpExp
 import HsBasic
 import HsMatches
 import HsPat
 import HsTypes
-import HsPragmas       ( ClassPragmas, ClassOpPragmas,
-                         DataPragmas, GenPragmas, InstancePragmas )
 import HsCore
-import BasicTypes      ( Fixity, Version, NewOrData, IfaceFlavour, Module )
+import BasicTypes      ( Fixity, Version, NewOrData )
 
 -- others:
-import FiniteMap       ( FiniteMap )
 import Outputable
 import SrcLoc          ( SrcLoc )
 import Bag
-import Name            ( NamedThing )
+import Module          ( ModuleName, pprModuleName )
 \end{code}
 
 All we actually declare here is the top-level structure for a module.
 \begin{code}
-data HsModule flexi name pat
+data HsModule name pat
   = HsModule
-       Module                  -- module name
+       ModuleName              -- module name
        (Maybe Version)         -- source interface version number
        (Maybe [IE name])       -- export list; Nothing => export everything
                                -- Just [] => export *nothing* (???)
@@ -70,30 +61,35 @@ data HsModule flexi name pat
                                -- imported interfaces early on, adding that
                                -- info to TyDecls/etc; so this list is
                                -- often empty, downstream.
-       [FixityDecl name]
-       [HsDecl flexi name pat] -- Type, class, value, and interface signature decls
+       [HsDecl name pat]       -- Type, class, value, and interface signature decls
+       (Maybe DeprecTxt)       -- reason/explanation for deprecation of this module
        SrcLoc
 \end{code}
 
 \begin{code}
-instance (NamedThing name, Outputable name, Outputable pat)
-       => Outputable (HsModule flexi name pat) where
+instance (Outputable name, Outputable pat)
+       => Outputable (HsModule name pat) where
 
-    ppr (HsModule name iface_version exports imports fixities
-                     decls src_loc)
+    ppr (HsModule name iface_version exports imports
+                     decls deprec src_loc)
       = vcat [
            case exports of
-             Nothing -> hsep [ptext SLIT("module"), ptext name, ptext SLIT("where")]
+             Nothing -> pp_header (ptext SLIT("where"))
              Just es -> vcat [
-                           hsep [ptext SLIT("module"), ptext name, lparen],
-                           nest 8 (interpp'SP es),
+                           pp_header lparen,
+                           nest 8 (fsep (punctuate comma (map ppr es))),
                            nest 4 (ptext SLIT(") where"))
                          ],
            pp_nonnull imports,
-           pp_nonnull fixities,
            pp_nonnull decls
        ]
       where
+       pp_header rest = case deprec of
+           Nothing -> pp_modname <+> rest
+           Just d -> vcat [ pp_modname, ppr d, rest ]
+
+       pp_modname = ptext SLIT("module") <+> pprModuleName name
+
        pp_nonnull [] = empty
        pp_nonnull xs = vcat (map ppr xs)
 
@@ -122,19 +118,19 @@ where
 it should return @[x, y, f, a, b]@ (remember, order important).
 
 \begin{code}
-collectTopBinders :: HsBinds flexi name (InPat name) -> Bag (name,SrcLoc)
+collectTopBinders :: HsBinds name (InPat name) -> Bag (name,SrcLoc)
 collectTopBinders EmptyBinds     = emptyBag
 collectTopBinders (MonoBind b _ _) = collectMonoBinders b
 collectTopBinders (ThenBinds b1 b2)
  = collectTopBinders b1 `unionBags` collectTopBinders b2
 
-collectMonoBinders :: MonoBinds flexi name (InPat name) -> Bag (name,SrcLoc)
-collectMonoBinders EmptyMonoBinds                     = emptyBag
-collectMonoBinders (PatMonoBind pat grhss_w_binds loc) = listToBag (map (\v->(v,loc)) (collectPatBinders pat))
-collectMonoBinders (FunMonoBind f _ matches loc)       = unitBag (f,loc)
-collectMonoBinders (VarMonoBind v expr)               = error "collectMonoBinders"
-collectMonoBinders (CoreMonoBind v expr)              = error "collectMonoBinders"
-collectMonoBinders (AndMonoBinds bs1 bs2)
- = collectMonoBinders bs1 `unionBags` collectMonoBinders bs2
+collectMonoBinders :: MonoBinds name (InPat name) -> Bag (name,SrcLoc)
+collectMonoBinders EmptyMonoBinds               = emptyBag
+collectMonoBinders (PatMonoBind pat _ loc)      = listToBag (map (\v->(v,loc)) (collectPatBinders pat))
+collectMonoBinders (FunMonoBind f _ matches loc) = unitBag (f,loc)
+collectMonoBinders (VarMonoBind v expr)         = error "collectMonoBinders"
+collectMonoBinders (CoreMonoBind v expr)        = error "collectMonoBinders"
+collectMonoBinders (AndMonoBinds bs1 bs2)       = collectMonoBinders bs1 `unionBags`
+                                                  collectMonoBinders bs2
 \end{code}