X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fparser%2FParserCore.y;h=7b82ebad22fb5ff222c00bfc34ebe6f095ebd1d1;hb=1f574dc41f5d11aec48a6ee24c0a28ee60267f95;hp=3210583f9651cfa70247dadca7adafb2fa17fd42;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git diff --git a/compiler/parser/ParserCore.y b/compiler/parser/ParserCore.y index 3210583..7b82eba 100644 --- a/compiler/parser/ParserCore.y +++ b/compiler/parser/ParserCore.y @@ -82,7 +82,7 @@ tdefs :: { [TyClDecl RdrName] } | tdef ';' tdefs {$1:$3} tdef :: { TyClDecl RdrName } - : '%data' q_tc_name tv_bndrs '=' '{' cons1 '}' + : '%data' q_tc_name tv_bndrs '=' '{' cons '}' { mkTyData DataType (noLoc [], noLoc (ifaceExtRdrName $2), map toHsTvBndr $3) Nothing $6 Nothing } | '%newtype' q_tc_name tv_bndrs trep { let tc_rdr = ifaceExtRdrName $2 in @@ -97,9 +97,9 @@ trep :: { OccName -> [LConDecl RdrName] } in [noLoc $ ConDecl (noLoc dc_name) Explicit [] (noLoc []) con_info ResTyH98]) } -cons1 :: { [LConDecl RdrName] } - : con { [$1] } - | con ';' cons1 { $1:$3 } +cons :: { [LConDecl RdrName] } + : {- empty -} { [] } -- 20060420 Empty data types allowed. jds + | con ';' cons { $1:$3 } con :: { LConDecl RdrName } : d_pat_occ attv_bndrs hs_atys