X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=9ad951881984b95b0046bc7b0a2bdd6bb26827a4;hb=27b81b461fbc754779b2c941b9e1b9e49d54211b;hp=eec611675970a9de96e239a2576a99132b39ad04;hpb=e13260bd595e518425a7f36ba34ca3297974cae8;p=ghc-hetmet.git

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index eec6116..9ad9518 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) }
@@ -1363,8 +1367,9 @@ aexp2	:: { LHsExpr RdrName }
 	| '[|' exp '|]'         { LL $ HsBracket (ExpBr $2) }                       
 	| '[t|' ctype '|]'      { LL $ HsBracket (TypBr $2) }                       
 	| '[p|' infixexp '|]'   {% checkPattern $2 >>= \p ->
-					   return (LL $ HsBracket (PatBr p)) }
-	| '[d|' cvtopbody '|]'	{ LL $ HsBracket (DecBr (mkGroup $2)) }
+					return (LL $ HsBracket (PatBr p)) }
+	| '[d|' cvtopbody '|]'	{% checkDecBrGroup $2 >>= \g -> 
+					return (LL $ HsBracket (DecBr g)) }
 
 	-- arrow notation extension
 	| '(|' aexp2 cmdargs '|)'	{ LL $ HsArrForm $2 Nothing (reverse $3) }