walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed #887 (Tokenizer: Simplify variable value after loop)

This commit is contained in:
Daniel Marjamäki 2010-06-15 17:56:14 +02:00
parent 5c00c1a539
commit a42273da63
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/tokenize.cpp
View File

@ -5591,6 +5591,7 @@ bool Tokenizer::simplifyKnownVariables()
tok3->deleteNext(); tok3->deleteNext();
} }
incdec(value, op); incdec(value, op);
if (!Token::simpleMatch(tok2->tokAt(-2), "for ("))
tok2->tokAt(2)->str(value); tok2->tokAt(2)->str(value);
ret = true; ret = true;
} }

20
test/testtokenize.cpp
View File

@ -108,6 +108,7 @@ private:
TEST_CASE(simplifyKnownVariables23); TEST_CASE(simplifyKnownVariables23);
TEST_CASE(simplifyKnownVariables24); TEST_CASE(simplifyKnownVariables24);
TEST_CASE(simplifyKnownVariables25); TEST_CASE(simplifyKnownVariables25);
TEST_CASE(simplifyKnownVariables26);
TEST_CASE(match1); TEST_CASE(match1);
@ -1296,6 +1297,25 @@ private:
} }
} }
void simplifyKnownVariables26()
{
// This testcase is related to ticket #887
const char code[] = "void foo()\n"
"{\n"
" int i;\n"
" for (i=0;i<10;++i) { }\n"
" int k = i++;\n"
"}\n";
ASSERT_EQUALS(
"void foo ( ) "
"{"
" int i ;"
" for ( i = 0 ; i < 10 ; ++ i ) { }"
" int k ; k = 10 ; "
"}",
simplifyKnownVariables(code));
}
void match1() void match1()
{ {