summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2018-03-06 13:33:22 (GMT)
committeralbert-github <albert.tests@gmail.com>2018-03-06 13:33:22 (GMT)
commit89f808f75f7d39962a0b9dba4f479b5c6d6d9a24 (patch)
tree8bd31bb79c621bedc118c486f5fe48848bee1168 /src
parentfd2e30508f50c2fe84d3619eaa1575545a25b1d3 (diff)
downloadDoxygen-89f808f75f7d39962a0b9dba4f479b5c6d6d9a24.zip
Doxygen-89f808f75f7d39962a0b9dba4f479b5c6d6d9a24.tar.gz
Doxygen-89f808f75f7d39962a0b9dba4f479b5c6d6d9a24.tar.bz2
Bug 743539 - Field with name "internal" confuses documentation builder.
internal is not a Java reserved word / keyword but was handled as such.
Diffstat (limited to 'src')
-rw-r--r--src/code.l1
-rw-r--r--src/scanner.l4
2 files changed, 1 insertions, 4 deletions
diff --git a/src/code.l b/src/code.l
index d7d5d74..1b86a62 100644
--- a/src/code.l
+++ b/src/code.l
@@ -2415,6 +2415,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
g_prefixed_with_this_keyword = TRUE;
}
<Body>{KEYWORD}/([^a-z_A-Z0-9]) {
+ if (g_insideJava && qstrcmp("internal",yytext) ==0) REJECT;
startFontClass("keyword");
codifyLines(yytext);
if (QCString(yytext)=="typedef")
diff --git a/src/scanner.l b/src/scanner.l
index 08a5e52..3a6eac0 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -2382,10 +2382,6 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
{
current->protection = Protected;
}
- else if (javaLike && qstrcmp(yytext,"internal")==0)
- {
- current->protection = Package;
- }
else if (javaLike && qstrcmp(yytext,"private")==0)
{
current->protection = Private;