X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=98599498aeb210bb8417f27709cd7074f3a2aa5b;hp=5a181cf53cfd7a3b68a77c8a483c8660ea225d6e;hb=d2f11ea842a25bebd51d6c0c730a756c1d987e25;hpb=64557b454b1a184ef9ee177806a05b75c79c0eb6

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 5a181cf..9859949 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -8,15 +8,8 @@
 -- ---------------------------------------------------------------------------
 
 {
-{-# OPTIONS -Wwarn -w -XNoMonomorphismRestriction #-}
--- The NoMonomorphismRestriction deals with a Happy infelicity
---    With OutsideIn's more conservativ monomorphism restriction
---    we aren't generalising
---        notHappyAtAll = error "urk"
---    which is terrible.  Switching off the restriction allows
---    the generalisation.  Better would be to make Happy generate
---    an appropriate signature.
-
+{-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6
+{-# OPTIONS -Wwarn -w #-}
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix
 -- any warnings in the module. See
@@ -1363,8 +1356,8 @@ aexp2	:: { LHsExpr RdrName }
 	| RATIONAL			{ sL (getLoc $1) (HsOverLit $! mkHsFractional (getRATIONAL $1) placeHolderType) }
 
         -- N.B.: sections get parsed by these next two productions.
-        -- This allows you to write, e.g., '(+ 3, 4 -)', which isn't correct Haskell98
-        -- (you'd have to write '((+ 3), (4 -))')
+        -- This allows you to write, e.g., '(+ 3, 4 -)', which isn't
+        -- correct Haskell (you'd have to write '((+ 3), (4 -))')
         -- but the less cluttered version fell out of having texps.
 	| '(' texp ')'			{ LL (HsPar $2) }
 	| '(' tup_exprs ')'             { LL (ExplicitTuple $2 Boxed) }
@@ -1424,8 +1417,8 @@ texp :: { LHsExpr RdrName }
 	-- Note [Parsing sections]
 	-- ~~~~~~~~~~~~~~~~~~~~~~~
 	-- We include left and right sections here, which isn't
-	-- technically right according to Haskell 98.  For example
-	--	(3 +, True) isn't legal
+	-- technically right according to the Haskell standard.
+        -- For example (3 +, True) isn't legal.
 	-- However, we want to parse bang patterns like
 	--	(!x, !y)
 	-- and it's convenient to do so here as a section