From ad0551c66bb7e8135e1b116a111f37176955e9f4 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Wed, 6 May 2015 08:07:31 -0500 Subject: 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 --- testsuite/tests/th/TH_RichKinds2.stderr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testsuite/tests') 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) -- cgit v1.2.1