summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-05-20 17:51:13 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-05-20 17:51:13 (GMT)
commiteb193634226ed778dbf5f27f21c6c459213f6158 (patch)
tree93d669de071797e5650a6c4d2f8240975ee80a3a /src/scanner.l
parent580c66073e662b10d4935802ade93dfd7953cd46 (diff)
downloadDoxygen-eb193634226ed778dbf5f27f21c6c459213f6158.zip
Doxygen-eb193634226ed778dbf5f27f21c6c459213f6158.tar.gz
Doxygen-eb193634226ed778dbf5f27f21c6c459213f6158.tar.bz2
Bug 700709 - typedef warning when "using" some operator functions
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 6bbf1c4..9a3d27f 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -624,6 +624,11 @@ IDLATTR ("["[^\]]*"]"){BN}*
TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
RAWBEGIN (u|U|L|u8)?R\"[^ \t\(\)\\]{0,16}"("
RAWEND ")"[^ \t\(\)\\]{0,16}\"
+ARITHOP "+"|"-"|"/"|"*"|"%"|"--"|"++"
+ASSIGNOP "="|"*="|"/="|"%="|"+="|"-="|"<<="|">>="|"&="|"^="|"|="
+LOGICOP "=="|"!="|">"|"<"|">="|"<="|"&&"|"||"|"!"
+BITOP "&"|"|"|"^"|"<<"|">>"|"~"
+OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
%option noyywrap
@@ -1938,7 +1943,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
BEGIN(Using);
}
<Using>"namespace"{BN}+ { lineCount(); BEGIN(UsingDirective); }
-<Using>{ID}{BN}*({BN}*("::"|"."){BN}*{ID})* {
+<Using>({ID}{BN}*("::"|"."){BN}*)*({ID}|{OPERATOR}) {
lineCount();
current->name=yytext;
current->fileName = yyFileName;