X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fhpc%2FHpcParser.y;h=01307bf565d17a1f14c934c9c8d962ebf5923b34;hb=f297744c392bf7fa10d8b692de7194dcad0b9afd;hp=99201396534899849bdc73c86cdbb13a1788ab8f;hpb=7fc749a43b4b6b85d234fa95d4928648259584f4;p=ghc-hetmet.git

diff --git a/utils/hpc/HpcParser.y b/utils/hpc/HpcParser.y
index 9920139..01307bf 100644
--- a/utils/hpc/HpcParser.y
+++ b/utils/hpc/HpcParser.y
@@ -1,5 +1,14 @@
 { 
-{-# OPTIONS -w #-}
+{-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6
+{-# OPTIONS -Wwarn -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.
+--
 -- 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
@@ -12,6 +21,7 @@ import HpcLexer
 }
 
 %name parser
+%expect 0
 %tokentype { Token }
 
 %token
@@ -31,7 +41,7 @@ import HpcLexer
 	'}'		{ SYM '}' }
 	int		{ INT $$ }
 	string		{ STR $$ }
-	cat		{ STR $$ }
+	cat		{ CAT $$ }
 %%
 
 Spec    :: { Spec }