From: David Waern <david.waern@gmail.com>
Date: Mon, 12 Nov 2007 22:05:37 +0000 (+0000)
Subject: Merge from Haddock: Add <<url>> for images
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=c6b0a84d8a3aec97086e5316b321dad9594a4fac

Merge from Haddock: Add <<url>> for images
A merge of this patch:

  Mon Aug  7 16:22:14 CEST 2006  Simon Marlow <simonmar@microsoft.com>
    * Add <<url>> for images
    Submitted by: Lennart Augustsson

Please merge to the 6.8.2 branch.
---

diff --git a/compiler/hsSyn/HsDoc.hs b/compiler/hsSyn/HsDoc.hs
index c71f58b..bd75408 100644
--- a/compiler/hsSyn/HsDoc.hs
+++ b/compiler/hsSyn/HsDoc.hs
@@ -34,6 +34,7 @@ data HsDoc id
   | DocDefList [(HsDoc id, HsDoc id)]
   | DocCodeBlock (HsDoc id)
   | DocURL String
+  | DocPic String
   | DocAName String
   deriving (Eq, Show)
 
diff --git a/compiler/parser/HaddockLex.hs-boot b/compiler/parser/HaddockLex.hs-boot
index 3144744..3e232c0 100644
--- a/compiler/parser/HaddockLex.hs-boot
+++ b/compiler/parser/HaddockLex.hs-boot
@@ -14,6 +14,7 @@ data Token
   | TokIdent [RdrName]
   | TokString String
   | TokURL String
+  | TokPic String
   | TokEmphasis String
   | TokAName String
   | TokBirdTrack String
diff --git a/compiler/parser/HaddockLex.x b/compiler/parser/HaddockLex.x
index acc04d6..52a2673 100644
--- a/compiler/parser/HaddockLex.x
+++ b/compiler/parser/HaddockLex.x
@@ -67,6 +67,7 @@ $ident    = [$alphanum \'\_\.\!\#\$\%\&\*\+\/\<\=\>\?\@\\\\\^\|\-\~]
 
 <string,def> {
   $special			{ strtoken $ \s -> TokSpecial (head s) }
+  \<\<.*\>\>                    { strtoken $ \s -> TokPic (init $ init $ tail $ tail s) }
   \<.*\>			{ strtoken $ \s -> TokURL (init (tail s)) }
   \#.*\#			{ strtoken $ \s -> TokAName (init (tail s)) }
   \/ [^\/]* \/                  { strtoken $ \s -> TokEmphasis (init (tail s)) }
@@ -102,6 +103,7 @@ data Token
   | TokIdent [RdrName]
   | TokString String
   | TokURL String
+  | TokPic String
   | TokEmphasis String
   | TokAName String
   | TokBirdTrack String
diff --git a/compiler/parser/HaddockParse.y b/compiler/parser/HaddockParse.y
index d591957..e23b4ee 100644
--- a/compiler/parser/HaddockParse.y
+++ b/compiler/parser/HaddockParse.y
@@ -21,6 +21,7 @@ import RdrName
 	']'     { TokDefEnd }
 	DQUO 	{ TokSpecial '\"' }
 	URL	{ TokURL $$ }
+	PIC     { TokPic $$ }
 	ANAME	{ TokAName $$ }
 	'/../'  { TokEmphasis $$ }
 	'-'	{ TokBullet }
@@ -83,6 +84,7 @@ elem1	:: { HsDoc RdrName }
 	: STRING		{ DocString $1 }
 	| '/../'                { DocEmphasis (DocString $1) }
 	| URL			{ DocURL $1 }
+	| PIC                   { DocPic $1 }
 	| ANAME			{ DocAName $1 }
 	| IDENT			{ DocIdentifier $1 }
 	| DQUO strings DQUO	{ DocModule $2 }
diff --git a/compiler/rename/RnHsDoc.hs b/compiler/rename/RnHsDoc.hs
index 1062531..a1e05c9 100644
--- a/compiler/rename/RnHsDoc.hs
+++ b/compiler/rename/RnHsDoc.hs
@@ -104,4 +104,6 @@ rnHsDoc doc = case doc of
 
   DocURL str -> return (DocURL str)
 
+  DocPic str -> return (DocPic str)
+
   DocAName str -> return (DocAName str)