Fix ticket 3140 and 3137 (Improve Tokenizer: Remove dead for loop - simplify while(0) better.

edward-san · edward-san · commit b792efb761ed · 2011-10-13T13:01:24.000+02:00
Note: it doesn't remove dead code if there's a label inside. Will be improved in another ticket.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -10036,7 +10036,7 @@ void Tokenizer::simplifyWhile0()
         if (Token::simpleMatch(tok->next()->link(), ") {"))
         {
             const Token *end = tok->next()->link()->next()->link();
-            if (!findmatch(tok, end, "continue|break"))
+            if (!findmatch(tok, end, "%var% : ;"))
             {
                 Token::eraseTokens(tok, end ? end->next() : 0);
                 tok->deleteThis();  // delete "while"
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -6432,6 +6432,8 @@ class TestSimplifyTokens : public TestFixture
         // for (condition is always false)
         ASSERT_EQUALS("void f ( ) { ; }", tok("void f() { int i; for (i = 0; i < 0; i++) { a; } }"));
         //ticket #3140
+        ASSERT_EQUALS("void f ( ) { ; }", tok("void f() { int i; for (i = 0; i < 0; i++) { foo(); break; } }"));
+        ASSERT_EQUALS("void f ( ) { ; }", tok("void f() { int i; for (i = 0; i < 0; i++) { foo(); continue; } }"));
         ASSERT_EQUALS("void f ( ) { }", tok("void f() { for (int i = 0; i < 0; i++) { a; } }"));
         ASSERT_EQUALS("void f ( ) { }", tok("void f() { for (unsigned int i = 0; i < 0; i++) { a; } }"));
         ASSERT_EQUALS("void f ( ) { }", tok("void f() { for (long long i = 0; i < 0; i++) { a; } }"));

Original file line number	Diff line number	Diff line change
`@@ -10036,7 +10036,7 @@ void Tokenizer::simplifyWhile0()`
`10036`	`10036`	`if (Token::simpleMatch(tok->next()->link(), ") {"))`
`10037`	`10037`	`{`
`10038`	`10038`	`const Token *end = tok->next()->link()->next()->link();`
`10039`		`- if (!findmatch(tok, end, "continue\|break"))`
	`10039`	`+ if (!findmatch(tok, end, "%var% : ;"))`
`10040`	`10040`	`{`
`10041`	`10041`	`Token::eraseTokens(tok, end ? end->next() : 0);`
`10042`	`10042`	`tok->deleteThis(); // delete "while"`