Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/ee435a27c9884962b6a39a7f222a6e051a62afce >--------------------------------------------------------------- commit ee435a27c9884962b6a39a7f222a6e051a62afce Author: Ian Lynagh <[email protected]> Date: Sun Feb 26 17:37:38 2012 +0000 Change -X flags into LANGUAGE pragmas >--------------------------------------------------------------- compiler/cmm/CmmBuildInfoTables.hs | 6 +++--- compiler/cmm/CmmPipeline.hs | 4 ++-- compiler/cmm/CmmStackLayout.hs | 6 +++--- compiler/typecheck/TcGenDeriv.lhs | 4 +++- compiler/utils/UniqFM.lhs | 4 +++- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/compiler/cmm/CmmBuildInfoTables.hs b/compiler/cmm/CmmBuildInfoTables.hs index e6d9eea..27c9bcb 100644 --- a/compiler/cmm/CmmBuildInfoTables.hs +++ b/compiler/cmm/CmmBuildInfoTables.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -XGADTs -XNoMonoLocalBinds #-} +{-# LANGUAGE GADTs, NoMonoLocalBinds #-} {-# OPTIONS -fno-warn-tabs #-} -- The above warning supression flag is a temporary kludge. -- While working on this module you are encouraged to remove it and @@ -7,8 +7,8 @@ -- for details -- Norman likes local bindings --- If this module lives on I'd like to get rid of the -XNoMonoLocalBinds --- flag in due course +-- If this module lives on I'd like to get rid of the NoMonoLocalBinds +-- extension in due course -- Todo: remove -fno-warn-warnings-deprecations {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} diff --git a/compiler/cmm/CmmPipeline.hs b/compiler/cmm/CmmPipeline.hs index 3d98d0a..73e8b33 100644 --- a/compiler/cmm/CmmPipeline.hs +++ b/compiler/cmm/CmmPipeline.hs @@ -1,6 +1,6 @@ -{-# OPTIONS_GHC -XNoMonoLocalBinds #-} +{-# LANGUAGE NoMonoLocalBinds #-} -- Norman likes local bindings --- If this module lives on I'd like to get rid of this flag in due course +-- If this module lives on I'd like to get rid of this extension in due course module CmmPipeline ( -- | Converts C-- with an implicit stack and native C-- calls into diff --git a/compiler/cmm/CmmStackLayout.hs b/compiler/cmm/CmmStackLayout.hs index 8c4f8e3..c7fedad 100644 --- a/compiler/cmm/CmmStackLayout.hs +++ b/compiler/cmm/CmmStackLayout.hs @@ -1,7 +1,7 @@ -{-# OPTIONS_GHC -XGADTs -XNoMonoLocalBinds #-} +{-# LANGUAGE GADTs, NoMonoLocalBinds #-} -- Norman likes local bindings --- If this module lives on I'd like to get rid of the -XNoMonoLocalBinds --- flag in due course +-- If this module lives on I'd like to get rid of the NoMonoLocalBinds +-- extension in due course {-# OPTIONS -fno-warn-tabs #-} -- The above warning supression flag is a temporary kludge. diff --git a/compiler/typecheck/TcGenDeriv.lhs b/compiler/typecheck/TcGenDeriv.lhs index 70d841e..481c4ed 100644 --- a/compiler/typecheck/TcGenDeriv.lhs +++ b/compiler/typecheck/TcGenDeriv.lhs @@ -11,7 +11,9 @@ This module is nominally ``subordinate'' to @TcDeriv@, which is the This is where we do all the grimy bindings' generation. \begin{code} -{-# OPTIONS -fno-warn-tabs -XScopedTypeVariables #-} +{-# LANGUAGE ScopedTypeVariables #-} + +{-# OPTIONS -fno-warn-tabs #-} -- The above warning supression flag is a temporary kludge. -- While working on this module you are encouraged to remove it and -- detab the module (please do the detabbing in a separate patch). See diff --git a/compiler/utils/UniqFM.lhs b/compiler/utils/UniqFM.lhs index 4ee6e19..259689c 100644 --- a/compiler/utils/UniqFM.lhs +++ b/compiler/utils/UniqFM.lhs @@ -20,7 +20,9 @@ and ``addToUFM\_C'' and ``Data.IntMap.insertWith'' differ in the order of arguments of combining function. \begin{code} -{-# OPTIONS -fno-warn-tabs -XGeneralizedNewtypeDeriving #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} + +{-# OPTIONS -fno-warn-tabs #-} -- The above warning supression flag is a temporary kludge. -- While working on this module you are encouraged to remove it and -- detab the module (please do the detabbing in a separate patch). See _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
