summaryrefslogtreecommitdiffstats
path: root/src/doctokenizer.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2007-08-15 18:35:31 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2007-08-15 18:35:31 (GMT)
commit115c6c02c3b246c525721aef9b1a43aeeb4666d5 (patch)
tree4d3b01807f8eb1364767b33ddb31bfd49b37ef3a /src/doctokenizer.l
parenta56b6170231a051a6ba7e2cb3f93b21c7d854761 (diff)
downloadDoxygen-115c6c02c3b246c525721aef9b1a43aeeb4666d5.zip
Doxygen-115c6c02c3b246c525721aef9b1a43aeeb4666d5.tar.gz
Doxygen-115c6c02c3b246c525721aef9b1a43aeeb4666d5.tar.bz2
Release-1.5.3-20070815
Diffstat (limited to 'src/doctokenizer.l')
-rw-r--r--src/doctokenizer.l7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 8fd3856..901773e 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -321,11 +321,12 @@ FUNCARG "("{FUNCCHAR}*")"({BLANK}*("volatile"|"const"))?
OPNEW {BLANK}+"new"({BLANK}*"[]")?
OPDEL {BLANK}+"delete"({BLANK}*"[]")?
OPNORM {OPNEW}|{OPDEL}|"+"|"-"|"*"|"/"|"%"|"^"|"&"|"|"|"~"|"!"|"="|"<"|">"|"+="|"-="|"*="|"/="|"%="|"^="|"&="|"|="|"<<"|">>"|"<<="|">>="|"=="|"!="|"<="|">="|"&&"|"||"|"++"|"--"|","|"->*"|"->"|"[]"|"()"
-OPCAST {BLANK}+[^(\r\n.,]+
-OPMASK ({BLANK}*{OPNORM}{FUNCARG}?)|({OPCAST}{FUNCARG})
+OPCAST {BLANK}+[^<(\r\n.,][^(\r\n.,]*
+OPMASK ({BLANK}*{OPNORM}{FUNCARG})
+OPMASKOPT ({BLANK}*{OPNORM}{FUNCARG}?)|({OPCAST}{FUNCARG})
LNKWORD1 ("::"|"#")?{SCOPEMASK}
CVSPEC {BLANK}*("const"|"volatile")
-LNKWORD2 {SCOPEPRE}*"operator"{OPMASK}
+LNKWORD2 ({SCOPEPRE}*"operator"{OPMASK})|(("::"|"#"){SCOPEPRE}*"operator"{OPMASKOPT})
LNKWORD3 ([0-9a-z_A-Z\-]+("/"|"\\"))*[0-9a-z_A-Z\-]+("."[0-9a-z_A-Z]+)+
CHARWORD [^ \t\n\r\\@<>()\[\]:;\?{}&%$#,.]
CHARWORDQ [^ \t\n\r\\@<>()\[\]:;\?{}&%$#,."]