Merge branch 'master' of github.com:doxygen/doxygen

Author: doxygen

src/commentscan.l

@@ -59,6 +59,7 @@ typedef yyguts_t *yyscan_t;
 #include "parserintf.h"
 #include "reflist.h"
 #include "section.h"
+#include "regex.h"
 #include "util.h"
 #include "reflist.h"
 #include "trace.h"
@@ -469,6 +470,7 @@ struct commentscanYY_state
   QCString         anchorTitle;
   QCString         htmlAnchorStr;
   bool             htmlAnchor = false;
+  bool             CScode = false;
 };
 
 
@@ -529,12 +531,14 @@ IMG       [iI][mM][gG]
 HR        [hH][rR]
 PARA      [pP][aA][rR][aA]
 CODE      [cC][oO][dD][eE]
+ENDCODE   "/"{CODE}
 CAPTION   [cC][aA][pP][tT][iI][oO][nN]
 CENTER    [cC][eE][nN][tT][eE][rR]
 DIV       [dD][iI][vV]
 DETAILS   [dD][eE][tT][aA][iI][lL][sS]
 DETAILEDHTML {CENTER}|{DIV}|{PRE}|{UL}|{TABLE}|{OL}|{DL}|{P}|[Hh][1-6]|{IMG}|{HR}|{PARA}
 DETAILEDHTMLOPT {CODE}
+DETAILEDHTMLOPTEND {ENDCODE}
 SUMMARY   [sS][uU][mM][mM][aA][rR][yY]
 REMARKS   [rR][eE][mM][aA][rR][kK][sS]
 AHTML     [aA]{BN}*
@@ -668,7 +672,35 @@ STopt  [^\n@\\]*
                                           // continue with the same input
                                           REJECT;
                                         }
-<Comment>"<"{DETAILEDHTMLOPT}{ATTR}">"  { // HTML command that ends a brief description
+<Comment>"<"{DETAILEDHTMLOPT}">"        { // HTML <code> command that ends a brief description
+                                          // without attributes
+                                          if (yyextra->current->lang==SrcLangExt_CSharp)
+                                          {
+                                            yyextra->CScode=true;
+                                            setOutput(yyscanner,OutputDoc);
+                                            addOutput(yyscanner,"@code{cs}");
+                                          }
+                                          else
+                                          {
+                                            // continue with the same input
+                                            REJECT;
+                                          }
+                                        }
+<Comment>"<"{DETAILEDHTMLOPTEND}">"     { // HTML command that ends a brief description
+                                          if (yyextra->CScode)
+                                          {
+                                            addOutput(yyscanner,"@endcode");
+                                            yyextra->CScode=false;
+                                          }
+                                          else
+                                          {
+                                            yyextra->CScode=false;
+                                            // continue with the same input
+                                            REJECT;
+                                          }
+                                        }
+<Comment>"<"{DETAILEDHTMLOPT}{ATTR}">"  { // HTML <code> command that ends a brief description
+                                          // with attributes, so cannot be CS.
                                           if (yyextra->current->lang==SrcLangExt_CSharp)
                                           {
                                             setOutput(yyscanner,OutputDoc);
@@ -1065,7 +1097,7 @@ STopt  [^\n@\\]*
                                             yyextra->briefEndsAtDot=FALSE;
                                           }
                                         }
-<Comment>{DOCNL}                             { // newline
+<Comment>{DOCNL}                        { // newline
                                           addOutput(yyscanner,yytext);
                                           if (*yytext == '\n') yyextra->lineNr++;
                                         }
@@ -3847,29 +3879,52 @@ static inline void setOutput(yyscan_t yyscanner,OutputContext ctx)
       yyextra->pOutputString = &yyextra->current->doc;
       break;
     case OutputBrief:
-      if (oldContext!=yyextra->inContext)
       {
-        if (yyextra->current->brief.isEmpty()) yyextra->current->briefLine = yyextra->lineNr;
-        if (yyextra->current->briefFile.isEmpty())
+        if (oldContext!=yyextra->inContext)
         {
-          yyextra->current->briefFile = yyextra->fileName;
-          yyextra->current->briefLine = yyextra->lineNr;
+          if (yyextra->current->brief.isEmpty()) yyextra->current->briefLine = yyextra->lineNr;
+          if (yyextra->current->briefFile.isEmpty())
+          {
+            yyextra->current->briefFile = yyextra->fileName;
+            yyextra->current->briefLine = yyextra->lineNr;
+          }
         }
-      }
-      if (yyextra->current->brief.stripWhiteSpace().isEmpty()) // we only want one brief
-        // description even if multiple
-        // are given...
-      {
-        yyextra->pOutputString = &yyextra->current->brief;
-      }
-      else
-      {
-        if (!yyextra->current->doc.isEmpty()) // when appending parts add a new line
+        bool foundMatch = false;
+        if (yyextra->current->brief.stripWhiteSpace().isEmpty()) // we only want one brief
+          // description even if multiple
+          // are given...
+        {
+          foundMatch = true;
+        }
+        else
+        {
+          static const reg::Ex nonBrief(R"( *[\\@]ifile *\"[^\"]*\" *[\\@]ilinebr *[\\@]iline *(\d+) *[\\@]ilinebr *([\n]?))");
+          std::string str = yyextra->current->brief.str();
+          reg::Match match;
+          if (reg::match(str,match,nonBrief)) // match found
+          {
+            if (QCString(match[2].str()) == "\n")
+            {
+              yyextra->current->brief = yyextra->current->brief.left(yyextra->current->brief.length()-1);
+              // set warning line correct
+              yyextra->current->brief += "\\iline " + QCString().setNum(1 + static_cast<int>(std::stoul(match[1].str()))) + " \\ilinebr ";
+            }
+            foundMatch = true;
+          }
+        }
+        if (foundMatch)
+        {
+            yyextra->pOutputString = &yyextra->current->brief;
+        }
+        else
         {
-          yyextra->current->doc += "\n";
+          if (!yyextra->current->doc.isEmpty()) // when appending parts add a new line
+          {
+            yyextra->current->doc += "\n";
+          }
+          yyextra->pOutputString = &yyextra->current->doc;
+          yyextra->inContext = OutputDoc; // need to switch to detailed docs, see bug 631380
         }
-        yyextra->pOutputString = &yyextra->current->doc;
-        yyextra->inContext = OutputDoc; // need to switch to detailed docs, see bug 631380
       }
       break;
     case OutputXRef: