From 18e1eb7c7015cb93b7a2058c75a5889a213a7e67 Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edo88@email.it>
Date: Sun, 4 Nov 2012 19:00:30 +0100
Subject: [PATCH] Add missing hunks in the previous commit.

---
 lib/tokenize.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index aa75b028b..cd1713dc4 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -3526,7 +3526,7 @@ void Tokenizer::removeRedundantAssignment()
                 } else if (tok2->varId() &&
                            !Token::Match(tok2->previous(), "[;{}] %var% = %var% ;") &&
                            !Token::Match(tok2->previous(), "[;{}] %var% = %num% ;") &&
-                           !(Token::Match(tok2->previous(), "[;{}] %var% = %any% ;") && tok2->strAt(2)[0] == '\'')) {
+                           !Token::Match(tok2->previous(), "[;{}] %var% = %char% ;")) {
                     localvars.erase(tok2->varId());
                 }
             }
@@ -5921,7 +5921,7 @@ bool Tokenizer::simplifyKnownVariables()
             else if (tok2->previous()->str() != "*" &&
                      (Token::Match(tok2, "%var% = %num% ;") ||
                       Token::Match(tok2, "%var% = %str% ;") ||
-                      (Token::Match(tok2, "%var% = %any% ;") && tok2->strAt(2)[0] == '\'') ||
+                      Token::Match(tok2, "%var% = %char% ;") ||
                       Token::Match(tok2, "%var% [ ] = %str% ;") ||
                       Token::Match(tok2, "%var% [ %num% ] = %str% ;") ||
                       Token::Match(tok2, "%var% = %bool% ;") ||
@@ -8880,7 +8880,7 @@ void Tokenizer::simplifyMicrosoftStringFunctions()
                 tok->deleteNext();
                 tok->deleteThis();
                 tok->deleteNext();
-            } else if (Token::Match(tok, "_T ( %any% )") && tok->strAt(2)[0] == '\'') {
+            } else if (Token::Match(tok, "_T ( %char% )")) {
                 tok->deleteNext();
                 tok->deleteThis();
                 tok->deleteNext();
@@ -8923,11 +8923,8 @@ void Tokenizer::simplifyMicrosoftStringFunctions()
                 tok->str("wscanf");
             } else if (Token::simpleMatch(tok, "_stscanf (")) {
                 tok->str("swscanf");
-            } else if (Token::Match(tok, "_T ( %str% )")) {
-                tok->deleteNext();
-                tok->deleteThis();
-                tok->deleteNext();
-            } else if (Token::Match(tok, "_T ( %any% )") && tok->strAt(2)[0] == '\'') {
+            } else if (Token::Match(tok, "_T ( %char% )") ||
+                       Token::Match(tok, "_T ( %str% )")) {
                 tok->deleteNext();
                 tok->deleteThis();
                 tok->deleteNext();