X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FLexer.x;h=9237384efcb1e7fd32a3a4532d2d2e059b3297a7;hp=6b73981350333f1517e70435bc5e7e717fa6f397;hb=d2f11ea842a25bebd51d6c0c730a756c1d987e25;hpb=5fa086c51816f09d03fb1a089dde64df6bd2d8a3

diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index 6b73981..9237384 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -369,10 +369,8 @@ $tab+         { warn Opt_WarnTabs (text "Warning: Tab character") }
 -- ToDo: - move `var` and (sym) into lexical syntax?
 --       - remove backquote from $special?
 <0> {
-  @qual @varsym       / { ifExtension oldQualOps } { idtoken qvarsym }
-  @qual @consym       / { ifExtension oldQualOps } { idtoken qconsym }
-  @qual \( @varsym \) / { ifExtension newQualOps } { idtoken prefixqvarsym }
-  @qual \( @consym \) / { ifExtension newQualOps } { idtoken prefixqconsym }
+  @qual @varsym                                    { idtoken qvarsym }
+  @qual @consym                                    { idtoken qconsym }
   @varsym                                          { varsym }
   @consym                                          { consym }
 }
@@ -512,8 +510,8 @@ data Token
   | ITvocurly
   | ITvccurly
   | ITobrack
-  | ITopabrack			-- [:, for parallel arrays with -XParr
-  | ITcpabrack			-- :], for parallel arrays with -XParr
+  | ITopabrack			-- [:, for parallel arrays with -XParallelArrays
+  | ITcpabrack			-- :], for parallel arrays with -XParallelArrays
   | ITcbrack
   | IToparen
   | ITcparen
@@ -1640,7 +1638,7 @@ alexGetChar (AI loc s)
 		  EnclosingMark         -> other_graphic
 		  DecimalNumber         -> digit
 		  LetterNumber          -> other_graphic
-		  OtherNumber           -> other_graphic
+                  OtherNumber           -> digit -- see #4373
 		  ConnectorPunctuation  -> symbol
 		  DashPunctuation       -> symbol
 		  OpenPunctuation       -> other_graphic
@@ -1726,7 +1724,7 @@ setAlrExpectingOCurly :: Maybe ALRLayout -> P ()
 setAlrExpectingOCurly b = P $ \s -> POk (s {alr_expecting_ocurly = b}) ()
 
 -- for reasons of efficiency, flags indicating language extensions (eg,
--- -fglasgow-exts or -XParr) are represented by a bitmap stored in an unboxed
+-- -fglasgow-exts or -XParallelArrays) are represented by a bitmap stored in an unboxed
 -- integer
 
 genericsBit :: Int
@@ -1770,8 +1768,6 @@ inRulePragBit :: Int
 inRulePragBit = 19
 rawTokenStreamBit :: Int
 rawTokenStreamBit = 20 -- producing a token stream with all comments included
-newQualOpsBit :: Int
-newQualOpsBit = 21 -- Haskell' qualified operator syntax, e.g. Prelude.(+)
 recBit :: Int
 recBit = 22 -- rec
 alternativeLayoutRuleBit :: Int
@@ -1817,10 +1813,6 @@ qqEnabled        flags = testBit flags qqBit
 -- inRulePrag       flags = testBit flags inRulePragBit
 rawTokenStreamEnabled :: Int -> Bool
 rawTokenStreamEnabled flags = testBit flags rawTokenStreamBit
-newQualOps :: Int -> Bool
-newQualOps       flags = testBit flags newQualOpsBit
-oldQualOps :: Int -> Bool
-oldQualOps flags = not (newQualOps flags)
 alternativeLayoutRule :: Int -> Bool
 alternativeLayoutRule flags = testBit flags alternativeLayoutRuleBit
 relaxedLayout :: Int -> Bool
@@ -1859,12 +1851,12 @@ mkPState flags buf loc =
     where
       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
+	       .|. parrBit           `setBitIf` xopt Opt_ParallelArrays  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
+	       .|. 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
@@ -1878,7 +1870,6 @@ mkPState flags buf loc =
                .|. datatypeContextsBit `setBitIf` xopt Opt_DatatypeContexts flags
                .|. transformComprehensionsBit `setBitIf` xopt Opt_TransformListComp flags
                .|. rawTokenStreamBit `setBitIf` dopt Opt_KeepRawTokenStream flags
-               .|. newQualOpsBit `setBitIf` xopt Opt_NewQualifiedOperators flags
                .|. alternativeLayoutRuleBit `setBitIf` xopt Opt_AlternativeLayoutRule flags
                .|. relaxedLayoutBit `setBitIf` xopt Opt_RelaxedLayout flags
                .|. nondecreasingIndentationBit `setBitIf` xopt Opt_NondecreasingIndentation flags