X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FhsSyn%2FHsImpExp.lhs;fp=compiler%2FhsSyn%2FHsImpExp.lhs;h=78e417c6e66fcba4d1ed13d8131c6536244b8075;hp=029ec28475646bb9c7eb8c3e4c139ecb7a8a0138;hb=06a627d08b7571d1a86d95a603bb036bd44e018d;hpb=ce0ff544eec55a39aa279f2641032e95320089b2 diff --git a/compiler/hsSyn/HsImpExp.lhs b/compiler/hsSyn/HsImpExp.lhs index 029ec28..78e417c 100644 --- a/compiler/hsSyn/HsImpExp.lhs +++ b/compiler/hsSyn/HsImpExp.lhs @@ -15,8 +15,6 @@ HsImpExp: Abstract syntax: imports, exports, interfaces module HsImpExp where -#include "HsVersions.h" - import Module ( ModuleName ) import HsDoc ( HsDoc ) @@ -47,24 +45,24 @@ data ImportDecl name \begin{code} instance (Outputable name) => Outputable (ImportDecl name) where ppr (ImportDecl mod from qual as spec) - = hang (hsep [ptext SLIT("import"), ppr_imp from, + = hang (hsep [ptext (sLit "import"), ppr_imp from, pp_qual qual, ppr mod, pp_as as]) 4 (pp_spec spec) where pp_qual False = empty - pp_qual True = ptext SLIT("qualified") + pp_qual True = ptext (sLit "qualified") pp_as Nothing = empty - pp_as (Just a) = ptext SLIT("as ") <+> ppr a + pp_as (Just a) = ptext (sLit "as ") <+> ppr a - ppr_imp True = ptext SLIT("{-# SOURCE #-}") + ppr_imp True = ptext (sLit "{-# SOURCE #-}") ppr_imp False = empty pp_spec Nothing = empty pp_spec (Just (False, spec)) = parens (interpp'SP spec) pp_spec (Just (True, spec)) - = ptext SLIT("hiding") <+> parens (interpp'SP spec) + = ptext (sLit "hiding") <+> parens (interpp'SP spec) ideclName :: ImportDecl name -> Located ModuleName ideclName (ImportDecl mod_nm _ _ _ _) = mod_nm @@ -116,7 +114,7 @@ instance (Outputable name) => Outputable (IE name) where ppr (IEThingWith thing withs) = ppr thing <> parens (fsep (punctuate comma (map pprHsVar withs))) ppr (IEModuleContents mod) - = ptext SLIT("module") <+> ppr mod + = ptext (sLit "module") <+> ppr mod ppr (IEGroup n _) = text ("") ppr (IEDoc doc) = ppr doc ppr (IEDocNamed string) = text ("")