X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=e4285ba9d653e13d695725bf95cee32b4eb84756;hb=2b6e4da63cfb4aba7b0d8ac13f4baee2e6ed38bf;hp=6a34c2de8609fd06e5081ca9f3681ce5b7c425e9;hpb=82a7cebaea5dce16fc9658cc6a5ec037348075d1;p=ghc-hetmet.git

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 6a34c2d..e4285ba 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -378,7 +378,7 @@ module 	:: { Located (HsModule RdrName) }
                           Nothing)) }
 
 maybedocheader :: { (HaddockModInfo RdrName, Maybe (HsDoc RdrName)) }
-        : moduleheader            { (fst $1, snd $1) }
+        : moduleheader            { $1 }
         | {- empty -}             { (emptyHaddockModInfo, Nothing) }
 
 missing_module_keyword :: { () }
@@ -606,8 +606,8 @@ ty_decl :: { LTyClDecl RdrName }
 	| data_or_newtype tycl_hdr constrs deriving
 		{% do { let {(ctxt, tc, tvs, tparms) = unLoc $2}
                       ; checkTyVars tparms    -- no type pattern
-		      ; return $
-			  L (comb4 $1 $2 $3 $4)
+		      ; return $!
+			  sL (comb4 $1 $2 $3 $4)
 			           -- We need the location on tycl_hdr in case 
 				   -- constrs and deriving are both empty
 			    (mkTyData (unLoc $1) (ctxt, tc, tvs, Nothing) 
@@ -619,8 +619,8 @@ ty_decl :: { LTyClDecl RdrName }
 		 deriving
 		{% do { let {(ctxt, tc, tvs, tparms) = unLoc $2}
                       ; checkTyVars tparms    -- can have type pats
-		      ; return $
-			  L (comb4 $1 $2 $4 $5)
+		      ; return $!
+			  sL (comb4 $1 $2 $4 $5)
 			    (mkTyData (unLoc $1) (ctxt, tc, tvs, Nothing) 
 			      (unLoc $3) (reverse (unLoc $5)) (unLoc $6)) } }