diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-06-16 14:31:13 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-06-16 14:31:13 +0000 |
| commit | 46ec5a8eaf994fd19545bbbe23ba6e7c36bfd61e (patch) | |
| tree | eb3e307b8f685404e10be27b3dce496a43a82954 /testsuite/tests | |
| parent | ee414c0df8f51394a8c24ea0dbbcdf25658fa973 (diff) | |
| download | haskell-46ec5a8eaf994fd19545bbbe23ba6e7c36bfd61e.tar.gz | |
Avoid using deprecated flags in the testsuite tests
Diffstat (limited to 'testsuite/tests')
149 files changed, 227 insertions, 186 deletions
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply1.hs index a7db72dd7e..abad47de26 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply1.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply1.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply2.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply2.hs index a18c3cfaaf..16cf2f3039 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply2.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply2.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply3.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply3.hs index 6517880751..3a9b49da92 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply3.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply3.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply4.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply4.hs index 4c4c0af0b7..af0dac4cee 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply4.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply4.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply5.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply5.hs index 8c3cace94e..46d1dc587f 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply5.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply5.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowcase1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowcase1.hs index 9c30ae9527..6d39b0be73 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowcase1.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowcase1.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo1.hs index cfa7c93d4a..b70eedd460 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo1.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo1.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo2.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo2.hs index 8237f224e6..3562dc23b9 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo2.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo2.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo3.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo3.hs index c95533e610..3b6a8c8d35 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo3.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo3.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} -- test for out-size tuples: takes a _long_ time to compile diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowform1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowform1.hs index 6af747683a..a282d71ed7 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowform1.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowform1.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowif1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowif1.hs index a5294b6025..404b1f164c 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowif1.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowif1.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowlet1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowlet1.hs index d3e016091e..b08e030d1c 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowlet1.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowlet1.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowrec1.hs b/testsuite/tests/ghc-regress/arrows/should_compile/arrowrec1.hs index 5be2afdfc1..57b6de783c 100644 --- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowrec1.hs +++ b/testsuite/tests/ghc-regress/arrows/should_compile/arrowrec1.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.hs b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.hs index 2e77e87321..89f1174b28 100644 --- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.hs +++ b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -farrows -fglasgow-exts #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE Arrows #-} -- Crashed GHC 6.4 with a lint error -- because of the existential diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.stderr b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.stderr index edaf37d0a4..993335ec5c 100644 --- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.stderr +++ b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.stderr @@ -1,5 +1,5 @@ -arrowfail001.hs:15:35: +arrowfail001.hs:16:35: Ambiguous type variable `a' in the constraint: - `Foo a' arising from a use of `foo' at arrowfail001.hs:15:35-37 + `Foo a' arising from a use of `foo' at arrowfail001.hs:16:35-37 Probable fix: add a type signature that fixes these type variable(s) diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.hs b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.hs index 4352c13566..96cc930565 100644 --- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.hs +++ b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module ShouldFail where diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.hs b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.hs index bc1a270a84..2f8cfeeaed 100644 --- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.hs +++ b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} -- Arrow commands where an expression is expected module ShouldFail where diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.hs b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.hs index ff0cf55c5a..c686b32546 100644 --- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.hs +++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} -- Toy lambda-calculus interpreter from John Hughes's arrows paper (s5) diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.hs b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.hs index b1feeba55f..16f29806ac 100644 --- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.hs +++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} -- Homogeneous (or depth-preserving) functions over perfectly balanced trees. diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.hs b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.hs index 9e568aa6dd..5f4580ab87 100644 --- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.hs +++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -farrows #-} +{-# LANGUAGE Arrows #-} module Main(main) where diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.hs b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.hs index 32002c8797..4f16db5cfd 100644 --- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.hs +++ b/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -farrows -fglasgow-exts #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE Arrows #-} -- Simple expression parser -- (uses do-notation and operators) diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc039.hs b/testsuite/tests/ghc-regress/concurrent/should_run/conc039.hs index 03d2241583..dc5d181a31 100644 --- a/testsuite/tests/ghc-regress/concurrent/should_run/conc039.hs +++ b/testsuite/tests/ghc-regress/concurrent/should_run/conc039.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fffi #-} +{-# LANGUAGE ForeignFunctionInterface #-} import Foreign import System.Mem diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc040.hs b/testsuite/tests/ghc-regress/concurrent/should_run/conc040.hs index df159840ea..be3bfdb915 100644 --- a/testsuite/tests/ghc-regress/concurrent/should_run/conc040.hs +++ b/testsuite/tests/ghc-regress/concurrent/should_run/conc040.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fffi #-} +{-# LANGUAGE ForeignFunctionInterface #-} import Foreign import Data.IORef diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc059.hs b/testsuite/tests/ghc-regress/concurrent/should_run/conc059.hs index a136dbfc44..bed28d27cb 100644 --- a/testsuite/tests/ghc-regress/concurrent/should_run/conc059.hs +++ b/testsuite/tests/ghc-regress/concurrent/should_run/conc059.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fffi -cpp #-} +{-# LANGUAGE CPP, ForeignFunctionInterface #-} module Test where import Control.Concurrent diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.hs b/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.hs index 3f81afc8f1..97d90b8dba 100644 --- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.hs +++ b/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -XRecordWildCards -XRecordPuns #-} +{-# OPTIONS_GHC -XRecordWildCards -XNamedFieldPuns #-} -- This is a very partial test of the record-wildcard extension -- but better than nothing diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.hs b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.hs index 0ddb6d4421..4f141d00a0 100644 --- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.hs +++ b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} -- The Show instance for S would have form -- instance X T c => Show S diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr index e85791d803..0eab3dcae1 100644 --- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr +++ b/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr @@ -1,5 +1,5 @@ -drvfail002.hs:15:0: +drvfail002.hs:16:0: Ambiguous constraint `X T c' At least one of the forall'd type variables mentioned by the constraint must be reachable from the type after the '=>' diff --git a/testsuite/tests/ghc-regress/driver/B/F.hs b/testsuite/tests/ghc-regress/driver/B/F.hs index d1a5ce4489..299cadbe19 100644 --- a/testsuite/tests/ghc-regress/driver/B/F.hs +++ b/testsuite/tests/ghc-regress/driver/B/F.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fffi #-} +{-# LANGUAGE ForeignFunctionInterface #-} module B.F where foreign export ccall f :: Int -> Int f :: Int -> Int diff --git a/testsuite/tests/ghc-regress/driver/F.hs b/testsuite/tests/ghc-regress/driver/F.hs index efacf05ba6..8443838259 100644 --- a/testsuite/tests/ghc-regress/driver/F.hs +++ b/testsuite/tests/ghc-regress/driver/F.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fffi #-} +{-# LANGUAGE ForeignFunctionInterface #-} module TestStub where foreign export ccall f :: Int -> Int f :: Int -> Int diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/all.T b/testsuite/tests/ghc-regress/ffi/should_compile/all.T index df74238260..3bbe4eb506 100644 --- a/testsuite/tests/ghc-regress/ffi/should_compile/all.T +++ b/testsuite/tests/ghc-regress/ffi/should_compile/all.T @@ -1,6 +1,6 @@ def ffi( opts ): - opts.extra_hc_opts = '-fffi -optc-Wno-implicit' + opts.extra_hc_opts = '-XForeignFunctionInterface -optc-Wno-implicit' setTestOpts(ffi) diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc012.hs b/testsuite/tests/ghc-regress/ffi/should_compile/cc012.hs index c2caaab78e..288f9acd02 100644 --- a/testsuite/tests/ghc-regress/ffi/should_compile/cc012.hs +++ b/testsuite/tests/ghc-regress/ffi/should_compile/cc012.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fffi #-} +{-# LANGUAGE ForeignFunctionInterface #-} -- !!! test that infix operators can be exported with foreign export, -- and that we can export something which isn't defined in this module. module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc013.hs b/testsuite/tests/ghc-regress/ffi/should_compile/cc013.hs index f256b15fd5..09dd2ef2ef 100644 --- a/testsuite/tests/ghc-regress/ffi/should_compile/cc013.hs +++ b/testsuite/tests/ghc-regress/ffi/should_compile/cc013.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fffi #-} +{-# LANGUAGE ForeignFunctionInterface #-} -- !!! test that exporting the same thing multiple times works. module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.hs b/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.hs index a8360dc347..f221a9890e 100644 --- a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.hs +++ b/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fffi -fglasgow-exts #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE ForeignFunctionInterface #-} -- Trac #1037 diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.stderr b/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.stderr index 835eacdc56..ce7905cd12 100644 --- a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.stderr +++ b/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.stderr @@ -1,5 +1,5 @@ -ccfail001.hs:9:0: +ccfail001.hs:10:0: Unacceptable result type in foreign declaration: State# RealWorld When checking declaration: foreign import ccall safe "static &foo" foo diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.hs b/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.hs index 12e8070768..6cbbf88414 100644 --- a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.hs +++ b/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fffi #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE ForeignFunctionInterface #-} -- Test for Trac #1680 diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.stderr b/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.stderr index a3bd13c6a4..4e3c92ced1 100644 --- a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.stderr +++ b/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.stderr @@ -1,5 +1,5 @@ -ccfail002.hs:9:0: +ccfail002.hs:10:0: Unacceptable result type in foreign declaration: (# Int#, Int#, Int# #) When checking declaration: diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi011.hs b/testsuite/tests/ghc-regress/ffi/should_run/ffi011.hs index 18c462050b..cfb0ae62a9 100644 --- a/testsuite/tests/ghc-regress/ffi/should_run/ffi011.hs +++ b/testsuite/tests/ghc-regress/ffi/should_run/ffi011.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fffi #-} +{-# LANGUAGE ForeignFunctionInterface #-} -- !!! returning a Bool from a foreign export confused GHCi 6.0.1. diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi015.hs b/testsuite/tests/ghc-regress/ffi/should_run/ffi015.hs index 0c8de37b72..c70220fa4a 100644 --- a/testsuite/tests/ghc-regress/ffi/should_run/ffi015.hs +++ b/testsuite/tests/ghc-regress/ffi/should_run/ffi015.hs @@ -1,4 +1,5 @@ -{-# OPTIONS_GHC -fffi -#include "ffi015_cbits.h" #-} +{-# OPTIONS_GHC -#include "ffi015_cbits.h" #-} +{-# LANGUAGE ForeignFunctionInterface #-} import Foreign import Foreign.C diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break015.script b/testsuite/tests/ghc-regress/ghci.debugger/scripts/break015.script index d4a007e26e..bbeba92f2c 100644 --- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break015.script +++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/break015.script @@ -1,6 +1,6 @@ -- implicit params availability in breakpoints -:set -fimplicit-params +:set -XImplicitParams :l break015.hs :b f g 5 diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.script b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.script index 28dfb8b34d..c38dcb5c1d 100644 --- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.script +++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.script @@ -1,7 +1,7 @@ -- TH generated code does not get instrumented :set -fglasgow-exts -:set -fth +:set -XTemplateHaskell :l dynbrk005 :st normal_fn [1,2,3] :st diff --git a/testsuite/tests/ghc-regress/ghci/prog007/C.hs b/testsuite/tests/ghc-regress/ghci/prog007/C.hs index 267a45dfa1..8273d6bdda 100644 --- a/testsuite/tests/ghc-regress/ghci/prog007/C.hs +++ b/testsuite/tests/ghc-regress/ghci/prog007/C.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fallow-overlapping-instances #-} +{-# LANGUAGE OverlappingInstances #-} module C where diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci018.script b/testsuite/tests/ghc-regress/ghci/scripts/ghci018.script index 692f5e5e31..7eea11e3c3 100644 --- a/testsuite/tests/ghc-regress/ghci/scripts/ghci018.script +++ b/testsuite/tests/ghc-regress/ghci/scripts/ghci018.script @@ -1,4 +1,4 @@ -:set -fth +:set -XTemplateHaskell :m + Language.Haskell.TH $( do runIO $ putStrLn "Q"; [| 'x' |] ) diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci024.py b/testsuite/tests/ghc-regress/ghci/scripts/ghci024.py index 4d642b310d..6e1ac7e646 100644 --- a/testsuite/tests/ghc-regress/ghci/scripts/ghci024.py +++ b/testsuite/tests/ghc-regress/ghci/scripts/ghci024.py @@ -157,6 +157,7 @@ other dynamic, non-language, flag settings: -fno-warn-unused-imports
-fno-warn-unused-matches
-fwarn-deprecations
+ -fwarn-deprecated-flags
-fno-warn-orphans
-fno-warn-tabs
-fno-strictness
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB004.hs b/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB004.hs index 1580edcc15..cc9e07e6b2 100644 --- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB004.hs +++ b/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB004.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-implicit-prelude #-} +{-# OPTIONS_GHC -XNoImplicitPrelude #-} ----------------------------------------------------------------------------- -- -- Module : Foreign diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD004.hs b/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD004.hs index 1580edcc15..cc9e07e6b2 100644 --- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD004.hs +++ b/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD004.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-implicit-prelude #-} +{-# OPTIONS_GHC -XNoImplicitPrelude #-} ----------------------------------------------------------------------------- -- -- Module : Foreign diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Gentle.hs b/testsuite/tests/ghc-regress/indexed-types/should_compile/Gentle.hs index 9318fbcccd..9fa13aea5c 100644 --- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Gentle.hs +++ b/testsuite/tests/ghc-regress/indexed-types/should_compile/Gentle.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-overlapping-instances -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE OverlappingInstances, UndecidableInstances #-} -- Rather exotic example posted to Haskell mailing list 17 Oct 07 -- It concerns context reduction and functional dependencies diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamUndec.stderr b/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamUndec.stderr index 1c1e66ea55..fc6386c27d 100644 --- a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamUndec.stderr +++ b/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamUndec.stderr @@ -2,17 +2,17 @@ TyFamUndec.hs:6:0: Variable occurs more often than in instance head in the type family application: T (b, b) - (Use -fallow-undecidable-instances to permit this) + (Use -XUndecidableInstances to permit this) In the type synonym instance declaration for `T' TyFamUndec.hs:7:0: Application is no smaller than the instance head in the type family application: T (a, Maybe b) - (Use -fallow-undecidable-instances to permit this) + (Use -XUndecidableInstances to permit this) In the type synonym instance declaration for `T' TyFamUndec.hs:8:0: Nested type family application in the type family application: T (a, T b) - (Use -fallow-undecidable-instances to permit this) + (Use -XUndecidableInstances to permit this) In the type synonym instance declaration for `T' diff --git a/testsuite/tests/ghc-regress/lib/Generics/getC.hs b/testsuite/tests/ghc-regress/lib/Generics/getC.hs index 7f067b38a6..32cf710dc6 100644 --- a/testsuite/tests/ghc-regress/lib/Generics/getC.hs +++ b/testsuite/tests/ghc-regress/lib/Generics/getC.hs @@ -1,6 +1,5 @@ {-# OPTIONS -fglasgow-exts #-} -{-# OPTIONS -fallow-undecidable-instances #-} -{-# OPTIONS -fallow-overlapping-instances #-} +{-# LANGUAGE OverlappingInstances, UndecidableInstances #-} {- diff --git a/testsuite/tests/ghc-regress/lib/Generics/nested-datatypes.hs b/testsuite/tests/ghc-regress/lib/Generics/nested-datatypes.hs index d86f5e1e53..e4c194caff 100644 --- a/testsuite/tests/ghc-regress/lib/Generics/nested-datatypes.hs +++ b/testsuite/tests/ghc-regress/lib/Generics/nested-datatypes.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} {- diff --git a/testsuite/tests/ghc-regress/lib/win32/win32002.hs b/testsuite/tests/ghc-regress/lib/win32/win32002.hs index d33ebec38e..0b57985333 100644 --- a/testsuite/tests/ghc-regress/lib/win32/win32002.hs +++ b/testsuite/tests/ghc-regress/lib/win32/win32002.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fffi #-} +{-# LANGUAGE ForeignFunctionInterface #-} -- Test that the Win32 error code from getLastError is thread-local. import System.Win32 diff --git a/testsuite/tests/ghc-regress/module/base01/Makefile b/testsuite/tests/ghc-regress/module/base01/Makefile index 0e460afe76..014b2f4c4b 100644 --- a/testsuite/tests/ghc-regress/module/base01/Makefile +++ b/testsuite/tests/ghc-regress/module/base01/Makefile @@ -9,6 +9,6 @@ clean: base01: rm -f GHC/*.o rm -f GHC/*.hi - $(TEST_HC) -fno-implicit-prelude -package-name base -c GHC/Base.hs - $(TEST_HC) -fno-implicit-prelude -package-name base --make GHC.Foo + $(TEST_HC) -XNoImplicitPrelude -package-name base -c GHC/Base.hs + $(TEST_HC) -XNoImplicitPrelude -package-name base --make GHC.Foo diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read042.hs b/testsuite/tests/ghc-regress/parser/should_compile/read042.hs index 291d872d05..922b7b12bb 100644 --- a/testsuite/tests/ghc-regress/parser/should_compile/read042.hs +++ b/testsuite/tests/ghc-regress/parser/should_compile/read042.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fbang-patterns #-} +{-# OPTIONS -XBangPatterns #-} -- Various bang-pattern and lazy-pattern tests diff --git a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/Main.hs b/testsuite/tests/ghc-regress/programs/thurston-modular-arith/Main.hs index 965dcb4d53..66f599af9f 100644 --- a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/Main.hs +++ b/testsuite/tests/ghc-regress/programs/thurston-modular-arith/Main.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} -- Modular arithmetic, due to Dale Thurston diff --git a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/TypeVal.hs b/testsuite/tests/ghc-regress/programs/thurston-modular-arith/TypeVal.hs index 02ef19b018..4879149218 100644 --- a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/TypeVal.hs +++ b/testsuite/tests/ghc-regress/programs/thurston-modular-arith/TypeVal.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} -- TypeVal.hs: dependent types, here we come! module TypeVal where diff --git a/testsuite/tests/ghc-regress/rebindable/DoParamM.hs b/testsuite/tests/ghc-regress/rebindable/DoParamM.hs index 36270700ab..f26f47ab79 100644 --- a/testsuite/tests/ghc-regress/rebindable/DoParamM.hs +++ b/testsuite/tests/ghc-regress/rebindable/DoParamM.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -XNoImplicitPrelude #-} -- Haskell98! -- Tests of the do-notation for the parameterized monads diff --git a/testsuite/tests/ghc-regress/rebindable/DoRestrictedM.hs b/testsuite/tests/ghc-regress/rebindable/DoRestrictedM.hs index d71f16efa5..a5e08f1266 100644 --- a/testsuite/tests/ghc-regress/rebindable/DoRestrictedM.hs +++ b/testsuite/tests/ghc-regress/rebindable/DoRestrictedM.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fglasgow-exts -fno-implicit-prelude #-} +{-# OPTIONS -fglasgow-exts -XNoImplicitPrelude #-} -- Tests of the do-notation for the restricted monads -- We demonstrate that all ordinary monads are restricted monads, diff --git a/testsuite/tests/ghc-regress/rebindable/all.T b/testsuite/tests/ghc-regress/rebindable/all.T index ad47c98986..1e6dcae7c2 100644 --- a/testsuite/tests/ghc-regress/rebindable/all.T +++ b/testsuite/tests/ghc-regress/rebindable/all.T @@ -1,5 +1,5 @@ # These tests try test the rebindable-syntax feature of GHC, -# which you get when you use -fno-implicit-prelude +# which you get when you use -XNoImplicitPrelude # # Written by Ashley Yakeley diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable1.hs b/testsuite/tests/ghc-regress/rebindable/rebindable1.hs index 01e2722b1a..a43e07d322 100644 --- a/testsuite/tests/ghc-regress/rebindable/rebindable1.hs +++ b/testsuite/tests/ghc-regress/rebindable/rebindable1.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fglasgow-exts -fno-implicit-prelude #-} +{-# OPTIONS -fglasgow-exts -XNoImplicitPrelude #-} module RebindableCase1 where { diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable2.hs b/testsuite/tests/ghc-regress/rebindable/rebindable2.hs index 6eb7666854..c48d2f28b5 100644 --- a/testsuite/tests/ghc-regress/rebindable/rebindable2.hs +++ b/testsuite/tests/ghc-regress/rebindable/rebindable2.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fglasgow-exts -fno-implicit-prelude #-} +{-# OPTIONS -fglasgow-exts -XNoImplicitPrelude #-} module Main where { diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable3.hs b/testsuite/tests/ghc-regress/rebindable/rebindable3.hs index c70e9b9432..f5734d60b3 100644 --- a/testsuite/tests/ghc-regress/rebindable/rebindable3.hs +++ b/testsuite/tests/ghc-regress/rebindable/rebindable3.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fglasgow-exts -fno-implicit-prelude #-} +{-# OPTIONS -fglasgow-exts -XNoImplicitPrelude #-} module Main where { diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable4.hs b/testsuite/tests/ghc-regress/rebindable/rebindable4.hs index 1cc24af20b..96fe8386ab 100644 --- a/testsuite/tests/ghc-regress/rebindable/rebindable4.hs +++ b/testsuite/tests/ghc-regress/rebindable/rebindable4.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fglasgow-exts -fno-implicit-prelude #-} +{-# OPTIONS -fglasgow-exts -XNoImplicitPrelude #-} module Main where { diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable5.hs b/testsuite/tests/ghc-regress/rebindable/rebindable5.hs index 82e7290255..7344ea1333 100644 --- a/testsuite/tests/ghc-regress/rebindable/rebindable5.hs +++ b/testsuite/tests/ghc-regress/rebindable/rebindable5.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fglasgow-exts -fno-implicit-prelude #-} +{-# OPTIONS -fglasgow-exts -XNoImplicitPrelude #-} module Main where { diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable6.hs b/testsuite/tests/ghc-regress/rebindable/rebindable6.hs index 5296b0f76b..2b1b041643 100644 --- a/testsuite/tests/ghc-regress/rebindable/rebindable6.hs +++ b/testsuite/tests/ghc-regress/rebindable/rebindable6.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fglasgow-exts -fno-implicit-prelude #-} +{-# OPTIONS -fglasgow-exts -XNoImplicitPrelude #-} module Main where { diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable7.hs b/testsuite/tests/ghc-regress/rebindable/rebindable7.hs index ca88bfc035..29f791f945 100644 --- a/testsuite/tests/ghc-regress/rebindable/rebindable7.hs +++ b/testsuite/tests/ghc-regress/rebindable/rebindable7.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fno-implicit-prelude #-}
+{-# OPTIONS -XNoImplicitPrelude #-}
-- This one tests rebindable syntax for do-notation
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable8.hs b/testsuite/tests/ghc-regress/rebindable/rebindable8.hs index b1aa0e2348..4177222540 100644 --- a/testsuite/tests/ghc-regress/rebindable/rebindable8.hs +++ b/testsuite/tests/ghc-regress/rebindable/rebindable8.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fno-implicit-prelude -fglasgow-exts #-} +{-# OPTIONS -XNoImplicitPrelude -fglasgow-exts #-} -- Trac #1537 diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable9.hs b/testsuite/tests/ghc-regress/rebindable/rebindable9.hs index 397d14b62e..51a82ab5c8 100644 --- a/testsuite/tests/ghc-regress/rebindable/rebindable9.hs +++ b/testsuite/tests/ghc-regress/rebindable/rebindable9.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fno-implicit-prelude -fglasgow-exts #-} +{-# OPTIONS -XNoImplicitPrelude -fglasgow-exts #-} -- Trac #1537 diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn051.hs b/testsuite/tests/ghc-regress/rename/should_compile/rn051.hs index af395ed732..ee5b53ee8e 100644 --- a/testsuite/tests/ghc-regress/rename/should_compile/rn051.hs +++ b/testsuite/tests/ghc-regress/rename/should_compile/rn051.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fno-implicit-prelude #-} +{-# OPTIONS -XNoImplicitPrelude #-} -- This one crashed GHC 6.6 in lookupDeprec -- See Trac #1128 diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail043.hs b/testsuite/tests/ghc-regress/rename/should_fail/rnfail043.hs index b8fc8cced8..492cebb516 100644 --- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail043.hs +++ b/testsuite/tests/ghc-regress/rename/should_fail/rnfail043.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fth #-}
+{-# LANGUAGE TemplateHaskell #-}
-- Duplicate bindings introduced one at a time with TH
module ShouldFail where
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl007.hs b/testsuite/tests/ghc-regress/simplCore/should_compile/simpl007.hs index 1eb1a42753..487f544e2d 100644 --- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl007.hs +++ b/testsuite/tests/ghc-regress/simplCore/should_compile/simpl007.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances -fallow-overlapping-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE OverlappingInstances, UndecidableInstances #-} -- module Formula where module Main where diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun010.hs b/testsuite/tests/ghc-regress/simplCore/should_run/simplrun010.hs index 412e607cb6..f263cd237f 100644 --- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun010.hs +++ b/testsuite/tests/ghc-regress/simplCore/should_run/simplrun010.hs @@ -1,4 +1,5 @@ -{-# OPTIONS_GHC -fffi -fglasgow-exts #-} +{-# OPTIONS_GHC -fglasgow-exts #-} +{-# LANGUAGE ForeignFunctionInterface #-} -- From trac #1947 diff --git a/testsuite/tests/ghc-regress/th/TH_dupdecl.hs b/testsuite/tests/ghc-regress/th/TH_dupdecl.hs index 0808f15d0d..80f1da4068 100644 --- a/testsuite/tests/ghc-regress/th/TH_dupdecl.hs +++ b/testsuite/tests/ghc-regress/th/TH_dupdecl.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fth #-} +{-# LANGUAGE TemplateHaskell #-} -- Two sliced declarations bind the same variable. -- This test checks that there's a reasonable error message diff --git a/testsuite/tests/ghc-regress/th/TH_exn1.hs b/testsuite/tests/ghc-regress/th/TH_exn1.hs index 6b02c907ae..b401ca40d5 100644 --- a/testsuite/tests/ghc-regress/th/TH_exn1.hs +++ b/testsuite/tests/ghc-regress/th/TH_exn1.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fth #-} +{-# LANGUAGE TemplateHaskell #-} -- Test error message when the code in a splice -- fails in an immediate fashion (e.g. with a diff --git a/testsuite/tests/ghc-regress/th/TH_exn2.hs b/testsuite/tests/ghc-regress/th/TH_exn2.hs index 47c0044447..ce742d906e 100644 --- a/testsuite/tests/ghc-regress/th/TH_exn2.hs +++ b/testsuite/tests/ghc-regress/th/TH_exn2.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fth #-} +{-# LANGUAGE TemplateHaskell #-} -- Test error message when the code in a splice -- fails in a lazy fashion (e.g. a (head []) diff --git a/testsuite/tests/ghc-regress/th/TH_fail.hs b/testsuite/tests/ghc-regress/th/TH_fail.hs index a212e54739..174939c5cb 100644 --- a/testsuite/tests/ghc-regress/th/TH_fail.hs +++ b/testsuite/tests/ghc-regress/th/TH_fail.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fth #-} +{-# LANGUAGE TemplateHaskell #-} -- Test for sane reporting on TH code giving up. diff --git a/testsuite/tests/ghc-regress/th/TH_genEx.hs b/testsuite/tests/ghc-regress/th/TH_genEx.hs index 0e4a1a114f..fdc47960ad 100644 --- a/testsuite/tests/ghc-regress/th/TH_genEx.hs +++ b/testsuite/tests/ghc-regress/th/TH_genEx.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fth -ddump-splices -XExistentialQuantification #-} +{-# OPTIONS -ddump-splices -XExistentialQuantification #-} +{-# LANGUAGE TemplateHaskell #-} module TH_genEx where diff --git a/testsuite/tests/ghc-regress/th/TH_genEx.stderr b/testsuite/tests/ghc-regress/th/TH_genEx.stderr index fb281fa4ea..41b02c1fdf 100644 --- a/testsuite/tests/ghc-regress/th/TH_genEx.stderr +++ b/testsuite/tests/ghc-regress/th/TH_genEx.stderr @@ -2,6 +2,6 @@ TH_genEx.hs:1:0: TH_genEx.hs:1:0: Splicing declarations genAny (reify 'MyInterface) ======> - TH_genEx.hs:12:2-29 + TH_genEx.hs:13:2-29 data AnyMyInterface1111 = forall a. (TH_genEx.MyInterface a) => AnyMyInterface1111 a diff --git a/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleB.hs b/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleB.hs index e2426e3ba2..9aaffb613f 100644 --- a/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleB.hs +++ b/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleB.hs @@ -1,5 +1,6 @@ -{-# OPTIONS -fth #-} +{-# LANGUAGE TemplateHaskell #-} + module ModuleB where import ModuleC diff --git a/testsuite/tests/ghc-regress/th/TH_mkName.hs b/testsuite/tests/ghc-regress/th/TH_mkName.hs index c08caa0c4b..44cddc89aa 100644 --- a/testsuite/tests/ghc-regress/th/TH_mkName.hs +++ b/testsuite/tests/ghc-regress/th/TH_mkName.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fth #-} +{-# LANGUAGE TemplateHaskell #-} -- Test name quoting and splicing, for built-in syntax diff --git a/testsuite/tests/ghc-regress/th/TH_recompile/Makefile b/testsuite/tests/ghc-regress/th/TH_recompile/Makefile index 26e83ef303..427413ca73 100644 --- a/testsuite/tests/ghc-regress/th/TH_recompile/Makefile +++ b/testsuite/tests/ghc-regress/th/TH_recompile/Makefile @@ -14,9 +14,9 @@ clean: TH_recompile: $(MAKE) clean cp Sub1.hs Sub.hs - ghc -v0 --make -fth Main.hs -o test + ghc -v0 --make -XTemplateHaskell Main.hs -o test cp Sub2.hs Sub.hs - ghc -v0 --make -fth Main.hs -o test2 + ghc -v0 --make -XTemplateHaskell Main.hs -o test2 ./test ./test2 diff --git a/testsuite/tests/ghc-regress/th/TH_recompile/all.T b/testsuite/tests/ghc-regress/th/TH_recompile/all.T index d3f4e82889..abbc6fa060 100644 --- a/testsuite/tests/ghc-regress/th/TH_recompile/all.T +++ b/testsuite/tests/ghc-regress/th/TH_recompile/all.T @@ -1,5 +1,5 @@ def f(opts): - opts.extra_hc_opts = '-fth -package template-haskell' + opts.extra_hc_opts = '-XTemplateHaskell -package template-haskell' if (ghc_with_interpreter == 0): opts.skip = 1 diff --git a/testsuite/tests/ghc-regress/th/TH_runIO.hs b/testsuite/tests/ghc-regress/th/TH_runIO.hs index 98f757093f..7a1f4c3d70 100644 --- a/testsuite/tests/ghc-regress/th/TH_runIO.hs +++ b/testsuite/tests/ghc-regress/th/TH_runIO.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fth #-} +{-# LANGUAGE TemplateHaskell #-} -- See Trac #1678 diff --git a/testsuite/tests/ghc-regress/th/TH_spliceD1.hs b/testsuite/tests/ghc-regress/th/TH_spliceD1.hs index a532651642..f641874672 100644 --- a/testsuite/tests/ghc-regress/th/TH_spliceD1.hs +++ b/testsuite/tests/ghc-regress/th/TH_spliceD1.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fth #-} +{-# LANGUAGE TemplateHaskell #-} -- We should get a civilised report of conflicting variable -- bindings in the definition spliced in by foo diff --git a/testsuite/tests/ghc-regress/th/TH_spliceD1_Lib.hs b/testsuite/tests/ghc-regress/th/TH_spliceD1_Lib.hs index e42c920648..47ffa4e4e6 100644 --- a/testsuite/tests/ghc-regress/th/TH_spliceD1_Lib.hs +++ b/testsuite/tests/ghc-regress/th/TH_spliceD1_Lib.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fth #-} +{-# LANGUAGE TemplateHaskell #-} + module TH_spliceD1_Lib where import Language.Haskell.TH diff --git a/testsuite/tests/ghc-regress/th/TH_spliceDecl4.hs b/testsuite/tests/ghc-regress/th/TH_spliceDecl4.hs index 17aa86cd8e..becb81b5c7 100644 --- a/testsuite/tests/ghc-regress/th/TH_spliceDecl4.hs +++ b/testsuite/tests/ghc-regress/th/TH_spliceDecl4.hs @@ -1,5 +1,6 @@ -{-# OPTIONS -fglasgow-exts -fth -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE TemplateHaskell, UndecidableInstances #-} module TH_spliceDecl4 where diff --git a/testsuite/tests/ghc-regress/th/TH_spliceDecl4_Lib.hs b/testsuite/tests/ghc-regress/th/TH_spliceDecl4_Lib.hs index 4fd933916e..65433d47bd 100644 --- a/testsuite/tests/ghc-regress/th/TH_spliceDecl4_Lib.hs +++ b/testsuite/tests/ghc-regress/th/TH_spliceDecl4_Lib.hs @@ -1,6 +1,6 @@ -{-# OPTIONS -fglasgow-exts -fth -fallow-undecidable-instances #-} - +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE TemplateHaskell, UndecidableInstances #-} module TH_spliceDecl4_Lib( instanceIncrSelfTuple, diff --git a/testsuite/tests/ghc-regress/th/TH_spliceInst.hs b/testsuite/tests/ghc-regress/th/TH_spliceInst.hs index 65ab7388f0..fd0918ce78 100644 --- a/testsuite/tests/ghc-regress/th/TH_spliceInst.hs +++ b/testsuite/tests/ghc-regress/th/TH_spliceInst.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fth #-} +{-# LANGUAGE TemplateHaskell #-} -- Tickles a GHC 6.4 buglet diff --git a/testsuite/tests/ghc-regress/th/TH_tuple1.hs b/testsuite/tests/ghc-regress/th/TH_tuple1.hs index 88d93f35e7..c3469e4a97 100644 --- a/testsuite/tests/ghc-regress/th/TH_tuple1.hs +++ b/testsuite/tests/ghc-regress/th/TH_tuple1.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fth #-} +{-# LANGUAGE TemplateHaskell #-} -- Test the use of tupleDataName, tupleTypeName diff --git a/testsuite/tests/ghc-regress/th/TH_where.hs b/testsuite/tests/ghc-regress/th/TH_where.hs index c6ff3a267e..94d8db76d4 100644 --- a/testsuite/tests/ghc-regress/th/TH_where.hs +++ b/testsuite/tests/ghc-regress/th/TH_where.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fth #-} +{-# LANGUAGE TemplateHaskell #-} module Main where diff --git a/testsuite/tests/ghc-regress/th/all.T b/testsuite/tests/ghc-regress/th/all.T index 237c9d137a..8fd6bdcf33 100644 --- a/testsuite/tests/ghc-regress/th/all.T +++ b/testsuite/tests/ghc-regress/th/all.T @@ -1,5 +1,5 @@ def f(opts): - opts.extra_hc_opts = '-fth -package template-haskell' + opts.extra_hc_opts = '-XTemplateHaskell -package template-haskell' if (ghc_with_interpreter == 0): opts.skip = 1 diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay1.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay1.hs index 101611f21c..ef73c583e2 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay1.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay1.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} -- Compiles fine. -- Instance selection works fine. diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay2.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay2.hs index b3026d0283..b9eeb09ade 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay2.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay2.hs @@ -1,5 +1,5 @@ {-# OPTIONS -fglasgow-exts #-} -{-# OPTIONS -fallow-undecidable-instances #-} +{-# LANGUAGE UndecidableInstances #-} -- Compilation loops in GHC 6.2! -- While LoopOfTheDay1.hs did compile and work, diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay3.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay3.hs index 429be5f154..71ace47760 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay3.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay3.hs @@ -1,6 +1,5 @@ {-# OPTIONS -fglasgow-exts #-} -{-# OPTIONS -fallow-undecidable-instances #-} -{-# OPTIONS -fallow-overlapping-instances #-} +{-# LANGUAGE OverlappingInstances, UndecidableInstances #-} -- Instances compile fine but instance selection loops in GHC 6.2. -- try: :t foo (T1a 1) diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/Makefile b/testsuite/tests/ghc-regress/typecheck/should_compile/Makefile index 6147eb2ecb..3bd57cc51a 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/Makefile +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/Makefile @@ -3,6 +3,6 @@ include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk tc173: - $(TEST_HC) -c -fglasgow-exts -fallow-undecidable-instances -fallow-overlapping-instances Tc173a.hs - $(TEST_HC) -c -fglasgow-exts -fallow-undecidable-instances -fallow-overlapping-instances Tc173b.hs + $(TEST_HC) -c -fglasgow-exts -XUndecidableInstances -XOverlappingInstances Tc173a.hs + $(TEST_HC) -c -fglasgow-exts -XUndecidableInstances -XOverlappingInstances Tc173b.hs diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc109.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc109.hs index d5f3c8defc..e74a71ade9 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc109.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc109.hs @@ -1,5 +1,6 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} --- -fallow-undecidable-instances because 'b' appears in the context but not the head +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} +-- UndecidableInstances because 'b' appears in the context but not the head module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc117.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc117.hs index 7fa0060bca..b04d296d46 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc117.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc117.hs @@ -1,5 +1,6 @@ -{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-} --- -fallow-undecidable-instanced now needed because the Coverage Condition fails +{-# OPTIONS_GHC -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} +-- UndecidableInstances now needed because the Coverage Condition fails -- !!! Functional dependencies -- This one gave another fail in tcReadMutVar diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc118.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc118.hs index 8157e59ed1..5bf99ec2d4 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc118.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc118.hs @@ -1,9 +1,10 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} -- !!! An instance decl with a context containing a free type variable -- The interest here is that there's a "b" in the instance decl -- context that isn't mentioned in the instance head. --- Hence -fallow-undecidable-instances +-- Hence UndecidableInstances module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.hs index df73abd242..bdf2f3aea8 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.hs @@ -1,5 +1,6 @@ -{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-} --- -fallow-undecidable-instanced now needed because the Coverage Condition fails +{-# OPTIONS_GHC -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} +-- UndecidableInstances now needed because the Coverage Condition fails -- !!! Functional dependency test. Hugs [Apr 2001] fails to typecheck this -- We should infer this type for foo diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.stderr-ghc b/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.stderr-ghc index c2e309ddd0..fc169c33c8 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.stderr-ghc +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.stderr-ghc @@ -1,20 +1,20 @@ -tc125.hs:15:0: +tc125.hs:16:0: Warning: No explicit method nor default method for `add' In the instance declaration for `Add Z a a' -tc125.hs:16:0: +tc125.hs:17:0: Warning: No explicit method nor default method for `add' In the instance declaration for `Add (S a) b (S c)' -tc125.hs:20:0: +tc125.hs:21:0: Warning: No explicit method nor default method for `mul' In the instance declaration for `Mul Z a Z' -tc125.hs:21:0: +tc125.hs:22:0: Warning: No explicit method nor default method for `mul' In the instance declaration for `Mul (S a) b d' -tc125.hs:28:0: +tc125.hs:29:0: Warning: No explicit method nor default method for `add' In the instance declaration for `Add (Q a b) (Q c d) (Q ad_bc bd)' diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.hs index 4fbcede031..d03a030067 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.hs @@ -1,5 +1,6 @@ -{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-} --- -fallow-undecidable-instanced now needed because the Coverage Condition fails +{-# OPTIONS_GHC -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} +-- UndecidableInstances now needed because the Coverage Condition fails -- !!! Functional dependency test. Hugs [Apr 2001] fails to typecheck this -- Rather bizarre example submitted by Jonathon Bell diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.stderr-ghc b/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.stderr-ghc index bd902b626a..0710dfd738 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.stderr-ghc +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.stderr-ghc @@ -1,8 +1,8 @@ -tc126.hs:14:0: +tc126.hs:15:0: Warning: No explicit method nor default method for `bug' In the instance declaration for `Bug (Int -> r) Int r' -tc126.hs:15:0: +tc126.hs:16:0: Warning: No explicit method nor default method for `bug' In the instance declaration for `Bug f (c a) (c r)' diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc152.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc152.hs index 14b8a07702..aa84855ca8 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc152.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc152.hs @@ -1,5 +1,6 @@ -{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-} --- -fallow-undecidable-instanced now needed because the Coverage Condition fails +{-# OPTIONS_GHC -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} +-- -XUndecidableInstances now needed because the Coverage Condition fails -- This one blew up Hugs (Apr 02) diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc176.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc176.hs index 75bc764053..ef74ab735f 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc176.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc176.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-overlapping-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE OverlappingInstances #-} {- With "hugs -98 +o test.hs" gives me: ERROR "test.hs":8 - Cannot justify constraints in instance member binding diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc177.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc177.hs index 2b56d8e6e4..c665bc850d 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc177.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc177.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} -- This is a rather complicated program that uses functional -- dependencies to do Peano arithmetic. diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc179.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc179.hs index 4b1c2463ce..4cefae4d3d 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc179.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc179.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-overlapping-instances -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE OverlappingInstances, UndecidableInstances #-} -- Tests context reduction for existentials diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc180.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc180.hs index 5619d5f7b1..f385a3e5b7 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc180.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc180.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} -- This tests an aspect of functional dependencies, revealing a bug in GHC 6.0.1 -- discovered by Martin Sulzmann diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc181.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc181.hs index 452a316762..69d1cd022f 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc181.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc181.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} -- Example of improvement, due to George Russel diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc187.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc187.hs index 9769b8ab60..b83311b279 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc187.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc187.hs @@ -1,5 +1,6 @@ -{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-} --- -fallow-undecidable-instanced now needed because the Coverage Condition fails +{-# OPTIONS_GHC -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} +-- UndecidableInstances now needed because the Coverage Condition fails -- Hugs failed this functional-dependency test -- Reported by Iavor Diatchki Feb 05 diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc189.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc189.hs index b63032fe63..3f9a2879b0 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc189.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc189.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fno-mono-pat-binds #-} +{-# LANGUAGE NoMonoPatBinds #-} -- Disable experimetal monomorphic pattern bindings -- Nasty test for type signatures diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc192.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc192.hs index 484e18b7b9..351f5ad322 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc192.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc192.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -farrows -cpp #-} +{-# OPTIONS -fglasgow-exts -cpp #-} +{-# LANGUAGE Arrows #-} -- Test infix type notation and arrow notation diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc208.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc208.hs index 2c4dedc2c4..4ad8c2fa31 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc208.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc208.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fimplicit-params #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE ImplicitParams #-} -- This program failed to typecheck in an early version of -- GHC with impredicative polymorphism, but it was fixed by diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc216.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc216.hs index a53ee84bc0..ecfdc04e55 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc216.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc216.hs @@ -1,4 +1,5 @@ -{-# OPTIONS_GHC -fallow-undecidable-instances -fglasgow-exts #-} +{-# OPTIONS_GHC -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} -- Test for trac #816 -- GHC's typechecker loops when trying to type this, resulting in a diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc217.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc217.hs index b9528f7fff..f3bcbb5f13 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc217.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc217.hs @@ -1,4 +1,5 @@ -{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -w #-} +{-# OPTIONS_GHC -fglasgow-exts -w #-} +{-# LANGUAGE UndecidableInstances #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc218.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc218.hs index 56ea16c7a6..ea77525dfc 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc218.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc218.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fimplicit-params #-} +{-# LANGUAGE ImplicitParams #-} module ShouldCompile where diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc219.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc219.hs index 92e0fdb879..638f1b6e1e 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc219.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc219.hs @@ -1,9 +1,9 @@ -{-# OPTIONS -fimplicit-params -fno-monomorphism-restriction #-} +{-# LANGUAGE ImplicitParams, NoMonomorphismRestriction #-} module ShouldCompile where -- c.f. tc218.hs, only no type signature here --- Instead, the -fno-monomorphism-restriction flag +-- Instead, the NoMonomorphismRestriction language bar = show ?c foo = let { ?c = 'x' } in bar diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc222.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc222.hs index 59e1a8fce0..029d3c4db9 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc222.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc222.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fimplicit-params #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE ImplicitParams #-} -- Tests impredivative polymorphism with left-to-right -- flow information; see the uses of "$" diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc229.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc229.hs index 1d6b88f750..00161c82ea 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc229.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc229.hs @@ -3,7 +3,7 @@ -- type variables {-# OPTIONS_GHC -fglasgow-exts #-} -{-# OPTIONS_GHC -fallow-undecidable-instances #-} +{-# LANGUAGE UndecidableInstances #-} module Problem where diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc235.hs b/testsuite/tests/ghc-regress/typecheck/should_compile/tc235.hs index e4040b9068..fb31c128a8 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc235.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/tc235.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} -- Trac #1564 diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail043.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail043.stderr index 9cb3fb9776..ae18a8d6cd 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail043.stderr +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail043.stderr @@ -5,4 +5,4 @@ tcfail043.hs:38:16: Possible cause: the monomorphism restriction applied to the following:
search :: a -> [a] -> Bool (bound at tcfail043.hs:37:0)
Probable fix: give these definition(s) an explicit type signature
- or use -fno-monomorphism-restriction
+ or use -XNoMonomorphismRestriction
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail093.hs b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail093.hs index 48553d3e26..f5e7bc47b2 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail093.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail093.hs @@ -1,5 +1,6 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} --- -fallow-undecidable-instances now needed because the Coverage Condition fails +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} +-- UndecidableInstances now needed because the Coverage Condition fails module ShouldFail where diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail108.hs b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail108.hs index 7230283c67..5ccebde83e 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail108.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail108.hs @@ -1,4 +1,4 @@ --- The instance decl is illegal without -fallow-undecidable-instances +-- The instance decl is illegal without UndecidableInstances module ShouldFail where diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.hs b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.hs index ede2ad65b3..b6561de178 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-overlapping-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE OverlappingInstances #-} module ShouldFail where diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.stderr index daf9e42363..c3e9367e7f 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.stderr +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.stderr @@ -1,13 +1,13 @@ -tcfail121.hs:12:8: +tcfail121.hs:13:8: Overlapping instances for Foo [a] - arising from a use of `op' at tcfail121.hs:12:8-11 + arising from a use of `op' at tcfail121.hs:13:8-11 Matching instances: instance [overlap ok] (Foo a) => Foo [a] - -- Defined at tcfail121.hs:8:0-24 - instance [overlap ok] Foo [Int] -- Defined at tcfail121.hs:9:0-17 + -- Defined at tcfail121.hs:9:0-24 + instance [overlap ok] Foo [Int] -- Defined at tcfail121.hs:10:0-17 (The choice depends on the instantiation of `a' - To pick the first instance above, use -fallow-incoherent-instances + To pick the first instance above, use -XIncoherentInstances when compiling the other instance declarations) In the expression: op x In the definition of `foo': foo x = op x diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail130.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail130.stderr index 75e199e2f1..9b1a94f861 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail130.stderr +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail130.stderr @@ -4,5 +4,5 @@ tcfail130.hs:10:0: the monomorphic top-level binding of `foo': ?x::Int arising from a use of `woggle' at tcfail130.hs:10:6-13 Probable fix: give these definition(s) an explicit type signature - or use -fno-monomorphism-restriction + or use -XNoMonomorphismRestriction When generalising the type(s) for `foo' diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.hs b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.hs index 819a6c38cf..b224a963ac 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} -- This one crashed GHC 6.3 due to an error in TcSimplify.add_ors diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.stderr index ea8e218b02..d9fbe9984a 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.stderr +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.stderr @@ -1,7 +1,7 @@ -tcfail133.hs:67:13: +tcfail133.hs:68:13: No instance for (AddDigit (Zero :@ (One :@ One)) One a) - arising from a use of `add' at tcfail133.hs:67:13-38 + arising from a use of `add' at tcfail133.hs:68:13-38 Possible fix: add an instance declaration for (AddDigit (Zero :@ (One :@ One)) One a) diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.hs b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.hs index 8db5a635b3..aa05dc8bdd 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.hs @@ -1,5 +1,6 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} --- -fallow-undecidable-instances because (L a b) is no smaller than (C a b) +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} +-- UndecidableInstances because (L a b) is no smaller than (C a b) -- This one shows up another rather subtle functional-dependecy -- case. The error is: diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.stderr index d4f0957e33..ec45f843f8 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.stderr +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.stderr @@ -1,8 +1,8 @@ -tcfail138.hs:28:0:
+tcfail138.hs:29:0:
Could not deduce (C a b') from the context (C a b)
arising from the superclasses of an instance declaration
- at tcfail138.hs:28:0
+ at tcfail138.hs:29:0
Possible fix:
add (C a b') to the context of the instance declaration
In the instance declaration for `C (Maybe a) a'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.hs b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.hs index 08cc9b47de..f5e4c2e913 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE UndecidableInstances #-} module Foo where diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.stderr index 13b9a00dac..485d7d4c28 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.stderr +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.stderr @@ -1,9 +1,9 @@ -tcfail143.hs:27:0:
+tcfail143.hs:28:0:
Couldn't match expected type `Z' against inferred type `S Z'
When using functional dependencies to combine
MinMax a Z Z a,
- arising from the instance declaration at tcfail143.hs:10:0
+ arising from the instance declaration at tcfail143.hs:11:0
MinMax (S Z) Z Z Z,
- arising from a use of `extend' at tcfail143.hs:27:5-18
+ arising from a use of `extend' at tcfail143.hs:28:5-18
When generalising the type(s) for `t2'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.hs b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.hs index 59b3bf4db4..5c1c6717e5 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.hs @@ -8,6 +8,6 @@ class C a b where op :: T a -> T b -> Bool -- Repeated type variable in an instance constraint --- should require -fallow-undecidable-instances +-- should require UndecidableInstances instance C a a => Eq (T a) where (==) = op diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.stderr index 1ce72220e1..30a9799bdc 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.stderr +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.stderr @@ -2,5 +2,5 @@ tcfail154.hs:12:0: Variable occurs more often in a constraint than in the instance head in the constraint: C a a - (Use -fallow-undecidable-instances to permit this) + (Use -XUndecidableInstances to permit this) In the instance declaration for `Eq (T a)' diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.hs b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.hs index 92013310fb..7e1fb9d608 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.hs @@ -1,8 +1,8 @@ {-# OPTIONS -fglasgow-exts #-} --- NB: *no* -fallow-undecidable-instances +-- NB: *no* UndecidableInstances -- This one (due to Oleg) made 6.4.1 go into a loop in the typechecker, --- despite the lack of -fallow-undecidable-instances +-- despite the lack of UndecidableInstances -- -- The example corresponds to a type function (realized as a class E -- with functional dependencies) in the context of an instance. diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.stderr index 0a9c42c074..0d78313963 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.stderr +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.stderr @@ -2,11 +2,11 @@ tcfail157.hs:27:0: Variable occurs more often in a constraint than in the instance head in the constraint: E m a b - (Use -fallow-undecidable-instances to permit this) + (Use -XUndecidableInstances to permit this) In the instance declaration for `Foo m (a -> ())' tcfail157.hs:27:0: Variable occurs more often in a constraint than in the instance head in the constraint: Foo m b - (Use -fallow-undecidable-instances to permit this) + (Use -XUndecidableInstances to permit this) In the instance declaration for `Foo m (a -> ())' diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.hs b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.hs index c56889b2f1..7027d13129 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fffi -fglasgow-exts #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE ForeignFunctionInterface #-} -- Kind error messsage should not contain bangs diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.stderr index df13aa18e1..b7d4f31abc 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.stderr +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.stderr @@ -1,5 +1,5 @@ -tcfail162.hs:9:15: +tcfail162.hs:10:15: `ForeignPtr' is not applied to enough type arguments Expected kind `?', but `ForeignPtr' has kind `* -> *' In the data type declaration for `Foo' diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail163.hs b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail163.hs index f65a24eeb8..0097036410 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail163.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail163.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fgenerics #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE Generics #-} -- Derivable type class with a higher-rank method -- Currently this does not work, but it crashed GHC 6.5, so diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail163.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail163.stderr index 4f9e968906..0e93e00d0d 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail163.stderr +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail163.stderr @@ -1,5 +1,5 @@ -tcfail163.hs:11:0: +tcfail163.hs:12:0: Generic method type is too complex match :: forall k. (ChurchEncode k) => diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail166.hs b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail166.hs index 6406577148..5a2d4b8df7 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail166.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail166.hs @@ -1,4 +1,4 @@ --- Without -fscoped-type-variables, this should fail +-- Without -XScopedTypeVariables, this should fail module ShouldFail where diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail170.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail170.stderr index b1167084a2..ab803be0cd 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail170.stderr +++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail170.stderr @@ -2,5 +2,5 @@ tcfail170.hs:7:0: Illegal instance declaration for `C [p] [q]' (the Coverage Condition fails for one of the functional dependencies; - Use -fallow-undecidable-instances to permit this) + Use -XUndecidableInstances to permit this) In the instance declaration for `C [p] [q]' diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun007.hs b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun007.hs index 9a203eab63..2652a0c3ba 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun007.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun007.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fgenerics #-} +{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE Generics #-} -- !!! Test generics module Main where diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun028.hs b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun028.hs index 289b555dd6..8bb6c1f553 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun028.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun028.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances -dcore-lint #-} +{-# OPTIONS -fglasgow-exts -dcore-lint #-} +{-# LANGUAGE UndecidableInstances #-} -- This is a rather exotic functional-dependency test. -- It crashed GHC 5.04.3 with a core-lint error, because diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun030.hs b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun030.hs index 3eaa5d3b90..fe28a33091 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun030.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun030.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fallow-undecidable-instances #-} +{-# LANGUAGE UndecidableInstances #-} -- Test recursive dictionaries diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun032.hs b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun032.hs index f547ce3457..537dc13d0f 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun032.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun032.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-}
+{-# OPTIONS -fglasgow-exts #-}
+{-# LANGUAGE UndecidableInstances #-}
-- This tests the recursive-dictionary stuff.
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun033.hs b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun033.hs index 0cfd5e56b3..bb31ebbf1c 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun033.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun033.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-}
+{-# OPTIONS -fglasgow-exts #-}
+{-# LANGUAGE UndecidableInstances #-}
-- This test made GHC 6.3 build a superclass loop, in
-- the instance ClassA a String declaration
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/testeq2.hs b/testsuite/tests/ghc-regress/typecheck/should_run/testeq2.hs index 08fcd15488..7309f50e42 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/testeq2.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/testeq2.hs @@ -1,6 +1,5 @@ {-# OPTIONS -fglasgow-exts #-} -{-# OPTIONS -fallow-overlapping-instances #-} -{-# OPTIONS -fallow-undecidable-instances #-} +{-# LANGUAGE OverlappingInstances, UndecidableInstances #-} -- -- Test case adopted from the HList library diff --git a/testsuite/tests/ghc-regress/typecheck/testeq1/FakePrelude.hs b/testsuite/tests/ghc-regress/typecheck/testeq1/FakePrelude.hs index 465ae99d02..4cb6524c4e 100644 --- a/testsuite/tests/ghc-regress/typecheck/testeq1/FakePrelude.hs +++ b/testsuite/tests/ghc-regress/typecheck/testeq1/FakePrelude.hs @@ -1,6 +1,5 @@ {-# OPTIONS -fglasgow-exts #-} -{-# OPTIONS -fallow-undecidable-instances #-} -{-# OPTIONS -fallow-overlapping-instances #-} +{-# LANGUAGE OverlappingInstances, UndecidableInstances #-} -- -- Test case adopted from the HList library diff --git a/testsuite/tests/ghc-regress/typecheck/testeq1/Main.hs b/testsuite/tests/ghc-regress/typecheck/testeq1/Main.hs index 7a475a15e2..63cac22547 100644 --- a/testsuite/tests/ghc-regress/typecheck/testeq1/Main.hs +++ b/testsuite/tests/ghc-regress/typecheck/testeq1/Main.hs @@ -1,6 +1,5 @@ {-# OPTIONS -fglasgow-exts #-} -{-# OPTIONS -fallow-overlapping-instances #-} -{-# OPTIONS -fallow-undecidable-instances #-} +{-# LANGUAGE OverlappingInstances, UndecidableInstances #-} -- -- Test case adopted from the HList library diff --git a/testsuite/tests/ghc-regress/typecheck/testeq1/TypeCast.hs b/testsuite/tests/ghc-regress/typecheck/testeq1/TypeCast.hs index c8e454009b..b645bfbc98 100644 --- a/testsuite/tests/ghc-regress/typecheck/testeq1/TypeCast.hs +++ b/testsuite/tests/ghc-regress/typecheck/testeq1/TypeCast.hs @@ -1,5 +1,5 @@ {-# OPTIONS -fglasgow-exts #-} -{-# OPTIONS -fallow-undecidable-instances #-} +{-# LANGUAGE UndecidableInstances #-} -- -- Test case adopted from the HList library diff --git a/testsuite/tests/ghc-regress/typecheck/testeq1/TypeEq.hs b/testsuite/tests/ghc-regress/typecheck/testeq1/TypeEq.hs index 0ecb0d57a5..d8632ed150 100644 --- a/testsuite/tests/ghc-regress/typecheck/testeq1/TypeEq.hs +++ b/testsuite/tests/ghc-regress/typecheck/testeq1/TypeEq.hs @@ -1,6 +1,5 @@ {-# OPTIONS -fglasgow-exts #-} -{-# OPTIONS -fallow-overlapping-instances #-} -{-# OPTIONS -fallow-undecidable-instances #-} +{-# LANGUAGE OverlappingInstances, UndecidableInstances #-} -- -- Test case adopted from the HList library |