diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-04-22 10:08:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 10:08:32 (GMT) |
| commit | 3eac2b8724a98a6216ace89e4a1b0d14e9ca1fd7 (patch) | |
| tree | 9a3efa245c3eabd1e8eace6dba4d5f18b4b29a37 | |
| parent | 9bc3ecc7253d897598aae64d6cf7eab5b4f1b494 (diff) | |
| parent | b0b67978e4f099bb999fc5f099259e229b9ce5ad (diff) | |
| download | Doxygen-3eac2b8724a98a6216ace89e4a1b0d14e9ca1fd7.zip Doxygen-3eac2b8724a98a6216ace89e4a1b0d14e9ca1fd7.tar.gz Doxygen-3eac2b8724a98a6216ace89e4a1b0d14e9ca1fd7.tar.bz2 | |
Merge pull request #677 from albert-github/feature/bug_743539
Bug 743539 - Field with name "internal" confuses documentation builder.
| -rw-r--r-- | src/code.l | 1 | ||||
| -rw-r--r-- | src/scanner.l | 4 |
2 files changed, 1 insertions, 4 deletions
@@ -2416,6 +2416,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; if (g_insideCpp && (QCString(yytext) =="set" ||QCString(yytext) =="get")) REJECT; startFontClass("keyword"); codifyLines(yytext); diff --git a/src/scanner.l b/src/scanner.l index 619eb5d..381ad6b 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; |