X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FLexer.x;h=cadd56d17d607fc9c242ab52c597dd08dbf34f00;hp=fdf4bddefef29c4612c2ce369312319138192016;hb=c800c1633c97a7ead022a142d015bf8db14f04f6;hpb=8538e4ba68b3d34ceaa2677ed242ac45ab456ce7

diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index fdf4bdd..cadd56d 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -51,7 +51,7 @@ module Lexer (
    getMessages, 
    popContext, pushCurrentContext, setLastToken, setSrcLoc,
    getLexState, popLexState, pushLexState,
-   extension, bangPatEnabled,
+   extension, bangPatEnabled, datatypeContextsEnabled,
    addWarning,
    lexTokenStream
   ) where
@@ -1349,11 +1349,13 @@ readNum2 is_digit base conv i = do
   where read i input = do
 	  case alexGetChar' input of
 	    Just (c,input') | is_digit c -> do
-		read (i*base + conv c) input'
+               let i' = i*base + conv c
+               if i' > 0x10ffff
+                  then setInput input >> lexError "numeric escape sequence out of range"
+                  else read i' input'
 	    _other -> do
-		if i >= 0 && i <= 0x10FFFF
-		   then do setInput input; return (chr i)
-		   else lit_error input
+              setInput input; return (chr i)
+
 
 silly_escape_chars :: [(String, Char)]
 silly_escape_chars = [
@@ -1735,6 +1737,8 @@ unicodeSyntaxBit :: Int
 unicodeSyntaxBit = 14 -- the forall symbol, arrow symbols, etc
 unboxedTuplesBit :: Int
 unboxedTuplesBit = 15 -- (# and #)
+datatypeContextsBit :: Int
+datatypeContextsBit = 16
 transformComprehensionsBit :: Int
 transformComprehensionsBit = 17
 qqBit :: Int
@@ -1778,6 +1782,8 @@ unicodeSyntaxEnabled :: Int -> Bool
 unicodeSyntaxEnabled flags = testBit flags unicodeSyntaxBit
 unboxedTuplesEnabled :: Int -> Bool
 unboxedTuplesEnabled flags = testBit flags unboxedTuplesBit
+datatypeContextsEnabled :: Int -> Bool
+datatypeContextsEnabled flags = testBit flags datatypeContextsBit
 qqEnabled :: Int -> Bool
 qqEnabled        flags = testBit flags qqBit
 -- inRulePrag :: Int -> Bool
@@ -1838,6 +1844,7 @@ mkPState flags buf loc =
 	       .|. recBit 	     `setBitIf` dopt Opt_Arrows flags
 	       .|. unicodeSyntaxBit  `setBitIf` dopt Opt_UnicodeSyntax flags
 	       .|. unboxedTuplesBit  `setBitIf` dopt Opt_UnboxedTuples flags
+               .|. datatypeContextsBit `setBitIf` dopt Opt_DatatypeContexts flags
                .|. transformComprehensionsBit `setBitIf` dopt Opt_TransformListComp flags
                .|. rawTokenStreamBit `setBitIf` dopt Opt_KeepRawTokenStream flags
                .|. newQualOpsBit `setBitIf` dopt Opt_NewQualifiedOperators flags