From c9a0d95e89366ea615f5049e6c8bff086917998a Mon Sep 17 00:00:00 2001
From: Raphael Geissert <atomo64@gmail.com>
Date: Wed, 2 Feb 2011 10:25:13 -0600
Subject: [PATCH] A few more Token::Match -> ::simpleMatch replacements

---
 lib/tokenize.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index f747e4a06..49d752020 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -4713,7 +4713,7 @@ void Tokenizer::simplifyIfAddBraces()
 
                 if (Token::simpleMatch(tempToken, "; else if"))
                     ;
-                else if (Token::Match(tempToken, "; else"))
+                else if (Token::simpleMatch(tempToken, "; else"))
                     innerIf = false;
                 else
                     break;
@@ -5760,35 +5760,35 @@ void Tokenizer::simplifyStdType()
 
         if (Token::simpleMatch(tok, "__int8"))
             tok->str("char");
-        else if (Token::Match(tok, "__int16"))
+        else if (Token::simpleMatch(tok, "__int16"))
             tok->str("short");
-        else if (Token::Match(tok, "__int32"))
+        else if (Token::simpleMatch(tok, "__int32"))
             tok->str("int");
-        else if (Token::Match(tok, "__int64"))
+        else if (Token::simpleMatch(tok, "__int64"))
         {
             tok->str("long");
             tok->isLong(true);
         }
-        else if (Token::Match(tok, "long"))
+        else if (Token::simpleMatch(tok, "long"))
         {
-            if (Token::Match(tok->next(), "long"))
+            if (Token::simpleMatch(tok->next(), "long"))
             {
                 tok->isLong(true);
                 tok->deleteNext();
             }
 
-            if (Token::Match(tok->next(), "int"))
+            if (Token::simpleMatch(tok->next(), "int"))
                 tok->deleteNext();
-            else if (Token::Match(tok->next(), "double"))
+            else if (Token::simpleMatch(tok->next(), "double"))
             {
                 tok->str("double");
                 tok->isLong(true);
                 tok->deleteNext();
             }
         }
-        else if (Token::Match(tok, "short"))
+        else if (Token::simpleMatch(tok, "short"))
         {
-            if (Token::Match(tok->next(), "int"))
+            if (Token::simpleMatch(tok->next(), "int"))
                 tok->deleteNext();
         }
     }
@@ -8251,7 +8251,7 @@ void Tokenizer::simplifyComma()
 
         if (tok->previous() && tok->previous()->previous())
         {
-            if (Token::Match(tok->previous()->previous(), "delete") &&
+            if (Token::simpleMatch(tok->previous()->previous(), "delete") &&
                 tok->next()->varId() != 0)
             {
                 // Handle "delete a, b;"