[Fencommits] fenfire-hs: use LANGUAGE pragmas instead of GHC-specific options

Tuukka Hastrup Tuukka.Hastrup at iki.fi
Mon Oct 5 22:32:54 EEST 2009 

Mon Oct  5 22:30:29 EEST 2009  Tuukka Hastrup <Tuukka.Hastrup at iki.fi>
  * use LANGUAGE pragmas instead of GHC-specific options
  Ignore-this: 559ca2a5b346270694aa4651cd157db2

    M ./Fenfire.fhs -1 +1
    M ./Fenfire/Cache.hs -2 +1
    M ./Fenfire/Cairo.fhs -3 +4
    M ./Fenfire/FRP.fhs -1 +1
    M ./Fenfire/FunctorTest.fhs -1 +1
    M ./Fenfire/GtkFixes.hs +1
    M ./Fenfire/Irc2Notetaker.hs -1 +1
    M ./Fenfire/Irc2RDF.hs -1 +1
    M ./Fenfire/Main.hs +1
    M ./Fenfire/RDF.hs -2 +5
    M ./Fenfire/URN5.hs +1
    M ./Fenfire/Utils.hs -1 +2
    M ./Fenfire/VanishingView.fhs +1
    M ./Fenfire/Vobs.fhs -1 +2
    M ./FunctorSugar.hs -1 +1
    M ./Preprocessor/Hsx/Transform.hs -1 +1
    M ./Raptor.chs -4 +1
    M ./fenfire.cabal -8 +8

Mon Oct  5 22:30:29 EEST 2009  Tuukka Hastrup <Tuukka.Hastrup at iki.fi>
  * use LANGUAGE pragmas instead of GHC-specific options
  Ignore-this: 559ca2a5b346270694aa4651cd157db2
diff -rN -u old-fenfire-hs/Fenfire/Cache.hs new-fenfire-hs/Fenfire/Cache.hs
--- old-fenfire-hs/Fenfire/Cache.hs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/Cache.hs	2009-10-05 22:32:54.268169115 +0300
@@ -1,5 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
+{-# LANGUAGE RecursiveDo, TypeSynonymInstances #-}
 module Fenfire.Cache where
 
 -- Copyright (c) 2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/Fenfire/Cairo.fhs new-fenfire-hs/Fenfire/Cairo.fhs
--- old-fenfire-hs/Fenfire/Cairo.fhs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/Cairo.fhs	2009-10-05 22:32:54.268169115 +0300
@@ -1,7 +1,8 @@
 -- For (instance (Cairo cx r, Monoid m) => Monoid (cx m)):
-{-# OPTIONS_GHC -fallow-undecidable-instances -fallow-incoherent-instances #-}
--- More, implied by the previous on GHC 6.6 but needed for earlier:
-{-# OPTIONS_GHC -fallow-overlapping-instances #-}
+{-# LANGUAGE UndecidableInstances, IncoherentInstances #-}
+{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies,
+             TypeSynonymInstances, FlexibleInstances, 
+             GeneralizedNewtypeDeriving, RelaxedPolyRec #-}
 module Fenfire.Cairo where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/Fenfire/FRP.fhs new-fenfire-hs/Fenfire/FRP.fhs
--- old-fenfire-hs/Fenfire/FRP.fhs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/FRP.fhs	2009-10-05 22:32:54.268169115 +0300
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fallow-undecidable-instances -fallow-incoherent-instances #-}
+{-# LANGUAGE UndecidableInstances, IncoherentInstances #-}
 module Fenfire.FRP where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/Fenfire/FunctorTest.fhs new-fenfire-hs/Fenfire/FunctorTest.fhs
--- old-fenfire-hs/Fenfire/FunctorTest.fhs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/FunctorTest.fhs	2009-10-05 22:32:54.268169115 +0300
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fallow-overlapping-instances #-}
+{-# LANGUAGE OverlappingInstances #-}
 
 module Fenfire.FunctorTest where
 
diff -rN -u old-fenfire-hs/Fenfire/GtkFixes.hs new-fenfire-hs/Fenfire/GtkFixes.hs
--- old-fenfire-hs/Fenfire/GtkFixes.hs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/GtkFixes.hs	2009-10-05 22:32:54.268169115 +0300
@@ -1,3 +1,4 @@
+{-# LANGUAGE ForeignFunctionInterface #-}
 module Fenfire.GtkFixes where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/Fenfire/Irc2Notetaker.hs new-fenfire-hs/Fenfire/Irc2Notetaker.hs
--- old-fenfire-hs/Fenfire/Irc2Notetaker.hs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/Irc2Notetaker.hs	2009-10-05 22:32:54.268169115 +0300
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fffi #-}
+{-# LANGUAGE ForeignFunctionInterface, ScopedTypeVariables, PatternGuards #-}
 module Fenfire.Irc2Notetaker where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/Fenfire/Irc2RDF.hs new-fenfire-hs/Fenfire/Irc2RDF.hs
--- old-fenfire-hs/Fenfire/Irc2RDF.hs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/Irc2RDF.hs	2009-10-05 22:32:54.268169115 +0300
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fffi #-}
+{-# LANGUAGE ForeignFunctionInterface, ScopedTypeVariables, PatternGuards #-}
 module Fenfire.Irc2RDF where
 
 -- Irc2RDF: An IRC to SIOC RDF converter
diff -rN -u old-fenfire-hs/Fenfire/Main.hs new-fenfire-hs/Fenfire/Main.hs
--- old-fenfire-hs/Fenfire/Main.hs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/Main.hs	2009-10-05 22:32:54.268169115 +0300
@@ -1,3 +1,4 @@
+{-# LANGUAGE ImplicitParams, RecursiveDo, PatternGuards #-}
 module Fenfire.Main where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/Fenfire/RDF.hs new-fenfire-hs/Fenfire/RDF.hs
--- old-fenfire-hs/Fenfire/RDF.hs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/RDF.hs	2009-10-05 22:32:54.268169115 +0300
@@ -1,5 +1,8 @@
-{-# OPTIONS_GHC -fglasgow-exts 
-        -fallow-overlapping-instances -fallow-undecidable-instances #-}
+{-# LANGUAGE UndecidableInstances, OverlappingInstances, ImplicitParams,
+             TypeOperators, ScopedTypeVariables, MultiParamTypeClasses,
+             FunctionalDependencies, FlexibleInstances, TypeSynonymInstances,
+             DeriveDataTypeable, FlexibleContexts, PatternGuards,
+             ScopedTypeVariables #-}
 module Fenfire.RDF where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/Fenfire/URN5.hs new-fenfire-hs/Fenfire/URN5.hs
--- old-fenfire-hs/Fenfire/URN5.hs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/URN5.hs	2009-10-05 22:32:54.268169115 +0300
@@ -1,3 +1,4 @@
+{-# LANGUAGE ImplicitParams #-}
 module Fenfire.URN5 where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/Fenfire/Utils.hs new-fenfire-hs/Fenfire/Utils.hs
--- old-fenfire-hs/Fenfire/Utils.hs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/Utils.hs	2009-10-05 22:32:54.268169115 +0300
@@ -1,5 +1,6 @@
 -- For (instance MonadReader w m => MonadReader w (MaybeT m)) in GHC 6.6:
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fallow-overlapping-instances #-}
+{-# LANGUAGE UndecidableInstances, OverlappingInstances,
+             FlexibleInstances, MultiParamTypeClasses #-}
 module Fenfire.Utils where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/Fenfire/VanishingView.fhs new-fenfire-hs/Fenfire/VanishingView.fhs
--- old-fenfire-hs/Fenfire/VanishingView.fhs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/VanishingView.fhs	2009-10-05 22:32:54.268169115 +0300
@@ -1,3 +1,4 @@
+{-# LANGUAGE ImplicitParams, RelaxedPolyRec #-}
 module Fenfire.VanishingView where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/Fenfire/Vobs.fhs new-fenfire-hs/Fenfire/Vobs.fhs
--- old-fenfire-hs/Fenfire/Vobs.fhs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Fenfire/Vobs.fhs	2009-10-05 22:32:54.268169115 +0300
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -fallow-overlapping-instances #-}
+{-# LANGUAGE OverlappingInstances, RecursiveDo, TypeSynonymInstances, 
+             MultiParamTypeClasses #-}
 module Fenfire.Vobs where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/fenfire.cabal new-fenfire-hs/fenfire.cabal
--- old-fenfire-hs/fenfire.cabal	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/fenfire.cabal	2009-10-05 22:32:54.268169115 +0300
@@ -28,7 +28,7 @@
 Main-Is:        Fenfire/Main.hs
 Other-Modules:  Fenfire, Fenfire.Vobs, Fenfire.RDF, Fenfire.Cache, Fenfire.Cairo, Fenfire.Utils, Raptor, FunctorSugar,
                 Fenfire.GtkFixes, Fenfire.VanishingView, Fenfire.Main
-GHC-Options:    -fglasgow-exts -Wall
+GHC-Options:    -Wall
                 -fno-warn-unused-imports -fno-warn-missing-signatures
                 -fno-warn-orphans -main-is Fenfire.Main.main
 Extra-Libraries: raptor
@@ -36,35 +36,35 @@
 Executable:     functortest
 Main-Is:        Fenfire/FunctorTest.hs
 Other-Modules:  Fenfire.FunctorTest, FunctorSugar
-GHC-Options:    -fglasgow-exts -Wall
+GHC-Options:    -Wall
                 -fno-warn-unused-imports -fno-warn-missing-signatures
                 -fno-warn-orphans -main-is Fenfire.FunctorTest.main
 
 Executable:     vobtest
 Main-Is:        Fenfire/VobTest.hs
 Other-Modules:  Fenfire.VobTest, Fenfire.Vobs, Fenfire.Cairo, Fenfire.Utils, FunctorSugar
-GHC-Options:    -fglasgow-exts -Wall
+GHC-Options:    -Wall
                 -fno-warn-unused-imports -fno-warn-missing-signatures
                 -fno-warn-orphans -main-is Fenfire.VobTest.main
 
 Executable:     frptest
 Main-Is:        Fenfire/FRP.hs
 Other-Modules:  Fenfire.FRP, Fenfire.Utils, FunctorSugar
-GHC-Options:    -fglasgow-exts -Wall
+GHC-Options:    -Wall
                 -fno-warn-unused-imports -fno-warn-missing-signatures
                 -fno-warn-orphans -main-is Fenfire.FRP.main
 
 Executable:     darcs2rdf
 Main-Is:        Fenfire/Darcs2RDF.hs
 Other-Modules:  Fenfire.Darcs2RDF, FunctorSugar
-GHC-Options:    -fglasgow-exts -Wall
+GHC-Options:    -Wall
                 -fno-warn-unused-imports -fno-warn-missing-signatures
                 -fno-warn-orphans -main-is Fenfire.Darcs2RDF.main
 
 Executable:     irc2rdf
 Main-Is:        Fenfire/Irc2RDF.hs
 Other-Modules:  Fenfire.Irc2RDF Fenfire.RDF Raptor
-GHC-Options:    -fglasgow-exts -Wall
+GHC-Options:    -Wall
                 -fno-warn-unused-imports -fno-warn-missing-signatures
                 -fno-warn-orphans -main-is Fenfire.Irc2RDF.main
 Extra-Libraries: raptor
@@ -72,7 +72,7 @@
 Executable:     irc2notetaker
 Main-Is:        Fenfire/Irc2Notetaker.hs
 Other-Modules:  Fenfire.Irc2Notetaker Fenfire.RDF
-GHC-Options:    -fglasgow-exts -Wall
+GHC-Options:    -Wall
                 -fno-warn-unused-imports -fno-warn-missing-signatures
                 -fno-warn-orphans -main-is Fenfire.Irc2Notetaker.main
 Extra-Libraries: raptor
@@ -80,7 +80,7 @@
 Executable:     latex2png
 Main-Is:        Fenfire/Latex2Png.hs
 Other-Modules:  Fenfire.Latex2Png
-GHC-Options:    -fglasgow-exts -Wall
+GHC-Options:    -Wall
                 -fno-warn-unused-imports -fno-warn-missing-signatures
                 -fno-warn-orphans -main-is Fenfire.Latex2Png.main
 
diff -rN -u old-fenfire-hs/Fenfire.fhs new-fenfire-hs/Fenfire.fhs
--- old-fenfire-hs/Fenfire.fhs	2009-10-05 22:32:54.268169115 +0300
+++ new-fenfire-hs/Fenfire.fhs	2009-10-05 22:32:54.268169115 +0300
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fallow-overlapping-instances -fimplicit-params #-}
+{-# LANGUAGE OverlappingInstances, ImplicitParams, PatternGuards #-}
 module Fenfire where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup
diff -rN -u old-fenfire-hs/FunctorSugar.hs new-fenfire-hs/FunctorSugar.hs
--- old-fenfire-hs/FunctorSugar.hs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/FunctorSugar.hs	2009-10-05 22:32:54.268169115 +0300
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fth #-} 
+{-# LANGUAGE TemplateHaskell #-}
 module FunctorSugar where
 
 import Control.Applicative
diff -rN -u old-fenfire-hs/Preprocessor/Hsx/Transform.hs new-fenfire-hs/Preprocessor/Hsx/Transform.hs
--- old-fenfire-hs/Preprocessor/Hsx/Transform.hs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Preprocessor/Hsx/Transform.hs	2009-10-05 22:32:54.268169115 +0300
@@ -90,7 +90,7 @@
                                  Nothing
                                  Nothing
                      else id
-            prags' = HsPragma " OPTIONS_GHC -fth " : prags
+            prags' = HsPragma " LANGUAGE TemplateHaskell " : prags
 	 in HsModule s prags' m mes (imps1 $ imps2 $ imps3 is) decls'
 
 -----------------------------------------------------------------------------
diff -rN -u old-fenfire-hs/Raptor.chs new-fenfire-hs/Raptor.chs
--- old-fenfire-hs/Raptor.chs	2009-10-05 22:32:54.258165885 +0300
+++ new-fenfire-hs/Raptor.chs	2009-10-05 22:32:54.268169115 +0300
@@ -1,7 +1,4 @@
--- We want the C compiler to always check that types match:
-{-# OPTIONS_GHC -fvia-C #-}
-{-# OPTIONS_GHC -fffi -I. #-}
-{-# OPTIONS_GHC -fglasgow-exts #-}
+{-# LANGUAGE ForeignFunctionInterface #-}
 module Raptor where
 
 -- Copyright (c) 2006-2007, Benja Fallenstein, Tuukka Hastrup

More information about the Fencommits mailing list