Tue Aug 28 11:19:54 CEST 2007 Simon Marlow <simonmar@microsoft.com>
* Modify lexing of /../
This makes /../ more like '..', so that a single / on a line doesn't
trigger a parse error. This should reduce the causes of accidental
parse errors in Haddock comments; apparently stray / characters are
a common source of failures.
Please merge this to the 6.8.2 branch.
| TokIdent [RdrName]
| TokString String
| TokURL String
| TokIdent [RdrName]
| TokString String
| TokURL String
| TokAName String
| TokBirdTrack String
| TokAName String
| TokBirdTrack String
$ws = $white # \n
$digit = [0-9]
$hexdigit = [0-9a-fA-F]
$ws = $white # \n
$digit = [0-9]
$hexdigit = [0-9a-fA-F]
$alphanum = [A-Za-z0-9]
$ident = [$alphanum \'\_\.\!\#\$\%\&\*\+\/\<\=\>\?\@\\\\\^\|\-\~]
$alphanum = [A-Za-z0-9]
$ident = [$alphanum \'\_\.\!\#\$\%\&\*\+\/\<\=\>\?\@\\\\\^\|\-\~]
$special { strtoken $ \s -> TokSpecial (head s) }
\<.*\> { strtoken $ \s -> TokURL (init (tail s)) }
\#.*\# { strtoken $ \s -> TokAName (init (tail s)) }
$special { strtoken $ \s -> TokSpecial (head s) }
\<.*\> { strtoken $ \s -> TokURL (init (tail s)) }
\#.*\# { strtoken $ \s -> TokAName (init (tail s)) }
+ \/ [^\/]* \/ { strtoken $ \s -> TokEmphasis (init (tail s)) }
[\'\`] $ident+ [\'\`] { ident }
\\ . { strtoken (TokString . tail) }
"&#" $digit+ \; { strtoken $ \s -> TokString [chr (read (init (drop 2 s)))] }
"&#" [xX] $hexdigit+ \; { strtoken $ \s -> case readHex (init (drop 3 s)) of [(n,_)] -> TokString [chr n] }
-- allow special characters through if they don't fit one of the previous
-- patterns.
[\'\`] $ident+ [\'\`] { ident }
\\ . { strtoken (TokString . tail) }
"&#" $digit+ \; { strtoken $ \s -> TokString [chr (read (init (drop 2 s)))] }
"&#" [xX] $hexdigit+ \; { strtoken $ \s -> case readHex (init (drop 3 s)) of [(n,_)] -> TokString [chr n] }
-- allow special characters through if they don't fit one of the previous
-- patterns.
- [\'\`\<\#\&\\] { strtoken TokString }
- [^ $special \< \# \n \'\` \& \\ \]]* \n { strtoken TokString `andBegin` line }
- [^ $special \< \# \n \'\` \& \\ \]]+ { strtoken TokString }
+ [\/\'\`\<\#\&\\] { strtoken TokString }
+ [^ $special \/ \< \# \n \'\` \& \\ \]]* \n { strtoken TokString `andBegin` line }
+ [^ $special \/ \< \# \n \'\` \& \\ \]]+ { strtoken TokString }
| TokIdent [RdrName]
| TokString String
| TokURL String
| TokIdent [RdrName]
| TokString String
| TokURL String
| TokAName String
| TokBirdTrack String
-- deriving Show
| TokAName String
| TokBirdTrack String
-- deriving Show
DQUO { TokSpecial '\"' }
URL { TokURL $$ }
ANAME { TokAName $$ }
DQUO { TokSpecial '\"' }
URL { TokURL $$ }
ANAME { TokAName $$ }
+ '/../' { TokEmphasis $$ }
'-' { TokBullet }
'(n)' { TokNumber }
'>..' { TokBirdTrack $$ }
'-' { TokBullet }
'(n)' { TokNumber }
'>..' { TokBirdTrack $$ }
elem1 :: { HsDoc RdrName }
: STRING { DocString $1 }
elem1 :: { HsDoc RdrName }
: STRING { DocString $1 }
- | '/' strings '/' { DocEmphasis (DocString $2) }
+ | '/../' { DocEmphasis (DocString $1) }
| URL { DocURL $1 }
| ANAME { DocAName $1 }
| IDENT { DocIdentifier $1 }
| URL { DocURL $1 }
| ANAME { DocAName $1 }
| IDENT { DocIdentifier $1 }