From be84823b956f0aa09c58d94d1901f2dff13546b4 Mon Sep 17 00:00:00 2001 From: Takano Akio Date: Wed, 31 Jan 2018 21:35:29 -0500 Subject: Implement BlockArguments (#10843) This patch implements the BlockArguments extension, as proposed at https://github.com/ghc-proposals/ghc-proposals/pull/90. It also fixes #10855 as a side-effect. This patch adds a large number of shift-reduce conflicts to the parser. All of them concern the ambiguity as to where constructs like `if` and `let` end. Fortunately they are resolved correctly by preferring shift. The patch is based on @gibiansky's ArgumentDo implementation (D1219). Test Plan: ./validate Reviewers: goldfire, bgamari, alanz, mpickering Reviewed By: bgamari, mpickering Subscribers: Wizek, dfeuer, gibiansky, rwbarton, thomie, mpickering, carter GHC Trac Issues: #10843, #10855 Differential Revision: https://phabricator.haskell.org/D4260 --- testsuite/tests/driver/T4437.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'testsuite/tests/driver/T4437.hs') diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs index 6a46e52ad6..14d9bf4b1d 100644 --- a/testsuite/tests/driver/T4437.hs +++ b/testsuite/tests/driver/T4437.hs @@ -40,6 +40,7 @@ expectedGhcOnlyExtensions = ["RelaxedLayout", "AlternativeLayoutRule", "AlternativeLayoutRuleTransitional", "EmptyDataDeriving", + "BlockArguments", "NumericUnderscores"] expectedCabalOnlyExtensions :: [String] -- cgit v1.2.1