diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2015-05-06 08:07:31 -0500 |
|---|---|---|
| committer | Alan Zimmerman <alan.zimm@gmail.com> | 2015-05-08 17:39:30 +0200 |
| commit | ad0551c66bb7e8135e1b116a111f37176955e9f4 (patch) | |
| tree | 8ee2ca9d7052368d3bde060f6d8e558befd0f82a /testsuite/tests | |
| parent | a3dfa1742223585ca77acbd58dc60a3eadcb9ee0 (diff) | |
| download | haskell-ad0551c66bb7e8135e1b116a111f37176955e9f4.tar.gz | |
Correct parsing of lifted empty list constructor
See #10299
Previously `'[]` was parsed to a `HsTyVar` rather than a
`HsExplicitListTy`. This patch fixes the
shift-reduce conflict which caused this problem.
Reviewed By: alanz, austin
Differential Revision: https://phabricator.haskell.org/D840
(cherry picked from commit caeae1a33e28745b51d952b034e253d3e51e0605)
Conflicts:
compiler/parser/Parser.y
Diffstat (limited to 'testsuite/tests')
| -rw-r--r-- | testsuite/tests/th/TH_RichKinds2.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testsuite/tests/th/TH_RichKinds2.stderr b/testsuite/tests/th/TH_RichKinds2.stderr index 45027d5c1c..bb567a6009 100644 --- a/testsuite/tests/th/TH_RichKinds2.stderr +++ b/testsuite/tests/th/TH_RichKinds2.stderr @@ -3,7 +3,7 @@ TH_RichKinds2.hs:23:4: Warning: data SMaybe_0 (t_1 :: k_0 -> *) (t_3 :: GHC.Base.Maybe k_0) = forall . t_3 ~ 'GHC.Base.Nothing => SNothing_4 | forall a_5 . t_3 ~ 'GHC.Base.Just a_5 => SJust_6 (t_1 a_5) -type instance TH_RichKinds2.Map f_7 'GHC.Types.[] = 'GHC.Types.[] +type instance TH_RichKinds2.Map f_7 '[] = '[] type instance TH_RichKinds2.Map f_8 ('GHC.Types.: h_9 t_10) = 'GHC.Types.: (f_8 h_9) (TH_RichKinds2.Map f_8 t_10) |