From c5490dd212ab4d1cce6cd9a095560f30eb4cf6d3 Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Fri, 26 Jun 2009 04:54:57 +0200 Subject: Replace most -fglasgow-exts with specific LANGUAGE pragmas Ignore-this: 2274fdd689b0576a76d9f3373e9c7159 darcs-hash:20090626025457-1499c-1d7bdb15732bb3d45e853e140f66fe38fc4fcafa.gz --- XMonad/Hooks/ManageDocks.hs | 2 +- XMonad/Layout/Decoration.hs | 3 +-- XMonad/Layout/DragPane.hs | 3 +-- XMonad/Layout/Gaps.hs | 6 +----- XMonad/Layout/LayoutCombinators.hs | 3 +-- XMonad/Layout/LayoutModifier.hs | 3 +-- XMonad/Layout/Magnifier.hs | 2 +- XMonad/Layout/Maximize.hs | 3 +-- XMonad/Layout/MosaicAlt.hs | 3 +-- XMonad/Layout/MultiToggle.hs | 7 ++----- XMonad/Layout/MultiToggle/Instances.hs | 4 +--- XMonad/Layout/Reflect.hs | 6 +----- XMonad/Layout/ResizableTile.hs | 3 +-- XMonad/Layout/StackTile.hs | 3 +-- XMonad/Layout/ToggleLayouts.hs | 3 +-- XMonad/Layout/WindowArranger.hs | 6 +----- XMonad/Layout/WindowNavigation.hs | 3 +-- XMonad/Layout/WorkspaceDir.hs | 3 +-- 18 files changed, 19 insertions(+), 47 deletions(-) diff --git a/XMonad/Hooks/ManageDocks.hs b/XMonad/Hooks/ManageDocks.hs index d06a68f..91e5ecd 100644 --- a/XMonad/Hooks/ManageDocks.hs +++ b/XMonad/Hooks/ManageDocks.hs @@ -1,6 +1,6 @@ {-# LANGUAGE PatternGuards, FlexibleInstances, MultiParamTypeClasses #-} {-# OPTIONS -fglasgow-exts #-} --- deriving Typeable +-- deriving Typeable for ghc-6.6 compatibility, which is retained in the core ----------------------------------------------------------------------------- -- | -- Module : XMonad.Hooks.ManageDocks diff --git a/XMonad/Layout/Decoration.hs b/XMonad/Layout/Decoration.hs index 5c94f12..0a51357 100644 --- a/XMonad/Layout/Decoration.hs +++ b/XMonad/Layout/Decoration.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- for deriving Typeable -{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances #-} +{-# LANGUAGE DeriveDataTypeable, FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances #-} ----------------------------------------------------------------------------- -- | -- Module : XMonad.Layout.Decoration diff --git a/XMonad/Layout/DragPane.hs b/XMonad/Layout/DragPane.hs index eb409e0..8f43d82 100644 --- a/XMonad/Layout/DragPane.hs +++ b/XMonad/Layout/DragPane.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable -{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances #-} +{-# LANGUAGE DeriveDataTypeable, FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout/Gaps.hs b/XMonad/Layout/Gaps.hs index 7734836..7164b65 100644 --- a/XMonad/Layout/Gaps.hs +++ b/XMonad/Layout/Gaps.hs @@ -1,8 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} - --- for now, use -fglasgow-exts for compatibility with ghc 6.6, which chokes --- on some of the LANGUAGE pragmas below -{- LANGUAGE FlexibleInstances, MultiParamTypeClasses, DeriveDataTypeable, TypeSynonymInstances -} +{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, DeriveDataTypeable, TypeSynonymInstances, PatternGuards #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout/LayoutCombinators.hs b/XMonad/Layout/LayoutCombinators.hs index 8a4de63..d4fb4ba 100644 --- a/XMonad/Layout/LayoutCombinators.hs +++ b/XMonad/Layout/LayoutCombinators.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable -{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards #-} +{-# LANGUAGE DeriveDataTypeable, FlexibleInstances, MultiParamTypeClasses, PatternGuards #-} ----------------------------------------------------------------------------- -- | -- Module : XMonad.Layout.LayoutCombinators diff --git a/XMonad/Layout/LayoutModifier.hs b/XMonad/Layout/LayoutModifier.hs index b037911..a55444f 100644 --- a/XMonad/Layout/LayoutModifier.hs +++ b/XMonad/Layout/LayoutModifier.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable -{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards #-} +{-# LANGUAGE DeriveDataTypeable, FlexibleInstances, MultiParamTypeClasses, PatternGuards #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout/Magnifier.hs b/XMonad/Layout/Magnifier.hs index bba0697..a4c1882 100644 --- a/XMonad/Layout/Magnifier.hs +++ b/XMonad/Layout/Magnifier.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} +{-# LANGUAGE DeriveDataTypeable, MultiParamTypeClasses, TypeSynonymInstances, PatternGuards #-} ----------------------------------------------------------------------------- -- | -- Module : XMonad.Layout.Magnifier diff --git a/XMonad/Layout/Maximize.hs b/XMonad/Layout/Maximize.hs index 28d17a2..febef18 100644 --- a/XMonad/Layout/Maximize.hs +++ b/XMonad/Layout/Maximize.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable -{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-} +{-# LANGUAGE DeriveDataTypeable, FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout/MosaicAlt.hs b/XMonad/Layout/MosaicAlt.hs index 16d87da..8bae199 100644 --- a/XMonad/Layout/MosaicAlt.hs +++ b/XMonad/Layout/MosaicAlt.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable -{-# LANGUAGE GeneralizedNewtypeDeriving, MultiParamTypeClasses, TypeSynonymInstances #-} +{-# LANGUAGE DeriveDataTypeable, GeneralizedNewtypeDeriving, MultiParamTypeClasses, TypeSynonymInstances #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout/MultiToggle.hs b/XMonad/Layout/MultiToggle.hs index eb753d4..a5dbb48 100644 --- a/XMonad/Layout/MultiToggle.hs +++ b/XMonad/Layout/MultiToggle.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} +{-# LANGUAGE DeriveDataTypeable, ExistentialQuantification, Rank2Types, MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, FlexibleContexts, PatternGuards #-} ----------------------------------------------------------------------------- -- | @@ -92,10 +92,7 @@ import Data.Maybe -- > transform _ x k = k (Mirror x) -- -- Note, you need to put @{-\# LANGUAGE DeriveDataTypeable \#-}@ at the --- beginning of your file (ghc 6.8 only; with ghc 6.6 you can use --- @{-\# OPTIONS_GHC -fglasgow-exts \#-}@ instead) to be able to --- derive "Data.Typeable". --- +-- beginning of your file. -- | A class to identify custom transformers (and look up transforming -- functions by type). diff --git a/XMonad/Layout/MultiToggle/Instances.hs b/XMonad/Layout/MultiToggle/Instances.hs index 378c12c..a409aa8 100644 --- a/XMonad/Layout/MultiToggle/Instances.hs +++ b/XMonad/Layout/MultiToggle/Instances.hs @@ -1,6 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} --- above is for compatibility with GHC 6.6. -{- LANGUAGE TypeSynonymInstances, DeriveDataTypeable -} +{-# LANGUAGE TypeSynonymInstances, DeriveDataTypeable, MultiParamTypeClasses #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout/Reflect.hs b/XMonad/Layout/Reflect.hs index 5ff8241..4d7725c 100644 --- a/XMonad/Layout/Reflect.hs +++ b/XMonad/Layout/Reflect.hs @@ -1,8 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} - --- for now, use -fglasgow-exts for compatibility with ghc 6.6, which chokes --- on some of the LANGUAGE pragmas below -{- LANGUAGE FlexibleInstances, MultiParamTypeClasses, DeriveDataTypeable, TypeSynonymInstances -} +{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, DeriveDataTypeable, TypeSynonymInstances #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout/ResizableTile.hs b/XMonad/Layout/ResizableTile.hs index 9ba6d8c..a55f42c 100644 --- a/XMonad/Layout/ResizableTile.hs +++ b/XMonad/Layout/ResizableTile.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable -{-# LANGUAGE FlexibleInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses #-} +{-# LANGUAGE DeriveDataTypeable, FlexibleInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout/StackTile.hs b/XMonad/Layout/StackTile.hs index 5090dcc..602ff37 100644 --- a/XMonad/Layout/StackTile.hs +++ b/XMonad/Layout/StackTile.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable -{-# LANGUAGE FlexibleInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses #-} +{-# LANGUAGE DeriveDataTypeable, FlexibleInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout/ToggleLayouts.hs b/XMonad/Layout/ToggleLayouts.hs index 18ab817..c77b0a2 100644 --- a/XMonad/Layout/ToggleLayouts.hs +++ b/XMonad/Layout/ToggleLayouts.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable -{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards #-} +{-# LANGUAGE DeriveDataTypeable, FlexibleInstances, MultiParamTypeClasses, PatternGuards #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout/WindowArranger.hs b/XMonad/Layout/WindowArranger.hs index 2548096..7ddb6e6 100644 --- a/XMonad/Layout/WindowArranger.hs +++ b/XMonad/Layout/WindowArranger.hs @@ -1,8 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- for deriving Typeable -{-# LANGUAGE PatternGuards #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeSynonymInstances #-} +{-# LANGUAGE DeriveDataTypeable, PatternGuards, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-} ----------------------------------------------------------------------------- -- | -- Module : XMonad.Layout.WindowArranger diff --git a/XMonad/Layout/WindowNavigation.hs b/XMonad/Layout/WindowNavigation.hs index 50d2a3c..0dd6d43 100644 --- a/XMonad/Layout/WindowNavigation.hs +++ b/XMonad/Layout/WindowNavigation.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable -{-# LANGUAGE FlexibleInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, TypeSynonymInstances #-} +{-# LANGUAGE DeriveDataTypeable, FlexibleInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, TypeSynonymInstances, PatternGuards #-} ----------------------------------------------------------------------------- -- | diff --git a/XMonad/Layout/WorkspaceDir.hs b/XMonad/Layout/WorkspaceDir.hs index abb2d7e..a989fcb 100644 --- a/XMonad/Layout/WorkspaceDir.hs +++ b/XMonad/Layout/WorkspaceDir.hs @@ -1,5 +1,4 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable -{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-} +{-# LANGUAGE DeriveDataTypeable, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances, PatternGuards #-} ----------------------------------------------------------------------------- -- | -- cgit v1.2.3