diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-19 08:29:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-19 08:29:52 (GMT) |
| commit | 8fd805292b0dd1079d819fccbb74777514537780 (patch) | |
| tree | 4c9051e59e02b5d3361a582a21b3dfe37c9d038d /src | |
| parent | a8d0d631b1fe7d542364278f5011096c2f9b5863 (diff) | |
| parent | 2eeeb637f1f856599c4d69395c146000b4524163 (diff) | |
| download | Doxygen-8fd805292b0dd1079d819fccbb74777514537780.zip Doxygen-8fd805292b0dd1079d819fccbb74777514537780.tar.gz Doxygen-8fd805292b0dd1079d819fccbb74777514537780.tar.bz2 | |
Merge pull request #6961 from albert-github/feature/bug_nested_comment_tcl_py
Incorrect Reached end of file while still inside a (nested) comment for TCL / Python
Diffstat (limited to 'src')
| -rw-r--r-- | src/commentcnv.l | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/commentcnv.l b/src/commentcnv.l index 6b08d74..0ea5ff7 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -399,6 +399,10 @@ void replaceComment(int offset); copyToOutput(yytext,(int)yyleng); } <Scan>"/*"[*!]? { /* start of a C comment */ + if ((g_lang==SrcLangExt_Python) || (g_lang==SrcLangExt_Tcl)) + { + REJECT; + } g_specialComment=(int)yyleng==3; g_nestingCount=0; g_commentStack.clear(); /* to be on the save side */ @@ -660,12 +664,16 @@ void replaceComment(int offset); } } <CComment>"/"+"*" { /* nested C comment */ + if ((g_lang==SrcLangExt_Python) || (g_lang==SrcLangExt_Tcl)) + { + REJECT; + } g_nestingCount++; g_commentStack.push(new CommentCtx(g_lineNr)); copyToOutput(yytext,(int)yyleng); } <CComment>"*"+"/" { /* end of C comment */ - if (g_lang==SrcLangExt_Python) + if ((g_lang==SrcLangExt_Python) || (g_lang==SrcLangExt_Tcl)) { REJECT; } |