summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-11-16 15:48:55 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-11-16 15:48:55 (GMT)
commit9f477b87fc492221e1b7109d197fe468cd0ed23d (patch)
tree803388c3939e17874cfb16f0aaa94d178324324e /src
parentad5dfc39bee7a1b3de16f36bc3a20565aa6438fe (diff)
downloadDoxygen-9f477b87fc492221e1b7109d197fe468cd0ed23d.zip
Doxygen-9f477b87fc492221e1b7109d197fe468cd0ed23d.tar.gz
Doxygen-9f477b87fc492221e1b7109d197fe468cd0ed23d.tar.bz2
Bug 739214 - Cannot make unscoped link to C++ conversion operator
Diffstat (limited to 'src')
-rw-r--r--src/doctokenizer.l4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 827b4fb..2de04a3 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -377,6 +377,7 @@ OPNORM {OPNEW}|{OPDEL}|"+"|"-"|"*"|"/"|"%"|"^"|"&"|"|"|"~"|"!"|"="|"<"|">"|"+
OPCAST {BLANK}+[^<(\r\n.,][^(\r\n.,]*
OPMASK ({BLANK}*{OPNORM}{FUNCARG})
OPMASKOPT ({BLANK}*{OPNORM}{FUNCARG}?)|({OPCAST}{FUNCARG})
+OPMASKOP2 ({BLANK}*{OPNORM}{FUNCARG2}?)|({OPCAST}{FUNCARG2})
LNKWORD1 ("::"|"#")?{SCOPEMASK}
CVSPEC {BLANK}*("const"|"volatile")
LNKWORD2 (({SCOPEPRE}*"operator"{OPMASK})|({SCOPEPRE}"operator"{OPMASKOPT})|(("::"|"#"){SCOPEPRE}*"operator"{OPMASKOPT})){CVSPEC}?
@@ -393,7 +394,8 @@ HTMLKEYU "STRONG"|"CENTER"|"TABLE"|"CAPTION"|"SMALL"|"CODE"|"DFN"|"VAR"|"IMG"|"
HTMLKEYW {HTMLKEYL}|{HTMLKEYU}
REFWORD2 ("#"|"::")?((({ID}{TEMPLPART}?)|{ANONNS})("."|"#"|"::"|"-"|"/"))*({ID}{TEMPLPART}?(":")?){FUNCARG2}?
REFWORD3 ({ID}":")*{ID}":"?
-REFWORD {LABELID}|{REFWORD2}|{REFWORD3}|{LNKWORD2}
+REFWORD4 (({SCOPEPRE}*"operator"{OPMASKOP2})|(("::"|"#"){SCOPEPRE}*"operator"{OPMASKOP2})){CVSPEC}?
+REFWORD {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
%option noyywrap
%option yylineno