X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FhsSyn%2FHsSyn.lhs;h=96379a5e2835f292f605a9cb9d8fbaba7c4ea739;hb=626b9cd2cca1b05e94d8937ccf176d3e74562f87;hp=22dcc544fdf5fef1cd18d6f1cc17d87b24df0085;hpb=6c53725823b9a4fc5ea68654f9394ab5b528d3a2;p=ghc-hetmet.git

diff --git a/ghc/compiler/hsSyn/HsSyn.lhs b/ghc/compiler/hsSyn/HsSyn.lhs
index 22dcc54..96379a5 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}
 
@@ -9,132 +9,91 @@ therefore, is almost nothing but re-exporting.
 
 \begin{code}
 module HsSyn (
-
-	-- NB: don't reexport HsCore or HsPragmas;
-	-- this module tells about "real Haskell"
-
-	module HsSyn,
 	module HsBinds,
 	module HsDecls,
 	module HsExpr,
 	module HsImpExp,
-	module HsBasic,
-	module HsMatches,
+	module HsLit,
 	module HsPat,
 	module HsTypes,
-	Fixity, NewOrData, IfaceFlavour,
+ 	module HsUtils,
+	Fixity, NewOrData, 
 
-	collectTopBinders, collectMonoBinders
+	HsModule(..), HsExtCore(..)
      ) where
 
 #include "HsVersions.h"
 
 -- friends:
+import HsDecls		
 import HsBinds
-import HsDecls		( HsDecl(..), TyDecl(..), InstDecl(..), ClassDecl(..), 
-			  DefaultDecl(..), ForeignDecl(..), ExtName(..), isDynamic,
-			  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 HscTypes		( DeprecTxt )
+import BasicTypes	( Fixity, NewOrData )
+import HsUtils
 
 -- others:
-import FiniteMap	( FiniteMap )
+import IfaceSyn		( IfaceBinding )
 import Outputable
-import SrcLoc		( SrcLoc )
-import Bag
-import Name		( NamedThing )
+import SrcLoc		( Located(..), unLoc, noLoc )
+import Module		( Module )
+import Bag		( Bag, foldrBag )
 \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
   = HsModule
-	Module			-- module name
-	(Maybe Version)		-- source interface version number
-	(Maybe [IE name])	-- export list; Nothing => export everything
-				-- Just [] => export *nothing* (???)
+	(Maybe (Located Module))-- Nothing => "module X where" is omitted
+				--	(in which case the next field is Nothing too)
+	(Maybe [LIE name])	-- Export list; Nothing => export list omitted, so export everything
+				-- Just [] => export *nothing*
 				-- Just [...] => as you would expect...
-	[ImportDecl name]	-- We snaffle interesting stuff out of the
+	[LImportDecl name]	-- We snaffle interesting stuff out of the
 				-- 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
-	SrcLoc
+	[LHsDecl name]	-- Type, class, value, and interface signature decls
+	(Maybe DeprecTxt)	-- reason/explanation for deprecation of this module
+
+data HsExtCore name	-- Read from Foo.hcr
+  = HsExtCore
+	Module
+	[TyClDecl name]	-- Type declarations only; just as in Haskell source,
+			-- so that we can infer kinds etc
+	[IfaceBinding]	-- And the bindings
 \end{code}
 
 \begin{code}
-instance (NamedThing name, Outputable name, Outputable pat)
-	=> Outputable (HsModule flexi name pat) where
+instance (OutputableBndr name)
+	=> Outputable (HsModule name) where
+
+    ppr (HsModule Nothing _ imports decls _)
+      = pp_nonnull imports $$ pp_nonnull decls
 
-    ppr (HsModule name iface_version exports imports fixities
-		      decls src_loc)
+    ppr (HsModule (Just name) exports imports decls deprec)
       = 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),
-			    nest 4 (ptext SLIT(") where"))
+			   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_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}
-
+	pp_header rest = case deprec of
+           Nothing -> pp_modname <+> rest
+           Just d -> vcat [ pp_modname, ppr d, rest ]
 
-%************************************************************************
-%*									*
-\subsection{Collecting binders from @HsBinds@}
-%*									*
-%************************************************************************
+	pp_modname = ptext SLIT("module") <+> ppr name
 
-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 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
+pp_nonnull [] = empty
+pp_nonnull xs = vcat (map ppr xs)
 \end{code}
-