Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics

[ghc-hetmet.git] / compiler / parser / ParserCore.y

diff --git a/compiler/parser/ParserCore.y b/compiler/parser/ParserCore.y
index 7c22e21..3f2b32a 100644 (file)
--- a/compiler/parser/ParserCore.y
+++ b/compiler/parser/ParserCore.y
@@ -1,14 +1,6 @@
 {
 {-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6
-{-# 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.
---
+{-# 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
@@ -277,7 +269,7 @@ exp :: { IfaceExpr }
        | '%let' let_bind '%in' exp   { IfaceLet $2 $4 }
 -- gaw 2004
        | '%case' '(' ty ')' aexp '%of' id_bndr
-         '{' alts1 '}'               { IfaceCase $5 (fst $7) $3 $9 }
+         '{' alts1 '}'               { IfaceCase $5 (fst $7) $9 }
         | '%cast' aexp aty { IfaceCast $2 $3 }
 -- No InlineMe any more
 --     | '%note' STRING exp