Add -XParallelListComp

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 86bbf31..93add2b 100644 (file)
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -187,6 +187,7 @@ data DynFlag
    | Opt_MagicHash
    | Opt_EmptyDataDecls
    | Opt_KindSignatures
+   | Opt_ParallelListComp
 
    -- optimisation opts
    | Opt_Strictness
@@ -1099,6 +1100,7 @@ xFlags = [
   ( "MagicHash",                        Opt_MagicHash ),
   ( "KindSignatures",                   Opt_KindSignatures ),
   ( "EmptyDataDecls",                   Opt_EmptyDataDecls ),
+  ( "ParallelListComp",                 Opt_ParallelListComp ),
   ( "FI",                              Opt_FFI ),  -- support `-ffi'...
   ( "FFI",                             Opt_FFI ),  -- ...and also `-fffi'
   ( "ForeignFunctionInterface",                Opt_FFI ),
@@ -1145,6 +1147,7 @@ glasgowExtsFlags = [ Opt_GlasgowExts
                   , Opt_ScopedTypeVariables
            , Opt_MultiParamTypeClasses
                   , Opt_MagicHash
+           , Opt_ParallelListComp
            , Opt_EmptyDataDecls
            , Opt_KindSignatures
                   , Opt_TypeFamilies ]

diff --git a/compiler/rename/RnExpr.lhs b/compiler/rename/RnExpr.lhs
index ff6e412..6fe6904 100644 (file)
--- a/compiler/rename/RnExpr.lhs
+++ b/compiler/rename/RnExpr.lhs
@@ -645,8 +645,8 @@ rnStmt ctxt (RecStmt rec_stmts _ _ _ _) thing_inside
     doc = text "In a recursive do statement"
 
 rnStmt ctxt (ParStmt segs) thing_inside
-  = do { opt_GlasgowExts <- doptM Opt_GlasgowExts
-       ; checkM opt_GlasgowExts parStmtErr
+  = do { parallel_list_comp <- doptM Opt_ParallelListComp
+       ; checkM parallel_list_comp parStmtErr
        ; orig_lcl_env <- getLocalRdrEnv
        ; ((segs',thing), fvs) <- go orig_lcl_env [] segs
        ; return ((ParStmt segs', thing), fvs) }
@@ -935,7 +935,7 @@ patSynErr e = do { addErr (sep [ptext SLIT("Pattern syntax in expression context
                                nest 4 (ppr e)])
                 ; return (EWildPat, emptyFVs) }
 
-parStmtErr = addErr (ptext SLIT("Illegal parallel list comprehension: use -fglasgow-exts"))
+parStmtErr = addErr (ptext SLIT("Illegal parallel list comprehension: use -XParallelListComp"))
 
 badIpBinds what binds
   = hang (ptext SLIT("Implicit-parameter bindings illegal in") <+> what)