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

diff --git a/compiler/rename/RnTypes.lhs b/compiler/rename/RnTypes.lhs
index 2cc232c..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)
@@ -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"),