diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2012-02-20 21:09:54 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2012-02-20 21:09:54 (GMT) |
| commit | 34d4ace6d4037862b6d280f1d7534292c714bf59 (patch) | |
| tree | a9a7b7b5542fbc9a2189f8ae6b39379770043b48 /src/doctokenizer.l | |
| parent | c22d77a7a9c0f26a060a58047f514869a9e0a067 (diff) | |
| download | Doxygen-34d4ace6d4037862b6d280f1d7534292c714bf59.zip Doxygen-34d4ace6d4037862b6d280f1d7534292c714bf59.tar.gz Doxygen-34d4ace6d4037862b6d280f1d7534292c714bf59.tar.bz2 | |
Release-1.7.6.1-20120220
Diffstat (limited to 'src/doctokenizer.l')
| -rw-r--r-- | src/doctokenizer.l | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index c9e5756..a183377 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2011 by Dimitri van Heesch. + * Copyright (C) 1997-2012 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -322,6 +322,7 @@ NONWS [^ \t\r\n] BLANK [ \t\r] ID "$"?[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]* LABELID [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-]* +PHPTYPE [\\:a-z_A-Z0-9\x80-\xFF\-]+ CITEID [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-:/]* MAILADR ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z_A-Z0-9\-]+ OPTSTARS ("//"{BLANK}*)?"*"*{BLANK}* @@ -518,7 +519,7 @@ REFWORD {LABELID}|{REFWORD2}|{REFWORD3} g_token->name = "inheritdoc"; return TK_COMMAND; } -<St_Para>"\\_fakenl" { // artificial new line +<St_Para>"@_fakenl" { // artificial new line yylineno++; } <St_Para>{SPCMD3} { @@ -958,7 +959,7 @@ REFWORD {LABELID}|{REFWORD2}|{REFWORD3} g_token->name = g_token->name.left(yyleng-2); return TK_WORD; } -<St_Param>({LABELID}"|")*{LABELID}{WS}+("&")?"$"{LABELID} { +<St_Param>({PHPTYPE}{BLANK}*"|"{BLANK}*)*{PHPTYPE}{WS}+("&")?"$"{LABELID} { QCString params = yytext; int j = params.find('&'); int i = params.find('$'); |