[project @ 2000-12-06 13:03:28 by simonmar]

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

diff --git a/ghc/compiler/hsSyn/HsSyn.lhs b/ghc/compiler/hsSyn/HsSyn.lhs
index 42731cc..f2ad080 100644 (file)
--- a/ghc/compiler/hsSyn/HsSyn.lhs
+++ b/ghc/compiler/hsSyn/HsSyn.lhs
@@ -10,7 +10,7 @@ therefore, is almost nothing but re-exporting.
 \begin{code}
 module HsSyn (
 
-       -- NB: don't reexport HsCore or HsPragmas;
+       -- NB: don't reexport HsCore
        -- this module tells about "real Haskell"
 
        module HsSyn,
@@ -18,13 +18,14 @@ 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,
+       hsModuleName, hsModuleImports
      ) where
 
 #include "HsVersions.h"
@@ -34,18 +35,18 @@ import HsDecls
 import HsBinds
 import HsExpr
 import HsImpExp
-import HsBasic
+import HsLit
 import HsMatches
 import HsPat
 import HsTypes
-import HsCore
 import BasicTypes      ( Fixity, Version, NewOrData )
 
 -- others:
+import Name            ( NamedThing )
 import Outputable
 import SrcLoc          ( SrcLoc )
 import Bag
-import Module          ( ModuleName, pprModuleName )
+import Module          ( ModuleName )
 \end{code}
 
 All we actually declare here is the top-level structure for a module.
@@ -67,7 +68,7 @@ data HsModule name pat
 \end{code}
 
 \begin{code}
-instance (Outputable name, Outputable pat)
+instance (NamedThing name, Outputable name, Outputable pat)
        => Outputable (HsModule name pat) where
 
     ppr (HsModule name iface_version exports imports
@@ -88,13 +89,13 @@ instance (Outputable name, Outputable pat)
            Nothing -> pp_modname <+> rest
            Just d -> vcat [ pp_modname, ppr d, rest ]
 
-       pp_modname = ptext SLIT("module") <+> pprModuleName name
+       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 "#-}"]
+hsModuleName    (HsModule mod_name _ _ _ _ _ _) = mod_name
+hsModuleImports (HsModule mod_name vers exports imports decls deprec src_loc) = imports
 \end{code}
 
 
@@ -119,18 +120,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}
-