X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FLexer.x;h=07179b858460b66e518665facdc5277208279f55;hp=0fa3256f694cf62ff4cb0b51884a8e305724f74c;hb=5289f5d85610f71625a439747a09384876655eb5;hpb=a51fe79ebcdcb8285573a18f12cade2101533419

diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index 0fa3256..07179b8 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -32,6 +32,7 @@
 
 {
 -- XXX The above flags turn off warnings in the generated code:
+{-# LANGUAGE BangPatterns #-}
 {-# OPTIONS_GHC -fno-warn-unused-matches #-}
 {-# OPTIONS_GHC -fno-warn-unused-binds #-}
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
@@ -140,7 +141,7 @@ haskell :-
 
 -- everywhere: skip whitespace and comments
 $white_no_nl+ 				;
-$tab+         { warn Opt_WarnTabs (text "Tab character") }
+$tab+         { warn Opt_WarnTabs (text "Warning: Tab character") }
 
 -- Everywhere: deal with nested comments.  We explicitly rule out
 -- pragmas, "{-#", so that we don't accidentally treat them as comments.
@@ -308,6 +309,10 @@ $tab+         { warn Opt_WarnTabs (text "Tab character") }
   \$ @varid / { ifExtension thEnabled }	{ skip_one_varid ITidEscape }
   "$("	    / { ifExtension thEnabled }	{ token ITparenEscape }
 
+-- For backward compatibility, accept the old dollar syntax
+  "[$" @varid "|"  / { ifExtension qqEnabled }
+                     { lex_quasiquote_tok }
+
   "[" @varid "|"  / { ifExtension qqEnabled }
                      { lex_quasiquote_tok }
 }
@@ -452,6 +457,7 @@ data Token
   | ITdynamic
   | ITsafe
   | ITthreadsafe
+  | ITinterruptible
   | ITunsafe
   | ITstdcallconv
   | ITccallconv
@@ -596,6 +602,7 @@ isSpecial ITlabel     	= True
 isSpecial ITdynamic   	= True
 isSpecial ITsafe    	= True
 isSpecial ITthreadsafe 	= True
+isSpecial ITinterruptible = True
 isSpecial ITunsafe    	= True
 isSpecial ITccallconv   = True
 isSpecial ITstdcallconv = True
@@ -658,6 +665,7 @@ reservedWordsFM = listToUFM $
 	( "dynamic",	ITdynamic,	 bit ffiBit),
 	( "safe",	ITsafe,		 bit ffiBit),
 	( "threadsafe",	ITthreadsafe,	 bit ffiBit),  -- ToDo: remove
+	( "interruptible", ITinterruptible, bit ffiBit),
 	( "unsafe",	ITunsafe,	 bit ffiBit),
 	( "stdcall",    ITstdcallconv,	 bit ffiBit),
 	( "ccall",      ITccallconv,	 bit ffiBit),
@@ -1826,29 +1834,29 @@ mkPState flags buf loc =
       alr_justClosedExplicitLetBlock = False
     }
     where
-      bitmap = genericsBit `setBitIf` dopt Opt_Generics flags
-	       .|. ffiBit            `setBitIf` dopt Opt_ForeignFunctionInterface flags
-	       .|. parrBit           `setBitIf` dopt Opt_PArr         flags
-	       .|. arrowsBit         `setBitIf` dopt Opt_Arrows       flags
-	       .|. thBit             `setBitIf` dopt Opt_TemplateHaskell flags
-	       .|. qqBit             `setBitIf` dopt Opt_QuasiQuotes flags
-	       .|. ipBit             `setBitIf` dopt Opt_ImplicitParams flags
-	       .|. explicitForallBit `setBitIf` dopt Opt_ExplicitForAll flags
-	       .|. bangPatBit        `setBitIf` dopt Opt_BangPatterns flags
-	       .|. tyFamBit          `setBitIf` dopt Opt_TypeFamilies flags
+      bitmap = genericsBit `setBitIf` xopt Opt_Generics flags
+	       .|. ffiBit            `setBitIf` xopt Opt_ForeignFunctionInterface flags
+	       .|. parrBit           `setBitIf` xopt Opt_PArr         flags
+	       .|. arrowsBit         `setBitIf` xopt Opt_Arrows       flags
+	       .|. thBit             `setBitIf` xopt Opt_TemplateHaskell flags
+	       .|. qqBit             `setBitIf` xopt Opt_QuasiQuotes flags
+	       .|. ipBit             `setBitIf` xopt Opt_ImplicitParams flags
+	       .|. explicitForallBit `setBitIf` xopt Opt_ExplicitForAll flags
+	       .|. bangPatBit        `setBitIf` xopt Opt_BangPatterns flags
+	       .|. tyFamBit          `setBitIf` xopt Opt_TypeFamilies flags
 	       .|. haddockBit        `setBitIf` dopt Opt_Haddock      flags
-	       .|. magicHashBit      `setBitIf` dopt Opt_MagicHash    flags
-	       .|. kindSigsBit       `setBitIf` dopt Opt_KindSignatures flags
-	       .|. recursiveDoBit    `setBitIf` dopt Opt_RecursiveDo flags
-	       .|. recBit 	     `setBitIf` dopt Opt_DoRec  flags
-	       .|. 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
+	       .|. magicHashBit      `setBitIf` xopt Opt_MagicHash    flags
+	       .|. kindSigsBit       `setBitIf` xopt Opt_KindSignatures flags
+	       .|. recursiveDoBit    `setBitIf` xopt Opt_RecursiveDo flags
+	       .|. recBit 	     `setBitIf` xopt Opt_DoRec  flags
+	       .|. recBit 	     `setBitIf` xopt Opt_Arrows flags
+	       .|. unicodeSyntaxBit  `setBitIf` xopt Opt_UnicodeSyntax flags
+	       .|. unboxedTuplesBit  `setBitIf` xopt Opt_UnboxedTuples flags
+               .|. datatypeContextsBit `setBitIf` xopt Opt_DatatypeContexts flags
+               .|. transformComprehensionsBit `setBitIf` xopt Opt_TransformListComp flags
                .|. rawTokenStreamBit `setBitIf` dopt Opt_KeepRawTokenStream flags
-               .|. newQualOpsBit `setBitIf` dopt Opt_NewQualifiedOperators flags
-               .|. alternativeLayoutRuleBit `setBitIf` dopt Opt_AlternativeLayoutRule flags
+               .|. newQualOpsBit `setBitIf` xopt Opt_NewQualifiedOperators flags
+               .|. alternativeLayoutRuleBit `setBitIf` xopt Opt_AlternativeLayoutRule flags
       --
       setBitIf :: Int -> Bool -> Int
       b `setBitIf` cond | cond      = bit b
@@ -1966,7 +1974,7 @@ alternativeLayoutRuleToken t
          justClosedExplicitLetBlock <- getJustClosedExplicitLetBlock
          setJustClosedExplicitLetBlock False
          dflags <- getDynFlags
-         let transitional = dopt Opt_AlternativeLayoutRuleTransitional dflags
+         let transitional = xopt Opt_AlternativeLayoutRuleTransitional dflags
              thisLoc = getLoc t
              thisCol = srcSpanStartCol thisLoc
              newLine = (lastLoc == noSrcSpan)
@@ -2218,6 +2226,8 @@ ignoredPrags = Map.fromList (map ignored pragmas)
 oneWordPrags = Map.fromList([("rules", rulePrag),
                            ("inline", token (ITinline_prag Inline FunLike)),
                            ("inlinable", token (ITinline_prag Inlinable FunLike)),
+                           ("inlineable", token (ITinline_prag Inlinable FunLike)),
+			   		  -- Spelling variant
                            ("notinline", token (ITinline_prag NoInline FunLike)),
                            ("specialize", token ITspec_prag),
                            ("source", token ITsource_prag),