X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fparser%2FLexer.x;h=0a2f3c5e23fa0d36dcecde8dc750708b9f0b442f;hb=766c499e75fa1aa178694dc1a74d1ecbabef0332;hp=1d0a5e7bce8df96455331637307166a6cc4063ab;hpb=9ed23db4821edfea91e6b74d71ebc4d1935ec11e;p=ghc-hetmet.git

diff --git a/ghc/compiler/parser/Lexer.x b/ghc/compiler/parser/Lexer.x
index 1d0a5e7..0a2f3c5 100644
--- a/ghc/compiler/parser/Lexer.x
+++ b/ghc/compiler/parser/Lexer.x
@@ -506,7 +506,7 @@ reservedWordsFM = listToUFM $
 	( "where",	ITwhere, 	0 ),
 	( "_scc_",	ITscc, 		0 ),		-- ToDo: remove
 
-      	( "forall",	ITforall,	 bit glaExtsBit),
+      	( "forall",	ITforall,	 bit tvBit),
 	( "mdo",	ITmdo,		 bit glaExtsBit),
 
 	( "foreign",	ITforeign,	 bit ffiBit),
@@ -542,7 +542,7 @@ reservedSymsFM = listToUFM $
        ,("!",	ITbang, 	0)
 
        ,("*",	ITstar,		bit glaExtsBit)	-- For data T (a::*) = MkT
-       ,(".",	ITdot,		bit glaExtsBit)	-- For 'forall a . t'
+       ,(".",	ITdot,		bit tvBit)	-- For 'forall a . t'
 
        ,("-<",	ITlarrowtail,	bit arrowsBit)
        ,(">-",	ITrarrowtail,	bit arrowsBit)
@@ -1160,6 +1160,7 @@ parrBit	   = 2
 arrowsBit  = 4
 thBit	   = 5
 ipBit      = 6
+tvBit	   = 7	-- Scoped type variables enables 'forall' keyword
 
 glaExtsEnabled, ffiEnabled, parrEnabled :: Int -> Bool
 glaExtsEnabled flags = testBit flags glaExtsBit
@@ -1168,6 +1169,7 @@ parrEnabled    flags = testBit flags parrBit
 arrowsEnabled  flags = testBit flags arrowsBit
 thEnabled      flags = testBit flags thBit
 ipEnabled      flags = testBit flags ipBit
+tvEnabled      flags = testBit flags tvBit
 
 -- create a parse state
 --
@@ -1190,6 +1192,7 @@ mkPState buf loc flags  =
 	       .|. arrowsBit  `setBitIf` dopt Opt_Arrows      flags
 	       .|. thBit      `setBitIf` dopt Opt_TH          flags
 	       .|. ipBit      `setBitIf` dopt Opt_ImplicitParams flags
+	       .|. tvBit      `setBitIf` dopt Opt_ScopedTypeVariables flags
       --
       setBitIf :: Int -> Bool -> Int
       b `setBitIf` cond | cond      = bit b