diff options
| author | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2018-07-16 18:46:52 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-07-16 18:46:53 -0400 |
| commit | 65c186f0fdde95fd7c63ab9bd9b33a0213dba7d1 (patch) | |
| tree | 92abe9e3aeab1711db0e77361c453ee49f48ef55 /compiler/parser/Lexer.x | |
| parent | 7fe4993673e43e5b21f38d79ecc8b5163e97ee84 (diff) | |
| download | haskell-65c186f0fdde95fd7c63ab9bd9b33a0213dba7d1.tar.gz | |
Do not imply NoStarIsType by TypeOperators/TypeInType
Implementation of the "Embrace TypeInType" proposal was done according
to the spec, which specified that TypeOperators must imply NoStarIsType.
This implication was meant to prevent breakage and to be removed in 2
releases. However, compiling head.hackage has shown that this
implication only magnified the breakage, so there is no reason to have
it in the first place.
To remain in compliance with the three-release policy, we add a
workaround to define the (*) type operator even when -XStarIsType is on.
Test Plan: ./validate
Reviewers: bgamari, RyanGlScott, goldfire, phadej, hvr
Reviewed By: bgamari, RyanGlScott
Subscribers: harpocrates, rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4865
Diffstat (limited to 'compiler/parser/Lexer.x')
| -rw-r--r-- | compiler/parser/Lexer.x | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x index 2887edff04..a6650acb15 100644 --- a/compiler/parser/Lexer.x +++ b/compiler/parser/Lexer.x @@ -68,7 +68,6 @@ module Lexer ( explicitNamespacesEnabled, patternSynonymsEnabled, sccProfilingOn, hpcEnabled, - typeOperatorsEnabled, starIsTypeEnabled, addWarning, lexTokenStream, @@ -2264,7 +2263,6 @@ data ExtBits | TypeApplicationsBit | StaticPointersBit | NumericUnderscoresBit - | TypeOperatorsBit | StarIsTypeBit deriving Enum @@ -2334,8 +2332,6 @@ staticPointersEnabled :: ExtsBitmap -> Bool staticPointersEnabled = xtest StaticPointersBit numericUnderscoresEnabled :: ExtsBitmap -> Bool numericUnderscoresEnabled = xtest NumericUnderscoresBit -typeOperatorsEnabled :: ExtsBitmap -> Bool -typeOperatorsEnabled = xtest TypeOperatorsBit starIsTypeEnabled :: ExtsBitmap -> Bool starIsTypeEnabled = xtest StarIsTypeBit @@ -2392,7 +2388,6 @@ mkParserFlags flags = .|. TypeApplicationsBit `xoptBit` LangExt.TypeApplications .|. StaticPointersBit `xoptBit` LangExt.StaticPointers .|. NumericUnderscoresBit `xoptBit` LangExt.NumericUnderscores - .|. TypeOperatorsBit `xoptBit` LangExt.TypeOperators .|. StarIsTypeBit `xoptBit` LangExt.StarIsType optBits = HaddockBit `goptBit` Opt_Haddock |