From: sof Date: Thu, 10 Oct 2002 15:14:37 +0000 (+0000) Subject: [project @ 2002-10-10 15:14:37 by sof] X-Git-Tag: Approx_11550_changesets_converted~1573 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=d61d6aea2c567a76629984f532022a11bc7fbe21;p=ghc-hetmet.git [project @ 2002-10-10 15:14:37 by sof] rules: permit trailing semi-colon(s) again (inserted by the lexer & needed when compiling Base.lhs) --- diff --git a/ghc/compiler/parser/Parser.y b/ghc/compiler/parser/Parser.y index ea68bb3..d09226a 100644 --- a/ghc/compiler/parser/Parser.y +++ b/ghc/compiler/parser/Parser.y @@ -1,6 +1,6 @@ {- -*-haskell-*- ----------------------------------------------------------------------------- -$Id: Parser.y,v 1.107 2002/10/09 16:53:11 simonpj Exp $ +$Id: Parser.y,v 1.108 2002/10/10 15:14:37 sof Exp $ Haskell grammar. @@ -414,7 +414,7 @@ topdecl :: { RdrBinding } | srcloc 'default' '(' comma_types0 ')' { RdrHsDecl (DefD (DefaultDecl $4 $1)) } | 'foreign' fdecl { RdrHsDecl $2 } | '{-# DEPRECATED' deprecations '#-}' { RdrBindings $2 } - | '{-# RULES' rules '#-}' { RdrBindings $2 } + | '{-# RULES' rules '#-}' { RdrBindings (reverse $2) } | srcloc '$(' exp ')' { RdrHsDecl (SpliceD (SpliceDecl $3 $1)) } | decl { $1 } @@ -488,7 +488,8 @@ letbinds :: { RdrNameHsExpr -> RdrNameHsExpr } -- Transformation Rules rules :: { [RdrBinding] } - : rule ';' rules { $1 : $3 } + : rules ';' rule { $3 : $1 } + | rules ';' { $1 } | rule { [$1] } | {- empty -} { [] }