diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2016-02-06 15:28:04 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2016-02-06 15:28:04 (GMT) |
| commit | ee2d6faecab57c1f929d6868ae6eb9bdaa53d654 (patch) | |
| tree | 3286fe6b94a657a7ad13a80ebdd1e6ecf5596762 | |
| parent | 50720068afa77484ec7253e7dca1e812050b33f1 (diff) | |
| download | Doxygen-ee2d6faecab57c1f929d6868ae6eb9bdaa53d654.zip Doxygen-ee2d6faecab57c1f929d6868ae6eb9bdaa53d654.tar.gz Doxygen-ee2d6faecab57c1f929d6868ae6eb9bdaa53d654.tar.bz2 | |
Bug 752712 - last entry missing in a @name group of typedefs
| -rw-r--r-- | src/commentcnv.l | 6 | ||||
| -rw-r--r-- | src/scanner.l | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/commentcnv.l b/src/commentcnv.l index 5457738..169f66a 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -379,6 +379,12 @@ void replaceComment(int offset); g_inRoseComment=TRUE; BEGIN(SComment); } +<Scan>"//"[!\/]/.*\n[ \t]*"//"[|\/][ \t]*[@\\]"}" { // next line contains an end marker, see bug 752712 + g_inSpecialComment=yytext[2]=='/' || yytext[2]=='!'; + copyToOutput(yytext,(int)yyleng); + g_readLineCtx=YY_START; + BEGIN(ReadLine); + } <Scan>"//"/.*\n { /* one line C++ comment */ g_inSpecialComment=yytext[2]=='/' || yytext[2]=='!'; copyToOutput(yytext,(int)yyleng); diff --git a/src/scanner.l b/src/scanner.l index 9ccd628..6e94a20 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -6224,6 +6224,11 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) handleCommentBlock(docBlock.data(),current->brief.isEmpty()); BEGIN( docBlockContext ); } +<DocLine>[^\n]*/"\n"{B}*"//"[!/]{B}*{CMD}"}" { // next line is an end group marker, see bug 752712 + docBlock+=yytext; + handleCommentBlock(docBlock.data(),current->brief.isEmpty()); + BEGIN( docBlockContext ); + } <DocLine>[^\n]*/"\n" { // whole line docBlock+=yytext; handleCommentBlock(docBlock.data(),current->brief.isEmpty()); |