summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2018-07-30 08:13:25 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2018-07-30 08:13:25 (GMT)
commit2b6fd3bd70795c1c1cf0accb1a991015ad6b2ba9 (patch)
treefc9db822f73771d1fdd7f689474bc51a40f5962c /src
parent55e020ce14abfa2dc2ee395fefd7b1da33180e70 (diff)
downloadDoxygen-2b6fd3bd70795c1c1cf0accb1a991015ad6b2ba9.zip
Doxygen-2b6fd3bd70795c1c1cf0accb1a991015ad6b2ba9.tar.gz
Doxygen-2b6fd3bd70795c1c1cf0accb1a991015ad6b2ba9.tar.bz2
Moved duplicated code into dedicated function skipLanguageSpecificKeyword
Diffstat (limited to 'src')
-rw-r--r--src/code.l13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/code.l b/src/code.l
index e248970..2c9b0ae 100644
--- a/src/code.l
+++ b/src/code.l
@@ -1797,6 +1797,11 @@ static QCString escapeComment(const char *s)
return result;
}
+static bool skipLanguageSpecificKeyword(const QCString &kw)
+{
+ return g_insideCpp && (kw == "remove" || kw == "set" || kw == "get");
+}
+
/* -----------------------------------------------------------------
*/
#undef YY_INPUT
@@ -2417,7 +2422,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
}
<Body>{KEYWORD}/([^a-z_A-Z0-9]) {
if (g_insideJava && qstrcmp("internal",yytext) ==0) REJECT;
- if (g_insideCpp && (QCString(yytext) == "remove" ||QCString(yytext) =="set" ||QCString(yytext) =="get")) REJECT;
+ if (skipLanguageSpecificKeyword(yytext)) REJECT;
startFontClass("keyword");
codifyLines(yytext);
if (QCString(yytext)=="typedef")
@@ -2428,13 +2433,13 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
endFontClass();
}
<Body>{KEYWORD}/{B}* {
- if (g_insideCpp && (QCString(yytext) == "remove" ||QCString(yytext) =="set" ||QCString(yytext) =="get")) REJECT;
+ if (skipLanguageSpecificKeyword(yytext)) REJECT;
startFontClass("keyword");
codifyLines(yytext);
endFontClass();
}
<Body>{KEYWORD}/{BN}*"(" {
- if (g_insideCpp && (QCString(yytext) == "remove" ||QCString(yytext) =="set" ||QCString(yytext) =="get")) REJECT;
+ if (skipLanguageSpecificKeyword(yytext)) REJECT;
startFontClass("keyword");
codifyLines(yytext);
endFontClass();
@@ -2989,7 +2994,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
<MemberCall2,FuncCall>{KEYWORD}/([^a-z_A-Z0-9]) {
//addParmType();
//g_parmName=yytext;
- if (g_insideCpp && (QCString(yytext) == "remove" ||QCString(yytext) =="set" ||QCString(yytext) =="get")) REJECT;
+ if (skipLanguageSpecificKeyword(yytext)) REJECT;
startFontClass("keyword");
g_code->codify(yytext);
endFontClass();