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

Fixed ticket #549 (Tokenizer: improve calculation simplification) 

http://sourceforge.net/apps/trac/cppcheck/ticket/549
This commit is contained in:
Slava Semushin 2009-08-02 15:45:33 +07:00
parent 342acaaaf2
commit ed86eda07d
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tokenize.cpp
View File

@ -2938,7 +2938,7 @@ bool Tokenizer::simplifyCalculations()
}
// (1-2)
if (Token::Match(tok, "[[,(=<>] %num% [+-*/] %num% [],);=<>]"))
if (Token::Match(tok, "[[,(=<>+-*] %num% [+-*/] %num% [],);=<>+-*]"))
{
tok = tok->next();
@ -2965,6 +2965,14 @@ bool Tokenizer::simplifyCalculations()
tok->deleteNext();
tok->deleteNext();
// evaluate "2 + 2 - 2 - 2"
// as (((2 + 2) - 2) - 2) = 0
// instead of ((2 + 2) - (2 - 2)) = 4
if (Token::Match(tok->next(), "[+-*/]")) {
tok = tok->tokAt(-2);
continue;
}
ret = true;
}

32
test/testsimplifytokens.cpp
View File

@ -115,6 +115,9 @@ private:
// Simplify "?:"
TEST_CASE(conditionOperator);
// Simplify calculations
TEST_CASE(calculations);
}
std::string tok(const char code[])
@ -1155,6 +1158,35 @@ private:
TODO_ASSERT_EQUALS("( abc . a )", tok(code));
}
}
void calculations()
{
{
const char code[] = "a[i+8+2]";
ASSERT_EQUALS("a [ i + 10 ]", tok(code));
}
{
const char code[] = "a[8+2+i]";
ASSERT_EQUALS("a [ 10 + i ]", tok(code));
}
{
const char code[] = "a[i + 2 * (2 * 4)]";
ASSERT_EQUALS("a [ i + 16 ]", tok(code));
}
{
const char code[] = "a[i + 100 - 90]";
ASSERT_EQUALS("a [ i + 10 ]", tok(code));
}
{
const char code[] = "a[1+1+1+1+1+1+1+1+1+1-2+5-3]";
ASSERT_EQUALS("a [ 10 ]", tok(code));
}
{
const char code[] = "a[10+10-10-10]";
ASSERT_EQUALS("a [ 0 ]", tok(code));
}
}
};
REGISTER_TEST(TestSimplifyTokens)