Remove most pragma-related deprecation warnings.

shachaf · shachaf · commit 501306f62ce9 · 2011-10-19T21:03:36.000-07:00
Mainly by removing unneeded OPTIONS declarations (and replacing them with the
appropriate LANGUAGE declarations where needed).
diff --git a/Pugs/src/Main.hs b/Pugs/src/Main.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 {-|
     The Main REPL loop.
 
diff --git a/Pugs/src/Pugs.hs b/Pugs/src/Pugs.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances -fffi #-}
+{-# LANGUAGE ForeignFunctionInterface, ImplicitParams, ScopedTypeVariables, PatternGuards #-}
 
 {-|
     Public API for the Pugs system.
diff --git a/Pugs/src/Pugs/AST.hs b/Pugs/src/Pugs/AST.hs
@@ -1,5 +1,5 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields -fallow-overlapping-instances -fparr #-}
-{-# LANGUAGE GADTs #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
+{-# LANGUAGE CPP, GADTs, ScopedTypeVariables, TypeSynonymInstances, MultiParamTypeClasses, DeriveDataTypeable, FlexibleContexts, PatternGuards #-}
 
 {-|
     Abstract syntax tree.
diff --git a/Pugs/src/Pugs/AST.hs-boot b/Pugs/src/Pugs/AST.hs-boot
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -funbox-strict-fields -fallow-overlapping-instances #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
+{-# LANGUAGE MultiParamTypeClasses, FlexibleContexts, TypeSynonymInstances #-}
 module Pugs.AST where
 import Pugs.Internals
 import Pugs.Types
diff --git a/Pugs/src/Pugs/AST/Eval.hs b/Pugs/src/Pugs/AST/Eval.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -funbox-strict-fields -fallow-undecidable-instances #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
+{-# LANGUAGE ScopedTypeVariables, MultiParamTypeClasses, DeriveDataTypeable #-}
 
 module Pugs.AST.Eval where
 import Pugs.Internals
diff --git a/Pugs/src/Pugs/AST/Functions.hs b/Pugs/src/Pugs/AST/Functions.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances -fparr #-}
+{-# LANGUAGE TypeSynonymInstances, MultiParamTypeClasses #-}
 module Pugs.AST.Functions where
 import Pugs.Internals
 import Pugs.Types
diff --git a/Pugs/src/Pugs/AST/Internals.hs b/Pugs/src/Pugs/AST/Internals.hs
@@ -1,5 +1,4 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances -fparr #-}
-{-# LANGUAGE GADTs #-}
+{-# LANGUAGE CPP, GADTs, RankNTypes, TypeSynonymInstances, FlexibleInstances, DeriveDataTypeable, ScopedTypeVariables, PatternGuards #-}
 
 module Pugs.AST.Internals (
     Eval(..),      -- uses Val, Env, SIO
diff --git a/Pugs/src/Pugs/AST/Internals.hs-boot b/Pugs/src/Pugs/AST/Internals.hs-boot
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances #-}
-
 module Pugs.AST.Internals where
 import Pugs.Types
 import Pugs.Internals
diff --git a/Pugs/src/Pugs/AST/Internals/Instances.hs b/Pugs/src/Pugs/AST/Internals/Instances.hs
@@ -1,5 +1,4 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances -fparr #-}
-{-# LANGUAGE GADTs #-}
+{-# LANGUAGE GADTs, CPP, MagicHash, ScopedTypeVariables, PatternGuards, TypeSynonymInstances, FlexibleContexts, FlexibleInstances, UndecidableInstances, OverlappingInstances #-}
 
 
 
diff --git a/Pugs/src/Pugs/AST/Pad.hs b/Pugs/src/Pugs/AST/Pad.hs
@@ -1,5 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fparr #-}
-{-# LANGUAGE GADTs #-}
+{-# LANGUAGE GADTs, ScopedTypeVariables, PatternGuards #-}
 module Pugs.AST.Pad (
   mkPad, unionPads, padKeys, filterPad, adjustPad, mergePadEntry,
   mergeLexPads, readMPad, writeMPad, appendMPad, modifyMPad, newMPad
diff --git a/Pugs/src/Pugs/AST/Pos.hs b/Pugs/src/Pugs/AST/Pos.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
+{-# LANGUAGE DeriveDataTypeable #-}
 
 module Pugs.AST.Pos (
     Pos(..),
diff --git a/Pugs/src/Pugs/AST/Prag.hs b/Pugs/src/Pugs/AST/Prag.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
+{-# LANGUAGE DeriveDataTypeable #-}
 
 module Pugs.AST.Prag (
     Pragma(..),
diff --git a/Pugs/src/Pugs/AST/SIO.hs b/Pugs/src/Pugs/AST/SIO.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
+{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances, DeriveDataTypeable #-}
 
 module Pugs.AST.SIO (
     MonadSTM(..),
@@ -19,22 +20,20 @@ data SIO a = MkSTM !(STM a) | MkIO !(IO a) | MkSIO !a
     deriving (Typeable)
 
 {-# INLINE runSIO #-}
-{-# SPECIALISE runSIO :: SIO () -> Maybe () #-}
-{-# SPECIALISE runSIO :: SIO () -> Either String () #-}
+{-# SPECIALISE runSIO :: SIO a -> Maybe a #-}
+{-# SPECIALISE runSIO :: SIO a -> Either String a #-}
 runSIO :: Monad m => SIO a -> m a
 runSIO MkSTM{}      = fail "Unsafe STM caught in pure computation"
 runSIO MkIO{}       = fail "Unsafe IO caught in pure computation"
 runSIO (MkSIO x)    = return x
 
 {-# INLINE runSTM #-}
-{-# SPECIALISE runSTM :: SIO () -> STM () #-}
 runSTM :: SIO a -> STM a
 runSTM (MkSTM stm)  = stm
 runSTM MkIO{}       = fail "Unsafe IO caught in STM"
 runSTM (MkSIO x)    = return x
 
 {-# INLINE runIO #-}
-{-# SPECIALISE runIO :: SIO () -> IO () #-}
 runIO :: SIO a -> IO a
 runIO (MkIO io)     = io
 runIO (MkSTM stm)   = atomically stm
diff --git a/Pugs/src/Pugs/AST/Scope.hs b/Pugs/src/Pugs/AST/Scope.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
+{-# LANGUAGE DeriveDataTypeable #-}
 
 module Pugs.AST.Scope (
     Scope(..),
diff --git a/Pugs/src/Pugs/AST/Types.hs b/Pugs/src/Pugs/AST/Types.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances -fparr #-}
+{-# LANGUAGE TypeSynonymInstances, DeriveDataTypeable #-}
 module Pugs.AST.Types where
 import Pugs.Internals
 import Pugs.Types
diff --git a/Pugs/src/Pugs/AST/Utils.hs b/Pugs/src/Pugs/AST/Utils.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -funbox-strict-fields -fallow-undecidable-instances #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
+{-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, FlexibleContexts, PatternGuards #-}
 
 module Pugs.AST.Utils where
 import Pugs.Internals
diff --git a/Pugs/src/Pugs/Bind.hs b/Pugs/src/Pugs/Bind.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-}
+{-# LANGUAGE PatternGuards #-}
 
 {-|
     Parameter binding.
diff --git a/Pugs/src/Pugs/Class.hs b/Pugs/src/Pugs/Class.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fparr -fallow-undecidable-instances -fallow-incoherent-instances #-}
+{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, TypeSynonymInstances, FlexibleInstances, UndecidableInstances, ScopedTypeVariables, IncoherentInstances #-}
 
 {-|
     Class meta-model.  (object meta-meta-model)
diff --git a/Pugs/src/Pugs/CodeGen.hs b/Pugs/src/Pugs/CodeGen.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 {-|
     Code generation interface.
diff --git a/Pugs/src/Pugs/CodeGen/Binary.hs b/Pugs/src/Pugs/CodeGen/Binary.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
 
 module Pugs.CodeGen.Binary (genParseBinary) where
 import Pugs.Internals
diff --git a/Pugs/src/Pugs/CodeGen/JSON.hs b/Pugs/src/Pugs/CodeGen/JSON.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
 
 module Pugs.CodeGen.JSON (genJSON) where
 import Pugs.AST
diff --git a/Pugs/src/Pugs/CodeGen/PIL1.hs b/Pugs/src/Pugs/CodeGen/PIL1.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
 
 module Pugs.CodeGen.PIL1 (genPIL1) where
 import Pugs.AST
diff --git a/Pugs/src/Pugs/CodeGen/PIR.hs b/Pugs/src/Pugs/CodeGen/PIR.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp -fallow-overlapping-instances #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
+{-# LANGUAGE ScopedTypeVariables, MultiParamTypeClasses, FunctionalDependencies, TypeSynonymInstances, FlexibleInstances, PatternGuards #-}
 
 {-|
     This module provides 'genPIR', a function which compiles the current
diff --git a/Pugs/src/Pugs/CodeGen/PIR/Prelude.hs b/Pugs/src/Pugs/CodeGen/PIR/Prelude.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS -fglasgow-exts #-}
- 
 {-
     *** NOTE ***
     DO NOT EDIT THIS FILE.
diff --git a/Pugs/src/Pugs/CodeGen/Perl5.hs b/Pugs/src/Pugs/CodeGen/Perl5.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
 
 module Pugs.CodeGen.Perl5 (genPerl5) where
 import Pugs.AST
diff --git a/Pugs/src/Pugs/CodeGen/YAML.hs b/Pugs/src/Pugs/CodeGen/YAML.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
 
 module Pugs.CodeGen.YAML (genYAML, genParseYAML, genParseHsYAML) where
 import Pugs.Internals
diff --git a/Pugs/src/Pugs/Compile.hs b/Pugs/src/Pugs/Compile.hs
@@ -1,5 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp -fno-warn-deprecations -fallow-overlapping-instances #-}
-{-# LANGUAGE GADTs #-}
+{-# LANGUAGE GADTs, ScopedTypeVariables, MultiParamTypeClasses, FlexibleInstances, TypeSynonymInstances #-}
 
 {-|
     Compiler interface.
diff --git a/Pugs/src/Pugs/Compile/Pugs.hs b/Pugs/src/Pugs/Compile/Pugs.hs
@@ -1,5 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances -fparr #-}
-{-# LANGUAGE GADTs #-}
+{-# LANGUAGE GADTs, FlexibleInstances, TypeSynonymInstances, PatternGuards #-}
 
 module Pugs.Compile.Pugs (genPugs) where
 import Pugs.AST
diff --git a/Pugs/src/Pugs/Cont.hs b/Pugs/src/Pugs/Cont.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-unused-binds #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 {-|
     Continuation with shift and reset operators.
diff --git a/Pugs/src/Pugs/Embed.hs b/Pugs/src/Pugs/Embed.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp #-}
-
 {-|
     Embedded interpreters.
 
diff --git a/Pugs/src/Pugs/Embed/Haskell.hs b/Pugs/src/Pugs/Embed/Haskell.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp #-}
+{-# LANGUAGE CPP #-}
 
 module Pugs.Embed.Haskell where
 
diff --git a/Pugs/src/Pugs/Embed/Parrot.hs b/Pugs/src/Pugs/Embed/Parrot.hs
@@ -1,6 +1,7 @@
-{-# INCLUDE "Parrot_hsc.h" #-}
+-- XXXXXX
+--{-# INCLUDE "Parrot_hsc.h" #-}
 {-# LINE 1 "Parrot.hsc" #-}
-{-# OPTIONS_GHC -fglasgow-exts -cpp -fno-full-laziness -fno-cse #-}
+--{-# OPTIONS_GHC -fglasgow-exts -cpp -fno-full-laziness -fno-cse #-}
 {-# LINE 2 "Parrot.hsc" #-}
 
 {-# LINE 3 "Parrot.hsc" #-}
diff --git a/Pugs/src/Pugs/Embed/Perl5.hs b/Pugs/src/Pugs/Embed/Perl5.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp -optc-w #-}
+{-# LANGUAGE CPP, ForeignFunctionInterface, DeriveDataTypeable #-}
 
 #ifndef PUGS_HAVE_PERL5
 module Pugs.Embed.Perl5 
@@ -177,8 +177,9 @@ nullEnv = error "perl5 not embedded"
 #else
 #undef RETURN
 
-{-# INCLUDE "../../perl5/p5embed.h" #-}
-{-# INCLUDE "../../perl5/pugsembed.h" #-}
+-- XXXXXX
+--{-# INCLUDE "../../perl5/p5embed.h" #-}
+--{-# INCLUDE "../../perl5/pugsembed.h" #-}
 
 module Pugs.Embed.Perl5 where
 import Pugs.Internals
diff --git a/Pugs/src/Pugs/Embed/Pugs.hs b/Pugs/src/Pugs/Embed/Pugs.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 module Pugs.Embed.Pugs where
 import System.Cmd
 import System.Directory
diff --git a/Pugs/src/Pugs/Eval.hs b/Pugs/src/Pugs/Eval.hs
@@ -1,5 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp -fno-warn-deprecations -fallow-overlapping-instances -fparr #-}
-{-# LANGUAGE GADTs #-}
+{-# LANGUAGE GADTs, ScopedTypeVariables, RankNTypes, ParallelListComp, FlexibleInstances, DeriveDataTypeable, PatternGuards #-}
 
 {-|
     Evaluation and reduction engine.
diff --git a/Pugs/src/Pugs/Eval/Var.hs b/Pugs/src/Pugs/Eval/Var.hs
@@ -1,5 +1,5 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances -funbox-strict-fields -fparr #-}
-{-# LANGUAGE GADTs #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
+{-# LANGUAGE GADTs, PatternGuards #-}
 
 module Pugs.Eval.Var (
     findVar, findVarRef, findSub,
diff --git a/Pugs/src/Pugs/Exp.hs b/Pugs/src/Pugs/Exp.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fallow-overlapping-instances -cpp #-}
+{-# LANGUAGE DeriveDataTypeable #-}
 {-! global : YAML_Pos, Perl6Class, MooseClass !-}
 
 {-| Capture-enabled "new" Pugs AST
diff --git a/Pugs/src/Pugs/Exp.hs-boot b/Pugs/src/Pugs/Exp.hs-boot
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fallow-overlapping-instances -cpp #-}
-
 module Pugs.Exp where
 import Text.PrettyPrint
 
diff --git a/Pugs/src/Pugs/External.hs b/Pugs/src/Pugs/External.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp -fallow-overlapping-instances #-}
+{-# LANGUAGE PatternGuards #-}
 
 {-|
     External call utilities.
diff --git a/Pugs/src/Pugs/External/Haskell.hs b/Pugs/src/Pugs/External/Haskell.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp #-}
+{-# LANGUAGE CPP #-}
 
 -- -fth -cpp -package plugins #-}
 
diff --git a/Pugs/src/Pugs/Help.hs b/Pugs/src/Pugs/Help.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 {-|
     Online help and banner text.
 
diff --git a/Pugs/src/Pugs/Internals.hs b/Pugs/src/Pugs/Internals.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-undecidable-instances -fallow-overlapping-instances -fparr #-}
-
 {-|
     Internal utilities and library imports.
 
diff --git a/Pugs/src/Pugs/Junc.hs b/Pugs/src/Pugs/Junc.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
+{-# LANGUAGE PatternGuards #-}
 
 {-|
     Junction logic.
diff --git a/Pugs/src/Pugs/Lexer.hs b/Pugs/src/Pugs/Lexer.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -fglasgow-exts -optc-w -cpp #-}
+{-# OPTIONS_GHC -optc-w #-}
+{-# LANGUAGE CPP #-}
 
 {-|
     Lexical analyzer.
diff --git a/Pugs/src/Pugs/Meta.hs b/Pugs/src/Pugs/Meta.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 {-|
     Perl 6 Meta-object definitions.
 
diff --git a/Pugs/src/Pugs/Meta/Class.hs b/Pugs/src/Pugs/Meta/Class.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 module Pugs.Meta.Class () where
 import Pugs.Val
 import Pugs.Class
diff --git a/Pugs/src/Pugs/Meta/Perl5.hs b/Pugs/src/Pugs/Meta/Perl5.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
+{-# LANGUAGE MultiParamTypeClasses, TypeSynonymInstances, DeriveDataTypeable, PatternGuards #-}
 
 module Pugs.Meta.Perl5 (Perl5Responder) where
 import Pugs.Val
diff --git a/Pugs/src/Pugs/Meta/Str.hs b/Pugs/src/Pugs/Meta/Str.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-deprecations #-}
+{-# LANGUAGE TypeSynonymInstances #-}
 
 module Pugs.Meta.Str (_StrClass) where
 import Data.Maybe
diff --git a/Pugs/src/Pugs/Monads.hs b/Pugs/src/Pugs/Monads.hs
@@ -1,5 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-}
-{-# LANGUAGE GADTs #-}
+{-# LANGUAGE GADTs, ScopedTypeVariables, PatternGuards #-}
 
 {-|
     Common operations on Eval monad.
diff --git a/Pugs/src/Pugs/PIL1.hs b/Pugs/src/Pugs/PIL1.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -fglasgow-exts -funbox-strict-fields -fallow-overlapping-instances -fno-warn-orphans -fno-warn-incomplete-patterns -fallow-undecidable-instances -cpp #-}
+{-# OPTIONS_GHC -funbox-strict-fields #-}
+{-# LANGUAGE DeriveDataTypeable #-}
 
 {-|
     Pugs Intermediate Language, version 1.
diff --git a/Pugs/src/Pugs/Parser.hs b/Pugs/src/Pugs/Parser.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -cpp -fglasgow-exts -funbox-strict-fields -fno-full-laziness -fno-cse -fallow-overlapping-instances #-}
+{-# OPTIONS_GHC -funbox-strict-fields -fno-full-laziness -fno-cse #-}
+{-# LANGUAGE ParallelListComp, ScopedTypeVariables, ScopedTypeVariables, PatternGuards #-}
 
 {-|
     Higher-level parser for building ASTs.
diff --git a/Pugs/src/Pugs/Parser/Charnames.hs b/Pugs/src/Pugs/Parser/Charnames.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -fglasgow-exts -fno-full-laziness -fno-cse -cpp -fallow-overlapping-instances #-}
+{-# OPTIONS_GHC -fno-full-laziness -fno-cse #-}
+{-# LANGUAGE CPP #-}
 
 module Pugs.Parser.Charnames (nameToCode) where
 
diff --git a/Pugs/src/Pugs/Parser/Doc.hs b/Pugs/src/Pugs/Parser/Doc.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -fglasgow-exts -funbox-strict-fields -fno-full-laziness -fno-cse #-}
+{-# OPTIONS_GHC -funbox-strict-fields -fno-full-laziness -fno-cse #-}
+{-# LANGUAGE PatternGuards #-}
 
 module Pugs.Parser.Doc (
     ruleDocBlock,
diff --git a/Pugs/src/Pugs/Parser/Export.hs b/Pugs/src/Pugs/Parser/Export.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 {-|
     Symbol export.
 -}
diff --git a/Pugs/src/Pugs/Parser/Literal.hs b/Pugs/src/Pugs/Parser/Literal.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-}
+{-# LANGUAGE DeriveDataTypeable, PatternGuards #-}
 module Pugs.Parser.Literal where
 
 import Pugs.Internals
diff --git a/Pugs/src/Pugs/Parser/Operator.hs b/Pugs/src/Pugs/Parser/Operator.hs
diff --git a/Pugs/src/Pugs/Parser/Program.hs b/Pugs/src/Pugs/Parser/Program.hs
diff --git a/Pugs/src/Pugs/Parser/Types.hs b/Pugs/src/Pugs/Parser/Types.hs
diff --git a/Pugs/src/Pugs/Parser/Unsafe.hs b/Pugs/src/Pugs/Parser/Unsafe.hs
diff --git a/Pugs/src/Pugs/Parser/Util.hs b/Pugs/src/Pugs/Parser/Util.hs
diff --git a/Pugs/src/Pugs/Pretty.hs b/Pugs/src/Pugs/Pretty.hs
diff --git a/Pugs/src/Pugs/Prim.hs b/Pugs/src/Pugs/Prim.hs
diff --git a/Pugs/src/Pugs/Prim/Code.hs b/Pugs/src/Pugs/Prim/Code.hs
diff --git a/Pugs/src/Pugs/Prim/Eval.hs b/Pugs/src/Pugs/Prim/Eval.hs
diff --git a/Pugs/src/Pugs/Prim/FileTest.hs b/Pugs/src/Pugs/Prim/FileTest.hs
diff --git a/Pugs/src/Pugs/Prim/Keyed.hs b/Pugs/src/Pugs/Prim/Keyed.hs
diff --git a/Pugs/src/Pugs/Prim/Lifts.hs b/Pugs/src/Pugs/Prim/Lifts.hs
diff --git a/Pugs/src/Pugs/Prim/List.hs b/Pugs/src/Pugs/Prim/List.hs
diff --git a/Pugs/src/Pugs/Prim/Match.hs b/Pugs/src/Pugs/Prim/Match.hs
diff --git a/Pugs/src/Pugs/Prim/Numeric.hs b/Pugs/src/Pugs/Prim/Numeric.hs
diff --git a/Pugs/src/Pugs/Prim/Param.hs b/Pugs/src/Pugs/Prim/Param.hs
diff --git a/Pugs/src/Pugs/Prim/Yaml.hs b/Pugs/src/Pugs/Prim/Yaml.hs
diff --git a/Pugs/src/Pugs/Rule.hs b/Pugs/src/Pugs/Rule.hs
diff --git a/Pugs/src/Pugs/Run.hs b/Pugs/src/Pugs/Run.hs
diff --git a/Pugs/src/Pugs/Run/Args.hs b/Pugs/src/Pugs/Run/Args.hs
diff --git a/Pugs/src/Pugs/Run/Perl5.hs b/Pugs/src/Pugs/Run/Perl5.hs
diff --git a/Pugs/src/Pugs/Shell.hs b/Pugs/src/Pugs/Shell.hs
diff --git a/Pugs/src/Pugs/Types.hs b/Pugs/src/Pugs/Types.hs
diff --git a/Pugs/src/Pugs/Val.hs b/Pugs/src/Pugs/Val.hs
diff --git a/Pugs/src/Pugs/Val/Base.hs b/Pugs/src/Pugs/Val/Base.hs
diff --git a/Pugs/src/Pugs/Val/Code.hs b/Pugs/src/Pugs/Val/Code.hs
diff --git a/Pugs/src/Pugs/Version.hs b/Pugs/src/Pugs/Version.hs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-{-# OPTIONS_GHC -fglasgow-exts #-}`
`2`		`-`
`3`	`1`	`{-\|`
`4`	`2`	`The Main REPL loop.`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances -fffi #-}`
	`1`	`+{-# LANGUAGE ForeignFunctionInterface, ImplicitParams, ScopedTypeVariables, PatternGuards #-}`
`2`	`2`
`3`	`3`	`{-\|`
`4`	`4`	`Public API for the Pugs system.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances -fparr #-}`
	`1`	`+{-# LANGUAGE TypeSynonymInstances, MultiParamTypeClasses #-}`
`2`	`2`	`module Pugs.AST.Functions where`
`3`	`3`	`import Pugs.Internals`
`4`	`4`	`import Pugs.Types`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances #-}`
`2`		`-`
`3`	`1`	`module Pugs.AST.Internals where`
`4`	`2`	`import Pugs.Types`
`5`	`3`	`import Pugs.Internals`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -fallow-overlapping-instances -fallow-undecidable-instances -fparr #-}`
`2`		`-{-# LANGUAGE GADTs #-}`
	`1`	`+{-# LANGUAGE GADTs, CPP, MagicHash, ScopedTypeVariables, PatternGuards, TypeSynonymInstances, FlexibleContexts, FlexibleInstances, UndecidableInstances, OverlappingInstances #-}`
`3`	`2`
`4`	`3`
`5`	`4`