Merge branch 'master' into overlapping-tyfams

tests/deriving/should_run/T7931.hs

@@ -0,0 +1,7 @@
+{-# LANGUAGE StandaloneDeriving #-} 
+module Main where 
+
+data A 
+deriving instance Read A 
+
+main = seq (read "" :: A) (return ()) 

tests/deriving/should_run/T7931.stderr

@@ -0,0 +1 @@
+T7931: Derived Read on empty data type

tests/deriving/should_run/all.T

@@ -34,4 +34,5 @@ test('T4528a', normal, compile_and_run, [''])
 test('T5041', normal, compile_and_run, [''])
 test('T5628', exit_code(1), compile_and_run, [''])
 test('T5712', normal, compile_and_run, [''])
+test('T7931', exit_code(1), compile_and_run, [''])
 

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)

tests/ghci/scripts/T7939.hs

@@ -0,0 +1,8 @@
+{-# LANGUAGE TypeFamilies, PolyKinds #-}
+
+module T7939 where
+
+class Foo a where
+   type Bar a
+
+

tests/ghci/scripts/T7939.script

@@ -0,0 +1,3 @@
+:l T7939
+:i Bar
+:k Bar

tests/ghci/scripts/T7939.stdout

@@ -0,0 +1,4 @@
+class Foo (k :: BOX) (a :: k) where
+  type family Bar (k :: BOX) (k :: BOX) (a :: k) :: k
+  	-- Defined at T7939.hs:6:9
+Bar :: k1 -> k

tests/ghci/scripts/all.T

@@ -149,4 +149,5 @@ test('T7586', normal, ghci_script, ['T7586.script'])
 test('T4175', normal, ghci_script, ['T4175.script'])
 test('T7872', normal, ghci_script, ['T7872.script'])
 test('T7873', normal, ghci_script, ['T7873.script'])
+test('T7939', normal, ghci_script, ['T7939.script'])
 

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

tests/ghci/scripts/ghci027.stdout

@@ -1,6 +1,8 @@
-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
-  ...
-  Control.Monad.mplus :: m a -> m a -> m a
+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
+  ...
+  Control.Monad.mplus :: m a -> m a -> m a

tests/rename/should_fail/T7937.hs

@@ -0,0 +1,10 @@
+module T7937 where
+
+-- Without this operator definition, a precedence parsing error is reported.
+-- Perhaps the default precedence is being assumed for the unknown operator?
+-- That seems wrong, since there's no way to know what the precedence will be when
+-- the operator is defined as the programmer intended.
+
+foo = 3 > 4 *** 5 == 6
+
+

tests/rename/should_fail/T7937.stderr

@@ -0,0 +1,4 @@
+
+T7937.hs:8:13:
+    Not in scope: ‛***’
+    Perhaps you meant ‛**’ (imported from Prelude)

tests/rename/should_fail/all.T

@@ -108,3 +108,4 @@ test('T7338', normal, compile_fail, [''])
 test('T7338a', normal, compile_fail, [''])
 test('T7454', normal, compile, [''])
 test('T7906', normal, compile_fail, [''])
+test('T7937', normal, compile_fail, [''])