X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FhsSyn%2FHsSyn.lhs;h=ed945331c7ca9428cee5fc204ab695dc6f7f522f;hb=2e83a720e0904d7cd7b347b831e00aae05dbb633;hp=0647ba232944a4b3ad994ac3c80b5f483f8e927b;hpb=dcef38bab91d45b56f7cf3ceeec96303d93728bb;p=ghc-hetmet.git

diff --git a/ghc/compiler/hsSyn/HsSyn.lhs b/ghc/compiler/hsSyn/HsSyn.lhs
index 0647ba2..ed94533 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}
 
@@ -8,69 +8,51 @@ which is declared in the various \tr{Hs*} modules.  This module,
 therefore, is almost nothing but re-exporting.
 
 \begin{code}
-#include "HsVersions.h"
-
 module HsSyn (
 
 	-- NB: don't reexport HsCore or HsPragmas;
 	-- this module tells about "real Haskell"
 
-	EXP_MODULE(HsSyn) ,
-	EXP_MODULE(HsBinds) ,
-	EXP_MODULE(HsDecls) ,
-	EXP_MODULE(HsExpr) ,
-	EXP_MODULE(HsImpExp) ,
-	EXP_MODULE(HsBasic) ,
-	EXP_MODULE(HsMatches) ,
-	EXP_MODULE(HsPat) ,
-	EXP_MODULE(HsTypes),
-	NewOrData(..)
+	module HsSyn,
+	module HsBinds,
+	module HsDecls,
+	module HsExpr,
+	module HsImpExp,
+	module HsLit,
+	module HsMatches,
+	module HsPat,
+	module HsTypes,
+	Fixity, NewOrData, 
+
+	collectTopBinders, collectMonoBinders, collectLocatedMonoBinders
      ) where
 
-IMP_Ubiq()
+#include "HsVersions.h"
 
 -- friends:
+import HsDecls		
 import HsBinds
-import HsDecls		( HsDecl(..), TyDecl(..), InstDecl(..), ClassDecl(..), 
-			  DefaultDecl(..), 
-			  FixityDecl(..), 
-			  ConDecl(..), ConDetails(..), BangType(..),
-			  IfaceSig(..), HsIdInfo,  SpecDataSig(..), SpecInstSig(..),
-			  hsDeclName
-			)
 import HsExpr
 import HsImpExp
-import HsBasic
+import HsLit
 import HsMatches
 import HsPat
 import HsTypes
-import HsPragmas	( ClassPragmas, ClassOpPragmas,
-			  DataPragmas, GenPragmas, InstancePragmas )
 import HsCore
-import TyCon		( NewOrData(..) )
+import BasicTypes	( Fixity, Version, NewOrData )
 
 -- others:
-import FiniteMap	( FiniteMap )
-import Outputable	( ifPprShowAll, ifnotPprForUser, interpp'SP, Outputable(..) )
-import Pretty
+import Outputable
 import SrcLoc		( SrcLoc )
-#if __GLASGOW_HASKELL__ >= 202
-import Name
-#endif
-\end{code}
-
-@Fake@ is a placeholder type; for when tyvars and uvars aren't used.
-\begin{code}
-data Fake = Fake
-instance Eq Fake
-instance Outputable Fake
+import Bag
+import Module		( ModuleName )
 \end{code}
 
 All we actually declare here is the top-level structure for a module.
 \begin{code}
-data HsModule tyvar uvar 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* (???)
@@ -79,36 +61,80 @@ data HsModule tyvar uvar name pat
 				-- imported interfaces early on, adding that
 				-- info to TyDecls/etc; so this list is
 				-- often empty, downstream.
-	[FixityDecl name]
-	[HsDecl tyvar uvar 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,
-	  Eq tyvar, Outputable tyvar, Eq uvar, Outputable uvar)
-	=> Outputable (HsModule tyvar uvar name pat) where
+instance (Outputable name, Outputable pat)
+	=> Outputable (HsModule name pat) where
 
-    ppr sty (HsModule name iface_version exports imports fixities
-		      decls src_loc)
+    ppr (HsModule name iface_version exports imports
+		      decls deprec src_loc)
       = vcat [
-	    ifPprShowAll sty (ppr sty src_loc),
-	    ifnotPprForUser sty (pp_iface_version iface_version),
 	    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 sty 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 sty) xs)
+	pp_nonnull xs = vcat (map ppr xs)
+\end{code}
+
+
+%************************************************************************
+%*									*
+\subsection{Collecting binders from @HsBinds@}
+%*									*
+%************************************************************************
+
+Get all the binders in some @MonoBinds@, IN THE ORDER OF APPEARANCE.
+
+These functions are here, rather than in HsBinds, to avoid a loop between HsPat and HsBinds.
+
+\begin{verbatim}
+...
+where
+  (x, y) = ...
+  f i j  = ...
+  [a, b] = ...
+\end{verbatim}
+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 _ _)  = 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)
 
-	pp_iface_version Nothing  = empty
-	pp_iface_version (Just n) = hsep [text "{-# INTERFACE", int n, text "#-}"]
+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}