summaryrefslogtreecommitdiffstats
path: root/src/doctokenizer.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2005-07-07 20:16:18 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2005-07-07 20:16:18 (GMT)
commite00238b5830e4cd858fe8a10cc7ac83981212203 (patch)
tree3b82721edc171f76f1a6712ff59e547a592aec23 /src/doctokenizer.l
parentd497898d92c2d2e3495505095563f07549dc2201 (diff)
downloadDoxygen-e00238b5830e4cd858fe8a10cc7ac83981212203.zip
Doxygen-e00238b5830e4cd858fe8a10cc7ac83981212203.tar.gz
Doxygen-e00238b5830e4cd858fe8a10cc7ac83981212203.tar.bz2
Release-1.4.3-20050707
Diffstat (limited to 'src/doctokenizer.l')
-rw-r--r--src/doctokenizer.l8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index b2be204..6cc93d1 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -302,7 +302,8 @@ FILEECHAR [a-z_A-Z0-9\-\+]
HFILEMASK ("."{FILESCHAR}*{FILEECHAR}+)*
FILEMASK ({FILESCHAR}*{FILEECHAR}+("."{FILESCHAR}*{FILEECHAR}+)*)|{HFILEMASK}
LINKMASK [^ \t\n\r\\@<&${}]+("("[^\n)]*")")?({BLANK}*("const"|"volatile"){BLANK}+)?
-SPCMD1 {CMD}[a-z_A-Z0-9]+
+VERBATIM "verbatim"{BLANK}*
+SPCMD1 {CMD}([a-z_A-Z0-9]+|{VERBATIM})
SPCMD2 {CMD}[\\@<>&$#%~]
SPCMD3 {CMD}form#[0-9]+
INOUT "in"|"out"|("in"{BLANK}*","{BLANK}*"out")|("out"{BLANK}*","{BLANK}*"in")
@@ -324,6 +325,7 @@ OPMASK ({BLANK}*{OPNORM}{FUNCARG}?)|({OPCAST}{FUNCARG})
LNKWORD1 ("::"|"#")?{SCOPEMASK}
CVSPEC {BLANK}*("const"|"volatile")
LNKWORD2 {SCOPEPRE}*"operator"{OPMASK}
+LNKWORD3 [0-9a-z_A-Z]+("."[0-9a-z_A-Z]+)+
CHARWORD [^ \t\n\r\\@<>()\[\]:;\?{}&%$#,.]
CHARWORDQ [^ \t\n\r\\@<>()\[\]:;\?{}&%$#,."]
WORD1 "%"?{CHARWORD}+|"{"|"}"|("\""[^"\n]*"\"")
@@ -416,6 +418,7 @@ REFWORD ("#"|"::")?({ID}("."|"#"|"::"|"-"))*({ID}(":")?){FUNCARG}?
<St_Para>{SPCMD1} |
<St_Para>{SPCMD2} { /* special command */
g_token->name = yytext+1;
+ g_token->name = g_token->name.stripWhiteSpace();
g_token->paramDir=TokenInfo::Unspecified;
return TK_COMMAND;
}
@@ -488,7 +491,8 @@ REFWORD ("#"|"::")?({ID}("."|"#"|"::"|"-"))*({ID}(":")?){FUNCARG}?
<St_Para>{LNKWORD1}/"<br>" | // prevent <br> html tag to be parsed as template arguments
<St_Para>{LNKWORD1} |
<St_Para>{LNKWORD1}{FUNCARG} |
-<St_Para>{LNKWORD2} {
+<St_Para>{LNKWORD2} |
+<St_Para>{LNKWORD3} {
g_token->name = yytext;
return TK_LNKWORD;
}