Merge branch 'master' of http://darcs.haskell.org//testsuite

Conflicts:
	tests/polykinds/all.T
	tests/simplCore/should_run/T5915.stdout

testsuite/tests/polykinds/PolyKinds06.hs

-{-# LANGUAGE DataKinds                  #-}
+{-# LANGUAGE DataKinds, KindSignatures  #-}
 {-# LANGUAGE GADTs                      #-}
 
 module PolyKinds06 where

testsuite/tests/polykinds/T5935.hs

+{-# LANGUAGE PolyKinds,
+             GADTs,
+             DataKinds,
+             KindSignatures
+ #-}
+
+module T5935 where
+
+data SList a where
+  SNil :: SList '[]
+
+x :: SList ('[] :: [Bool])
+x = SNil

testsuite/tests/polykinds/all.T

@@ -30,4 +30,6 @@ test('T5912', normal, compile, [''])
 test('T5881', normal, run_command, ['$MAKE -s --no-print-directory T5881'])
 test('T5716', normal, compile_fail, [''])
 test('T5937', normal, compile, [''])
+test('T5935', normal, compile, [''])
+
 

testsuite/tests/simplCore/should_run/T5915.stdout

-[0]
+[0]

testsuite/tests/th/T1541.hs

+{-# LANGUAGE TemplateHaskell #-}
+module T1541 where
+
+$( [d|  infixr 3 +++
+        (+++) :: Int -> Bool -> Bool
+        (+++) x y = error "ruk"
+   |])
+
+-- This definition will only typecheck if the
+-- the fixity of (+++) is infixr
+foo p q r = p +++ q +++ r

testsuite/tests/th/T5882.hs

+{-# LANGUAGE GADTSyntax, TemplateHaskell, KindSignatures #-}
+
+module T5882 where
+data Foo :: * -> * where
+   Foo :: a -> Foo a
+
+$( [d|  data Bar :: * -> * where
+           Bar :: a -> Bar a
+  |] )
+
+f (Bar x) = Foo x

testsuite/tests/th/T5883.hs

+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeFamilies    #-}
+module T5883 where
+
+import Language.Haskell.TH
+
+$( [d|
+        data Unit = Unit
+        instance Show Unit where
+          show _ = ""
+          {-# INLINE show #-}
+  |])

testsuite/tests/th/T5883.stderr

+T5883.hs:1:1: Splicing declarations
+    [d| data Unit = Unit
+        
+        instance Show Unit where
+          show _ = ""
+          {-# INLINE show #-} |]
+  ======>
+    T5883.hs:(7,4)-(12,4)
+    data Unit = Unit
+    instance Show Unit where
+      {-# INLINE show #-}
+      show _ = ""

testsuite/tests/th/T5886.hs

+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeFamilies #-}
+
+module T5886 where
+
+import T5886a
+
+$(bang)

testsuite/tests/th/T5886a.hs

+{-# LANGUAGE UnicodeSyntax #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeFamilies #-}
+
+module T5886a where
+
+import Language.Haskell.TH
+
+class C α where
+  type AT α ∷ ★
+
+bang ∷ DecsQ
+bang = return [InstanceD [] (AppT (ConT ''C) (ConT ''Int))
+                [TySynInstD ''AT [ConT ''Int] (ConT ''Int)]]

testsuite/tests/th/all.T

@@ -220,4 +220,9 @@ test('T5665', extra_clean(['T5665a.hi','T5665a.o']),
 test('T5700', extra_clean(['T5700a.hi','T5700a.o']), 
               multimod_compile, ['T5700','-v0 -ddump-splices'])
 test('T5721', normal, compile, ['-v0'])
+test('T1541', normal, compile, ['-v0'])
+test('T5883', normal, compile, ['-v0 -dsuppress-uniques -ddump-splices'])
+test('T5882', normal, compile, ['-v0'])
+test('T5886', extra_clean(['T5886a.hi','T5886a.o']), 
+              multimod_compile, ['T5886','-v0'])