summaryrefslogtreecommitdiff
path: root/testsuite/tests/generics
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/tests/generics')
-rw-r--r--testsuite/tests/generics/GEq/GEq1.hs5
-rw-r--r--testsuite/tests/generics/GenDerivOutput.stderr16
-rw-r--r--testsuite/tests/generics/GenDerivOutput1_0.stderr4
-rw-r--r--testsuite/tests/generics/GenDerivOutput1_1.stderr32
-rw-r--r--testsuite/tests/generics/Makefile5
-rw-r--r--testsuite/tests/generics/T10604/T10604_deriving.stderr40
-rw-r--r--testsuite/tests/generics/T15012.hs7
-rw-r--r--testsuite/tests/generics/T15012a.hs11
-rw-r--r--testsuite/tests/generics/all.T2
9 files changed, 78 insertions, 44 deletions
diff --git a/testsuite/tests/generics/GEq/GEq1.hs b/testsuite/tests/generics/GEq/GEq1.hs
index 54867db8ed..1c7e2ca8c3 100644
--- a/testsuite/tests/generics/GEq/GEq1.hs
+++ b/testsuite/tests/generics/GEq/GEq1.hs
@@ -3,6 +3,7 @@
module Main where
+import Data.Kind
import GHC.Exts
import GHC.Generics hiding (C, D)
import GEq1A
@@ -18,14 +19,14 @@ data D a = D0 | D1 { d11 :: a, d12 :: (D a) }
data (:**:) a b = a :**: b
deriving Generic
-data family F a b :: * -> *
+data family F a b :: Type -> Type
data instance F Int b c = F b Int c
deriving Generic
data U a = U a Addr# Char# Double# Float# Int# Word#
deriving Generic
-data family UF a b :: * -> *
+data family UF a b :: Type -> Type
data instance UF Int b c = UF b c Addr# Char# Double# Float# Int# Word#
deriving Generic
diff --git a/testsuite/tests/generics/GenDerivOutput.stderr b/testsuite/tests/generics/GenDerivOutput.stderr
index d531e914f4..9c008e0038 100644
--- a/testsuite/tests/generics/GenDerivOutput.stderr
+++ b/testsuite/tests/generics/GenDerivOutput.stderr
@@ -116,7 +116,7 @@ Derived type family instances:
'GHC.Types.True)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"element")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -124,7 +124,7 @@ Derived type family instances:
(GHC.Generics.Rec0 a)
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"rest")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -146,7 +146,7 @@ Derived type family instances:
'GHC.Types.True)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"element")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -154,7 +154,7 @@ Derived type family instances:
GHC.Generics.Par1
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"rest")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -180,14 +180,14 @@ Derived type family instances:
'GHC.Types.False)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- 'GHC.Base.Nothing
+ 'GHC.Maybe.Nothing
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
(GHC.Generics.Rec0 a)
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- 'GHC.Base.Nothing
+ 'GHC.Maybe.Nothing
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -211,14 +211,14 @@ Derived type family instances:
'GHC.Types.False)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- 'GHC.Base.Nothing
+ 'GHC.Maybe.Nothing
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
GHC.Generics.Par1
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- 'GHC.Base.Nothing
+ 'GHC.Maybe.Nothing
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
diff --git a/testsuite/tests/generics/GenDerivOutput1_0.stderr b/testsuite/tests/generics/GenDerivOutput1_0.stderr
index bf9cf1590c..6090499abf 100644
--- a/testsuite/tests/generics/GenDerivOutput1_0.stderr
+++ b/testsuite/tests/generics/GenDerivOutput1_0.stderr
@@ -43,7 +43,7 @@ Derived type family instances:
'GHC.Types.True)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"element")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -51,7 +51,7 @@ Derived type family instances:
GHC.Generics.Par1
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"rest")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
diff --git a/testsuite/tests/generics/GenDerivOutput1_1.stderr b/testsuite/tests/generics/GenDerivOutput1_1.stderr
index 5f4e7e241d..139d7ed255 100644
--- a/testsuite/tests/generics/GenDerivOutput1_1.stderr
+++ b/testsuite/tests/generics/GenDerivOutput1_1.stderr
@@ -178,14 +178,14 @@ Derived type family instances:
'GHC.Types.True)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just "d11d")
+ ('GHC.Maybe.Just "d11d")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
GHC.Generics.Par1
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"d12d")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -206,14 +206,14 @@ Derived type family instances:
'GHC.Types.True)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just "d11d")
+ ('GHC.Maybe.Just "d11d")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
(GHC.Generics.Rec0 a)
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"d12d")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -235,14 +235,14 @@ Derived type family instances:
'GHC.Types.True)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just "d11c")
+ ('GHC.Maybe.Just "d11c")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
(GHC.Generics.Rec0 a)
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"d12c")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -264,14 +264,14 @@ Derived type family instances:
'GHC.Types.True)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just "d11b")
+ ('GHC.Maybe.Just "d11b")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
GHC.Generics.Par1
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"d12b")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -292,14 +292,14 @@ Derived type family instances:
'GHC.Types.True)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just "d11a")
+ ('GHC.Maybe.Just "d11a")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
(GHC.Generics.Rec0 a)
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"d12a")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -321,14 +321,14 @@ Derived type family instances:
'GHC.Types.True)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just "d11a")
+ ('GHC.Maybe.Just "d11a")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
GHC.Generics.Par1
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"d12a")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -349,14 +349,14 @@ Derived type family instances:
'GHC.Types.True)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just "d11b")
+ ('GHC.Maybe.Just "d11b")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
(GHC.Generics.Rec0 a)
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"d12b")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -378,14 +378,14 @@ Derived type family instances:
'GHC.Types.True)
(GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just "d11c")
+ ('GHC.Maybe.Just "d11c")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
GHC.Generics.Par1
GHC.Generics.:*: GHC.Generics.S1
('GHC.Generics.MetaSel
- ('GHC.Base.Just
+ ('GHC.Maybe.Just
"d12c")
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
diff --git a/testsuite/tests/generics/Makefile b/testsuite/tests/generics/Makefile
index 9a36a1c5fe..69a5802b96 100644
--- a/testsuite/tests/generics/Makefile
+++ b/testsuite/tests/generics/Makefile
@@ -1,3 +1,8 @@
TOP=../..
include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/test.mk
+
+T15012:
+ $(RM) T15012.hi T15012.o T15012a.hi T15012a.o
+ '$(TEST_HC)' $(TEST_HC_OPTS) -c T15012a.hs
+ '$(TEST_HC)' $(TEST_HC_OPTS) -c T15012.hs
diff --git a/testsuite/tests/generics/T10604/T10604_deriving.stderr b/testsuite/tests/generics/T10604/T10604_deriving.stderr
index 20417e37a5..cb9ea36454 100644
--- a/testsuite/tests/generics/T10604/T10604_deriving.stderr
+++ b/testsuite/tests/generics/T10604/T10604_deriving.stderr
@@ -232,7 +232,7 @@ Derived type family instances:
(GHC.Generics.S1
*
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing GHC.Types.Symbol)
+ ('GHC.Maybe.Nothing GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -251,7 +251,7 @@ Derived type family instances:
(GHC.Generics.S1
(* -> *)
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing GHC.Types.Symbol)
+ ('GHC.Maybe.Nothing GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -273,7 +273,7 @@ Derived type family instances:
(GHC.Generics.S1
*
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing
+ ('GHC.Maybe.Nothing
GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -301,7 +301,7 @@ Derived type family instances:
(GHC.Generics.S1
(k -> *)
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing GHC.Types.Symbol)
+ ('GHC.Maybe.Nothing GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -333,7 +333,8 @@ Derived type family instances:
(GHC.Generics.S1
*
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing GHC.Types.Symbol)
+ ('GHC.Maybe.Nothing
+ GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -342,7 +343,8 @@ Derived type family instances:
(GHC.Generics.S1
*
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing GHC.Types.Symbol)
+ ('GHC.Maybe.Nothing
+ GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -359,7 +361,8 @@ Derived type family instances:
(GHC.Generics.S1
*
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing GHC.Types.Symbol)
+ ('GHC.Maybe.Nothing
+ GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -368,7 +371,8 @@ Derived type family instances:
(GHC.Generics.S1
*
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing GHC.Types.Symbol)
+ ('GHC.Maybe.Nothing
+ GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -395,7 +399,8 @@ Derived type family instances:
(GHC.Generics.S1
k
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing GHC.Types.Symbol)
+ ('GHC.Maybe.Nothing
+ GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -404,7 +409,8 @@ Derived type family instances:
(GHC.Generics.S1
k
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing GHC.Types.Symbol)
+ ('GHC.Maybe.Nothing
+ GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -421,7 +427,8 @@ Derived type family instances:
(GHC.Generics.S1
k
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing GHC.Types.Symbol)
+ ('GHC.Maybe.Nothing
+ GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -430,7 +437,8 @@ Derived type family instances:
(GHC.Generics.S1
k
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing GHC.Types.Symbol)
+ ('GHC.Maybe.Nothing
+ GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
'GHC.Generics.DecidedLazy)
@@ -454,7 +462,7 @@ Derived type family instances:
(GHC.Generics.S1
*
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing
+ ('GHC.Maybe.Nothing
GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -469,7 +477,7 @@ Derived type family instances:
(GHC.Generics.S1
*
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing
+ ('GHC.Maybe.Nothing
GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -494,7 +502,7 @@ Derived type family instances:
(GHC.Generics.S1
*
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing
+ ('GHC.Maybe.Nothing
GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
@@ -509,7 +517,7 @@ Derived type family instances:
(GHC.Generics.S1
*
('GHC.Generics.MetaSel
- ('GHC.Base.Nothing
+ ('GHC.Maybe.Nothing
GHC.Types.Symbol)
'GHC.Generics.NoSourceUnpackedness
'GHC.Generics.NoSourceStrictness
diff --git a/testsuite/tests/generics/T15012.hs b/testsuite/tests/generics/T15012.hs
new file mode 100644
index 0000000000..388eddc0ed
--- /dev/null
+++ b/testsuite/tests/generics/T15012.hs
@@ -0,0 +1,7 @@
+module T15012 where
+
+import GHC.Generics
+import T15012a
+
+blah :: IO ()
+blah = print $ from1 $ TyFamily 1 2
diff --git a/testsuite/tests/generics/T15012a.hs b/testsuite/tests/generics/T15012a.hs
new file mode 100644
index 0000000000..5109ea08f0
--- /dev/null
+++ b/testsuite/tests/generics/T15012a.hs
@@ -0,0 +1,11 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TypeFamilies #-}
+module T15012a where
+
+import GHC.Generics
+
+type FakeOut a = Int
+
+data family TyFamily y z
+data instance TyFamily a b = TyFamily Int (FakeOut b)
+ deriving Generic1
diff --git a/testsuite/tests/generics/all.T b/testsuite/tests/generics/all.T
index 1d4aeaee38..f127f7895f 100644
--- a/testsuite/tests/generics/all.T
+++ b/testsuite/tests/generics/all.T
@@ -43,3 +43,5 @@ test('T10361a', normal, compile, [''])
test('T10361b', normal, compile, [''])
test('T11358', normal, compile_and_run, [''])
test('T12220', normal, compile, [''])
+test('T15012', [extra_files(['T15012.hs', 'T15012a.hs'])], run_command,
+ ['$MAKE -s --no-print-directory T15012'])
View Lorry Controller Status