Merge pull request cppcheck-opensource#607 from simartin/simplify_known_var_todo

amai2012 · amai2012 · commit bc2c172a1fc6 · 2015-05-31T06:50:55.000+02:00
Simplify known variables when they are at the end of a statement.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -6732,9 +6732,9 @@ bool Tokenizer::simplifyKnownVariablesSimplify(Token **tok2, Token *tok3, unsign
             ret = true;
         }
 
-        // condition "(|&&|%OROR% %varid% )|&&|%OROR%
+        // condition "(|&&|%OROR% %varid% )|&&|%OROR%|;
         if (!Token::Match(tok3->previous(), "( %name% )") &&
-            Token::Match(tok3->previous(), "&&|(|%oror% %varid% &&|%oror%|)", varid)) {
+            Token::Match(tok3->previous(), "&&|(|%oror% %varid% &&|%oror%|)|;", varid)) {
             tok3->str(value);
             tok3->varId(valueVarId);
             ret = true;
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -2231,8 +2231,7 @@ class TestTokenizer : public TestFixture {
                                   "4:\n"
                                   "5: return u@1 && v@2 ;\n"
                                   "6: }\n";
-            const char current[] =  "\n\n##file 0\n1: bool foo ( int u@1 , int v@2 )\n2: {\n3:\n4: int i@4 ; i@4 = v@2 ;\n5: return u@1 && i@4 ;\n6: }\n";
-            TODO_ASSERT_EQUALS(wanted, current, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(wanted, tokenizeDebugListing(code, true));
         }
 
         {
@@ -2245,12 +2244,11 @@ class TestTokenizer : public TestFixture {
             const char wanted[] = "\n\n##file 0\n"
                                   "1: bool foo ( int u@1 , int v@2 )\n"
                                   "2: {\n"
-                                  "3: ;\n"
-                                  "4: ;\n"
+                                  "3:\n"
+                                  "4:\n"
                                   "5: return u@1 || v@2 ;\n"
                                   "6: }\n";
-            const char current[] =  "\n\n##file 0\n1: bool foo ( int u@1 , int v@2 )\n2: {\n3:\n4: int i@4 ; i@4 = v@2 ;\n5: return u@1 || i@4 ;\n6: }\n";
-            TODO_ASSERT_EQUALS(wanted, current, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(wanted, tokenizeDebugListing(code, true));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2231,8 +2231,7 @@ class TestTokenizer : public TestFixture {`
`2231`	`2231`	`"4:\n"`
`2232`	`2232`	`"5: return u@1 && v@2 ;\n"`
`2233`	`2233`	`"6: }\n";`
`2234`		`- const char current[] = "\n\n##file 0\n1: bool foo ( int u@1 , int v@2 )\n2: {\n3:\n4: int i@4 ; i@4 = v@2 ;\n5: return u@1 && i@4 ;\n6: }\n";`
`2235`		`- TODO_ASSERT_EQUALS(wanted, current, tokenizeDebugListing(code, true));`
	`2234`	`+ ASSERT_EQUALS(wanted, tokenizeDebugListing(code, true));`
`2236`	`2235`	`}`
`2237`	`2236`
`2238`	`2237`	`{`
`@@ -2245,12 +2244,11 @@ class TestTokenizer : public TestFixture {`
`2245`	`2244`	`const char wanted[] = "\n\n##file 0\n"`
`2246`	`2245`	`"1: bool foo ( int u@1 , int v@2 )\n"`
`2247`	`2246`	`"2: {\n"`
`2248`		`- "3: ;\n"`
`2249`		`- "4: ;\n"`
	`2247`	`+ "3:\n"`
	`2248`	`+ "4:\n"`
`2250`	`2249`	`"5: return u@1 \|\| v@2 ;\n"`
`2251`	`2250`	`"6: }\n";`
`2252`		`- const char current[] = "\n\n##file 0\n1: bool foo ( int u@1 , int v@2 )\n2: {\n3:\n4: int i@4 ; i@4 = v@2 ;\n5: return u@1 \|\| i@4 ;\n6: }\n";`
`2253`		`- TODO_ASSERT_EQUALS(wanted, current, tokenizeDebugListing(code, true));`
	`2251`	`+ ASSERT_EQUALS(wanted, tokenizeDebugListing(code, true));`
`2254`	`2252`	`}`
`2255`	`2253`	`}`
`2256`	`2254`