Add -XPatternSigs flag

[ghc-hetmet.git] / compiler / rename / RnTypes.lhs

diff --git a/compiler/rename/RnTypes.lhs b/compiler/rename/RnTypes.lhs
index b061834..15f4daf 100644 (file)
--- 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,7 +572,7 @@ rnPat (VarPat name)
     returnM (VarPat vname, emptyFVs)
 
 rnPat (SigPatIn pat ty)
-  = doptM Opt_GlasgowExts `thenM` \ glaExts ->
+  = doptM Opt_PatternSignatures `thenM` \ glaExts ->
     
     if glaExts
     then rnLPat pat            `thenM` \ (pat', fvs1) ->
@@ -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"),