Replace Rank2Types and PolymorphicComponents by RankNTypes

testsuite/tests/deSugar/should_compile/ds050.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldCompile where
 

testsuite/tests/gadt/doaitse.hs

 {-# LANGUAGE GADTs, ExistentialQuantification, ScopedTypeVariables,
-             Rank2Types #-}
+             RankNTypes #-}
 
 -- Here's an example from Doaitse Swiestra (Sept 06)
 -- which requires use of scoped type variables

testsuite/tests/gadt/gadt1.hs

-{-# LANGUAGE GADTs, Rank2Types #-}
+{-# LANGUAGE GADTs, RankNTypes #-}
 
 module ShouldCompile where
 

testsuite/tests/gadt/gadt21.hs

-{-# LANGUAGE GADTs, ExistentialQuantification, KindSignatures, Rank2Types #-}
+{-# LANGUAGE GADTs, ExistentialQuantification, KindSignatures, RankNTypes #-}
 
 -- Fails (needs the (Ord a) in TypeSet 
 -- c.f. gadt22.hs

testsuite/tests/gadt/gadt22.hs

-{-# LANGUAGE GADTs, ExistentialQuantification, KindSignatures, Rank2Types #-}
+{-# LANGUAGE GADTs, ExistentialQuantification, KindSignatures, RankNTypes #-}
 
 -- Succeeds (needs the (Ord a) in TypeSet 
 -- c.f. gadt21.hs

testsuite/tests/gadt/nbe.hs

-{-# LANGUAGE GADTs, Rank2Types #-}
+{-# LANGUAGE GADTs, RankNTypes #-}
 
 module Main where
 

testsuite/tests/gadt/termination.hs

-{-# LANGUAGE GADTs, Rank2Types #-}
+{-# LANGUAGE GADTs, RankNTypes #-}
 
 module Termination where
 

testsuite/tests/ghci.debugger/scripts/print012.script

-:set -XGADTs -XRank2Types -XExistentialQuantification -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
+:set -XGADTs -XRankNTypes -XExistentialQuantification -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
 :l ../GADT
 :a ../Test
 :m +Main

testsuite/tests/ghci.debugger/scripts/print013.script

 -- Test handling of extra fields in the representation due to dictionaries
 
-:set -XGADTs -XRank2Types
+:set -XGADTs -XRankNTypes
 :l ../GADT
 
 let d = DictN (1 :: Integer)

testsuite/tests/ghci.debugger/scripts/print014.script

 -- Test handling of extra fields in the representation due to existentials.
 
-:set -XGADTs -XRank2Types
+:set -XGADTs -XRankNTypes
 :l ../GADT
 
 let e = Exist 1

testsuite/tests/ghci.debugger/scripts/print034.script

 -- More GADT goodness
 
-:set -XGADTs -XRank2Types -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
+:set -XGADTs -XRankNTypes -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
 :l ../GADT
 :a ../Test
 :m +Main

testsuite/tests/ghci/prog008/A.hs

-{-# LANGUAGE Rank2Types, MultiParamTypeClasses #-}
+{-# LANGUAGE RankNTypes, MultiParamTypeClasses #-}
 
 -- Tests a bug spotted by Claus in which the type
 -- of c3 was wrongly displayed in GHCi as

testsuite/tests/ghci/scripts/ghci025.hs

-{-# LANGUAGE Rank2Types, MultiParamTypeClasses #-}
+{-# LANGUAGE RankNTypes, MultiParamTypeClasses #-}
 
 module T where
 

testsuite/tests/haddock/haddock_examples/test.T

@@ -3,4 +3,4 @@ test('haddock.Test',
       extra_clean(['Test.hi', 'Test.o', 'Hidden.hi', 'Hidden.o',
                    'Visible.hi', 'Visible.o'])],
      multimod_compile,
-     ['Test Hidden Visible', '-XRank2Types -XExistentialQuantification -haddock -ddump-parsed'])
+     ['Test Hidden Visible', '-XRankNTypes -XExistentialQuantification -haddock -ddump-parsed'])

testsuite/tests/haddock/should_compile_flag_haddock/all.T

@@ -23,8 +23,8 @@ test('haddockA022', normal, compile, ['-haddock -ddump-parsed'])
 test('haddockA023', normal, compile, ['-haddock -ddump-parsed'])
 test('haddockA024', normal, compile, ['-haddock -ddump-parsed'])
 test('haddockA025', normal, compile, ['-haddock -ddump-parsed'])
-test('haddockA026', normal, compile, ['-haddock -ddump-parsed -XRank2Types'])
-test('haddockA027', normal, compile, ['-haddock -ddump-parsed -XRank2Types'])
+test('haddockA026', normal, compile, ['-haddock -ddump-parsed -XRankNTypes'])
+test('haddockA027', normal, compile, ['-haddock -ddump-parsed -XRankNTypes'])
 test('haddockA028', normal, compile, ['-haddock -ddump-parsed -XTypeOperators'])
 test('haddockA029', normal, compile, ['-haddock -ddump-parsed'])
 test('haddockA030', normal, compile, ['-haddock -ddump-parsed'])

testsuite/tests/haddock/should_compile_noflag_haddock/all.T

@@ -23,8 +23,8 @@ test('haddockC022', normal, compile, [''])
 test('haddockC023', normal, compile, [''])
 test('haddockC024', normal, compile, [''])
 test('haddockC025', normal, compile, [''])
-test('haddockC026', normal, compile, ['-XRank2Types'])
-test('haddockC027', normal, compile, ['-XRank2Types'])
+test('haddockC026', normal, compile, ['-XRankNTypes'])
+test('haddockC027', normal, compile, ['-XRankNTypes'])
 test('haddockC028', normal, compile, ['-XTypeOperators'])
 test('haddockC029', normal, compile, [''])
 test('haddockC030', normal, compile, [''])

testsuite/tests/indexed-types/should_compile/Roman1.hs

-{-# LANGUAGE TypeFamilies, Rank2Types #-}
+{-# LANGUAGE TypeFamilies, RankNTypes #-}
 
 -- This test made the type checker produce an
 -- ill-kinded coercion term.

testsuite/tests/indexed-types/should_compile/T3787.hs

@@ -16,7 +16,7 @@
 
 -- | Module "Trampoline" defines the trampoline computations and their basic building blocks.
 
-{-# LANGUAGE ScopedTypeVariables, Rank2Types, MultiParamTypeClasses, TypeFamilies, KindSignatures,
+{-# LANGUAGE ScopedTypeVariables, RankNTypes, MultiParamTypeClasses, TypeFamilies, KindSignatures,
              FlexibleContexts, FlexibleInstances, OverlappingInstances, UndecidableInstances
  #-}
 

testsuite/tests/indexed-types/should_compile/T4120.hs

-{-# LANGUAGE Rank2Types, TypeFamilies #-}
+{-# LANGUAGE RankNTypes, TypeFamilies #-}
 
 -- Unification yielding a coercion under a forall
 

testsuite/tests/indexed-types/should_compile/T4178.hs

 {-# LANGUAGE
 	FlexibleContexts,
-	Rank2Types,
+	RankNTypes,
 	TypeFamilies,
 	MultiParamTypeClasses,
 	FlexibleInstances #-}

testsuite/tests/indexed-types/should_compile/T4358.hs

-{-# LANGUAGE TypeFamilies, Rank2Types, FlexibleContexts #-}
+{-# LANGUAGE TypeFamilies, RankNTypes, FlexibleContexts #-}
 
 module T4358 where
 

testsuite/tests/indexed-types/should_compile/T4935.hs

-{-# LANGUAGE TypeFamilies, Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE TypeFamilies, RankNTypes, ScopedTypeVariables #-}
 module T4935 where
 
 import Control.Applicative

testsuite/tests/indexed-types/should_compile/T7280.hs

-{-# LANGUAGE Rank2Types, MultiParamTypeClasses, FlexibleContexts,
+{-# LANGUAGE RankNTypes, MultiParamTypeClasses, FlexibleContexts,
    TypeFamilies, ScopedTypeVariables #-}
 
 module T7280 where

testsuite/tests/indexed-types/should_fail/SimpleFail12.hs

-{-# LANGUAGE TypeFamilies, Rank2Types #-}
+{-# LANGUAGE TypeFamilies, RankNTypes #-}
 
 
 module ShouldFail where

testsuite/tests/indexed-types/should_fail/T5439.hs

@@ -3,7 +3,7 @@
 {-# LANGUAGE EmptyDataDecls #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE MultiParamTypeClasses #-}

testsuite/tests/rebindable/rebindable6.hs

-{-# LANGUAGE RebindableSyntax, NPlusKPatterns, Rank2Types,
+{-# LANGUAGE RebindableSyntax, NPlusKPatterns, RankNTypes,
              ScopedTypeVariables, FlexibleInstances #-}
 module Main where
 	{

testsuite/tests/rename/should_fail/mc13.hs

@@ -2,7 +2,7 @@
 --
 -- Test trying to use a function bound in the list comprehension as the transform function
 
-{-# OPTIONS_GHC -XRank2Types -XMonadComprehensions -XTransformListComp #-}
+{-# OPTIONS_GHC -XRankNTypes -XMonadComprehensions -XTransformListComp #-}
 
 module RnFail048 where
 

testsuite/tests/rename/should_fail/mc14.hs

@@ -2,7 +2,7 @@
 --
 -- Test trying to use a function bound in the list comprehension as the group function
 
-{-# OPTIONS_GHC -XRank2Types -XMonadComprehensions -XTransformListComp #-}
+{-# OPTIONS_GHC -XRankNTypes -XMonadComprehensions -XTransformListComp #-}
 
 module RnFail049 where
 

testsuite/tests/rename/should_fail/rnfail026.hs

-{-# LANGUAGE Rank2Types, FlexibleInstances #-}
+{-# LANGUAGE RankNTypes, FlexibleInstances #-}
 
 -- This one made ghc-4.08 crash 
 -- rename/RnEnv.lhs:239: Non-exhaustive patterns in function get_tycon_key

testsuite/tests/rename/should_fail/rnfail049.hs

 -- Test trying to use a function bound in the list comprehension as the group function
 
-{-# OPTIONS_GHC -XRank2Types -XTransformListComp #-}
+{-# OPTIONS_GHC -XRankNTypes -XTransformListComp #-}
 
 module RnFail049 where
 

testsuite/tests/rename/should_fail/rnfail050.hs

 -- Test trying to use a function bound in the list comprehension as the transform function
 
-{-# OPTIONS_GHC -XRank2Types -XTransformListComp #-}
+{-# OPTIONS_GHC -XRankNTypes -XTransformListComp #-}
 
 module RnFail048 where
 

testsuite/tests/simplCore/should_compile/T5359a.hs

-{-# LANGUAGE BangPatterns, Rank2Types, MagicHash, UnboxedTuples #-}
+{-# LANGUAGE BangPatterns, RankNTypes, MagicHash, UnboxedTuples #-}
 
 module T5359a (linesT) where
 

testsuite/tests/simplCore/should_compile/simpl009.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 {-# OPTIONS_GHC -dcore-lint #-}
 
 -- This one killed GHC 6.0, with a "panic: applyTys"

testsuite/tests/simplCore/should_compile/simpl011.hs

-{-# LANGUAGE CPP, Rank2Types, ScopedTypeVariables, KindSignatures,
+{-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables, KindSignatures,
              MultiParamTypeClasses, FunctionalDependencies #-}
 
 -- This one triggered a bug in the indirection-shorting 

testsuite/tests/simplCore/should_compile/simpl014.hs

-{-# LANGUAGE Rank2Types, GADTs, FlexibleContexts #-}
+{-# LANGUAGE RankNTypes, GADTs, FlexibleContexts #-}
 {-# OPTIONS_GHC -O2 #-}
 
 -- This one make SpecConstr generate bogus code (hence -O2), 

testsuite/tests/typecheck/should_compile/T2494-2.hs

-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- Trac #2494, should compile ok
 

testsuite/tests/typecheck/should_compile/T2494.hs

-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- Trac #2494, should generate an error message
 

testsuite/tests/typecheck/should_compile/T2683.hs

 {-# LANGUAGE ExistentialQuantification, MultiParamTypeClasses,
-             FunctionalDependencies, Rank2Types #-}
+             FunctionalDependencies, RankNTypes #-}
 
 module Q where
 

testsuite/tests/typecheck/should_compile/T3018.hs

 {-# LANGUAGE OverlappingInstances , UndecidableInstances, EmptyDataDecls #-}
-{-# LANGUAGE Rank2Types, KindSignatures, MultiParamTypeClasses, FlexibleInstances #-}
+{-# LANGUAGE RankNTypes, KindSignatures, MultiParamTypeClasses, FlexibleInstances #-}
 
 -- Works with new constraint solver
 

testsuite/tests/typecheck/should_compile/T4355.hs

-{-# LANGUAGE DeriveDataTypeable, ExistentialQuantification, Rank2Types, MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, FlexibleContexts, PatternGuards, DatatypeContexts #-}
+{-# LANGUAGE DeriveDataTypeable, ExistentialQuantification, RankNTypes, MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, FlexibleContexts, PatternGuards, DatatypeContexts #-}
 
 module T4355 where
 

testsuite/tests/typecheck/should_compile/T5655.hs

-{-# LANGUAGE TypeFamilies, GADTs, ConstraintKinds, Rank2Types #-}
+{-# LANGUAGE TypeFamilies, GADTs, ConstraintKinds, RankNTypes #-}
 module T5655 where
 
 import GHC.Prim (Constraint)

testsuite/tests/typecheck/should_compile/faxen.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- A classic test for type inference
 -- Taken from "Haskell and principal types", Section 3

testsuite/tests/typecheck/should_compile/tc087.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldSucceed where
 

testsuite/tests/typecheck/should_compile/tc092.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldSucceed where
 

testsuite/tests/typecheck/should_compile/tc097.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 -- !!! Local universal quantification.
 module ShouldSucceed where
 

testsuite/tests/typecheck/should_compile/tc102.hs

-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- !!! Caused ghc-4.04proto to report a bogus type error
 -- !!! (as reported by Keith)

testsuite/tests/typecheck/should_compile/tc105.hs

-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 module ShouldCompile where
 

testsuite/tests/typecheck/should_compile/tc124.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- !!! Rank 2 polymorphism
 -- Both f and g are rejected by Hugs [April 2001]

testsuite/tests/typecheck/should_compile/tc140.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- Make sure for-alls can occur in data types
 

testsuite/tests/typecheck/should_compile/tc144.hs

-{-# LANGUAGE ImplicitParams, Rank2Types #-}
+{-# LANGUAGE ImplicitParams, RankNTypes #-}
 
 -- Rank-2 types with implicit parameters.
 -- GHC 5.02 erroneously rejected this

testsuite/tests/typecheck/should_compile/tc146.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- The interesting thign about this one is that
 -- there's an unbound type variable of kind *->*

testsuite/tests/typecheck/should_compile/tc148.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- This program tickled a bug in 5.02.2's forall-lifting
 

testsuite/tests/typecheck/should_compile/tc157.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- Test silly type synonyms
 

testsuite/tests/typecheck/should_compile/tc160.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 --Tests alpha-renaming in with extended type-synonyms
 

testsuite/tests/typecheck/should_compile/tc161.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 -- Blew up GHC 5.04, with:
 --    Ambiguous type variable(s) `q' in the constraint `Foo q'
 --    arising from a function with an overloaded argument type at Foo.hs:7

testsuite/tests/typecheck/should_compile/tc162.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- These ones failed with 5.04.  They need a coercion
 -- in the pattern matching compiler, so they are a bit

testsuite/tests/typecheck/should_compile/tc166.hs

 {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies,
-             ExistentialQuantification, Rank2Types,
+             ExistentialQuantification, RankNTypes,
              FlexibleInstances #-}
 
 -- Arguably, the type signature for f1 should be enough to make

testsuite/tests/typecheck/should_compile/tc183.hs

-{-# LANGUAGE ExistentialQuantification, Rank2Types #-}
+{-# LANGUAGE ExistentialQuantification, RankNTypes #-}
 
 -- An interesting interaction of universals and existentials, prompted by 
 -- http://www.haskell.org/pipermail/haskell-cafe/2004-October/007160.html

testsuite/tests/typecheck/should_compile/tc194.hs

-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- Tests the special case of
 -- 	non-recursive, function binding, 

testsuite/tests/typecheck/should_compile/tc198.hs

-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- This should work, because the type sig and the type
 -- in the pattern match exactly

testsuite/tests/typecheck/should_compile/tc203.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- Check that we can have a forall after a forall
 

testsuite/tests/typecheck/should_compile/tc206.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- This one showed up a bug in pre-subsumption
 

testsuite/tests/typecheck/should_compile/tc208.hs

-{-# LANGUAGE ImplicitParams, Rank2Types #-}
+{-# LANGUAGE ImplicitParams, RankNTypes #-}
 
 -- This program failed to typecheck in an early version of
 -- GHC with impredicative polymorphism, but it was fixed by

testsuite/tests/typecheck/should_compile/tc210.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldCompile where
 

testsuite/tests/typecheck/should_compile/tc213.hs

-{-# LANGUAGE Rank2Types, ScopedTypeVariables, FlexibleInstances,
+{-# LANGUAGE RankNTypes, ScopedTypeVariables, FlexibleInstances,
              MultiParamTypeClasses, FunctionalDependencies #-}
 
 -- This tests scoped type variables, used in an expression 

testsuite/tests/typecheck/should_compile/tc222.hs

-{-# LANGUAGE ImplicitParams, Rank2Types #-}
+{-# LANGUAGE ImplicitParams, RankNTypes #-}
 
 -- Tests impredivative polymorphism with left-to-right
 -- flow information; see the uses of "$"

testsuite/tests/typecheck/should_compile/tc229.hs

@@ -2,7 +2,7 @@
 -- trac #1406: Constraint doesn't reduce in the presence of quantified
 --             type variables
 
-{-# LANGUAGE FlexibleInstances, UndecidableInstances, Rank2Types,
+{-# LANGUAGE FlexibleInstances, UndecidableInstances, RankNTypes,
              MultiParamTypeClasses, FunctionalDependencies #-}
 
 module Problem where

testsuite/tests/typecheck/should_compile/tc233.hs

 
-{-# OPTIONS_GHC -XPolymorphicComponents #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldCompile where
 

testsuite/tests/typecheck/should_compile/tc236.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldCompile where
 

testsuite/tests/typecheck/should_fail/T7019.hs

 {-# LANGUAGE FlexibleInstances    #-}
 {-# LANGUAGE TypeFamilies         #-}
-{-# LANGUAGE Rank2Types           #-}
+{-# LANGUAGE RankNTypes           #-}
 {-# LANGUAGE ConstraintKinds      #-}
 {-# LANGUAGE UndecidableInstances #-}
 

testsuite/tests/typecheck/should_fail/T7019a.hs

 {-# LANGUAGE FlexibleInstances    #-}
 {-# LANGUAGE TypeFamilies         #-}
-{-# LANGUAGE Rank2Types           #-}
+{-# LANGUAGE RankNTypes           #-}
 
 module T7019a where
 

testsuite/tests/typecheck/should_fail/tcfail076.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 {- 
 	From: Ralf Hinze <ralf@uran.informatik.uni-bonn.de>

testsuite/tests/typecheck/should_fail/tcfail088.hs

-{-# LANGUAGE Rank2Types, FlexibleInstances #-}
+{-# LANGUAGE RankNTypes, FlexibleInstances #-}
 
 -- !!! Check that forall types can't be arguments
 module ShouldFail where

testsuite/tests/typecheck/should_fail/tcfail104.hs

-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- Test the handling of conditionals in rank-n stuff
 -- Should fail, regardless of branch ordering

testsuite/tests/typecheck/should_fail/tcfail110.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldCompile where
 

testsuite/tests/typecheck/should_fail/tcfail122.hs

-{-# LANGUAGE Rank2Types, KindSignatures #-}
+{-# LANGUAGE RankNTypes, KindSignatures #-}
 
 module ShouldFail where
 

testsuite/tests/typecheck/should_fail/tcfail188.hs

-{-# LANGUAGE Rank2Types, KindSignatures #-}
+{-# LANGUAGE RankNTypes, KindSignatures #-}
 {-# OPTIONS_GHC -Werror #-}
 
 -- Trac #959

testsuite/tests/typecheck/should_fail/tcfail201.hs

-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 
 -- Claus reported by email that