X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=cc348bd443841bd1e28bdba6da477f327e2988b5;hp=abfc2582d36893b2d7b92a0a0f04b6d05e31bda2;hb=6777144f7522d8db5935737e12fa451ca3211e6d;hpb=d52ec21d7ef5dc077f406cd17e57116b9f83fa18

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index abfc258..cc348bd 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -361,10 +361,10 @@ module 	:: { Located (HsModule RdrName) }
 		{% fileSrcSpan >>= \ loc -> case $1 of { (opt, info, doc) -> 
 		   return (L loc (HsModule (Just $3) $5 (fst $7) (snd $7) $4 
                           opt info doc) )}}
-	| missing_module_keyword top close
+        | body2
 		{% fileSrcSpan >>= \ loc ->
 		   return (L loc (HsModule Nothing Nothing 
-                          (fst $2) (snd $2) Nothing Nothing emptyHaddockModInfo 
+                          (fst $1) (snd $1) Nothing Nothing emptyHaddockModInfo 
                           Nothing)) }
 
 optdoc :: { (Maybe String, HaddockModInfo RdrName, Maybe (HsDoc RdrName)) }                             
@@ -385,6 +385,10 @@ body 	:: { ([LImportDecl RdrName], [LHsDecl RdrName]) }
 	:  '{'            top '}'		{ $2 }
  	|      vocurly    top close		{ $2 }
 
+body2 	:: { ([LImportDecl RdrName], [LHsDecl RdrName]) }
+	:  '{' top '}'          		{ $2 }
+ 	|  missing_module_keyword top close     { $2 }
+
 top 	:: { ([LImportDecl RdrName], [LHsDecl RdrName]) }
 	: importdecls				{ (reverse $1,[]) }
 	| importdecls ';' cvtopdecls		{ (reverse $1,$3) }
@@ -614,7 +618,7 @@ ty_decl :: { LTyClDecl RdrName }
 			      (unLoc $3) (reverse (unLoc $5)) (unLoc $6)) } }
 
           -- data/newtype family
-        | data_or_newtype 'family' tycl_hdr opt_kind_sig
+        | 'data' 'family' tycl_hdr opt_kind_sig
 		{% do { let {(ctxt, tc, tvs, tparms) = unLoc $3}
                       ; checkTyVars tparms            -- no type pattern
 		      ; unless (null (unLoc ctxt)) $  -- and no context
@@ -622,8 +626,7 @@ ty_decl :: { LTyClDecl RdrName }
 			    "A family declaration cannot have a context"
 		      ; return $
 			  L (comb3 $1 $2 $4)
-			    (TyFamily (DataFamily (unLoc $1)) tc tvs 
-				      (unLoc $4)) } }
+			    (TyFamily DataFamily tc tvs (unLoc $4)) } }
 
           -- data/newtype instance declaration
 	| data_or_newtype 'instance' tycl_hdr constrs deriving
@@ -678,7 +681,7 @@ at_decl_cls :: { LTyClDecl RdrName }
                       } }
 
           -- data/newtype family declaration
-        | data_or_newtype tycl_hdr opt_kind_sig
+        | 'data' tycl_hdr opt_kind_sig
 		{% do { let {(ctxt, tc, tvs, tparms) = unLoc $2}
                       ; checkTyVars tparms            -- no type pattern
 		      ; unless (null (unLoc ctxt)) $  -- and no context
@@ -686,8 +689,7 @@ at_decl_cls :: { LTyClDecl RdrName }
 			    "A family declaration cannot have a context"
 		      ; return $
 			  L (comb3 $1 $2 $3)
-			    (TyFamily (DataFamily (unLoc $1)) tc tvs
-				      (unLoc $3)) 
+			    (TyFamily DataFamily tc tvs (unLoc $3)) 
                       } }
 
 -- Associate type instances