From ea54ebc01fc0a448ed523530a3a52271191337f1 Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Mon, 18 Aug 2003 11:48:46 +0000
Subject: [haddock @ 2003-08-18 11:48:46 by simonmar] Fixes to the new lexer.

---
 src/HaddockParse.y | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/HaddockParse.y')

diff --git a/src/HaddockParse.y b/src/HaddockParse.y
index db712c42..e1a1cb8c 100644
--- a/src/HaddockParse.y
+++ b/src/HaddockParse.y
@@ -10,8 +10,8 @@ import HsSyn
 %token	'/'	{ TokSpecial '/' }
 	'@'	{ TokSpecial '@' }
 	DQUO 	{ TokSpecial '\"' }
-	'#'	{ TokSpecial '#' }
 	URL	{ TokURL $$ }
+	ANAME	{ TokAName $$ }
 	'*'	{ TokBullet }
 	'(n)'	{ TokNumber }
 	'>..'	{ TokBirdTrack $$ }
@@ -65,12 +65,16 @@ seq1	:: { Doc }
 
 elem1	:: { Doc }
 	: STRING		{ DocString $1 }
-	| '/' STRING '/'	{ DocEmphasis (DocString $2) }
-	| '#' STRING '#'	{ DocAName $2 }
+	| '/' strings '/'	{ DocEmphasis $2 }
 	| URL			{ DocURL $1 }
+	| ANAME			{ DocAName $1 }
 	| IDENT			{ DocIdentifier $1 }
 	| DQUO STRING DQUO	{ DocModule $2 }
 
+strings  :: { Doc }
+	: STRING		{ DocString $1 }
+	| STRING strings	{ docAppend (DocString $1) $2 }
+
 {
 happyError :: [Token] -> Either String a
 happyError toks = 
-- 
cgit v1.2.3