From b3ecf49e3a19b241630641f715854847190e494e Mon Sep 17 00:00:00 2001 From: igloo Date: Tue, 10 Dec 2002 16:28:48 +0000 Subject: [PATCH] [project @ 2002-12-10 16:28:48 by igloo] Use layout inside declarations quasi-quotes [d| ... |] --- ghc/compiler/parser/Parser.y | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc/compiler/parser/Parser.y b/ghc/compiler/parser/Parser.y index f5993d1..907c929 100644 --- a/ghc/compiler/parser/Parser.y +++ b/ghc/compiler/parser/Parser.y @@ -1,6 +1,6 @@ {- -*-haskell-*- ----------------------------------------------------------------------------- -$Id: Parser.y,v 1.113 2002/10/25 15:23:06 simonpj Exp $ +$Id: Parser.y,v 1.114 2002/12/10 16:28:48 igloo Exp $ Haskell grammar. @@ -1021,8 +1021,11 @@ aexp2 :: { RdrNameHsExpr } | srcloc '[t|' ctype '|]' { HsBracket (TypBr $3) $1 } | srcloc '[p|' infixexp '|]' {% checkPattern $1 $3 `thenP` \p -> returnP (HsBracket (PatBr p) $1) } - | srcloc '[d|' cvtopdecls '|]' { HsBracket (DecBr (mkGroup $3)) $1 } + | srcloc '[d|' cvtopbody '|]' { HsBracket (DecBr (mkGroup $3)) $1 } +cvtopbody :: { [RdrNameHsDecl] } + : '{' cvtopdecls '}' { $2 } + | layout_on cvtopdecls close { $2 } texps :: { [RdrNameHsExpr] } : texps ',' exp { $3 : $1 } -- 1.7.10.4