(F)SLIT -> (f)sLit in HsSyn

[ghc-hetmet.git] / compiler / hsSyn / HsSyn.lhs

diff --git a/compiler/hsSyn/HsSyn.lhs b/compiler/hsSyn/HsSyn.lhs
index 6ed59ee..507eab6 100644 (file)
--- 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
@@ -46,6 +44,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.
@@ -63,7 +62,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
 
@@ -98,18 +96,18 @@ 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
-             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,11 +117,13 @@ 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 
 pp_mb Nothing  = empty
 
+pp_nonnull :: Outputable t => [t] -> SDoc
 pp_nonnull [] = empty
 pp_nonnull xs = vcat (map ppr xs)
 \end{code}