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

diff --git a/ghc/compiler/hsSyn/HsSyn.lhs b/ghc/compiler/hsSyn/HsSyn.lhs
index f2ad080..96379a5 100644
--- a/ghc/compiler/hsSyn/HsSyn.lhs
+++ b/ghc/compiler/hsSyn/HsSyn.lhs
@@ -9,23 +9,17 @@ therefore, is almost nothing but re-exporting.
 
 \begin{code}
 module HsSyn (
-
-	-- NB: don't reexport HsCore
-	-- this module tells about "real Haskell"
-
-	module HsSyn,
 	module HsBinds,
 	module HsDecls,
 	module HsExpr,
 	module HsImpExp,
 	module HsLit,
-	module HsMatches,
 	module HsPat,
 	module HsTypes,
+ 	module HsUtils,
 	Fixity, NewOrData, 
 
-	collectTopBinders, collectMonoBinders, collectLocatedMonoBinders,
-	hsModuleName, hsModuleImports
+	HsModule(..), HsExtCore(..)
      ) where
 
 #include "HsVersions.h"
@@ -36,50 +30,59 @@ import HsBinds
 import HsExpr
 import HsImpExp
 import HsLit
-import HsMatches
 import HsPat
 import HsTypes
-import BasicTypes	( Fixity, Version, NewOrData )
+import HscTypes		( DeprecTxt )
+import BasicTypes	( Fixity, NewOrData )
+import HsUtils
 
 -- others:
-import Name		( NamedThing )
+import IfaceSyn		( IfaceBinding )
 import Outputable
-import SrcLoc		( SrcLoc )
-import Bag
-import Module		( ModuleName )
+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 name pat
+data HsModule name
   = HsModule
-	ModuleName		-- 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.
-	[HsDecl name pat]	-- Type, class, value, and interface signature decls
+	[LHsDecl name]	-- Type, class, value, and interface signature decls
 	(Maybe DeprecTxt)	-- reason/explanation for deprecation of this module
-	SrcLoc
+
+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 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
-		      decls deprec src_loc)
+    ppr (HsModule (Just name) exports imports decls deprec)
       = vcat [
 	    case exports of
 	      Nothing -> pp_header (ptext SLIT("where"))
 	      Just es -> vcat [
-			    pp_header lparen,
-			    nest 8 (fsep (punctuate comma (map ppr 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 decls
@@ -91,54 +94,6 @@ instance (NamedThing name, Outputable name, Outputable pat)
 
 	pp_modname = ptext SLIT("module") <+> ppr name
 
-	pp_nonnull [] = empty
-	pp_nonnull xs = vcat (map ppr xs)
-
-hsModuleName    (HsModule mod_name _ _ _ _ _ _) = mod_name
-hsModuleImports (HsModule mod_name vers exports imports decls deprec src_loc) = imports
-\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)
-
-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)
+pp_nonnull [] = empty
+pp_nonnull xs = vcat (map ppr xs)
 \end{code}