Merge pull request doxygen#11825 from artyom-fedosov/feature/clang

Add -Wcomma option for Clang

Author: doxygen

cmake/CompilerWarnings.cmake

@@ -60,7 +60,7 @@ function(set_project_warnings project_name)
       -Wdouble-promotion # warn if float is implicit promoted to double
       -Wformat=2 # warn on security issues around functions that format output
                  # (ie printf)
-      -Wpedantic # warn if non-standard C++ is used
+      $<$<COMPILE_LANGUAGE:CXX>:-Wcomma>
 
       # turn off warning caused by generated code (flex)
       -Wno-unused-parameter

src/definition.cpp

@@ -164,9 +164,15 @@ static bool matchExcludedSymbols(const QCString &name)
     bool forceStart=FALSE;
     bool forceEnd=FALSE;
     if (pattern.at(0)=='^')
-      pattern=pattern.mid(1),forceStart=TRUE;
-    if (pattern.at(pattern.length()-1)=='$')
-      pattern=pattern.left(pattern.length()-1),forceEnd=TRUE;
+    {
+      pattern    = pattern.mid(1);
+      forceStart = true;
+    }
+    if (pattern.at(pattern.length() - 1) == '$')
+    {
+      pattern  = pattern.left(pattern.length() - 1);
+      forceEnd = true;
+    }
     if (pattern.find('*')!=-1) // wildcard mode
     {
       const reg::Ex re(substitute(pattern,"*",".*").str());
@@ -781,7 +787,8 @@ bool readCodeFragment(const QCString &fileName,bool isMacro,
         //printf("parsing char '%c'\n",c);
         if (c=='\n')
         {
-          lineNr++,col=0;
+          lineNr++;
+          col = 0;
         }
         else if (c=='\t')
         {
@@ -790,13 +797,21 @@ bool readCodeFragment(const QCString &fileName,bool isMacro,
         else if (pc=='/' && c=='/') // skip single line comment
         {
           while ((c=*p++)!='\n' && c!=0);
-          if (c=='\n') lineNr++,col=0;
+          if (c == '\n')
+          {
+            lineNr++;
+            col = 0;
+          }
         }
         else if (pc=='/' && c=='*') // skip C style comment
         {
           while (((c=*p++)!='/' || pc!='*') && c!=0)
           {
-            if (c=='\n') lineNr++,col=0;
+            if (c == '\n')
+            {
+              lineNr++;
+              col = 0;
+            }
             pc=c;
           }
         }

src/doxygen.cpp

@@ -11443,7 +11443,11 @@ static int computeIdealCacheParam(size_t v)
   //printf("computeIdealCacheParam(v=%u)\n",v);
 
   int r=0;
-  while (v!=0) v>>=1,r++;
+  while (v!=0)
+  {
+    v >>= 1;
+    r++;
+  }
   // r = log2(v)
 
   // convert to a valid cache size value

src/markdown.cpp

@@ -778,7 +778,11 @@ size_t Markdown::Private::findEmphasisChar(std::string_view data, char c, size_t
     if (data[i]=='`')
     {
       int snb=0;
-      while (i<size && data[i]=='`') snb++,i++;
+      while (i < size && data[i] == '`')
+      {
+        snb++;
+        i++;
+      }
 
       // find same pattern to end the span
       int enb=0;
@@ -977,11 +981,13 @@ int Markdown::Private::processNmdash(std::string_view data,size_t offset)
   int count=1;
   if (i<size && data[i]=='-') // found --
   {
-    count++,i++;
+    count++;
+    i++;
   }
   if (i<size && data[i]=='-') // found ---
   {
-    count++,i++;
+    count++;
+    i++;
   }
   if (i<size && data[i]=='-') // found ----
   {
@@ -1045,7 +1051,11 @@ int Markdown::Private::processHtmlTagWrite(std::string_view data,size_t offset,b
   size_t i=1;
   size_t l=0;
   // compute length of the tag name
-  while (i<size && isIdChar(data[i])) i++,l++;
+  while (i < size && isIdChar(data[i]))
+  {
+    i++;
+    l++;
+  }
   QCString tagName(data.substr(1,i-1));
   if (tagName.lower()=="pre") // found <pre> tag
   {
@@ -1895,7 +1905,11 @@ int Markdown::Private::isHeaderline(std::string_view data, bool allowAdjustLevel
   // test of level 1 header
   if (data[i]=='=')
   {
-    while (i<size && data[i]=='=') i++,c++;
+    while (i < size && data[i] == '=')
+    {
+      i++;
+      c++;
+    }
     while (i<size && data[i]==' ') i++;
     int level = (c>1 && (i>=size || data[i]=='\n')) ? 1 : 0;
     if (allowAdjustLevel && level==1 && indentLevel==-1)
@@ -1913,7 +1927,11 @@ int Markdown::Private::isHeaderline(std::string_view data, bool allowAdjustLevel
   // test of level 2 header
   if (data[i]=='-')
   {
-    while (i<size && data[i]=='-') i++,c++;
+    while (i < size && data[i] == '-')
+    {
+      i++;
+      c++;
+    }
     while (i<size && data[i]==' ') i++;
     return (c>1 && (i>=size || data[i]=='\n')) ? indentLevel+2 : 0;
   }
@@ -2117,12 +2135,20 @@ int Markdown::Private::isAtxHeader(std::string_view data,
   {
     return 0;
   }
-  while (i<size && data[i]=='#') i++,level++;
+  while (i < size && data[i] == '#')
+  {
+    i++;
+    level++;
+  }
   if (level>SectionType::MaxLevel) // too many #'s -> no section
   {
     return 0;
   }
-  while (i<size && data[i]==' ') i++,blanks++;
+  while (i < size && data[i] == ' ')
+  {
+    i++;
+    blanks++;
+  }
   if (level==1 && blanks==0)
   {
     return 0; // special case to prevent #someid seen as a header (see bug 671395)
@@ -2255,7 +2281,8 @@ static size_t computeIndentExcludingListMarkers(std::string_view data)
     { // end of indent
       break;
     }
-    indent++,i++;
+    indent++;
+    i++;
   }
   AUTO_TRACE_EXIT("result={}",indent);
   return indent;
@@ -2313,15 +2340,23 @@ static bool isFencedCodeBlock(std::string_view data,size_t refIndent,
   size_t indent=0;
   int startTildes=0;
   const size_t size = data.size();
-  while (i<size && data[i]==' ') indent++,i++;
+  while (i < size && data[i] == ' ')
+  {
+    indent++;
+    i++;
+  }
   if (indent>=refIndent+4)
   {
     AUTO_TRACE_EXIT("result=false: content is part of code block indent={} refIndent={}",indent,refIndent);
     return FALSE;
   } // part of code block
   char tildaChar='~';
   if (i<size && data[i]=='`') tildaChar='`';
-  while (i<size && data[i]==tildaChar) startTildes++,i++;
+  while (i < size && data[i] == tildaChar)
+  {
+    startTildes++;
+    i++;
+  }
   if (startTildes<3)
   {
     AUTO_TRACE_EXIT("result=false: no fence marker found #tildes={}",startTildes);
@@ -2367,7 +2402,11 @@ static bool isFencedCodeBlock(std::string_view data,size_t refIndent,
     {
       end=i;
       int endTildes=0;
-      while (i<size && data[i]==tildaChar) endTildes++,i++;
+      while (i < size && data[i] == tildaChar)
+      {
+        endTildes++;
+        i++;
+      }
       while (i<size && data[i]==' ') i++;
       {
         if (endTildes==startTildes)
@@ -2392,7 +2431,11 @@ static bool isCodeBlock(std::string_view data, size_t offset,size_t &indent)
   size_t i=0;
   size_t indent0=0;
   const size_t size = data.size();
-  while (i<size && data[i]==' ') indent0++,i++;
+  while (i < size && data[i] == ' ')
+  {
+    indent0++;
+    i++;
+  }
 
   if (indent0<codeBlockIndent)
   {
@@ -2484,7 +2527,11 @@ static size_t findTableColumns(std::string_view data,size_t &start,size_t &end,s
   size_t i=0,n=0;
   // find start character of the table line
   while (i<size && data[i]==' ') i++;
-  if (i<size && data[i]=='|' && data[i]!='\n') i++,n++; // leading | does not count
+  if (i < size && data[i] == '|' && data[i] != '\n')
+  {
+    i++;
+    n++; // leading | does not count
+  }
   start = i;
 
   // find end character of the table line
@@ -2494,7 +2541,11 @@ static size_t findTableColumns(std::string_view data,size_t &start,size_t &end,s
 
   if (j>0 && i>0) i--; // move i to point before newline
   while (i>0 && data[i]==' ') i--;
-  if (i>0 && data[i-1]!='\\' && data[i]=='|') i--,n++; // trailing or escaped | does not count
+  if (i > 0 && data[i - 1] != '\\' && data[i] == '|')
+  {
+    i--;
+    n++; // trailing or escaped | does not count
+  }
   end = i;
 
   // count columns between start and end
@@ -2980,7 +3031,11 @@ bool skipOverFileAndLineCommands(std::string_view data,size_t indent,size_t &off
       i+=9;
       location=data.substr(locStart,i-locStart);
       location+='\n';
-      while (indent>0 && i<size && data[i]==' ') i++,indent--;
+      while (indent > 0 && i < size && data[i] == ' ')
+      {
+        i++;
+        indent--;
+      }
       if (i<size && data[i]=='\n') i++;
       offset = i;
       return true;
@@ -3005,7 +3060,11 @@ size_t Markdown::Private::writeCodeBlock(std::string_view data,size_t refIndent)
     while (end<=size && data[end-1]!='\n') end++;
     size_t j=i;
     size_t indent=0;
-    while (j<end && data[j]==' ') j++,indent++;
+    while (j < end && data[j] == ' ')
+    {
+      j++;
+      indent++;
+    }
     //printf("j=%d end=%d indent=%d refIndent=%d tabSize=%d data={%s}\n",
     //    j,end,indent,refIndent,Config_getInt(TAB_SIZE),qPrint(QCString(data+i).left(end-i-1)));
     if (j==end-1) // empty line
@@ -3111,12 +3170,20 @@ size_t Markdown::Private::findEndOfLine(std::string_view data,size_t offset)
     }
     else if (nb==0 && data[end-1]=='`')
     {
-      while (end<=size && data[end-1]=='`') end++,nb++;
+      while (end <= size && data[end - 1] == '`')
+      {
+        end++;
+        nb++;
+      }
     }
     else if (nb>0 && data[end-1]=='`')
     {
       size_t enb=0;
-      while (end<=size && data[end-1]=='`') end++,enb++;
+      while (end <= size && data[end - 1] == '`')
+      {
+        end++;
+        enb++;
+      }
       if (enb==nb) nb=0;
     }
     else