X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FRdrHsSyn.lhs;h=aeb80a271311876ba802c5013f072ef5e7fbb0ed;hb=6b4ab02f289394c82f27e46e44c017b4a0c88fb0;hp=e3bb3696bbc0986ced0e97750db43d02d52dce92;hpb=d19a72ea089deab3aa4bb584e69c102daebb1cb4;p=ghc-hetmet.git

diff --git a/compiler/parser/RdrHsSyn.lhs b/compiler/parser/RdrHsSyn.lhs
index e3bb369..aeb80a2 100644
--- a/compiler/parser/RdrHsSyn.lhs
+++ b/compiler/parser/RdrHsSyn.lhs
@@ -58,8 +58,6 @@ module RdrHsSyn (
 	parseError,	      -- String -> Pa
     ) where
 
-#include "HsVersions.h"
-
 import HsSyn		-- Lots of it
 import Class            ( FunDep )
 import TypeRep          ( Kind )
@@ -691,7 +689,7 @@ checkAPat loc e = case e of
  	| bang == bang_RDR 
 	-> do { bang_on <- extension bangPatEnabled
 	      ; if bang_on then checkLPat e >>= (return . BangPat)
-		else parseError loc "Illegal bang-pattern (use -fbang-patterns)" }
+		else parseError loc "Illegal bang-pattern (use -XBangPatterns)" }
 
    ELazyPat e	      -> checkLPat e >>= (return . LazyPat)
    EAsPat n e	      -> checkLPat e >>= (return . AsPat n)
@@ -708,7 +706,7 @@ checkAPat loc e = case e of
    
    -- n+k patterns
    OpApp (L nloc (HsVar n)) (L _ (HsVar plus)) _ 
-	(L _ (HsOverLit lit@(HsIntegral _ _ _)))
+	 (L _ (HsOverLit lit@(OverLit {ol_val = HsIntegral {}})))
    		      | plus == plus_RDR
    		      -> return (mkNPlusKPat (L nloc n) lit)
    
@@ -737,8 +735,8 @@ checkAPat loc e = case e of
    _                  -> patFail loc
 
 plus_RDR, bang_RDR :: RdrName
-plus_RDR = mkUnqual varName FSLIT("+")	-- Hack
-bang_RDR = mkUnqual varName FSLIT("!")	-- Hack
+plus_RDR = mkUnqual varName (fsLit "+")	-- Hack
+bang_RDR = mkUnqual varName (fsLit "!")	-- Hack
 
 checkPatField :: HsRecField RdrName (LHsExpr RdrName) -> P (HsRecField RdrName (LPat RdrName))
 checkPatField fld = do	{ p <- checkLPat (hsRecFieldArg fld)
@@ -777,7 +775,7 @@ checkFunBind :: SrcSpan
 checkFunBind lhs_loc fun is_infix pats opt_sig (L rhs_span grhss)
   | isQual (unLoc fun)
   = parseErrorSDoc (getLoc fun) 
-	(ptext SLIT("Qualified name in function definition:") <+> ppr (unLoc fun))
+	(ptext (sLit "Qualified name in function definition:") <+> ppr (unLoc fun))
   | otherwise
   = do	ps <- checkPatterns pats
 	let match_span = combineSrcSpans lhs_loc rhs_span
@@ -959,9 +957,9 @@ parseCImport :: Located FastString
 	     -> P ForeignImport
 parseCImport (L loc entity) cconv safety v
   -- FIXME: we should allow white space around `dynamic' and `wrapper' -=chak
-  | entity == FSLIT ("dynamic") = 
+  | entity == fsLit "dynamic" = 
     return $ CImport cconv safety nilFS nilFS (CFunction DynamicTarget)
-  | entity == FSLIT ("wrapper") =
+  | entity == fsLit "wrapper" =
     return $ CImport cconv safety nilFS nilFS CWrapper
   | otherwise		       = parse0 (unpackFS entity)
     where