diff options
| author | albert-github <albert.tests@gmail.com> | 2014-04-06 18:47:42 (GMT) |
|---|---|---|
| committer | albert-github <albert.tests@gmail.com> | 2014-04-06 18:47:42 (GMT) |
| commit | de502ca71fc1c20ed93209f6a223c488eee38297 (patch) | |
| tree | f7a5b863792988e19d192074817bb9031c9937e4 /src/commentscan.l | |
| parent | 1134237afe25f86fcf7c7e2a76a3542eee8acc79 (diff) | |
| download | Doxygen-de502ca71fc1c20ed93209f6a223c488eee38297.zip Doxygen-de502ca71fc1c20ed93209f6a223c488eee38297.tar.gz Doxygen-de502ca71fc1c20ed93209f6a223c488eee38297.tar.bz2 | |
Bug 678436 - Nested \if messes up list items
Blank spaces after an if statement have to be removed as well. Just enable them as part of the parameter of the conditional expression and remove them later on (to be safe not having them in the parser).
Diffstat (limited to 'src/commentscan.l')
| -rw-r--r-- | src/commentscan.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index 82afca5..8aa3c83 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -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) |