Remove most pragma-related deprecation warnings.

Mainly by removing unneeded OPTIONS declarations (and replacing them with the
appropriate LANGUAGE declarations where needed).

Pugs/src/Main.hs

@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 {-|
     The Main REPL loop.
 

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.

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.

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

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

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

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

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

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 #-}
 
 
 

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

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(..),

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(..),

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

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(..),

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

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

Pugs/src/Pugs/Bind.hs

@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -fallow-overlapping-instances #-}
+{-# LANGUAGE PatternGuards #-}
 
 {-|
     Parameter binding.

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)

Pugs/src/Pugs/CodeGen.hs

@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 {-|
     Code generation interface.

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

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

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

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

Pugs/src/Pugs/CodeGen/PIR/Prelude.hs

@@ -1,5 +1,3 @@
-{-# OPTIONS -fglasgow-exts #-}
-
 {-
     *** NOTE ***
     DO NOT EDIT THIS FILE.

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

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

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.

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

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.

Pugs/src/Pugs/Embed.hs

@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp #-}
-
 {-|
     Embedded interpreters.
 

Pugs/src/Pugs/Embed/Haskell.hs

@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp #-}
+{-# LANGUAGE CPP #-}
 
 module Pugs.Embed.Haskell where
 

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" #-}

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

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

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.

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,

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

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
 

Pugs/src/Pugs/External.hs

@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp -fallow-overlapping-instances #-}
+{-# LANGUAGE PatternGuards #-}
 
 {-|
     External call utilities.

Pugs/src/Pugs/External/Haskell.hs

@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp #-}
+{-# LANGUAGE CPP #-}
 
 -- -fth -cpp -package plugins #-}
 

Pugs/src/Pugs/Help.hs

@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 {-|
     Online help and banner text.
 

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.
 

Pugs/src/Pugs/Junc.hs

@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
+{-# LANGUAGE PatternGuards #-}
 
 {-|
     Junction logic.

Pugs/src/Pugs/Lexer.hs

@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -fglasgow-exts -optc-w -cpp #-}
+{-# OPTIONS_GHC -optc-w #-}
+{-# LANGUAGE CPP #-}
 
 {-|
     Lexical analyzer.

Pugs/src/Pugs/Meta.hs

@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 {-|
     Perl 6 Meta-object definitions.
 

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

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

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

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.

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.

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.

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
 

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,

Pugs/src/Pugs/Parser/Export.hs

@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 {-|
     Symbol export.
 -}

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