[commit: testsuite] master: Explicit kinds in :info command ===> testsuite wibbles (3152092)

Simon Peyton Jones simonpj at microsoft.com
Tue May 28 10:26:08 CEST 2013


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

https://github.com/ghc/testsuite/commit/3152092d9149388fe580dc042c6acac470d60dd7

>---------------------------------------------------------------

commit 3152092d9149388fe580dc042c6acac470d60dd7
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon May 27 17:33:13 2013 +0100

    Explicit kinds in :info command ===> testsuite wibbles

>---------------------------------------------------------------

 tests/ghci/scripts/T7627.stdout   |    3 ++-
 tests/ghci/scripts/ghci025.stdout |    4 ++--
 tests/ghci/scripts/ghci027.stdout |    6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/ghci/scripts/T7627.stdout b/tests/ghci/scripts/T7627.stdout
index a23781a..351b9ab 100644
--- a/tests/ghci/scripts/T7627.stdout
+++ b/tests/ghci/scripts/T7627.stdout
@@ -18,7 +18,8 @@ instance Functor ((,) a) -- Defined in ‛GHC.Base’
 instance (Ord a, Ord b) => Ord (a, b) -- Defined in ‛GHC.Classes’
 instance (Read a, Read b) => Read (a, b) -- Defined in ‛GHC.Read’
 instance (Show a, Show b) => Show (a, b) -- Defined in ‛GHC.Show’
-data (#,#) a b = (#,#) a b 	-- Defined in ‛GHC.Prim’
+data (#,#) (a :: OpenKind) (b :: OpenKind) = (#,#) a b
+  	-- Defined in ‛GHC.Prim’
 (,) :: a -> b -> (a, b)
 (#,#) :: a -> b -> (# a, b #)
 (  ,  ) :: a -> b -> (a, b)
diff --git a/tests/ghci/scripts/ghci025.stdout b/tests/ghci/scripts/ghci025.stdout
index 3650de2..9308dd3 100644
--- a/tests/ghci/scripts/ghci025.stdout
+++ b/tests/ghci/scripts/ghci025.stdout
@@ -14,7 +14,7 @@ c2 :: (C a b, N b, S b) => a -> b
 c3 :: C a b => forall a1. a1 -> b
 c4 :: C a b => forall a1. a1 -> b
 -- imported via Control.Monad
-class Monad m => MonadPlus m where
+class Monad m => MonadPlus (m :: * -> *) where
   mzero :: m a
   mplus :: m a -> m a -> m a
 mplus :: MonadPlus m => forall a. m a -> m a -> m a
@@ -25,7 +25,7 @@ mzero :: MonadPlus m => forall a. m a
 fail :: Monad m => forall a. GHC.Base.String -> m a
 return :: Monad m => forall a. a -> m a
 -- imported via Control.Monad, Prelude, T
-class Monad m where
+class Monad (m :: * -> *) where
   (>>=) :: m a -> (a -> m b) -> m b
   (>>) :: m a -> m b -> m b
   return :: a -> m a
diff --git a/tests/ghci/scripts/ghci027.stdout b/tests/ghci/scripts/ghci027.stdout
index 2f627b4..0d722c9 100644
--- a/tests/ghci/scripts/ghci027.stdout
+++ b/tests/ghci/scripts/ghci027.stdout
@@ -1,6 +1,8 @@
-class GHC.Base.Monad m => Control.Monad.MonadPlus m where
+class GHC.Base.Monad m =>
+      Control.Monad.MonadPlus (m :: * -> *) where
   ...
   mplus :: m a -> m a -> m a
-class GHC.Base.Monad m => Control.Monad.MonadPlus m where
+class GHC.Base.Monad m =>
+      Control.Monad.MonadPlus (m :: * -> *) where
   ...
   Control.Monad.mplus :: m a -> m a -> m a





More information about the ghc-commits mailing list