diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2016-10-09 11:09:50 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2016-10-09 11:09:50 (GMT) |
| commit | d4accb68ff6536dcf128236b7e1e8d0239d4ffc2 (patch) | |
| tree | 16690b8872a09e64a9d3f07f2cdc9c23767a6522 /src | |
| parent | 155bd0110585d401d0f898baf9c69b2ec46833ff (diff) | |
| download | Doxygen-d4accb68ff6536dcf128236b7e1e8d0239d4ffc2.zip Doxygen-d4accb68ff6536dcf128236b7e1e8d0239d4ffc2.tar.gz Doxygen-d4accb68ff6536dcf128236b7e1e8d0239d4ffc2.tar.bz2 | |
ug 756185 - Multiline //!< behavior changed
Diffstat (limited to 'src')
| -rw-r--r-- | src/scanner.l | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/scanner.l b/src/scanner.l index a310f4f..64b2cd2 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -6227,9 +6227,10 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) /**********************************************************************************/ /* ---- Single line comments ------ */ -<DocLine>[^\n]*"\n"[ \t]*"//"[/!] { // continuation of multiline C++-style comment +<DocLine>[^\n]*"\n"[ \t]*"//"[/!][<]? { // continuation of multiline C++-style comment docBlock+=yytext; - docBlock.resize(docBlock.length() - 3); + int markerLen = yytext[yyleng-1]=='<' ? 4 : 3; + docBlock.resize(docBlock.length() - markerLen); lineCount(); } <DocLine>{B}*"///"[/]+{B}*/"\n" { // ignore marker line (see bug700345) |