diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-04-22 09:51:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 09:51:01 (GMT) |
| commit | b0b67978e4f099bb999fc5f099259e229b9ce5ad (patch) | |
| tree | 439ca1aef919ca186abc1a6ff5998a1e467f4226 /src/code.l | |
| parent | 89f808f75f7d39962a0b9dba4f479b5c6d6d9a24 (diff) | |
| parent | 243a3fce87107ac7c6afc7a9d5883ddc007a8534 (diff) | |
| download | Doxygen-b0b67978e4f099bb999fc5f099259e229b9ce5ad.zip Doxygen-b0b67978e4f099bb999fc5f099259e229b9ce5ad.tar.gz Doxygen-b0b67978e4f099bb999fc5f099259e229b9ce5ad.tar.bz2 | |
Merge branch 'master' into feature/bug_743539
Diffstat (limited to 'src/code.l')
| -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; @@ -2416,6 +2417,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) =="set" ||QCString(yytext) =="get")) REJECT; startFontClass("keyword"); codifyLines(yytext); if (QCString(yytext)=="typedef") @@ -2426,11 +2428,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(); @@ -2985,6 +2989,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(); @@ -3743,6 +3748,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"); |