Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-7.4
http://hackage.haskell.org/trac/ghc/changeset/ac467685bbf045412e22f26261ba20d94c2cebb9 >--------------------------------------------------------------- commit ac467685bbf045412e22f26261ba20d94c2cebb9 Author: Jose Pedro Magalhaes <[email protected]> Date: Mon Jan 16 14:19:16 2012 +0100 Use the new flag -XDataKinds >--------------------------------------------------------------- tests/driver/T4437.hs | 1 + tests/polykinds/PolyKinds01.hs | 3 ++- tests/polykinds/PolyKinds02.hs | 3 ++- tests/polykinds/PolyKinds02.stderr | 2 +- tests/polykinds/PolyKinds05.hs | 2 +- tests/polykinds/PolyKinds06.hs | 2 +- tests/polykinds/PolyKinds07.hs | 2 +- tests/polykinds/PolyKinds09.hs | 2 +- tests/polykinds/PolyKinds10.hs | 2 +- tests/polykinds/PolyKinds11.hs | 2 +- tests/polykinds/PolyKinds12.hs | 2 +- 11 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tests/driver/T4437.hs b/tests/driver/T4437.hs index 8f36f7d..fde9635 100644 --- a/tests/driver/T4437.hs +++ b/tests/driver/T4437.hs @@ -39,6 +39,7 @@ expectedGhcOnlyExtensions = ["ParallelArrays", "AlternativeLayoutRuleTransitional", "MonadComprehensions", "TraditionalRecordSyntax", + "DataKinds", "PolyKinds", "CApiFFI"] diff --git a/tests/polykinds/PolyKinds01.hs b/tests/polykinds/PolyKinds01.hs index 2f5f1e8..918e5a9 100644 --- a/tests/polykinds/PolyKinds01.hs +++ b/tests/polykinds/PolyKinds01.hs @@ -1,4 +1,5 @@ -{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE KindSignatures #-} {-# LANGUAGE GADTs #-} module PolyKinds01 where diff --git a/tests/polykinds/PolyKinds02.hs b/tests/polykinds/PolyKinds02.hs index 259b53e..6a5559c 100644 --- a/tests/polykinds/PolyKinds02.hs +++ b/tests/polykinds/PolyKinds02.hs @@ -1,4 +1,5 @@ -{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE KindSignatures #-} {-# LANGUAGE GADTs #-} module PolyKinds02 where diff --git a/tests/polykinds/PolyKinds02.stderr b/tests/polykinds/PolyKinds02.stderr index 7c73222..3c61552 100644 --- a/tests/polykinds/PolyKinds02.stderr +++ b/tests/polykinds/PolyKinds02.stderr @@ -1,5 +1,5 @@ -PolyKinds02.hs:12:16: +PolyKinds02.hs:13:16: Kind mis-match The second argument of `Vec' should have kind `Nat', but `Nat' has kind `*' diff --git a/tests/polykinds/PolyKinds05.hs b/tests/polykinds/PolyKinds05.hs index f86433c..50bea43 100644 --- a/tests/polykinds/PolyKinds05.hs +++ b/tests/polykinds/PolyKinds05.hs @@ -5,5 +5,5 @@ module PolyKinds05 where data A f data B = B1 (A Maybe) --- Should fail. We have -XPolyKinds on, so `A` gets the polymorphic kind +-- Should work. We have -XPolyKinds on, so `A` gets the polymorphic kind -- forall k. k -> * diff --git a/tests/polykinds/PolyKinds06.hs b/tests/polykinds/PolyKinds06.hs index b89d3fb..9691d45 100644 --- a/tests/polykinds/PolyKinds06.hs +++ b/tests/polykinds/PolyKinds06.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} module PolyKinds06 where diff --git a/tests/polykinds/PolyKinds07.hs b/tests/polykinds/PolyKinds07.hs index b132b09..27d0ace 100644 --- a/tests/polykinds/PolyKinds07.hs +++ b/tests/polykinds/PolyKinds07.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} module PolyKinds07 where diff --git a/tests/polykinds/PolyKinds09.hs b/tests/polykinds/PolyKinds09.hs index 4b6f412..b874d5c 100644 --- a/tests/polykinds/PolyKinds09.hs +++ b/tests/polykinds/PolyKinds09.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE GADTs #-} diff --git a/tests/polykinds/PolyKinds10.hs b/tests/polykinds/PolyKinds10.hs index b573532..b023fd0 100644 --- a/tests/polykinds/PolyKinds10.hs +++ b/tests/polykinds/PolyKinds10.hs @@ -5,7 +5,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} module Main where diff --git a/tests/polykinds/PolyKinds11.hs b/tests/polykinds/PolyKinds11.hs index c7eea5b..f80fa3f 100644 --- a/tests/polykinds/PolyKinds11.hs +++ b/tests/polykinds/PolyKinds11.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} module PolyKinds11 where diff --git a/tests/polykinds/PolyKinds12.hs b/tests/polykinds/PolyKinds12.hs index 736f584..4d18551 100644 --- a/tests/polykinds/PolyKinds12.hs +++ b/tests/polykinds/PolyKinds12.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE PolyKinds, TypeFamilies, GADTs #-} +{-# LANGUAGE DataKinds, PolyKinds, TypeFamilies, GADTs #-} module PolyKinds12 where _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
