X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FLexer.x;h=96f1ad2eba942a372d508dd421cda1b4daf88ded;hb=01ecefa4b97106fec5c139c5514e5d56e59ecbaf;hp=a6f7224c97d3fcf72226a717d065d3a0aa99ce53;hpb=2b4b74fba442bd07e14712846b3e4fc0145c851e;p=ghc-hetmet.git

diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index a6f7224..96f1ad2 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -334,19 +334,12 @@ $tab+         { warn Opt_WarnTabs (text "Tab character") }
 }
 
 <0,option_prags> {
-  @qual @varid			{ check_qvarid }
+  @qual @varid			{ idtoken qvarid }
   @qual @conid			{ idtoken qconid }
   @varid			{ varid }
   @conid			{ idtoken conid }
 }
 
--- after an illegal qvarid, such as 'M.let', 
--- we back up and try again in the bad_qvarid state:
-<bad_qvarid> {
-  @conid			{ pop_and (idtoken conid) }
-  @qual @conid			{ pop_and (idtoken qconid) }
-}
-
 <0> {
   @qual @varid "#"+ / { ifExtension magicHashEnabled } { idtoken qvarid }
   @qual @conid "#"+ / { ifExtension magicHashEnabled } { idtoken qconid }
@@ -781,7 +774,7 @@ multiline_doc_comment span buf _len = withLexedDocType (worker "")
 nested_comment :: P (Located Token) -> Action
 nested_comment cont span _str _len = do
   input <- getInput
-  go 1 input
+  go (1::Int) input
   where
     go 0 input = do setInput input; cont
     go n input = case alexGetChar input of
@@ -871,30 +864,6 @@ close_brace span _str _len = do
   popContext
   return (L span ITccurly)
 
--- We have to be careful not to count M.<varid> as a qualified name
--- when <varid> is a keyword.  We hack around this by catching 
--- the offending tokens afterward, and re-lexing in a different state.
-check_qvarid span buf len = do
-  case lookupUFM reservedWordsFM var of
-	Just (keyword,exts)
-	  | not (isSpecial keyword) ->
-	  if exts == 0 
-	     then try_again
-	     else do
-		b <- extension (\i -> exts .&. i /= 0)
-		if b then try_again
-		     else return token
-	_other -> return token
-  where
-	(mod,var) = splitQualName buf len
-	token     = L span (ITqvarid (mod,var))
-
-	try_again = do
-		(AI _ offs _) <- getInput	
-		setInput (AI (srcSpanStart span) (offs-len) buf)
-		pushLexState bad_qvarid
-		lexToken
-
 qvarid buf len = ITqvarid $! splitQualName buf len
 qconid buf len = ITqconid $! splitQualName buf len
 
@@ -1591,10 +1560,10 @@ mkPState buf loc flags  =
     }
     where
       bitmap = genericsBit `setBitIf` dopt Opt_Generics flags
-	       .|. ffiBit       `setBitIf` dopt Opt_FFI          flags
+	       .|. ffiBit       `setBitIf` dopt Opt_ForeignFunctionInterface flags
 	       .|. parrBit      `setBitIf` dopt Opt_PArr         flags
 	       .|. arrowsBit    `setBitIf` dopt Opt_Arrows       flags
-	       .|. thBit        `setBitIf` dopt Opt_TH           flags
+	       .|. thBit        `setBitIf` dopt Opt_TemplateHaskell flags
 	       .|. ipBit        `setBitIf` dopt Opt_ImplicitParams flags
 	       .|. explicitForallBit `setBitIf` dopt Opt_ScopedTypeVariables flags
 	       .|. explicitForallBit `setBitIf` dopt Opt_PolymorphicComponents flags