summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-12-22 20:03:51 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2019-12-22 20:03:51 (GMT)
commit5d6f6b9971ab484fe811feba940200a31876a213 (patch)
treeb705a15da554eb99b3dac15c4888ec8fbeddef27
parent786f8c9d2b55ebcde9e2702fc9dfc8ab1e4609b6 (diff)
parentd376b8a80eb26feec66c22358d67ed134395169a (diff)
downloadDoxygen-5d6f6b9971ab484fe811feba940200a31876a213.zip
Doxygen-5d6f6b9971ab484fe811feba940200a31876a213.tar.gz
Doxygen-5d6f6b9971ab484fe811feba940200a31876a213.tar.bz2
Merge branch 'albert-github-feature/bug_550158'
-rw-r--r--src/commentcnv.l7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/commentcnv.l b/src/commentcnv.l
index bd4ed5c..f3367a4 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -728,16 +728,19 @@ MAILADR ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z
yyextra->inRoseComment=FALSE;
BEGIN(Scan);
}
+<ReadLine>"/**" {
+ copyToOutput(yyscanner,"/&zwj;**",8);
+ }
<ReadLine>"*/" {
copyToOutput(yyscanner,"*&zwj;/",7);
}
<ReadLine>"*" {
copyToOutput(yyscanner,yytext,(int)yyleng);
}
-<ReadLine>[^\\@\n\*]* {
+<ReadLine>[^\\@\n\*/]* {
copyToOutput(yyscanner,yytext,(int)yyleng);
}
-<ReadLine>[^\\@\n\*]*/\n {
+<ReadLine>[^\\@\n\*/]*/\n {
copyToOutput(yyscanner,yytext,(int)yyleng);
BEGIN(yyextra->readLineCtx);
}