Bug 752712 - last entry missing in a @name group of typedefs

doxygen · Feb 6, 2016 · ee2d6fa · ee2d6fa
1 parent 5072006
commit ee2d6fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git 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
@@ -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());