From 23d3fd3a5a5ed28c6928e29d687e4cfa0e1a3a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Sun, 31 Oct 2010 08:47:13 +0100
Subject: [PATCH] Fixed #2147 (uninitialized variable: false negative for 'x +=
 y;')

---
 lib/checkmemoryleak.cpp |  2 +-
 lib/tokenize.cpp        | 41 ++++++++++++++++++++++++++++++++++++++++-
 lib/tokenize.h          |  6 ++++++
 test/testtokenize.cpp   | 17 +++++++++++++++++
 test/testunusedvar.cpp  |  3 ++-
 5 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 4a0e3c1c6..58631c8a5 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -1032,7 +1032,7 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
             }
 
             if (Token::Match(tok->previous(), "[;{})=] %var%") ||
-                Token::Match(tok->previous(), "|= %var%"))
+                Token::Match(tok->previous(), "| %var%"))
             {
                 AllocType dealloc = getDeallocationType(tok, varid);
 
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index f3de99082..7f9714407 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -1840,11 +1840,16 @@ bool Tokenizer::tokenize(std::istream &code,
             {
                 tok->str(tok->str() + c2);
                 tok->deleteNext();
+                if (c1 == '<' && tok->next()->str() == "=")
+                {
+                    tok->str("<<=");
+                    tok->deleteNext();
+                }
                 continue;
             }
 
             // combine +-*/ and =
-            else if (c2 == '=' && (strchr("+-*/&|=!<>", c1)))
+            else if (c2 == '=' && (strchr("+-*/%&|^=!<>", c1)))
             {
                 tok->str(tok->str() + c2);
                 tok->deleteNext();
@@ -1860,6 +1865,12 @@ bool Tokenizer::tokenize(std::istream &code,
             }
         }
 
+        else if (tok->str() == ">>" && tok->next()->str() == "=")
+        {
+            tok->str(">>=");
+            tok->deleteNext();
+        }
+
         else if ((c1 == 'p' || c1 == '_') && tok->next()->str() == ":")
         {
             if (tok->str() == "private" || tok->str() == "protected" || tok->str() == "public" || tok->str() == "__published")
@@ -1871,6 +1882,9 @@ bool Tokenizer::tokenize(std::istream &code,
         }
     }
 
+    // ";a+=b;" => ";a=a+b;"
+    simplifyCompoundAssignment();
+
     // check for more complicated syntax errors when using templates..
     if (!preprocessorCondition)
     {
@@ -4349,6 +4363,31 @@ void Tokenizer::simplifyDoWhileAddBraces()
     }
 }
 
+void Tokenizer::simplifyCompoundAssignment()
+{
+    for (Token *tok = _tokens; tok; tok = tok->next())
+    {
+        if (Token::Match(tok, "; %var%"))
+        {
+            const Token *vartok = tok->next();
+            const std::string str = tok->strAt(2);
+            std::string op;
+            if (str.size() == 2 && str[1] == '=' && str.find_first_of("+-*/%&|^")==0)
+                op = str.substr(0, 1);
+            else if (str=="<<=" || str==">>=")
+                op = str.substr(0, 2);
+            else
+                continue;
+
+            tok = tok->tokAt(2);
+            tok->str("=");
+            tok->insertToken(op);
+            tok->insertToken(vartok->str());
+            tok->next()->varId(vartok->varId());
+        }
+    }
+}
+
 void Tokenizer::simplifyConditionOperator()
 {
     int parlevel = 0;
diff --git a/lib/tokenize.h b/lib/tokenize.h
index 43082d97c..3cc3509fb 100644
--- a/lib/tokenize.h
+++ b/lib/tokenize.h
@@ -193,6 +193,12 @@ public:
      */
     bool simplifyQuestionMark();
 
+    /**
+     * Simplify compound assignments
+     * Example: ";a+=b;" => ";a=a+b;"
+     */
+    void simplifyCompoundAssignment();
+
     /**
      * simplify if-assignments
      * Example: "if(a=b);" => "a=b;if(a);"
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index c3e439f53..470e8abcc 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -267,6 +267,9 @@ private:
         // foo(p = new char[10]);  =>  p = new char[10]; foo(p);
         TEST_CASE(simplifyAssignmentInFunctionCall);
 
+        // "x += .." => "x = x + .."
+        TEST_CASE(simplifyCompoundAssignment);
+
         // Tokenize C#
         TEST_CASE(cs);
 
@@ -4583,6 +4586,20 @@ private:
         ASSERT_EQUALS("if ( a != b )", tokenizeAndStringify("if (a not_eq b)"));
     }
 
+    void simplifyCompoundAssignment()
+    {
+        ASSERT_EQUALS("; x = x + y ;", tokenizeAndStringify("; x += y;"));
+        ASSERT_EQUALS("; x = x - y ;", tokenizeAndStringify("; x -= y;"));
+        ASSERT_EQUALS("; x = x * y ;", tokenizeAndStringify("; x *= y;"));
+        ASSERT_EQUALS("; x = x / y ;", tokenizeAndStringify("; x /= y;"));
+        ASSERT_EQUALS("; x = x % y ;", tokenizeAndStringify("; x %= y;"));
+        ASSERT_EQUALS("; x = x & y ;", tokenizeAndStringify("; x &= y;"));
+        ASSERT_EQUALS("; x = x | y ;", tokenizeAndStringify("; x |= y;"));
+        ASSERT_EQUALS("; x = x ^ y ;", tokenizeAndStringify("; x ^= y;"));
+        ASSERT_EQUALS("; x = x << y ;", tokenizeAndStringify("; x <<= y;"));
+        ASSERT_EQUALS("; x = x >> y ;", tokenizeAndStringify("; x >>= y;"));
+    }
+
     void simplifyAssignmentInFunctionCall()
     {
         ASSERT_EQUALS("; x = g ( ) ; f ( x ) ;", tokenizeAndStringify(";f(x=g());"));
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
index fa85cba44..9685c60bd 100644
--- a/test/testunusedvar.cpp
+++ b/test/testunusedvar.cpp
@@ -2281,7 +2281,8 @@ private:
                               "    int b = 2;\n"
                               "    a |= b;\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'a' is assigned a value that is never used\n", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'a' is assigned a value that is never used\n", errout.str());
+        ASSERT_EQUALS("", errout.str());
     }
 
     void localvarFor()