diff options
author | sheaf <sam.derbyshire@gmail.com> | 2021-06-09 20:43:42 +0200 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-06-10 13:54:05 -0400 |
commit | 472c2bf003e9f3bb93b82265f2a0a7124f944421 (patch) | |
tree | 74767fe0b48521254b22350d4b1f34a3957adc06 /testsuite | |
parent | 61c51c00b6e12e309bc5643e89330b93d86f5449 (diff) | |
download | haskell-472c2bf003e9f3bb93b82265f2a0a7124f944421.tar.gz |
Reword: representation instead of levity
fixes #19756, updates haddock submodule
Diffstat (limited to 'testsuite')
25 files changed, 69 insertions, 61 deletions
diff --git a/testsuite/tests/codeGen/should_fail/T13233.stderr b/testsuite/tests/codeGen/should_fail/T13233.stderr index 2609e41d97..a00ccd536a 100644 --- a/testsuite/tests/codeGen/should_fail/T13233.stderr +++ b/testsuite/tests/codeGen/should_fail/T13233.stderr @@ -1,20 +1,22 @@ T13233.hs:14:11: error: - Cannot use function with levity-polymorphic arguments: + Cannot use function with representation-polymorphic arguments: (#,#) :: a -> a -> (# a, a #) - (Note that levity-polymorphic primops such as 'coerce' and unboxed tuples - are eta-expanded internally because they must occur fully saturated. + (Note that representation-polymorphic primops, + such as 'coerce' and unboxed tuples, are eta-expanded + internally because they must occur fully saturated. Use -fprint-typechecker-elaboration to display the full expression.) - Levity-polymorphic arguments: + Representation-polymorphic arguments: a :: TYPE rep a :: TYPE rep T13233.hs:22:16: error: - Cannot use function with levity-polymorphic arguments: + Cannot use function with representation-polymorphic arguments: (#,#) :: a -> b -> (# a, b #) - (Note that levity-polymorphic primops such as 'coerce' and unboxed tuples - are eta-expanded internally because they must occur fully saturated. + (Note that representation-polymorphic primops, + such as 'coerce' and unboxed tuples, are eta-expanded + internally because they must occur fully saturated. Use -fprint-typechecker-elaboration to display the full expression.) - Levity-polymorphic arguments: + Representation-polymorphic arguments: a :: TYPE rep1 b :: TYPE rep2 diff --git a/testsuite/tests/codeGen/should_fail/T13233_elab.stderr b/testsuite/tests/codeGen/should_fail/T13233_elab.stderr index 1b84b9bf95..6242873514 100644 --- a/testsuite/tests/codeGen/should_fail/T13233_elab.stderr +++ b/testsuite/tests/codeGen/should_fail/T13233_elab.stderr @@ -1,14 +1,14 @@ T13233_elab.hs:17:11: error: - Cannot use function with levity-polymorphic arguments: + Cannot use function with representation-polymorphic arguments: (#,#) @rep @rep @a @a :: a -> a -> (# a, a #) - Levity-polymorphic arguments: + Representation-polymorphic arguments: a :: TYPE rep a :: TYPE rep T13233_elab.hs:25:16: error: - Cannot use function with levity-polymorphic arguments: + Cannot use function with representation-polymorphic arguments: (#,#) @rep1 @rep2 @a @b :: a -> b -> (# a, b #) - Levity-polymorphic arguments: + Representation-polymorphic arguments: a :: TYPE rep1 b :: TYPE rep2 diff --git a/testsuite/tests/dependent/should_fail/T11473.stderr b/testsuite/tests/dependent/should_fail/T11473.stderr index 3252452eb2..431c2dff92 100644 --- a/testsuite/tests/dependent/should_fail/T11473.stderr +++ b/testsuite/tests/dependent/should_fail/T11473.stderr @@ -1,6 +1,6 @@ T11473.hs:19:7: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: a Kind: TYPE r In the type of binder ‘x’ diff --git a/testsuite/tests/ghci/should_run/UnboxedTuples/Common.hs-incl b/testsuite/tests/ghci/should_run/UnboxedTuples/Common.hs-incl index 6931397f09..46cefa025e 100644 --- a/testsuite/tests/ghci/should_run/UnboxedTuples/Common.hs-incl +++ b/testsuite/tests/ghci/should_run/UnboxedTuples/Common.hs-incl @@ -305,7 +305,7 @@ tuple_v6_a :: TV6 -> Int -> Double -> Int -> Double tuple_v6_a f x y z w = case f x y z w of (# x', _, y', _, z', _, w', _ #) -> (I# x', D# y', I# z', D# w') --- some levity polymorphic things +-- some representation-polymorphic things {-# NOINLINE lev_poly #-} lev_poly :: forall r a (b :: TYPE r). (a -> a -> a -> a -> diff --git a/testsuite/tests/ghci/should_run/UnboxedTuples/UnboxedTuples.hs b/testsuite/tests/ghci/should_run/UnboxedTuples/UnboxedTuples.hs index 1bbaf39837..ae6dc4dd3d 100644 --- a/testsuite/tests/ghci/should_run/UnboxedTuples/UnboxedTuples.hs +++ b/testsuite/tests/ghci/should_run/UnboxedTuples/UnboxedTuples.hs @@ -118,7 +118,7 @@ main = do B.tuple_v6 O.tuple_v6 (\f -> f 601 602 603 604) - -- levity polymorphic + -- representation-polymorphic print $ B.lev_poly_a B.lev_poly B.tuple3 991 print $ B.lev_poly_a B.lev_poly O.tuple3 992 print $ B.lev_poly_a O.lev_poly B.tuple3 993 diff --git a/testsuite/tests/polykinds/T14561.hs b/testsuite/tests/polykinds/T14561.hs index 4be0812c68..dede8ba2f8 100644 --- a/testsuite/tests/polykinds/T14561.hs +++ b/testsuite/tests/polykinds/T14561.hs @@ -10,7 +10,7 @@ import Unsafe.Coerce badId :: forall r (a :: TYPE r). a -> a badId = unsafeCoerce# --- Un-saturated application of a levity-polymorphic +-- Un-saturated application of a representation-polymorphic -- function that must be eta-expanded goodId :: forall (a :: Type). a -> a diff --git a/testsuite/tests/polykinds/T14561.stderr b/testsuite/tests/polykinds/T14561.stderr index 16e3be33b2..098a31127f 100644 --- a/testsuite/tests/polykinds/T14561.stderr +++ b/testsuite/tests/polykinds/T14561.stderr @@ -1,8 +1,9 @@ T14561.hs:12:9: error: - Cannot use function with levity-polymorphic arguments: + Cannot use function with representation-polymorphic arguments: unsafeCoerce# :: a -> a - (Note that levity-polymorphic primops such as 'coerce' and unboxed tuples - are eta-expanded internally because they must occur fully saturated. + (Note that representation-polymorphic primops, + such as 'coerce' and unboxed tuples, are eta-expanded + internally because they must occur fully saturated. Use -fprint-typechecker-elaboration to display the full expression.) - Levity-polymorphic arguments: a :: TYPE r + Representation-polymorphic arguments: a :: TYPE r diff --git a/testsuite/tests/th/T19709a.stderr b/testsuite/tests/th/T19709a.stderr index 4cb72aeed7..6594949d2b 100644 --- a/testsuite/tests/th/T19709a.stderr +++ b/testsuite/tests/th/T19709a.stderr @@ -1,6 +1,6 @@ T19709a.hs:8:14: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: a Kind: TYPE r In the type of binder ‘x’ diff --git a/testsuite/tests/th/T19709b.hs b/testsuite/tests/th/T19709b.hs index afc9ed5769..629172a892 100644 --- a/testsuite/tests/th/T19709b.hs +++ b/testsuite/tests/th/T19709b.hs @@ -6,7 +6,7 @@ import GHC.Exts import Language.Haskell.TH $( let levfun :: forall (r :: RuntimeRep) (a :: TYPE r). a -> () - levfun = error "e1" -- NB: this, so far, is OK: no levity-polymorphic binder + levfun = error "e1" -- NB: this, so far, is OK: no representation-polymorphic binder - in levfun (error @Any "e2") -- but this is very naughty: levity-polymorphic argument + in levfun (error @Any "e2") -- but this is very naughty: representation-polymorphic argument `seq` return [] ) diff --git a/testsuite/tests/th/T19709b.stderr b/testsuite/tests/th/T19709b.stderr index 78405ebaea..fb2d55a917 100644 --- a/testsuite/tests/th/T19709b.stderr +++ b/testsuite/tests/th/T19709b.stderr @@ -1,6 +1,6 @@ T19709b.hs:11:14: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: Any Kind: TYPE Any In the type of expression: (error @Any "e2") diff --git a/testsuite/tests/typecheck/should_fail/LevPolyLet.stderr b/testsuite/tests/typecheck/should_fail/LevPolyLet.stderr index 8d01f4028b..73d37dae84 100644 --- a/testsuite/tests/typecheck/should_fail/LevPolyLet.stderr +++ b/testsuite/tests/typecheck/should_fail/LevPolyLet.stderr @@ -1,5 +1,5 @@ LevPolyLet.hs:18:7: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: a Kind: TYPE ('BoxedRep v) In the type of binder ‘x’ diff --git a/testsuite/tests/typecheck/should_fail/T11724.stderr b/testsuite/tests/typecheck/should_fail/T11724.stderr index dbdbb6fdef..2971b27597 100644 --- a/testsuite/tests/typecheck/should_fail/T11724.stderr +++ b/testsuite/tests/typecheck/should_fail/T11724.stderr @@ -1,6 +1,6 @@ T11724.hs:7:44: error: - • A levity-polymorphic type is not allowed here: + • A representation-polymorphic type is not allowed here: Type: a Kind: TYPE r • In the definition of data constructor ‘Foo’ diff --git a/testsuite/tests/typecheck/should_fail/T12709.stderr b/testsuite/tests/typecheck/should_fail/T12709.stderr index 9d79d8dd0c..f8da5ea120 100644 --- a/testsuite/tests/typecheck/should_fail/T12709.stderr +++ b/testsuite/tests/typecheck/should_fail/T12709.stderr @@ -1,24 +1,24 @@ T12709.hs:28:13: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: a Kind: TYPE rep In the type of expression: 1 T12709.hs:28:17: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: a Kind: TYPE rep In the type of expression: 2 T12709.hs:28:21: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: a Kind: TYPE rep In the type of expression: 3 T12709.hs:28:25: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: a Kind: TYPE rep In the type of expression: 4 diff --git a/testsuite/tests/typecheck/should_fail/T12973.stderr b/testsuite/tests/typecheck/should_fail/T12973.stderr index a6d97009cd..f062b1e222 100644 --- a/testsuite/tests/typecheck/should_fail/T12973.stderr +++ b/testsuite/tests/typecheck/should_fail/T12973.stderr @@ -1,12 +1,12 @@ T12973.hs:13:7: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: a Kind: TYPE r In the type of expression: 3 T12973.hs:13:11: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: a Kind: TYPE r In the type of expression: 4 diff --git a/testsuite/tests/typecheck/should_fail/T13105.stderr b/testsuite/tests/typecheck/should_fail/T13105.stderr index c54327ef70..5d2c74a85d 100644 --- a/testsuite/tests/typecheck/should_fail/T13105.stderr +++ b/testsuite/tests/typecheck/should_fail/T13105.stderr @@ -1,6 +1,6 @@ T13105.hs:22:8: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: Rep Int Kind: TYPE (RepRep Int) In the type of binder ‘n’ diff --git a/testsuite/tests/typecheck/should_fail/T13929.stderr b/testsuite/tests/typecheck/should_fail/T13929.stderr index d1e1f63dd9..8fc7edab78 100644 --- a/testsuite/tests/typecheck/should_fail/T13929.stderr +++ b/testsuite/tests/typecheck/should_fail/T13929.stderr @@ -1,24 +1,24 @@ T13929.hs:29:27: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: GUnboxed f rf Kind: TYPE rf In the type of expression: gunbox x T13929.hs:29:37: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: GUnboxed g rg Kind: TYPE rg In the type of expression: gunbox y T13929.hs:33:24: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: GUnboxed f rf Kind: TYPE rf In the type of expression: gunbox l T13929.hs:34:26: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: GUnboxed g rg Kind: TYPE rg In the type of expression: gunbox r diff --git a/testsuite/tests/typecheck/should_fail/T17021.stderr b/testsuite/tests/typecheck/should_fail/T17021.stderr index 52f48d2bed..8944876b3f 100644 --- a/testsuite/tests/typecheck/should_fail/T17021.stderr +++ b/testsuite/tests/typecheck/should_fail/T17021.stderr @@ -1,14 +1,16 @@ T17021.hs:18:5: error: - Cannot use function with levity-polymorphic arguments: + Cannot use function with representation-polymorphic arguments: MkT :: Int -> T - (Note that levity-polymorphic primops such as 'coerce' and unboxed tuples - are eta-expanded internally because they must occur fully saturated. + (Note that representation-polymorphic primops, + such as 'coerce' and unboxed tuples, are eta-expanded + internally because they must occur fully saturated. Use -fprint-typechecker-elaboration to display the full expression.) - Levity-polymorphic arguments: Int :: TYPE (Id ('BoxedRep 'Lifted)) + Representation-polymorphic arguments: + Int :: TYPE (Id ('BoxedRep 'Lifted)) T17021.hs:18:9: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: Int Kind: TYPE (Id ('BoxedRep 'Lifted)) In the type of expression: 42 diff --git a/testsuite/tests/typecheck/should_fail/T17360.stderr b/testsuite/tests/typecheck/should_fail/T17360.stderr index 9eccd7fe29..e3ed36f381 100644 --- a/testsuite/tests/typecheck/should_fail/T17360.stderr +++ b/testsuite/tests/typecheck/should_fail/T17360.stderr @@ -1,6 +1,6 @@ T17360.hs:11:5: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: Id a Kind: TYPE r In the type of binder ‘x’ diff --git a/testsuite/tests/typecheck/should_fail/T17817.stderr b/testsuite/tests/typecheck/should_fail/T17817.stderr index 56753cb34b..8d1548e2c8 100644 --- a/testsuite/tests/typecheck/should_fail/T17817.stderr +++ b/testsuite/tests/typecheck/should_fail/T17817.stderr @@ -1,13 +1,14 @@ T17817.hs:16:10: error: - Cannot use function with levity-polymorphic arguments: + Cannot use function with representation-polymorphic arguments: mkWeak# :: a -> b -> (State# RealWorld -> (# State# RealWorld, c #)) -> State# RealWorld -> (# State# RealWorld, Weak# b #) - (Note that levity-polymorphic primops such as 'coerce' and unboxed tuples - are eta-expanded internally because they must occur fully saturated. + (Note that representation-polymorphic primops, + such as 'coerce' and unboxed tuples, are eta-expanded + internally because they must occur fully saturated. Use -fprint-typechecker-elaboration to display the full expression.) - Levity-polymorphic arguments: a :: TYPE ('BoxedRep l) + Representation-polymorphic arguments: a :: TYPE ('BoxedRep l) diff --git a/testsuite/tests/typecheck/should_fail/T17817_elab.stderr b/testsuite/tests/typecheck/should_fail/T17817_elab.stderr index aaa48448d2..0a03cf6080 100644 --- a/testsuite/tests/typecheck/should_fail/T17817_elab.stderr +++ b/testsuite/tests/typecheck/should_fail/T17817_elab.stderr @@ -1,10 +1,10 @@ T17817_elab.hs:17:10: error: - Cannot use function with levity-polymorphic arguments: + Cannot use function with representation-polymorphic arguments: mkWeak# @l @a @b @c :: a -> b -> (State# RealWorld -> (# State# RealWorld, c #)) -> State# RealWorld -> (# State# RealWorld, Weak# b #) - Levity-polymorphic arguments: a :: TYPE ('BoxedRep l) + Representation-polymorphic arguments: a :: TYPE ('BoxedRep l) diff --git a/testsuite/tests/typecheck/should_fail/T18534.stderr b/testsuite/tests/typecheck/should_fail/T18534.stderr index cd78fbf819..b5db0f02bc 100644 --- a/testsuite/tests/typecheck/should_fail/T18534.stderr +++ b/testsuite/tests/typecheck/should_fail/T18534.stderr @@ -1,6 +1,6 @@ T18534.hs:7:27: error: - • A levity-polymorphic type is not allowed here: + • A representation-polymorphic type is not allowed here: Type: a Kind: TYPE r • In the definition of data constructor ‘Test’ diff --git a/testsuite/tests/typecheck/should_fail/T19615.stderr b/testsuite/tests/typecheck/should_fail/T19615.stderr index b2e4f40231..c4a82800d2 100644 --- a/testsuite/tests/typecheck/should_fail/T19615.stderr +++ b/testsuite/tests/typecheck/should_fail/T19615.stderr @@ -1,6 +1,6 @@ T19615.hs:17:20: error: - A levity-polymorphic type is not allowed here: + A representation-polymorphic type is not allowed here: Type: b Kind: TYPE r' In the type of expression: (f x) diff --git a/testsuite/tests/typecheck/should_fail/UnliftedNewtypesCoerceFail.stderr b/testsuite/tests/typecheck/should_fail/UnliftedNewtypesCoerceFail.stderr index 1c39c9133b..9867100a63 100644 --- a/testsuite/tests/typecheck/should_fail/UnliftedNewtypesCoerceFail.stderr +++ b/testsuite/tests/typecheck/should_fail/UnliftedNewtypesCoerceFail.stderr @@ -1,8 +1,9 @@ UnliftedNewtypesCoerceFail.hs:15:8: error: - Cannot use function with levity-polymorphic arguments: + Cannot use function with representation-polymorphic arguments: coerce :: x -> y - (Note that levity-polymorphic primops such as 'coerce' and unboxed tuples - are eta-expanded internally because they must occur fully saturated. + (Note that representation-polymorphic primops, + such as 'coerce' and unboxed tuples, are eta-expanded + internally because they must occur fully saturated. Use -fprint-typechecker-elaboration to display the full expression.) - Levity-polymorphic arguments: x :: TYPE rep + Representation-polymorphic arguments: x :: TYPE rep diff --git a/testsuite/tests/typecheck/should_fail/UnliftedNewtypesLevityBinder.stderr b/testsuite/tests/typecheck/should_fail/UnliftedNewtypesLevityBinder.stderr index 70746fd60a..d82a35d122 100644 --- a/testsuite/tests/typecheck/should_fail/UnliftedNewtypesLevityBinder.stderr +++ b/testsuite/tests/typecheck/should_fail/UnliftedNewtypesLevityBinder.stderr @@ -1,8 +1,9 @@ UnliftedNewtypesLevityBinder.hs:16:7: error: - Cannot use function with levity-polymorphic arguments: + Cannot use function with representation-polymorphic arguments: IdentC :: a -> Ident a - (Note that levity-polymorphic primops such as 'coerce' and unboxed tuples - are eta-expanded internally because they must occur fully saturated. + (Note that representation-polymorphic primops, + such as 'coerce' and unboxed tuples, are eta-expanded + internally because they must occur fully saturated. Use -fprint-typechecker-elaboration to display the full expression.) - Levity-polymorphic arguments: a :: TYPE r + Representation-polymorphic arguments: a :: TYPE r diff --git a/testsuite/tests/typecheck/should_run/EtaExpandLevPoly.hs b/testsuite/tests/typecheck/should_run/EtaExpandLevPoly.hs index 82553b4ff2..cd011a71c9 100644 --- a/testsuite/tests/typecheck/should_run/EtaExpandLevPoly.hs +++ b/testsuite/tests/typecheck/should_run/EtaExpandLevPoly.hs @@ -8,7 +8,7 @@ import GHC.Exts data G a where MkG :: G (TupleRep [BoxedRep Lifted, IntRep]) --- tests that we don't eta-expand functions that are levity-polymorphic +-- tests that we don't eta-expand functions that are representation-polymorphic -- see CoreArity.mkEtaWW foo :: forall a (b :: TYPE a). G a -> b -> b foo MkG = (\x -> x) :: forall (c :: TYPE (TupleRep [BoxedRep Lifted, IntRep])). c -> c @@ -16,7 +16,7 @@ foo MkG = (\x -> x) :: forall (c :: TYPE (TupleRep [BoxedRep Lifted, IntRep])). data H a where MkH :: H IntRep --- tests that we don't push coercions that make args levity-polymorphic +-- tests that we don't push coercions that make args representation-polymorphic -- see Simplify.simplCast bar :: forall (r :: RuntimeRep) (a :: TYPE r). H r -> (a -> a -> (# a, a #)) -> a -> (# a, a #) bar MkH = (\f x -> f x x) :: forall (b :: TYPE IntRep). (b -> b -> (# b, b #)) -> b -> (# b, b #) |