diff options
author | Takano Akio <tak@anoak.io> | 2018-01-31 21:35:29 -0500 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2018-01-31 23:28:48 -0500 |
commit | be84823b956f0aa09c58d94d1901f2dff13546b4 (patch) | |
tree | 94b76f4746a8af6748bbfb2f868c9fd98206735f /libraries/ghc-boot-th | |
parent | 0bff9e677f0569bc8a7207c20cddddfd67e2448f (diff) | |
download | haskell-be84823b956f0aa09c58d94d1901f2dff13546b4.tar.gz |
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
Diffstat (limited to 'libraries/ghc-boot-th')
-rw-r--r-- | libraries/ghc-boot-th/GHC/LanguageExtensions/Type.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libraries/ghc-boot-th/GHC/LanguageExtensions/Type.hs b/libraries/ghc-boot-th/GHC/LanguageExtensions/Type.hs index 2b06c851a8..b3016e167d 100644 --- a/libraries/ghc-boot-th/GHC/LanguageExtensions/Type.hs +++ b/libraries/ghc-boot-th/GHC/LanguageExtensions/Type.hs @@ -63,6 +63,7 @@ data Extension | GADTSyntax | NPlusKPatterns | DoAndIfThenElse + | BlockArguments | RebindableSyntax | ConstraintKinds | PolyKinds -- Kind polymorphism |