Refactoring: replace qstrncmp(s,"literal",7)==0 by literal_at(s,"literal")

doxygen · doxygen · commit 242462e76177 · 2025-01-22T21:08:49.000+01:00
diff --git a/src/commentscan.l b/src/commentscan.l
@@ -4375,7 +4375,7 @@ static void stripTrailingWhiteSpace(QCString &s)
     {
       i--;
     }
-    else if (c=='r' && i>=7 && qstrncmp("\\ilinebr",s.data()+i-7,8)==0) // special line break marker
+    else if (c=='r' && i>=7 && literal_at(s.data()+i-7,"\\ilinebr")) // special line break marker
     {
       i-=8;
     }
diff --git a/src/docparser.cpp b/src/docparser.cpp
@@ -38,6 +38,7 @@
 #include "util.h"
 #include "indexlist.h"
 #include "trace.h"
+#include "stringutil.h"
 
 #if !ENABLE_DOCPARSER_TRACING
 #undef  AUTO_TRACE
@@ -1779,7 +1780,7 @@ static QCString extractCopyDocId(const char *data, size_t &j, size_t len)
           found=(round==0);
           break;
         case ' ':  // allow spaces in cast operator (see issue #11169)
-          found=(round==0) && (j<8 || qstrncmp(data+j-8,"operator",8)!=0);
+          found=(round==0) && (j<8 || !literal_at(data+j-8,"operator"));
           break;
       }
     }
@@ -1801,11 +1802,11 @@ static QCString extractCopyDocId(const char *data, size_t &j, size_t len)
   }
 
   // include const and volatile
-  if (qstrncmp(data+j," const",6)==0)
+  if (literal_at(data+j," const"))
   {
     j+=6;
   }
-  else if (qstrncmp(data+j," volatile",9)==0)
+  else if (literal_at(data+j," volatile"))
   {
     j+=9;
   }
@@ -1829,7 +1830,7 @@ static QCString extractCopyDocId(const char *data, size_t &j, size_t len)
 // and the sizeof(str) returns the size of str including the '\0' terminator;
 // a fact we abuse to skip over the start of the command character.
 #define CHECK_FOR_COMMAND(str,action) \
-   do if ((i+sizeof(str)<len) && qstrncmp(data+i+1,str,sizeof(str)-1)==0) \
+   do if ((i+sizeof(str)<len) && literal_at(data+i+1,str)) \
    { j=i+sizeof(str); action; } while(0)
 
 static size_t isCopyBriefOrDetailsCmd(const char *data, size_t i,size_t len,bool &brief)
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
@@ -48,6 +48,7 @@ typedef yyguts_t *yyscan_t;
 #include "regex.h"
 #include "debug.h"
 #include "docnode.h"
+#include "stringutil.h"
 
 #define YY_NO_INPUT 1
 #define YY_NO_UNISTD_H 1
@@ -138,7 +139,7 @@ static int computeIndent(const char *str,size_t length)
     {
       indent=0;
     }
-    else if (str[i]=='\\' && qstrncmp(str+i+1,"ilinebr",7)==0)
+    else if (literal_at(&str[i],"\\ilinebr"))
     {
       indent=0;
       i+=7;
diff --git a/src/dotfilepatcher.cpp b/src/dotfilepatcher.cpp
@@ -24,6 +24,7 @@
 #include "dot.h"
 #include "dir.h"
 #include "portable.h"
+#include "stringutil.h"
 
 // top part of the interactive SVG header
 static const char svgZoomHeader0[] = R"svg(
@@ -552,7 +553,7 @@ static bool readSVGSize(const QCString &fileName,int *width,int *height)
   std::string line;
   while (getline(f,line) && !found)
   {
-    if (qstrncmp(line.c_str(),"<!--zoomable ",13)==0)
+    if (literal_at(line.c_str(),"<!--zoomable "))
     {
       *width=-1;
       *height=-1;
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
@@ -56,6 +56,7 @@
 #include "datetime.h"
 #include "portable.h"
 #include "outputlist.h"
+#include "stringutil.h"
 
 //#define DBG_HTML(x) x;
 #define DBG_HTML(x)
@@ -172,11 +173,11 @@ static QCString getConvertLatexMacro()
       return "";
     }
     i++;
-    if (!qstrncmp(data + i, "newcommand", strlen("newcommand")))
+    if (literal_at(data+i,"newcommand"))
     {
       i += strlen("newcommand");
     }
-    else if (!qstrncmp(data + i, "renewcommand", strlen("renewcommand")))
+    else if (literal_at(data+i,"renewcommand"))
     {
       i += strlen("renewcommand");
     }
diff --git a/src/markdown.cpp b/src/markdown.cpp
@@ -209,7 +209,7 @@ inline size_t isNewline(std::string_view data)
   // normal newline
   if (data[0] == '\n') return 1;
   // artificial new line from ^^ in ALIASES
-  if (data[0] == '\\' && qstrncmp(data.data()+1,"ilinebr ",7)==0) return data[8]==' ' ? 9 : 8;
+  if (literal_at(data,"\\ilinebr ")) return 8;
   return 0;
 }
 
@@ -551,10 +551,7 @@ size_t Markdown::Private::isSpecialCommand(std::string_view data,size_t offset)
       // skip over name (and optionally type)
       while (offset_<data_.size() && (c=data_[offset_])!='\n' && (allowSpaces || c!=' ') && c!='(')
       {
-        if (offset_+9<data_.size() && data_[offset_]=='\\')
-        {
-          if (qstrncmp(&data_[offset_+1],"ilinebr ",8)==0) break;
-        }
+        if (literal_at(data_.substr(offset_),"\\ilinebr ")) break;
         offset_++;
       }
       if (c=='(') // find the end of the function
@@ -959,13 +956,13 @@ int Markdown::Private::processNmdash(std::string_view data,size_t offset)
   {
     count++;
   }
-  if (count>=2 && offset>=2 && qstrncmp(data.data()-2,"<!",2)==0)
+  if (count>=2 && offset>=2 && literal_at(data.data()-2,"<!"))
   { AUTO_TRACE_EXIT("result={}",1-count); return 1-count; } // start HTML comment
   if (count==2 && size > 2 && data[2]=='>')
   { return 0; } // end HTML comment
   if (count==3 && size > 3 && data[3]=='>')
   { return 0; } // end HTML comment
-  if (count==2 && (offset<8 || qstrncmp(data.data()-8,"operator",8)!=0)) // -- => ndash
+  if (count==2 && (offset<8 || !literal_at(data.data()-8,"operator"))) // -- => ndash
   {
     out+="&ndash;";
     AUTO_TRACE_EXIT("result=2");
@@ -2890,15 +2887,15 @@ bool skipOverFileAndLineCommands(std::string_view data,size_t indent,size_t &off
   size_t i = offset;
   size_t size = data.size();
   while (i<data.size() && data[i]==' ') i++;
-  if (i<size+8 && data[i]=='\\' && qstrncmp(&data[i+1],"ifile \"",7)==0)
+  if (literal_at(data.substr(i),"\\ifile \""))
   {
     size_t locStart = i;
     if (i>offset) locStart--; // include the space before \ifile
     i+=8;
     bool found=false;
     while (i+9<size && data[i]!='\n')
     {
-      if (data[i]=='\\' && qstrncmp(&data[i+1],"ilinebr ",8)==0)
+      if (literal_at(data.substr(i),"\\ilinebr "))
       {
         found=true;
         break;
@@ -3459,7 +3456,7 @@ static ExplicitPageResult isExplicitPage(const QCString &docs)
     {
       i++;
     }
-    if (i+5<size && data[i]=='<' && qstrncmp(&data[i],"<!--!",5)==0) // skip over <!--! marker
+    if (literal_at(data.substr(i),"<!--!")) // skip over <!--! marker
     {
       i+=5;
       while (i<size && (data[i]==' ' || data[i]=='\n')) // skip over spaces after the <!--! marker
@@ -3469,10 +3466,10 @@ static ExplicitPageResult isExplicitPage(const QCString &docs)
     }
     if (i+1<size &&
         (data[i]=='\\' || data[i]=='@') &&
-        (qstrncmp(&data[i+1],"page ",5)==0 || qstrncmp(&data[i+1],"mainpage",8)==0)
+        (literal_at(data.substr(i+1),"page ") || literal_at(data.substr(i+1),"mainpage"))
        )
     {
-      if (qstrncmp(&data[i+1],"page ",5)==0)
+      if (literal_at(data.substr(i+1),"page "))
       {
         AUTO_TRACE_EXIT("result=ExplicitPageResult::explicitPage");
         return ExplicitPageResult::explicitPage;
@@ -3485,7 +3482,7 @@ static ExplicitPageResult isExplicitPage(const QCString &docs)
     }
     else if (i+1<size &&
              (data[i]=='\\' || data[i]=='@') &&
-             (qstrncmp(&data[i+1],"dir\n",4)==0 || qstrncmp(&data[i+1],"dir ",4)==0)
+             (literal_at(data.substr(i+1),"dir\n") || literal_at(data.substr(i+1),"dir "))
             )
     {
       AUTO_TRACE_EXIT("result=ExplicitPageResult::explicitDirPage");
@@ -3588,7 +3585,7 @@ QCString Markdown::process(const QCString &input, int &startNewlines, bool fromP
   {
     while (*p==' ')  p++; // skip over spaces
     while (*p=='\n') {startNewlines++;p++;}; // skip over newlines
-    if (qstrncmp(p,"<br>",4)==0) p+=4; // skip over <br>
+    if (literal_at(p,"<br>")) p+=4; // skip over <br>
   }
   if (p>result.data())
   {
diff --git a/src/msc.cpp b/src/msc.cpp
@@ -25,6 +25,7 @@
 #include "mscgen_api.h"
 #include "dir.h"
 #include "textstream.h"
+#include "stringutil.h"
 
 static const int maxCmdLine = 40960;
 
@@ -48,7 +49,7 @@ static bool convertMapFile(TextStream &t,const QCString &mapName,const QCString
   {
     bool isRef = false;
     //printf("ReadLine '%s'\n",line.c_str());
-    if (qstrncmp(line.c_str(),"rect",4)==0)
+    if (literal_at(line.c_str(),"rect"))
     {
       // obtain the url and the coordinates in the order used by graphviz-1.5
       sscanf(line.c_str(),"rect %s %d,%d %d,%d",url,&x1,&y1,&x2,&y2);
diff --git a/src/plantuml.cpp b/src/plantuml.cpp
@@ -23,6 +23,7 @@
 #include "fileinfo.h"
 #include "dir.h"
 #include "indexlist.h"
+#include "stringutil.h"
 
 QCString PlantumlManager::writePlantUMLSource(const QCString &outDirArg,const QCString &fileName,
                                               const QCString &content,OutputFormat format, const QCString &engine,
@@ -94,7 +95,7 @@ QCString PlantumlManager::writePlantUMLSource(const QCString &outDirArg,const QC
         case '\t': break;
         case ' ':  break;
         case '@':
-          if (initial && qstrncmp(p,"start",5)==0) // @start...
+          if (initial && literal_at(p,"start")) // @start...
           {
             while ((c=*p++) && isId(c)) text+=c;
             // insert the image name
diff --git a/src/pre.l b/src/pre.l
@@ -63,6 +63,7 @@ typedef yyguts_t *yyscan_t;
 #include "fileinfo.h"
 #include "trace.h"
 #include "debug.h"
+#include "stringutil.h"
 
 #define YY_NO_UNISTD_H 1
 
@@ -3159,7 +3160,7 @@ static QCString removeIdsAndMarkers(const QCString &s)
           continue;
         }
       }
-      else if (c=='s' && qstrncmp(p,"sizeof",6)==0) // sizeof(...)
+      else if (c=='s' && literal_at(p,"sizeof")) // sizeof(...)
       {
         const char *q = p+6;
         while (*q==' ' || *q=='\t') q++;
@@ -3200,7 +3201,7 @@ static QCString removeIdsAndMarkers(const QCString &s)
       }
       else if (c=='d' && !inNum) // identifier starting with a 'd'
       {
-        if (qstrncmp(p,"defined ",8)==0 || qstrncmp(p,"defined(",8)==0)
+        if (literal_at(p,"defined ") || literal_at(p,"defined("))
                    // defined keyword
         {
           p+=7; // skip defined
diff --git a/src/scanner.l b/src/scanner.l
@@ -50,6 +50,7 @@ typedef yyguts_t *yyscan_t;
 #include "commentscan.h"
 #include "arguments.h"
 #include "moduledef.h"
+#include "stringutil.h"
 
 #include "clangparser.h"
 #include "markdown.h"
@@ -984,7 +985,7 @@ NONLopt [^\n]*
                                             yyextra->roundCount=0;
                                             BEGIN( SkipRound );
                                           }
-                                          else if (qstrncmp(yytext,"@property",9)==0) // ObjC 2.0 property
+                                          else if (literal_at(yytext,"@property")) // ObjC 2.0 property
                                           {
                                             yyextra->current->mtype = yyextra->mtype = MethodTypes::Property;
                                             yyextra->current->spec.setReadable(true).setWritable(true).setAssign(true);
@@ -6079,7 +6080,7 @@ NONLopt [^\n]*
                                           BEGIN( ClassVar );
                                         }
 <ClassVar>{SCOPENAME}{BNopt}/"("        {
-                                          if (yyextra->insideIDL && qstrncmp(yytext,"switch",6)==0 && !isId(yytext[6]))
+                                          if (yyextra->insideIDL && literal_at(yytext,"switch") && !isId(yytext[6]))
                                           {
                                             // Corba IDL style union
                                             yyextra->roundCount=0;
diff --git a/src/stringutil.h b/src/stringutil.h
@@ -93,4 +93,20 @@ inline void addTerminalCharIfMissing(std::string &s,char c)
   }
 }
 
+/// returns TRUE iff \a data points to a substring that matches string literal \a str
+template <size_t N>
+bool literal_at(const char *data,const char (&str)[N])
+{
+  size_t len = N-1; // exclude 0 terminator
+  return data!=nullptr && data[0]==str[0] && qstrncmp(data+1,str+1,len-1)==0;
+}
+
+/// returns TRUE iff \a data points to a substring that matches string literal \a str
+template <size_t N>
+bool literal_at(std::string_view data,const char (&str)[N])
+{
+  size_t len = N-1; // exclude 0 terminator
+  return len<data.size() && data[0]==str[0] && qstrncmp(data.data()+1,str+1,len-1)==0;
+}
+
 #endif // STRINGUTIL_H
diff --git a/src/util.cpp b/src/util.cpp
@@ -5472,7 +5472,7 @@ QCString stripLeadingAndTrailingEmptyLines(const QCString &s,int &docLine)
   while ((c=*p))
   {
     if (c==' ' || c=='\t' || c=='\r') i++,p++;
-    else if (c=='\\' && qstrncmp(p,"\\ilinebr",8)==0) i+=8,li=i,p+=8;
+    else if (c=='\\' && literal_at(p,"\\ilinebr")) i+=8,li=i,p+=8;
     else if (c=='\n') i++,li=i,docLine++,p++;
     else break;
   }
@@ -5484,8 +5484,8 @@ QCString stripLeadingAndTrailingEmptyLines(const QCString &s,int &docLine)
   {
     c=*p;
     if (c==' ' || c=='\t' || c=='\r') b--,p--;
-    else if (c=='r' && b>=7 && qstrncmp(p-7,"\\ilinebr",8)==0) bi=b-7,b-=8,p-=8;
-    else if (c=='>' && b>=11 && qstrncmp(p-11,"\\ilinebr<br>",12)==0) bi=b-11,b-=12,p-=12;
+    else if (c=='r' && b>=7 && literal_at(p-7,"\\ilinebr")) bi=b-7,b-=8,p-=8;
+    else if (c=='>' && b>=11 && literal_at(p-11,"\\ilinebr<br>")) bi=b-11,b-=12,p-=12;
     else if (c=='\n') bi=b,b--,p--;
     else break;
   }
@@ -6431,7 +6431,7 @@ QCString stripIndentation(const QCString &s)
         indent++;
       }
     }
-    else if (c=='\\' && qstrncmp(p,"ilinebr ",8)==0)
+    else if (c=='\\' && literal_at(p,"ilinebr "))
       // we also need to remove the indentation after a \ilinebr command at the end of a line
     {
       result << "\\ilinebr ";
@@ -6443,7 +6443,7 @@ QCString stripIndentation(const QCString &s)
         p+=skipAmount; // remove the indent
       }
     }
-    else if (c=='@' && qstrncmp(p,"ilinebr",7)==0)
+    else if (c=='@' && literal_at(p,"ilinebr"))
     {
       result << "\\ilinebr";
       p+=7;
@@ -7173,12 +7173,12 @@ QCString detab(const QCString &s,size_t &refIndent)
           out.addChar(data[i++]);
           col+=2;
         }
-        else if (i+5<size && qstrncmp(&data[i],"iskip",5)==0) // \iskip command
+        else if (i+5<size && literal_at(data+i,"iskip")) // \iskip command
         {
           i+=5;
           skip = true;
         }
-        else if (i+8<size && qstrncmp(&data[i],"endiskip",8)==0) // \endiskip command
+        else if (i+8<size && literal_at(data+i,"endiskip")) // \endiskip command
         {
           i+=8;
           skip = false;

Original file line number	Diff line number	Diff line change
`@@ -4375,7 +4375,7 @@ static void stripTrailingWhiteSpace(QCString &s)`
`4375`	`4375`	`{`
`4376`	`4376`	`i--;`
`4377`	`4377`	`}`
`4378`		`- else if (c=='r' && i>=7 && qstrncmp("\\ilinebr",s.data()+i-7,8)==0) // special line break marker`
	`4378`	`+ else if (c=='r' && i>=7 && literal_at(s.data()+i-7,"\\ilinebr")) // special line break marker`
`4379`	`4379`	`{`
`4380`	`4380`	`i-=8;`
`4381`	`4381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`#include "util.h"`
`39`	`39`	`#include "indexlist.h"`
`40`	`40`	`#include "trace.h"`
	`41`	`+#include "stringutil.h"`
`41`	`42`
`42`	`43`	`#if !ENABLE_DOCPARSER_TRACING`
`43`	`44`	`#undef AUTO_TRACE`
`@@ -1779,7 +1780,7 @@ static QCString extractCopyDocId(const char *data, size_t &j, size_t len)`
`1779`	`1780`	`found=(round==0);`
`1780`	`1781`	`break;`
`1781`	`1782`	`case ' ': // allow spaces in cast operator (see issue #11169)`
`1782`		`- found=(round==0) && (j<8 \|\| qstrncmp(data+j-8,"operator",8)!=0);`
	`1783`	`+ found=(round==0) && (j<8 \|\| !literal_at(data+j-8,"operator"));`
`1783`	`1784`	`break;`
`1784`	`1785`	`}`
`1785`	`1786`	`}`
`@@ -1801,11 +1802,11 @@ static QCString extractCopyDocId(const char *data, size_t &j, size_t len)`
`1801`	`1802`	`}`
`1802`	`1803`
`1803`	`1804`	`// include const and volatile`
`1804`		`- if (qstrncmp(data+j," const",6)==0)`
	`1805`	`+ if (literal_at(data+j," const"))`
`1805`	`1806`	`{`
`1806`	`1807`	`j+=6;`
`1807`	`1808`	`}`
`1808`		`- else if (qstrncmp(data+j," volatile",9)==0)`
	`1809`	`+ else if (literal_at(data+j," volatile"))`
`1809`	`1810`	`{`
`1810`	`1811`	`j+=9;`
`1811`	`1812`	`}`
`@@ -1829,7 +1830,7 @@ static QCString extractCopyDocId(const char *data, size_t &j, size_t len)`
`1829`	`1830`	`// and the sizeof(str) returns the size of str including the '\0' terminator;`
`1830`	`1831`	`// a fact we abuse to skip over the start of the command character.`
`1831`	`1832`	`#define CHECK_FOR_COMMAND(str,action) \`
`1832`		`- do if ((i+sizeof(str)<len) && qstrncmp(data+i+1,str,sizeof(str)-1)==0) \`
	`1833`	`+ do if ((i+sizeof(str)<len) && literal_at(data+i+1,str)) \`
`1833`	`1834`	`{ j=i+sizeof(str); action; } while(0)`
`1834`	`1835`
`1835`	`1836`	`static size_t isCopyBriefOrDetailsCmd(const char *data, size_t i,size_t len,bool &brief)`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ typedef yyguts_t *yyscan_t;`
`48`	`48`	`#include "regex.h"`
`49`	`49`	`#include "debug.h"`
`50`	`50`	`#include "docnode.h"`
	`51`	`+#include "stringutil.h"`
`51`	`52`
`52`	`53`	`#define YY_NO_INPUT 1`
`53`	`54`	`#define YY_NO_UNISTD_H 1`
`@@ -138,7 +139,7 @@ static int computeIndent(const char *str,size_t length)`
`138`	`139`	`{`
`139`	`140`	`indent=0;`
`140`	`141`	`}`
`141`		`- else if (str[i]=='\\' && qstrncmp(str+i+1,"ilinebr",7)==0)`
	`142`	`+ else if (literal_at(&str[i],"\\ilinebr"))`
`142`	`143`	`{`
`143`	`144`	`indent=0;`
`144`	`145`	`i+=7;`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@`
`56`	`56`	`#include "datetime.h"`
`57`	`57`	`#include "portable.h"`
`58`	`58`	`#include "outputlist.h"`
	`59`	`+#include "stringutil.h"`
`59`	`60`
`60`	`61`	`//#define DBG_HTML(x) x;`
`61`	`62`	`#define DBG_HTML(x)`
`@@ -172,11 +173,11 @@ static QCString getConvertLatexMacro()`
`172`	`173`	`return "";`
`173`	`174`	`}`
`174`	`175`	`i++;`
`175`		`- if (!qstrncmp(data + i, "newcommand", strlen("newcommand")))`
	`176`	`+ if (literal_at(data+i,"newcommand"))`
`176`	`177`	`{`
`177`	`178`	`i += strlen("newcommand");`
`178`	`179`	`}`
`179`		`- else if (!qstrncmp(data + i, "renewcommand", strlen("renewcommand")))`
	`180`	`+ else if (literal_at(data+i,"renewcommand"))`
`180`	`181`	`{`
`181`	`182`	`i += strlen("renewcommand");`
`182`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ inline size_t isNewline(std::string_view data)`
`209`	`209`	`// normal newline`
`210`	`210`	`if (data[0] == '\n') return 1;`
`211`	`211`	`// artificial new line from ^^ in ALIASES`
`212`		`- if (data[0] == '\\' && qstrncmp(data.data()+1,"ilinebr ",7)==0) return data[8]==' ' ? 9 : 8;`
	`212`	`+ if (literal_at(data,"\\ilinebr ")) return 8;`
`213`	`213`	`return 0;`
`214`	`214`	`}`
`215`	`215`
`@@ -551,10 +551,7 @@ size_t Markdown::Private::isSpecialCommand(std::string_view data,size_t offset)`
`551`	`551`	`// skip over name (and optionally type)`
`552`	`552`	`while (offset_<data_.size() && (c=data_[offset_])!='\n' && (allowSpaces \|\| c!=' ') && c!='(')`
`553`	`553`	`{`
`554`		`- if (offset_+9<data_.size() && data_[offset_]=='\\')`
`555`		`- {`
`556`		`- if (qstrncmp(&data_[offset_+1],"ilinebr ",8)==0) break;`
`557`		`- }`
	`554`	`+ if (literal_at(data_.substr(offset_),"\\ilinebr ")) break;`
`558`	`555`	`offset_++;`
`559`	`556`	`}`
`560`	`557`	`if (c=='(') // find the end of the function`
`@@ -959,13 +956,13 @@ int Markdown::Private::processNmdash(std::string_view data,size_t offset)`
`959`	`956`	`{`
`960`	`957`	`count++;`
`961`	`958`	`}`
`962`		`- if (count>=2 && offset>=2 && qstrncmp(data.data()-2,"<!",2)==0)`
	`959`	`+ if (count>=2 && offset>=2 && literal_at(data.data()-2,"<!"))`
`963`	`960`	`{ AUTO_TRACE_EXIT("result={}",1-count); return 1-count; } // start HTML comment`
`964`	`961`	`if (count==2 && size > 2 && data[2]=='>')`
`965`	`962`	`{ return 0; } // end HTML comment`
`966`	`963`	`if (count==3 && size > 3 && data[3]=='>')`
`967`	`964`	`{ return 0; } // end HTML comment`
`968`		`- if (count==2 && (offset<8 \|\| qstrncmp(data.data()-8,"operator",8)!=0)) // -- => ndash`
	`965`	`+ if (count==2 && (offset<8 \|\| !literal_at(data.data()-8,"operator"))) // -- => ndash`
`969`	`966`	`{`
`970`	`967`	`out+="–";`
`971`	`968`	`AUTO_TRACE_EXIT("result=2");`
`@@ -2890,15 +2887,15 @@ bool skipOverFileAndLineCommands(std::string_view data,size_t indent,size_t &off`
`2890`	`2887`	`size_t i = offset;`
`2891`	`2888`	`size_t size = data.size();`
`2892`	`2889`	`while (i<data.size() && data[i]==' ') i++;`
`2893`		`- if (i<size+8 && data[i]=='\\' && qstrncmp(&data[i+1],"ifile \"",7)==0)`
	`2890`	`+ if (literal_at(data.substr(i),"\\ifile \""))`
`2894`	`2891`	`{`
`2895`	`2892`	`size_t locStart = i;`
`2896`	`2893`	`if (i>offset) locStart--; // include the space before \ifile`
`2897`	`2894`	`i+=8;`
`2898`	`2895`	`bool found=false;`
`2899`	`2896`	`while (i+9<size && data[i]!='\n')`
`2900`	`2897`	`{`
`2901`		`- if (data[i]=='\\' && qstrncmp(&data[i+1],"ilinebr ",8)==0)`
	`2898`	`+ if (literal_at(data.substr(i),"\\ilinebr "))`
`2902`	`2899`	`{`
`2903`	`2900`	`found=true;`
`2904`	`2901`	`break;`
`@@ -3459,7 +3456,7 @@ static ExplicitPageResult isExplicitPage(const QCString &docs)`
`3459`	`3456`	`{`
`3460`	`3457`	`i++;`
`3461`	`3458`	`}`
`3462`		`- if (i+5<size && data[i]=='<' && qstrncmp(&data[i],"<!--!",5)==0) // skip over <!--! marker`
	`3459`	`+ if (literal_at(data.substr(i),"<!--!")) // skip over <!--! marker`
`3463`	`3460`	`{`
`3464`	`3461`	`i+=5;`
`3465`	`3462`	`while (i<size && (data[i]==' ' \|\| data[i]=='\n')) // skip over spaces after the <!--! marker`
`@@ -3469,10 +3466,10 @@ static ExplicitPageResult isExplicitPage(const QCString &docs)`
`3469`	`3466`	`}`
`3470`	`3467`	`if (i+1<size &&`
`3471`	`3468`	`(data[i]=='\\' \|\| data[i]=='@') &&`
`3472`		`- (qstrncmp(&data[i+1],"page ",5)==0 \|\| qstrncmp(&data[i+1],"mainpage",8)==0)`
	`3469`	`+ (literal_at(data.substr(i+1),"page ") \|\| literal_at(data.substr(i+1),"mainpage"))`
`3473`	`3470`	`)`
`3474`	`3471`	`{`
`3475`		`- if (qstrncmp(&data[i+1],"page ",5)==0)`
	`3472`	`+ if (literal_at(data.substr(i+1),"page "))`
`3476`	`3473`	`{`
`3477`	`3474`	`AUTO_TRACE_EXIT("result=ExplicitPageResult::explicitPage");`
`3478`	`3475`	`return ExplicitPageResult::explicitPage;`
`@@ -3485,7 +3482,7 @@ static ExplicitPageResult isExplicitPage(const QCString &docs)`
`3485`	`3482`	`}`
`3486`	`3483`	`else if (i+1<size &&`
`3487`	`3484`	`(data[i]=='\\' \|\| data[i]=='@') &&`
`3488`		`- (qstrncmp(&data[i+1],"dir\n",4)==0 \|\| qstrncmp(&data[i+1],"dir ",4)==0)`
	`3485`	`+ (literal_at(data.substr(i+1),"dir\n") \|\| literal_at(data.substr(i+1),"dir "))`
`3489`	`3486`	`)`
`3490`	`3487`	`{`
`3491`	`3488`	`AUTO_TRACE_EXIT("result=ExplicitPageResult::explicitDirPage");`
`@@ -3588,7 +3585,7 @@ QCString Markdown::process(const QCString &input, int &startNewlines, bool fromP`
`3588`	`3585`	`{`
`3589`	`3586`	`while (*p==' ') p++; // skip over spaces`
`3590`	`3587`	`while (*p=='\n') {startNewlines++;p++;}; // skip over newlines`
`3591`		`- if (qstrncmp(p,"<br>",4)==0) p+=4; // skip over <br>`
	`3588`	`+ if (literal_at(p,"<br>")) p+=4; // skip over <br>`
`3592`	`3589`	`}`
`3593`	`3590`	`if (p>result.data())`
`3594`	`3591`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`#include "mscgen_api.h"`
`26`	`26`	`#include "dir.h"`
`27`	`27`	`#include "textstream.h"`
	`28`	`+#include "stringutil.h"`
`28`	`29`
`29`	`30`	`static const int maxCmdLine = 40960;`
`30`	`31`
`@@ -48,7 +49,7 @@ static bool convertMapFile(TextStream &t,const QCString &mapName,const QCString`
`48`	`49`	`{`
`49`	`50`	`bool isRef = false;`
`50`	`51`	`//printf("ReadLine '%s'\n",line.c_str());`
`51`		`- if (qstrncmp(line.c_str(),"rect",4)==0)`
	`52`	`+ if (literal_at(line.c_str(),"rect"))`
`52`	`53`	`{`
`53`	`54`	`// obtain the url and the coordinates in the order used by graphviz-1.5`
`54`	`55`	`sscanf(line.c_str(),"rect %s %d,%d %d,%d",url,&x1,&y1,&x2,&y2);`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ typedef yyguts_t *yyscan_t;`
`63`	`63`	`#include "fileinfo.h"`
`64`	`64`	`#include "trace.h"`
`65`	`65`	`#include "debug.h"`
	`66`	`+#include "stringutil.h"`
`66`	`67`
`67`	`68`	`#define YY_NO_UNISTD_H 1`
`68`	`69`
`@@ -3159,7 +3160,7 @@ static QCString removeIdsAndMarkers(const QCString &s)`
`3159`	`3160`	`continue;`
`3160`	`3161`	`}`
`3161`	`3162`	`}`
`3162`		`- else if (c=='s' && qstrncmp(p,"sizeof",6)==0) // sizeof(...)`
	`3163`	`+ else if (c=='s' && literal_at(p,"sizeof")) // sizeof(...)`
`3163`	`3164`	`{`
`3164`	`3165`	`const char *q = p+6;`
`3165`	`3166`	`while (q==' ' \|\| q=='\t') q++;`
`@@ -3200,7 +3201,7 @@ static QCString removeIdsAndMarkers(const QCString &s)`
`3200`	`3201`	`}`
`3201`	`3202`	`else if (c=='d' && !inNum) // identifier starting with a 'd'`
`3202`	`3203`	`{`
`3203`		`- if (qstrncmp(p,"defined ",8)==0 \|\| qstrncmp(p,"defined(",8)==0)`
	`3204`	`+ if (literal_at(p,"defined ") \|\| literal_at(p,"defined("))`
`3204`	`3205`	`// defined keyword`
`3205`	`3206`	`{`
`3206`	`3207`	`p+=7; // skip defined`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ typedef yyguts_t *yyscan_t;`
`50`	`50`	`#include "commentscan.h"`
`51`	`51`	`#include "arguments.h"`
`52`	`52`	`#include "moduledef.h"`
	`53`	`+#include "stringutil.h"`
`53`	`54`
`54`	`55`	`#include "clangparser.h"`
`55`	`56`	`#include "markdown.h"`
`@@ -984,7 +985,7 @@ NONLopt [^\n]*`
`984`	`985`	`yyextra->roundCount=0;`
`985`	`986`	`BEGIN( SkipRound );`
`986`	`987`	`}`
`987`		`- else if (qstrncmp(yytext,"@property",9)==0) // ObjC 2.0 property`
	`988`	`+ else if (literal_at(yytext,"@property")) // ObjC 2.0 property`
`988`	`989`	`{`
`989`	`990`	`yyextra->current->mtype = yyextra->mtype = MethodTypes::Property;`
`990`	`991`	`yyextra->current->spec.setReadable(true).setWritable(true).setAssign(true);`
`@@ -6079,7 +6080,7 @@ NONLopt [^\n]*`
`6079`	`6080`	`BEGIN( ClassVar );`
`6080`	`6081`	`}`
`6081`	`6082`	`<ClassVar>{SCOPENAME}{BNopt}/"(" {`
`6082`		`- if (yyextra->insideIDL && qstrncmp(yytext,"switch",6)==0 && !isId(yytext[6]))`
	`6083`	`+ if (yyextra->insideIDL && literal_at(yytext,"switch") && !isId(yytext[6]))`
`6083`	`6084`	`{`
`6084`	`6085`	`// Corba IDL style union`
`6085`	`6086`	`yyextra->roundCount=0;`