summaryrefslogtreecommitdiff
path: root/testsuite/tests/partial-sigs
diff options
context:
space:
mode:
authorRyan Scott <ryan.gl.scott@gmail.com>2018-07-11 12:28:38 -0400
committerRyan Scott <ryan.gl.scott@gmail.com>2018-07-11 12:28:38 -0400
commit1c3536239cb5e83ff1427ac410d8fa2549e7d9c0 (patch)
tree585787904cb8ce8b1b755ca85fb11eeec206fe6c /testsuite/tests/partial-sigs
parente24da5edb4709bdb050c8d0676f302d0b87b8446 (diff)
downloadhaskell-1c3536239cb5e83ff1427ac410d8fa2549e7d9c0.tar.gz
Use IfaceAppArgs to store an IfaceAppTy's arguments
Summary: Currently, an `IfaceAppTy` has no way to tell whether its argument is visible or not, so it simply treats all arguments as visible, leading to #15330. We already have a solution for this problem in the form of the `IfaceTcArgs` data structure, used by `IfaceTyConApp` to represent the arguments to a type constructor. Therefore, it makes sense to reuse this machinery for `IfaceAppTy`, so this patch does just that. This patch: 1. Renames `IfaceTcArgs` to `IfaceAppArgs` to reflect its more general purpose. 2. Changes the second field of `IfaceAppTy` from `IfaceType` to `IfaceAppArgs`, and propagates the necessary changes through. In particular, pretty-printing an `IfaceAppTy` now goes through the `IfaceAppArgs` pretty-printer, which correctly displays arguments as visible or not for free, fixing #15330. 3. Changes `toIfaceTypeX` and related functions so that when converting an `AppTy` to an `IfaceAppTy`, it flattens as many argument `AppTy`s as possible, and then converts those arguments into an `IfaceAppArgs` list, using the kind of the function `Type` as a guide. (Doing so minimizes the number of times we need to call `typeKind`, which is more expensive that finding the kind of a `TyCon`.) Test Plan: make test TEST=T15330 Reviewers: goldfire, simonpj, bgamari Reviewed By: simonpj Subscribers: rwbarton, thomie, carter GHC Trac Issues: #15330 Differential Revision: https://phabricator.haskell.org/D4938
Diffstat (limited to 'testsuite/tests/partial-sigs')
-rw-r--r--testsuite/tests/partial-sigs/should_fail/T14040a.stderr9
1 files changed, 3 insertions, 6 deletions
diff --git a/testsuite/tests/partial-sigs/should_fail/T14040a.stderr b/testsuite/tests/partial-sigs/should_fail/T14040a.stderr
index b9318940fd..20a0fa51ca 100644
--- a/testsuite/tests/partial-sigs/should_fail/T14040a.stderr
+++ b/testsuite/tests/partial-sigs/should_fail/T14040a.stderr
@@ -1,13 +1,10 @@
T14040a.hs:34:8: error:
• Cannot apply expression of type ‘Sing wl
- -> (forall y. p k0 w0 'WeirdNil)
+ -> (forall y. p w0 'WeirdNil)
-> (forall z1 (x :: z1) (xs :: WeirdList (WeirdList z1)).
- Sing x
- -> Sing xs
- -> p (WeirdList k1) w1 xs
- -> p k1 w2 ('WeirdCons x xs))
- -> p k2 w3 wl’
+ Sing x -> Sing xs -> p w1 xs -> p w2 ('WeirdCons x xs))
+ -> p w3 wl’
to a visible type argument ‘(WeirdList z)’
• In the sixth argument of ‘pWeirdCons’, namely
‘(elimWeirdList @(WeirdList z) @xs @p xs pWeirdNil pWeirdCons)’