X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FhsSyn%2FHsSyn.lhs;h=6277f5cc3cc8f677122b4ddf6ed90488f539812f;hb=f16dbbbe59cf3aa19c5fd384560a1b89076d7bc8;hp=20e339f1f5fced6444f7274aa04fe42d5f535ae0;hpb=30c122df62ec75f9ed7f392f24c2925675bf1d06;p=ghc-hetmet.git

diff --git a/compiler/hsSyn/HsSyn.lhs b/compiler/hsSyn/HsSyn.lhs
index 20e339f..6277f5c 100644
--- a/compiler/hsSyn/HsSyn.lhs
+++ b/compiler/hsSyn/HsSyn.lhs
@@ -27,8 +27,6 @@ module HsSyn (
 	emptyHaddockModInfo,
 ) where
 
-#include "HsVersions.h"
-
 -- friends:
 import HsDecls		
 import HsBinds
@@ -37,7 +35,7 @@ import HsImpExp
 import HsLit
 import HsPat
 import HsTypes
-import BasicTypes	( Fixity, DeprecTxt )
+import BasicTypes	( Fixity, WarningTxt )
 import HsUtils
 import HsDoc
 
@@ -63,7 +61,7 @@ data HsModule name
 				-- info to TyDecls/etc; so this list is
 				-- often empty, downstream.
 	[LHsDecl name]		-- Type, class, value, and interface signature decls
-	(Maybe DeprecTxt)	-- reason/explanation for deprecation of this module
+	(Maybe WarningTxt)	-- reason/explanation for warning/deprecation of this module
 	(HaddockModInfo name)   -- Haddock module info
 	(Maybe (HsDoc name))    -- Haddock module description
 
@@ -105,11 +103,11 @@ instance (OutputableBndr name)
       = vcat [
 	    pp_mb mbDoc,
 	    case exports of
-	      Nothing -> pp_header (ptext SLIT("where"))
+	      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"))
+			   nest 4 (ptext (sLit ") where"))
 			  ],
 	    pp_nonnull imports,
 	    pp_nonnull decls
@@ -119,7 +117,7 @@ instance (OutputableBndr name)
            Nothing -> pp_modname <+> rest
            Just d -> vcat [ pp_modname, ppr d, rest ]
 
-	pp_modname = ptext SLIT("module") <+> ppr name
+	pp_modname = ptext (sLit "module") <+> ppr name
 
 pp_mb :: Outputable t => Maybe t -> SDoc
 pp_mb (Just x) = ppr x