summaryrefslogtreecommitdiffstats
path: root/src/commentcnv.l
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2018-11-28 13:48:56 (GMT)
committeralbert-github <albert.tests@gmail.com>2018-11-28 13:48:56 (GMT)
commit8e96d9c994e18626cd6f00ea875c7cab1d7502c4 (patch)
treeff9cb21fa6199d41f65fc8f00896f0e9476a18a7 /src/commentcnv.l
parent8c7b1352474e4da5024cfc3ecc25a486b1d4ef2a (diff)
downloadDoxygen-8e96d9c994e18626cd6f00ea875c7cab1d7502c4.zip
Doxygen-8e96d9c994e18626cd6f00ea875c7cab1d7502c4.tar.gz
Doxygen-8e96d9c994e18626cd6f00ea875c7cab1d7502c4.tar.bz2
Bug 616379 - doxygen result by nested comment incorrectly
Improvement on handling `///` comments in relation to `*/` during comment conversion.
Diffstat (limited to 'src/commentcnv.l')
-rw-r--r--src/commentcnv.l17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/commentcnv.l b/src/commentcnv.l
index 88236ed..6b08d74 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -829,10 +829,19 @@ void replaceComment(int offset);
g_inRoseComment=FALSE;
BEGIN(Scan);
}
-<ReadLine>[^\\@\n]*/\n {
- copyToOutput(yytext,(int)yyleng);
- BEGIN(g_readLineCtx);
- }
+<ReadLine>"*/" {
+ copyToOutput("*&zwj;/",7);
+ }
+<ReadLine>"*" {
+ copyToOutput(yytext,(int)yyleng);
+ }
+<ReadLine>[^\\@\n\*]* {
+ copyToOutput(yytext,(int)yyleng);
+ }
+<ReadLine>[^\\@\n\*]*/\n {
+ copyToOutput(yytext,(int)yyleng);
+ BEGIN(g_readLineCtx);
+ }
<CComment,ReadLine>[\\@][\\@][~a-z_A-Z][a-z_A-Z0-9]*[ \t]* { // escaped command
copyToOutput(yytext,(int)yyleng);
}