X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=b0b7751f02e622790efb127c7c7f438f08dd0be5;hp=3b51e5841845de141519f628fbc23282085b7770;hb=1a9245caefb80a3c4c5965aaacdf9a607e792e1c;hpb=836b1e90821aacc9d1e09fe78085f911597274c8

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 3b51e58..b0b7751 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -8,7 +8,15 @@
 -- ---------------------------------------------------------------------------
 
 {
-{-# OPTIONS -Wwarn -w #-}
+{-# 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.
+
 -- 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
@@ -697,9 +705,9 @@ opt_kind_sig :: { Located (Maybe Kind) }
 --	(Eq a, Ord b) => T a b
 --      T Int [a]			-- for associated types
 -- Rather a lot of inlining here, else we get reduce/reduce errors
-tycl_hdr :: { Located (LHsContext RdrName, LHsType RdrName) }
-	: context '=>' type		{ LL ($1, $3) }
-	| type                          { L1 (noLoc [], $1) }
+tycl_hdr :: { Located (Maybe (LHsContext RdrName), LHsType RdrName) }
+	: context '=>' type		{ LL (Just $1, $3) }
+	| type                          { L1 (Nothing, $1) }
 
 -----------------------------------------------------------------------------
 -- Stand-alone deriving
@@ -936,7 +944,7 @@ infixtype :: { LHsType RdrName }
 
 strict_mark :: { Located HsBang }
 	: '!'				{ L1 HsStrict }
-	| '{-# UNPACK' '#-}' '!'	{ LL HsUnbox }
+	| '{-# UNPACK' '#-}' '!'	{ LL HsUnpack }
 
 -- A ctype is a for-all type
 ctype	:: { LHsType RdrName }
@@ -1269,7 +1277,9 @@ exp10 :: { LHsExpr RdrName }
 							   	(unguardedGRHSs $6)
 							    ]) }
   	| 'let' binds 'in' exp			{ LL $ HsLet (unLoc $2) $4 }
-	| 'if' exp 'then' exp 'else' exp	{ LL $ HsIf $2 $4 $6 }
+	| 'if' exp optSemi 'then' exp optSemi 'else' exp
+                                        {% checkDoAndIfThenElse $2 $3 $5 $6 $8 >>
+                                           return (LL $ HsIf $2 $5 $8) }
    	| 'case' exp 'of' altslist		{ LL $ HsCase $2 (mkMatchGroup (unLoc $4)) }
 	| '-' fexp				{ LL $ NegApp $2 noSyntaxExpr }
 
@@ -1296,6 +1306,10 @@ exp10 :: { LHsExpr RdrName }
 						    -- hdaume: core annotation
 	| fexp					{ $1 }
 
+optSemi :: { Bool }
+	: ';'         { True }
+	| {- empty -} { False }
+
 scc_annot :: { Located FastString }
 	: '_scc_' STRING			{% (addWarning Opt_WarnWarningsDeprecations (getLoc $1) (text "_scc_ is deprecated; use an SCC pragma instead")) >>= \_ ->
                                    ( do scc <- getSCC $2; return $ LL scc ) }
@@ -1633,11 +1647,10 @@ fbinds1	:: { ([HsRecField RdrName (LHsExpr RdrName)], Bool) }
 	| '..'				{ ([],   True) }
   
 fbind	:: { HsRecField RdrName (LHsExpr RdrName) }
-	: qvar '=' exp	{ HsRecField $1 $3 False }
-        | qvar          { HsRecField $1 (L (getLoc $1) placeHolderPunRhs) True }
-			-- Here's where we say that plain 'x'
-			-- means exactly 'x = x'.  The pun-flag boolean is
-			-- there so we can still print it right
+	: qvar '=' exp	{ HsRecField $1 $3                False }
+        | qvar          { HsRecField $1 placeHolderPunRhs True }
+			-- In the punning case, use a place-holder
+                        -- The renamer fills in the final value
 
 -----------------------------------------------------------------------------
 -- Implicit Parameter Bindings