diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2012-06-10 09:28:22 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2012-06-10 09:28:22 (GMT) |
| commit | 0ce3aea886f4e95da56d164b3944fd54d3d68f89 (patch) | |
| tree | 6709ddc7b1764dc3b20bbac7eb36c05edcc91e03 /src/commentscan.l | |
| parent | 1983c30b71bf92b3fa6bfedbb98451c3b7f74498 (diff) | |
| download | Doxygen-0ce3aea886f4e95da56d164b3944fd54d3d68f89.zip Doxygen-0ce3aea886f4e95da56d164b3944fd54d3d68f89.tar.gz Doxygen-0ce3aea886f4e95da56d164b3944fd54d3d68f89.tar.bz2 | |
Release-1.8.1.1
Diffstat (limited to 'src/commentscan.l')
| -rw-r--r-- | src/commentscan.l | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index c7e36a5..26c381f 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -957,11 +957,18 @@ RCSTAG "$"{ID}":"[^\n$]+"$" } <Comment>"<summary>" { // start of a .NET XML style brief description setOutput(OutputBrief); + addOutput(yytext); + } +<Comment>"<remarks>" { // start of a .NET XML style detailed description + setOutput(OutputDoc); + addOutput(yytext); } -<Comment>"<remarks>"|"</summary>" { // start of a .NET XML style detailed description +<Comment>"</summary>" { // start of a .NET XML style detailed description + addOutput(yytext); setOutput(OutputDoc); } <Comment>"</remarks>" { // end of a brief or detailed description + addOutput(yytext); } <Comment>{RCSTAG} { // RCS tag which end a brief description setOutput(OutputDoc); @@ -988,6 +995,9 @@ RCSTAG "$"{ID}":"[^\n$]+"$" // this command forces the end of brief description setOutput(OutputDoc); } + int i=0; + while (yytext[i]==' ' || yytext[i]=='\t') i++; + if (i>0) addOutput(QCString(yytext).left(i)); if (cmdPtr->func && cmdPtr->func(cmdName)) { // implicit split of the comment block into two @@ -1010,7 +1020,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" { // command without handler, to be processed // later by parsedoc.cpp - addOutput(yytext); + addOutput(yytext+i); } } else // command not relevant @@ -1315,7 +1325,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" <ClassDocArg2>. { // ignore other stuff } -<ClassDocArg3>[<]?{FILE}?[>]? { // third argument; include file name +<ClassDocArg3>[<"]?{FILE}?[">]? { // third argument; include file name current->includeName = yytext; BEGIN( Comment ); } @@ -2331,7 +2341,7 @@ static bool handleMemberOf(const QCString &) static bool handleRefItem(const QCString &) { - addOutput(" @refitem "); + addOutput("@refitem "); BEGIN(LineParam); return FALSE; } @@ -2339,7 +2349,7 @@ static bool handleRefItem(const QCString &) static bool handleSection(const QCString &s) { setOutput(OutputDoc); - addOutput(" @"+s+" "); + addOutput("@"+s+" "); BEGIN(SectionLabel); if (s=="section") g_sectionLevel=1; else if (s=="subsection") g_sectionLevel=2; @@ -2358,28 +2368,28 @@ static bool handleSubpage(const QCString &s) warn(yyFileName,yyLineNr, "warning: found \\subpage command in a comment block that is not marked as a page!"); } - addOutput(" @"+s+" "); + addOutput("@"+s+" "); BEGIN(SubpageLabel); return FALSE; } static bool handleAnchor(const QCString &s) { - addOutput(" @"+s+" "); + addOutput("@"+s+" "); BEGIN(AnchorLabel); return FALSE; } static bool handleCite(const QCString &s) { - addOutput(" @"+s+" "); + addOutput("@"+s+" "); BEGIN(CiteLabel); return FALSE; } static bool handleFormatBlock(const QCString &s) { - addOutput(" @"+s+" "); + addOutput("@"+s+" "); //printf("handleFormatBlock(%s)\n",s.data()); blockName=s; g_commentCount=0; @@ -2389,7 +2399,7 @@ static bool handleFormatBlock(const QCString &s) static bool handleAddIndex(const QCString &) { - addOutput(" @addindex "); + addOutput("@addindex "); BEGIN(LineParam); return FALSE; } |