Match: Added matching for []

CheckBufferOverrun.cpp

@@ -220,10 +220,7 @@ static void CheckBufferOverrun_CheckScope( const TOKEN *tok, const char *varname
                     par++;
                 }
 
-                if ( parlevel == 1 &&
-                    strchr( "(,", *getstr(tok2,0) ) &&
-                    Match( tok2->next, "%var1%", varname ) &&
-                    strchr( ",)", *getstr(tok2, 2+varc) ) )
+                if ( parlevel == 1 && Match(tok2, "[(,] %var1% [,)]", varname) )
                 {
                     par++;
                     break;
@@ -364,7 +361,7 @@ static void CheckBufferOverrun_StructVariable()
                             varname[0] = getstr(tok3, 1);
 
                         // Declare pointer: Fred *fred1
-                        else if ( Match(tok3->next, "* %var%") && tok3->next->next->next && strchr(",);=", tok3->next->next->next->str[0]) )
+                        else if ( Match(tok3->next, "* %var% [,);=]") )
                             varname[0] = getstr(tok3, 2);
 
                         else

CheckClass.cpp

@@ -187,7 +187,7 @@ static void ClassChecking_VarList_Initialize(const TOKEN *ftok, struct VAR *varl
             indentlevel--;
         }
 
-        if (strchr("{};", ftok->str[0]) && indentlevel>=1 && IsName(ftok->next->str))
+        if (indentlevel>=1 && Match(ftok, "[{};] %var%"))
         {
             ftok = ftok->next;
 

CheckMemoryLeak.cpp

@@ -59,7 +59,7 @@ static void CheckMemoryLeak_CheckScope( const TOKEN *Tok1, const char *varname[]
             return;
 
         // Used..
-        if ( strchr("=,(", tok->str[0]) && Match( tok->next, "%var1%", varname )  )
+        if ( Match( tok, "[=,(] %var1%", varname )  )
             return;
         if ( Match( tok, "return %var1%", varname ) )
             return;

CommonCheck.cpp

@@ -308,6 +308,14 @@ bool Match(const TOKEN *tok, const char pattern[], const char *varname1[], const
                 return false;
         }
 
+        // [.. => search for a one-character token..
+        else if (str[0]=='[' && strchr(str, ']') && tok->str[1] == 0)
+        {
+            *strrchr(str, ']') = 0;
+            if ( strchr( str + 1, tok->str[0] ) == 0 )
+                return false;
+        }
+
         else if (strcmp(str, tok->str) != 0)
             return false;