X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Frename%2FRnExpr.lhs;h=bccd2e22af3abbde579b66b018af73b4165ee7ca;hp=ff6e4123bb78d5e298602b7008546fffd94bc6ec;hb=17b297d97d327620ed6bfab942f8992b2446f1bf;hpb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa

diff --git a/compiler/rename/RnExpr.lhs b/compiler/rename/RnExpr.lhs
index ff6e412..bccd2e2 100644
--- a/compiler/rename/RnExpr.lhs
+++ b/compiler/rename/RnExpr.lhs
@@ -10,6 +10,13 @@ general, all of these functions return a renamed thing, and a set of
 free variables.
 
 \begin{code}
+{-# OPTIONS_GHC -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+-- for details
+
 module RnExpr (
 	rnLExpr, rnExpr, rnStmts
    ) where
@@ -45,7 +52,7 @@ import Util		( isSingleton )
 import ListSetOps	( removeDups )
 import Maybes		( expectJust )
 import Outputable
-import SrcLoc		( Located(..), unLoc, getLoc, cmpLocated )
+import SrcLoc		( Located(..), unLoc, getLoc )
 import FastString
 
 import List		( unzip4 )
@@ -645,8 +652,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 +942,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)