X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnTypes.lhs;h=82c7367ed2a00f8b3c13dad1586f6ec5e1868433;hb=c1681a73fa4ca4cf8758264ae387ac09a9e900d8;hp=b061834e77934f3672464a48fdd6311cd4720181;hpb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;p=ghc-hetmet.git

diff --git a/compiler/rename/RnTypes.lhs b/compiler/rename/RnTypes.lhs
index b061834..82c7367 100644
--- a/compiler/rename/RnTypes.lhs
+++ b/compiler/rename/RnTypes.lhs
@@ -124,7 +124,7 @@ rnHsType doc (HsTyVar tyvar)
 
 rnHsType doc ty@(HsOpTy ty1 (L loc op) ty2)
   = setSrcSpan loc $ 
-    do	{ ty_ops_ok <- doptM Opt_ScopedTypeVariables	-- Badly named option
+    do	{ ty_ops_ok <- doptM Opt_TypeOperators
 	; checkErr ty_ops_ok (opTyErr op ty)
 	; op' <- lookupOccRn op
 	; let l_op' = L loc op'
@@ -572,9 +572,9 @@ rnPat (VarPat name)
     returnM (VarPat vname, emptyFVs)
 
 rnPat (SigPatIn pat ty)
-  = doptM Opt_GlasgowExts `thenM` \ glaExts ->
+  = doptM Opt_PatternSignatures `thenM` \ patsigs ->
     
-    if glaExts
+    if patsigs
     then rnLPat pat		`thenM` \ (pat', fvs1) ->
          rnHsTypeFVs doc ty	`thenM` \ (ty',  fvs2) ->
          returnM (SigPatIn pat' ty', fvs1 `plusFV` fvs2)
@@ -689,7 +689,7 @@ rnHsRecFields str mb_con rn_thing mk_rhs (HsRecFields fields dd)
 	; case dd of
 	    Nothing -> return (HsRecFields fields1 dd, fvs1)
 	    Just n  -> ASSERT( n == length fields ) do
-	{ dd_flag <- doptM Opt_RecordDotDot
+	{ dd_flag <- doptM Opt_RecordWildCards
 	; checkErr dd_flag (needFlagDotDot str)
 
 	; let fld_names1 = map (unLoc . hsRecFieldId) fields1
@@ -808,14 +808,14 @@ forAllWarn doc ty (L loc tyvar)
 
 opTyErr op ty 
   = hang (ptext SLIT("Illegal operator") <+> quotes (ppr op) <+> ptext SLIT("in type") <+> quotes (ppr ty))
-	 2 (parens (ptext SLIT("Use -fscoped-type-variables to allow operators in types")))
+	 2 (parens (ptext SLIT("Use -XTypeOperators to allow operators in types")))
 
 bogusCharError c
   = ptext SLIT("character literal out of range: '\\") <> char c  <> char '\''
 
 patSigErr ty
   =  (ptext SLIT("Illegal signature in pattern:") <+> ppr ty)
-	$$ nest 4 (ptext SLIT("Use -fglasgow-exts to permit it"))
+	$$ nest 4 (ptext SLIT("Use -XPatternSigs to permit it"))
 
 dupFieldErr str dup
   = hsep [ptext SLIT("duplicate field name"),