diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-04-22 09:30:51 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 09:30:51 (GMT) |
| commit | cf18122bdd08cf02a701afcc6b5cde901a0f10a5 (patch) | |
| tree | 0c50a4b24c7909e6eeb7f6d0388a8d9726cf0337 | |
| parent | e9320ddfff805590a5c64fb9f77be2220e746e11 (diff) | |
| parent | 0bdaf4541c2495b3166386992666f842c38642c1 (diff) | |
| download | Doxygen-cf18122bdd08cf02a701afcc6b5cde901a0f10a5.zip Doxygen-cf18122bdd08cf02a701afcc6b5cde901a0f10a5.tar.gz Doxygen-cf18122bdd08cf02a701afcc6b5cde901a0f10a5.tar.bz2 | |
Merge pull request #671 from albert-github/feature/bug_611240
Bug 611240 - C# keywords 'get' and 'set' are highlighted as reserved words in C++ documentation source browser.
| -rw-r--r-- | src/code.l | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -116,6 +116,7 @@ static int g_memCallContext; static int g_lastCContext; static int g_skipInlineInitContext; +static bool g_insideCpp; static bool g_insideObjC; static bool g_insideJava; static bool g_insideCS; @@ -2415,6 +2416,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" g_prefixed_with_this_keyword = TRUE; } <Body>{KEYWORD}/([^a-z_A-Z0-9]) { + if (g_insideCpp && (QCString(yytext) =="set" ||QCString(yytext) =="get")) REJECT; startFontClass("keyword"); codifyLines(yytext); if (QCString(yytext)=="typedef") @@ -2425,11 +2427,13 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" endFontClass(); } <Body>{KEYWORD}/{B}* { + if (g_insideCpp && (QCString(yytext) =="set" ||QCString(yytext) =="get")) REJECT; startFontClass("keyword"); codifyLines(yytext); endFontClass(); } <Body>{KEYWORD}/{BN}*"(" { + if (g_insideCpp && (QCString(yytext) =="set" ||QCString(yytext) =="get")) REJECT; startFontClass("keyword"); codifyLines(yytext); endFontClass(); @@ -2984,6 +2988,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" <MemberCall2,FuncCall>{KEYWORD}/([^a-z_A-Z0-9]) { //addParmType(); //g_parmName=yytext; + if (g_insideCpp && (QCString(yytext) =="set" ||QCString(yytext) =="get")) REJECT; startFontClass("keyword"); g_code->codify(yytext); endFontClass(); @@ -3742,6 +3747,7 @@ void parseCCode(CodeOutputInterface &od,const char *className,const QCString &s, g_insideJava = lang==SrcLangExt_Java; g_insideCS = lang==SrcLangExt_CSharp; g_insidePHP = lang==SrcLangExt_PHP; + g_insideCpp = lang==SrcLangExt_Cpp; if (g_sourceFileDef) { setCurrentDoc("l00001"); |