Convert `ghc-bin.cabal` to use others-extensions
authorHerbert Valerio Riedel <hvr@gnu.org>
Wed, 14 May 2014 10:41:21 +0000 (12:41 +0200)
committerHerbert Valerio Riedel <hvr@gnu.org>
Thu, 15 May 2014 08:18:02 +0000 (10:18 +0200)
This replaces the previous `default-extensions` by per-file declared
`{-# LANGUAGE ... #-}` pragmas.

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
ghc/GhciMonad.hs
ghc/InteractiveUI.hs
ghc/Main.hs
ghc/ghc-bin.cabal.in

index a4abe32..8f429c5 100644 (file)
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP, FlexibleInstances, UnboxedTuples, MagicHash #-}
 {-# OPTIONS_GHC -fno-cse -fno-warn-orphans #-}
 -- -fno-cse is needed for GLOBAL_VAR's to behave properly
 
index b41c2db..3f93972 100644 (file)
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP, MagicHash, NondecreasingIndentation, TupleSections #-}
 {-# OPTIONS -fno-cse #-}
 -- -fno-cse is needed for GLOBAL_VAR's to behave properly
 
index fcb9bd1..86f1af3 100644 (file)
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP, NondecreasingIndentation #-}
 {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
 
 -----------------------------------------------------------------------------
index 5b40e25..dcbc695 100644 (file)
@@ -45,11 +45,17 @@ Executable ghc
     if flag(ghci)
         CPP-Options: -DGHCI
         GHC-Options: -fno-warn-name-shadowing
-        Other-Modules: InteractiveUI, GhciMonad, GhciTags
+        Other-Modules:
+            InteractiveUI
+            GhciMonad
+            GhciTags
         Build-Depends: transformers, haskeline
-        Default-Extensions: UnboxedTuples,
-                    FlexibleInstances,
-                    TupleSections,
-                    MagicHash
+        Other-Extensions:
+            FlexibleInstances
+            MagicHash
+            TupleSections
+            UnboxedTuples
 
-    Default-Extensions: CPP, NondecreasingIndentation
+    Other-Extensions:
+        CPP
+        NondecreasingIndentation