diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-07-21 12:52:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 12:52:16 (GMT) |
| commit | 6f9b2aca0d564f3d29565c168b0e1b58dbfdcfe6 (patch) | |
| tree | 5b34b083783f59442b1619be84d1dc398a2de568 /src/commentscan.l | |
| parent | 59781ae4ee1937f51836c03bd7c67e1e7be13bfc (diff) | |
| parent | c6eacb2dd4847ba5734836e06721bca5eb8f4fac (diff) | |
| download | Doxygen-6f9b2aca0d564f3d29565c168b0e1b58dbfdcfe6.zip Doxygen-6f9b2aca0d564f3d29565c168b0e1b58dbfdcfe6.tar.gz Doxygen-6f9b2aca0d564f3d29565c168b0e1b58dbfdcfe6.tar.bz2 | |
Merge branch 'master' into feature/bug_663297
Diffstat (limited to 'src/commentscan.l')
| -rw-r--r-- | src/commentscan.l | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index ebfaedb..2023448 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -548,7 +548,7 @@ static void addXRefItem(const char *listName,const char *itemTitle, if (docEntry->sli) { QListIterator<ListItemInfo> slii(*docEntry->sli); - for (slii.toFirst();(lii=slii.current());++slii) + for (slii.toLast();(lii=slii.current());--slii) { if (qstrcmp(lii->type,listName)==0) { @@ -1046,10 +1046,13 @@ RCSTAG "$"{ID}":"[^\n$]+"$" addOutput(yytext); } <Comment>"</summary>" { // start of a .NET XML style detailed description + setOutput(OutputBrief); addOutput(yytext); setOutput(OutputDoc); } <Comment>"</remarks>" { // end of a brief or detailed description + + setOutput(OutputDoc); addOutput(yytext); } <Comment>"<"{CAPTION}{ATTR}">" { @@ -2038,7 +2041,6 @@ RCSTAG "$"{ID}":"[^\n$]+"$" } } <SkipInternal>[@\\]"endinternal"[ \t]* { - addOutput(" \\endinternal "); BEGIN(Comment); } <SkipInternal>[^ \\@\n]+ { // skip non-special characters @@ -2544,12 +2546,23 @@ static bool handleEndParBlock(const QCString &) static bool handleRelated(const QCString &) { + if (!current->relates.isEmpty()) + { + warn(yyFileName,yyLineNr, + "found multiple \\relates, \\relatesalso or \\memberof commands in a comment block, using last definition"); + } + current->relatesType = Simple; BEGIN(RelatesParam1); return FALSE; } static bool handleRelatedAlso(const QCString &) { + if (!current->relates.isEmpty()) + { + warn(yyFileName,yyLineNr, + "found multiple \\relates, \\relatesalso or \\memberof commands in a comment block, using last definition"); + } current->relatesType = Duplicate; BEGIN(RelatesParam1); return FALSE; @@ -2557,6 +2570,11 @@ static bool handleRelatedAlso(const QCString &) static bool handleMemberOf(const QCString &) { + if (!current->relates.isEmpty()) + { + warn(yyFileName,yyLineNr, + "found multiple \\relates, \\relatesalso or \\memberof commands in a comment block, using last definition"); + } current->relatesType = MemberOf; BEGIN(RelatesParam1); return FALSE; |