From 92e7ecbcc393caab7f0d8883a51cbfca42767cb1 Mon Sep 17 00:00:00 2001 From: David Waern Date: Mon, 12 Nov 2007 01:34:39 +0000 Subject: [PATCH] Merge from Haddock: allow blank lines inside code blocks Tue Jan 9 14:14:34 CET 2007 Simon Marlow * allow blank lines inside a @...@ code block Please merge this to the 6.8.2 branch --- compiler/parser/HaddockParse.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/parser/HaddockParse.y b/compiler/parser/HaddockParse.y index 880652e..ded4dbe 100644 --- a/compiler/parser/HaddockParse.y +++ b/compiler/parser/HaddockParse.y @@ -74,7 +74,8 @@ elem :: { HsDoc RdrName } | '@' seq1 '@' { DocMonospaced $2 } seq1 :: { HsDoc RdrName } - : elem1 seq1 { docAppend $1 $2 } + : PARA seq1 { docAppend (DocString "\n") $2 } + | elem1 seq1 { docAppend $1 $2 } | elem1 { $1 } elem1 :: { HsDoc RdrName } -- 1.7.10.4