X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FhsSyn%2FHsSyn.lhs;h=20e339f1f5fced6444f7274aa04fe42d5f535ae0;hb=4c6a3f787abcaed009a574196d82237d9ae64fc8;hp=afaad8c05c412df52bf02dc7f24cb1ef621d2857;hpb=7fc749a43b4b6b85d234fa95d4928648259584f4;p=ghc-hetmet.git

diff --git a/compiler/hsSyn/HsSyn.lhs b/compiler/hsSyn/HsSyn.lhs
index afaad8c..20e339f 100644
--- a/compiler/hsSyn/HsSyn.lhs
+++ b/compiler/hsSyn/HsSyn.lhs
@@ -9,13 +9,6 @@ which is declared in the various \tr{Hs*} modules.  This module,
 therefore, is almost nothing but re-exporting.
 
 \begin{code}
-{-# OPTIONS -w #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and fix
--- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
--- for details
-
 module HsSyn (
 	module HsBinds,
 	module HsDecls,
@@ -53,6 +46,7 @@ import IfaceSyn		( IfaceBinding )
 import Outputable
 import SrcLoc		( Located(..) )
 import Module		( Module, ModuleName )
+import FastString
 \end{code}
 
 All we actually declare here is the top-level structure for a module.
@@ -70,7 +64,6 @@ data HsModule name
 				-- often empty, downstream.
 	[LHsDecl name]		-- Type, class, value, and interface signature decls
 	(Maybe DeprecTxt)	-- reason/explanation for deprecation of this module
-	(Maybe String)          -- Haddock options, declared with the {-# DOCOPTIONS ... #-} pragma
 	(HaddockModInfo name)   -- Haddock module info
 	(Maybe (HsDoc name))    -- Haddock module description
 
@@ -105,10 +98,10 @@ instance Outputable Char where
 instance (OutputableBndr name)
 	=> Outputable (HsModule name) where
 
-    ppr (HsModule Nothing _ imports decls _ _ _ mbDoc)
+    ppr (HsModule Nothing _ imports decls _ _ mbDoc)
       = pp_mb mbDoc $$ pp_nonnull imports $$ pp_nonnull decls
 
-    ppr (HsModule (Just name) exports imports decls deprec opts _ mbDoc)
+    ppr (HsModule (Just name) exports imports decls deprec _ mbDoc)
       = vcat [
 	    pp_mb mbDoc,
 	    case exports of
@@ -128,9 +121,11 @@ instance (OutputableBndr name)
 
 	pp_modname = ptext SLIT("module") <+> ppr name
 
+pp_mb :: Outputable t => Maybe t -> SDoc
 pp_mb (Just x) = ppr x 
 pp_mb Nothing  = empty
 
+pp_nonnull :: Outputable t => [t] -> SDoc
 pp_nonnull [] = empty
 pp_nonnull xs = vcat (map ppr xs)
 \end{code}