From 36ead6882881b516b15361b633c60b6ae10a01ca Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 12 Apr 2008 12:09:09 +0000 Subject: [PATCH] (F)SLIT -> (f)sLit in SrcLoc --- compiler/basicTypes/SrcLoc.lhs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/compiler/basicTypes/SrcLoc.lhs b/compiler/basicTypes/SrcLoc.lhs index cf68b79..7e43251 100644 --- a/compiler/basicTypes/SrcLoc.lhs +++ b/compiler/basicTypes/SrcLoc.lhs @@ -38,8 +38,6 @@ module SrcLoc ( leftmost_smallest, leftmost_largest, rightmost, spans, isSubspanOf ) where -#include "HsVersions.h" - import Util import Outputable import FastString @@ -77,9 +75,9 @@ mkSrcLoc :: FastString -> Int -> Int -> SrcLoc mkSrcLoc x line col = SrcLoc x line col noSrcLoc, generatedSrcLoc, interactiveSrcLoc :: SrcLoc -noSrcLoc = UnhelpfulLoc FSLIT("") -generatedSrcLoc = UnhelpfulLoc FSLIT("") -interactiveSrcLoc = UnhelpfulLoc FSLIT("") +noSrcLoc = UnhelpfulLoc (fsLit "") +generatedSrcLoc = UnhelpfulLoc (fsLit "") +interactiveSrcLoc = UnhelpfulLoc (fsLit "") mkGeneralSrcLoc :: FastString -> SrcLoc mkGeneralSrcLoc = UnhelpfulLoc @@ -90,7 +88,7 @@ isGoodSrcLoc _other = False srcLocFile :: SrcLoc -> FastString srcLocFile (SrcLoc fname _ _) = fname -srcLocFile _other = FSLIT(" Int srcLocLine (SrcLoc _ l _) = l @@ -204,8 +202,8 @@ instance Ord SrcSpan where (srcSpanEnd a `compare` srcSpanEnd b) noSrcSpan, wiredInSrcSpan :: SrcSpan -noSrcSpan = UnhelpfulSpan FSLIT("") -wiredInSrcSpan = UnhelpfulSpan FSLIT("") +noSrcSpan = UnhelpfulSpan (fsLit "") +wiredInSrcSpan = UnhelpfulSpan (fsLit "") mkGeneralSrcSpan :: FastString -> SrcSpan mkGeneralSrcSpan = UnhelpfulSpan @@ -313,7 +311,7 @@ combineSrcSpans start end pprDefnLoc :: SrcSpan -> SDoc -- "defined at ..." pprDefnLoc loc - | isGoodSrcSpan loc = ptext SLIT("Defined at") <+> ppr loc + | isGoodSrcSpan loc = ptext (sLit "Defined at") <+> ppr loc | otherwise = ppr loc instance Outputable SrcSpan where -- 1.7.10.4