summaryrefslogtreecommitdiffstats
path: root/src/commentcnv.l
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-02-08 16:17:55 (GMT)
committerGitHub <noreply@github.com>2020-02-08 16:17:55 (GMT)
commite2bfb392959acd0d397daa4ca2ab08930add4719 (patch)
treea0e5babd2bdf94a9fb4f4dd7d081d341b8b6fe5d /src/commentcnv.l
parentabd887af5cb3e70f801848adb87c70642e6fb1dc (diff)
parent137328681e7dcbd07a5ec0e4b068aea96ec41b4a (diff)
downloadDoxygen-e2bfb392959acd0d397daa4ca2ab08930add4719.zip
Doxygen-e2bfb392959acd0d397daa4ca2ab08930add4719.tar.gz
Doxygen-e2bfb392959acd0d397daa4ca2ab08930add4719.tar.bz2
Merge branch 'master' into vhdl-fixed-bug-7432
Diffstat (limited to 'src/commentcnv.l')
-rw-r--r--src/commentcnv.l12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/commentcnv.l b/src/commentcnv.l
index f3367a4..ba2e5ec 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -546,7 +546,7 @@ MAILADR ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z
}
}
<CComment>\n { /* new line in comment */
- copyToOutput(yyscanner,yytext,(int)yyleng);
+ copyToOutput(yyscanner,yytext,(int)yyleng);
/* in case of Fortran always end of comment */
if (yyextra->lang==SrcLangExt_Fortran)
{
@@ -554,16 +554,20 @@ MAILADR ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z
}
}
<CComment>"/"+"*" { /* nested C comment */
- if ((yyextra->lang==SrcLangExt_Python) || (yyextra->lang==SrcLangExt_Tcl))
+ if (yyextra->lang==SrcLangExt_Python ||
+ yyextra->lang==SrcLangExt_Tcl ||
+ yyextra->lang==SrcLangExt_Markdown)
{
REJECT;
}
yyextra->nestingCount++;
yyextra->commentStack.push(new CommentCtx(yyextra->lineNr));
- copyToOutput(yyscanner,yytext,(int)yyleng);
+ copyToOutput(yyscanner,yytext,(int)yyleng);
}
<CComment>"*"+"/" { /* end of C comment */
- if ((yyextra->lang==SrcLangExt_Python) || (yyextra->lang==SrcLangExt_Tcl))
+ if (yyextra->lang==SrcLangExt_Python ||
+ yyextra->lang==SrcLangExt_Tcl ||
+ yyextra->lang==SrcLangExt_Markdown)
{
REJECT;
}