[project @ 2000-02-20 17:51:30 by panne]

Get deprecation info out of the renamer again

1 files changed, 12 insertions, 16 deletions

diff --git a/ghc/compiler/hsSyn/HsSyn.lhs b/ghc/compiler/hsSyn/HsSyn.lhs
index 3435071763..6347228f6d 100644
--- a/ghc/compiler/hsSyn/HsSyn.lhs
+++ b/ghc/compiler/hsSyn/HsSyn.lhs
@@ -52,17 +52,17 @@ All we actually declare here is the top-level structure for a module.
 \begin{code}
 data HsModule name pat
   = HsModule
-	ModuleName		-- module name
-	(Maybe Version)		-- source interface version number
-	(Maybe [IE name])	-- export list; Nothing => export everything
-				-- Just [] => export *nothing* (???)
-				-- Just [...] => as you would expect...
-	[ImportDecl 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
-	(Maybe DeprecTxt)	-- reason/explanation for deprecation of this module
+	ModuleName			-- module name
+	(Maybe Version)			-- source interface version number
+	(Maybe [IE name])		-- export list; Nothing => export everything
+					-- Just [] => export *nothing* (???)
+					-- Just [...] => as you would expect...
+	[ImportDecl 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
+	(Maybe (Deprecation name))	-- reason/explanation for deprecation of this module
 	SrcLoc
 \end{code}
 
@@ -86,11 +86,7 @@ instance (Outputable name, Outputable pat)
       where
 	pp_header rest = case deprec of
            Nothing -> pp_modname <+> rest
-           Just dt -> vcat [
-                         pp_modname,
-                         hsep [ptext SLIT("{-# DEPRECATED"), doubleQuotes (ppr dt), ptext SLIT("#-}")],
-                         rest
-                       ]
+           Just d -> vcat [ pp_modname, ppr d, rest ]
 
 	pp_modname = ptext SLIT("module") <+> pprModuleName name