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

Merge pull request #162 from simartin/ticket_4708 

Fixed #4708: prefix {in,de}crement too eagerly computed.
This commit is contained in:
Daniel Marjamäki 2013-08-15 20:35:38 -07:00
parent 5d7f30b88f bf09191b78
commit 33a948f816
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -6713,7 +6713,7 @@ bool Tokenizer::simplifyKnownVariablesSimplify(Token **tok2, Token *tok3, unsign
ret = true; ret = true;
} }
if (indentlevel == indentlevel3 && Token::Match(tok3->next(), "++|-- %varid%", varid) && MathLib::isInt(value) && if (!skipincdec && indentlevel == indentlevel3 && Token::Match(tok3->next(), "++|-- %varid%", varid) && MathLib::isInt(value) &&
!Token::Match(tok3->tokAt(3), "[.[]")) { !Token::Match(tok3->tokAt(3), "[.[]")) {
incdec(value, tok3->next()->str()); incdec(value, tok3->next()->str());
(*tok2)->tokAt(2)->str(value); (*tok2)->tokAt(2)->str(value);

41
test/testtokenize.cpp
View File

@ -178,6 +178,7 @@ private:
TEST_CASE(simplifyKnownVariables53); // references TEST_CASE(simplifyKnownVariables53); // references
TEST_CASE(simplifyKnownVariablesIfEq1); // if (a==5) => a is 5 in the block TEST_CASE(simplifyKnownVariablesIfEq1); // if (a==5) => a is 5 in the block
TEST_CASE(simplifyKnownVariablesIfEq2); // if (a==5) { buf[a++] = 0; } TEST_CASE(simplifyKnownVariablesIfEq2); // if (a==5) { buf[a++] = 0; }
TEST_CASE(simplifyKnownVariablesIfEq3); // #4708 - if (a==5) { buf[--a] = 0; }
TEST_CASE(simplifyKnownVariablesBailOutAssign1); TEST_CASE(simplifyKnownVariablesBailOutAssign1);
TEST_CASE(simplifyKnownVariablesBailOutAssign2); TEST_CASE(simplifyKnownVariablesBailOutAssign2);
TEST_CASE(simplifyKnownVariablesBailOutAssign3); // #4395 - nested assignments TEST_CASE(simplifyKnownVariablesBailOutAssign3); // #4395 - nested assignments
@ -2749,14 +2750,50 @@ private:
const char code[] = "void f(int x) {\n" const char code[] = "void f(int x) {\n"
" if (x==5) {\n" " if (x==5) {\n"
" buf[x++] = 0;\n" " buf[x++] = 0;\n"
" buf[x--] = 0;\n"
" }\n" " }\n"
"}"; "}";
const char expected[] = "void f ( int x ) {\n" const char current[] = "void f ( int x ) {\n"
"if ( x == 5 ) {\n" "if ( x == 5 ) {\n"
"buf [ x ++ ] = 0 ;\n" "buf [ x ++ ] = 0 ;\n"
"buf [ x -- ] = 0 ;\n"
"}\n" "}\n"
"}"; "}";
ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, true, Settings::Unspecified, "test.c")); // Increment and decrements should be computed
const char expected[] = "void f ( int x ) {\n"
"if ( x == 5 ) {\n"
"buf [ 5 ] = 0 ;\n"
"buf [ 6 ] = 0 ;\n"
"}\n"
"}";
TODO_ASSERT_EQUALS(expected, current, tokenizeAndStringify(code, true, true, Settings::Unspecified, "test.c"));
}
void simplifyKnownVariablesIfEq3() {
const char code[] = "void f(int x) {\n"
" if (x==5) {\n"
" buf[++x] = 0;\n"
" buf[++x] = 0;\n"
" buf[--x] = 0;\n"
" }\n"
"}";
const char current[] = "void f ( int x ) {\n"
"if ( x == 5 ) {\n"
"buf [ ++ x ] = 0 ;\n"
"buf [ ++ x ] = 0 ;\n"
"buf [ -- x ] = 0 ;\n"
"}\n"
"}";
// Increment and decrements should be computed
const char expected[] = "void f ( int x ) {\n"
"if ( x == 5 ) {\n"
"x = 6 ;\n"
"buf [ 6 ] = 0 ;\n"
"buf [ 7 ] = 0 ;\n"
"buf [ 6 ] = 0 ;\n"
"}\n"
"}";
TODO_ASSERT_EQUALS(expected, current, tokenizeAndStringify(code, true, true, Settings::Unspecified, "test.c"));
} }
void simplifyKnownVariablesBailOutAssign1() { void simplifyKnownVariablesBailOutAssign1() {