Skip to content

Commit 141b854

Browse files
committed
Fix for PR doxygen#11559: don't remove fallback rule
1 parent 22e5fe0 commit 141b854

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

src/commentcnv.l

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,8 @@ SLASHopt [/]*
388388
<Scan>\n { /* new line */
389389
copyToOutput(yyscanner,yytext,yyleng);
390390
}
391-
<Scan>{CPPC}[!/]/.*\n[ \t]*{CPPC}[!/][ \t]*{CMD}"}" {
391+
<Scan>{CPPC}[!/]/.*\n[ \t]*{CPPC}[!/][ \t]*{CMD}"}" { // see bug #8731, don't treat multiline C++ comment as detailed description
392+
// if the next line is an end of group marker.
392393
yyextra->inSpecialComment=true;
393394
yyextra->blockHeadCol=yyextra->col+1;
394395
yyextra->insertCppCommentMarker=true;
@@ -444,6 +445,14 @@ SLASHopt [/]*
444445
yyextra->readLineCtx=YY_START;
445446
BEGIN(ReadLine);
446447
}
448+
<Scan>{CPPC}[!/]/.*\n { /* one line special C++ comment */
449+
yyextra->inSpecialComment=true;
450+
yyextra->blockHeadCol=yyextra->col+1;
451+
yyextra->insertCppCommentMarker=true;
452+
copyToOutput(yyscanner,yytext,yyleng);
453+
yyextra->readLineCtx=YY_START;
454+
BEGIN(ReadLine);
455+
}
447456
<Scan>{CPPC}/.*\n { /* one line normal C++ comment */
448457
yyextra->inSpecialComment=false;
449458
copyToOutput(yyscanner,yytext,yyleng);

0 commit comments

Comments
 (0)