[project @ 2000-10-12 13:44:59 by simonpj]

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

diff --git a/ghc/compiler/hsSyn/HsSyn.lhs b/ghc/compiler/hsSyn/HsSyn.lhs
index fb656a2..ed94533 100644 (file)
--- a/ghc/compiler/hsSyn/HsSyn.lhs
+++ b/ghc/compiler/hsSyn/HsSyn.lhs
@@ -18,13 +18,13 @@ module HsSyn (
        module HsDecls,
        module HsExpr,
        module HsImpExp,
-       module HsBasic,
+       module HsLit,
        module HsMatches,
        module HsPat,
        module HsTypes,
        Fixity, NewOrData, 
 
-       collectTopBinders, collectMonoBinders
+       collectTopBinders, collectMonoBinders, collectLocatedMonoBinders
      ) where
 
 #include "HsVersions.h"
@@ -34,7 +34,7 @@ import HsDecls
 import HsBinds
 import HsExpr
 import HsImpExp
-import HsBasic
+import HsLit
 import HsMatches
 import HsPat
 import HsTypes
@@ -45,14 +45,14 @@ import BasicTypes   ( Fixity, Version, NewOrData )
 import Outputable
 import SrcLoc          ( SrcLoc )
 import Bag
-import OccName         ( Module, pprModule )
+import Module          ( ModuleName )
 \end{code}
 
 All we actually declare here is the top-level structure for a module.
 \begin{code}
 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* (???)
@@ -62,6 +62,7 @@ data HsModule name pat
                                -- info to TyDecls/etc; so this list is
                                -- often empty, downstream.
        [HsDecl name pat]       -- Type, class, value, and interface signature decls
+       (Maybe DeprecTxt)       -- reason/explanation for deprecation of this module
        SrcLoc
 \end{code}
 
@@ -70,24 +71,27 @@ instance (Outputable name, Outputable pat)
        => Outputable (HsModule name pat) where
 
     ppr (HsModule name iface_version exports imports
-                     decls src_loc)
+                     decls deprec src_loc)
       = vcat [
            case exports of
-             Nothing -> hsep [ptext SLIT("module"), pprModule name, ptext SLIT("where")]
+             Nothing -> pp_header (ptext SLIT("where"))
              Just es -> vcat [
-                           hsep [ptext SLIT("module"), pprModule 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 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") <+> ppr name
+
        pp_nonnull [] = empty
        pp_nonnull xs = vcat (map ppr xs)
-
-       pp_iface_version Nothing  = empty
-       pp_iface_version (Just n) = hsep [text "{-# INTERFACE", int n, text "#-}"]
 \end{code}
 
 
@@ -112,18 +116,25 @@ it should return @[x, y, f, a, b]@ (remember, order important).
 
 \begin{code}
 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 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
+collectTopBinders EmptyBinds        = emptyBag
+collectTopBinders (MonoBind b _ _)  = listToBag (collectLocatedMonoBinders b)
+collectTopBinders (ThenBinds b1 b2) = collectTopBinders b1 `unionBags` collectTopBinders b2
+
+collectLocatedMonoBinders :: MonoBinds name (InPat name) -> [(name,SrcLoc)]
+collectLocatedMonoBinders binds
+  = go binds []
+  where
+    go EmptyMonoBinds         acc = acc
+    go (PatMonoBind pat _ loc) acc = map (\v->(v,loc)) (collectPatBinders pat) ++ acc
+    go (FunMonoBind f _ _ loc) acc = (f,loc) : acc
+    go (AndMonoBinds bs1 bs2)  acc = go bs1 (go bs2 acc)
+
+collectMonoBinders :: MonoBinds name (InPat name) -> [name]
+collectMonoBinders binds
+  = go binds []
+  where
+    go EmptyMonoBinds         acc = acc
+    go (PatMonoBind pat _ loc) acc = collectPatBinders pat ++ acc
+    go (FunMonoBind f _ _ loc) acc = f : acc
+    go (AndMonoBinds bs1 bs2)  acc = go bs1 (go bs2 acc)
 \end{code}
-