diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-09-28 15:53:45 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-09-28 15:53:45 +0100 |
| commit | 6e3e64aeda1add215ffccca87931a60e4f8b53e5 (patch) | |
| tree | a8cc5dd835ed86fb02f746969cf0cb376942f6b2 /compiler/parser | |
| parent | 9a058b173a6e12296ac302a6ccd22d9c8f0a09d0 (diff) | |
| parent | 42cb30bd2c00705da598cc8d4170b41fb5693166 (diff) | |
| download | haskell-6e3e64aeda1add215ffccca87931a60e4f8b53e5.tar.gz | |
Merge remote-tracking branch 'origin/master' into tc-untouchables
Diffstat (limited to 'compiler/parser')
| -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 91f00ecf2f..aaa4f054ba 100644 --- a/compiler/parser/Lexer.x +++ b/compiler/parser/Lexer.x @@ -1869,8 +1869,6 @@ explicitNamespacesBit :: Int explicitNamespacesBit = 29 lambdaCaseBit :: Int lambdaCaseBit = 30 -multiWayIfBit :: Int -multiWayIfBit = 31 always :: Int -> Bool @@ -1926,8 +1924,6 @@ explicitNamespacesEnabled :: Int -> Bool explicitNamespacesEnabled flags = testBit flags explicitNamespacesBit lambdaCaseEnabled :: Int -> Bool lambdaCaseEnabled flags = testBit flags lambdaCaseBit -multiWayIfEnabled :: Int -> Bool -multiWayIfEnabled flags = testBit flags multiWayIfBit -- PState for parsing options pragmas -- @@ -1991,7 +1987,6 @@ mkPState flags buf loc = .|. typeLiteralsBit `setBitIf` xopt Opt_DataKinds flags .|. explicitNamespacesBit `setBitIf` xopt Opt_ExplicitNamespaces flags .|. lambdaCaseBit `setBitIf` xopt Opt_LambdaCase flags - .|. multiWayIfBit `setBitIf` xopt Opt_MultiWayIf flags -- setBitIf :: Int -> Bool -> Int b `setBitIf` cond | cond = bit b |