X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FhsSyn%2FHsSyn.lhs;h=c2feb2af26a4ce2d4782cba58d55b739e0d20686;hb=ea138284b7343bb1810cfbd0284a608dc57f7d46;hp=a6219b1aa1867d40264c656b8d64cc27ff573f7e;hpb=83817d01dff687643eee23218435b968ba358a25;p=ghc-hetmet.git

diff --git a/ghc/compiler/hsSyn/HsSyn.lhs b/ghc/compiler/hsSyn/HsSyn.lhs
index a6219b1..c2feb2a 100644
--- 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}
 
@@ -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,50 +18,40 @@ module HsSyn (
 	module HsDecls,
 	module HsExpr,
 	module HsImpExp,
-	module HsBasic,
-	module HsMatches,
+	module HsLit,
 	module HsPat,
 	module HsTypes,
-	Fixity, NewOrData, IfaceFlavour,
+	Fixity, NewOrData, 
 
-	collectTopBinders, collectMonoBinders
+	collectHsBinders, collectLocatedHsBinders, 
+	collectMonoBinders, collectLocatedMonoBinders,
+	hsModuleName, hsModuleImports
      ) where
 
 #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 HsLit
 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 Name		( NamedThing )
 import Outputable
 import SrcLoc		( SrcLoc )
-import Bag
-import Name		( NamedThing )
+import Module		( ModuleName )
 \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,35 +60,40 @@ 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
+	=> 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") <+> 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}
 
 
@@ -122,19 +117,35 @@ where
 it should return @[x, y, f, a, b]@ (remember, order important).
 
 \begin{code}
-collectTopBinders :: HsBinds flexi 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
+collectLocatedHsBinders :: HsBinds name (InPat name) -> [(name,SrcLoc)]
+collectLocatedHsBinders EmptyBinds = []
+collectLocatedHsBinders (MonoBind b _ _) 
+ = collectLocatedMonoBinders b
+collectLocatedHsBinders (ThenBinds b1 b2)
+ = collectLocatedHsBinders b1 ++ collectLocatedHsBinders b2
+
+collectHsBinders :: HsBinds name (InPat name) -> [name]
+collectHsBinders EmptyBinds = []
+collectHsBinders (MonoBind b _ _) 
+ = collectMonoBinders b
+collectHsBinders (ThenBinds b1 b2)
+ = collectHsBinders b1 ++ collectHsBinders 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}
-