diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-04-11 18:10:54 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-04-11 18:10:54 (GMT) |
| commit | e1a039881e40ac658606f50d0f6d3f97ffd32564 (patch) | |
| tree | 2fa6c34e2956369dd0c04d3df925279f2783677c | |
| parent | 0754c968a4a06c8217c9301a5ca82c6212c228ec (diff) | |
| parent | 7f4414b92a1c2147b073dd3cf58e0db7c8a88be6 (diff) | |
| download | Doxygen-e1a039881e40ac658606f50d0f6d3f97ffd32564.zip Doxygen-e1a039881e40ac658606f50d0f6d3f97ffd32564.tar.gz Doxygen-e1a039881e40ac658606f50d0f6d3f97ffd32564.tar.bz2 | |
Merge branch 'feature/bug_678436' of https://github.com/albert-github/doxygen into albert-github-feature/bug_678436
| -rw-r--r-- | src/commentscan.l | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index 82afca5..4b25dff 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -1810,7 +1810,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" /* ----- handle arguments of if/ifnot commands ------- */ -<GuardParam>"(" { +<GuardParam>{B}*"(" { g_guardExpr=yytext; g_roundCount=1; BEGIN(GuardExpr); @@ -1836,7 +1836,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" unput(*yytext); BEGIN(GuardParam); } -<GuardParam>[a-z_A-Z0-9.\-]+ { // parameter of if/ifnot guard +<GuardParam>{B}*[a-z_A-Z0-9.\-]+ { // parameter of if/ifnot guard handleGuard(yytext); } <GuardParam>{DOCNL} { // end of argument @@ -3135,7 +3135,7 @@ static void groupAddDocs(Entry *e,const char *fileName) static void handleGuard(const QCString &expr) { CondParser prs; - bool sectionEnabled=prs.parse(yyFileName,yyLineNr,expr); + bool sectionEnabled=prs.parse(yyFileName,yyLineNr,expr.stripWhiteSpace()); bool parentEnabled = TRUE; if (!guards.isEmpty()) parentEnabled = guards.top()->isEnabled(); if (parentEnabled) |